From c134deb3e2c6177c990ba0142d080242ef3531db Mon Sep 17 00:00:00 2001
From: Felix Hanau <felix@cloudflare.com>
Date: Tue, 14 Jan 2025 21:19:25 -0500
Subject: [PATCH] [o11y] Adjust user span naming

This is more descriptive:
Websocket::constructor => websocket_open
actor_subrequest => durable_object_subrequest
hyperdrive_dev => hyperdrive_connect to match downstream name
---
 src/workerd/api/actor.c++      | 6 +++---
 src/workerd/api/hyperdrive.c++ | 2 +-
 src/workerd/api/web-socket.c++ | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/workerd/api/actor.c++ b/src/workerd/api/actor.c++
index 397d350a099..8158b86f16b 100644
--- a/src/workerd/api/actor.c++
+++ b/src/workerd/api/actor.c++
@@ -40,7 +40,7 @@ class LocalActorOutgoingFactory final: public Fetcher::OutgoingFactory {
     },
         {.inHouse = true,
           .wrapMetrics = true,
-          .operationName = kj::ConstString("actor_subrequest"_kjc)}));
+          .operationName = kj::ConstString("durable_object_subrequest"_kjc)}));
   }
 
  private:
@@ -82,7 +82,7 @@ class GlobalActorOutgoingFactory final: public Fetcher::OutgoingFactory {
     },
         {.inHouse = true,
           .wrapMetrics = true,
-          .operationName = kj::ConstString("actor_subrequest"_kjc)}));
+          .operationName = kj::ConstString("durable_object_subrequest"_kjc)}));
   }
 
  private:
@@ -110,7 +110,7 @@ kj::Own<WorkerInterface> ReplicaActorOutgoingFactory::newSingleUseClient(
   },
       {.inHouse = true,
         .wrapMetrics = true,
-        .operationName = kj::ConstString("actor_subrequest"_kjc)}));
+        .operationName = kj::ConstString("durable_object_subrequest"_kjc)}));
 }
 
 jsg::Ref<Fetcher> ColoLocalActorNamespace::get(kj::String actorId) {
diff --git a/src/workerd/api/hyperdrive.c++ b/src/workerd/api/hyperdrive.c++
index d046a650483..41f143c927e 100644
--- a/src/workerd/api/hyperdrive.c++
+++ b/src/workerd/api/hyperdrive.c++
@@ -86,7 +86,7 @@ kj::String Hyperdrive::getConnectionString() {
 kj::Promise<kj::Own<kj::AsyncIoStream>> Hyperdrive::connectToDb() {
   auto& context = IoContext::current();
   auto service =
-      context.getSubrequestChannel(this->clientIndex, true, kj::none, "hyperdrive_dev"_kjc);
+      context.getSubrequestChannel(this->clientIndex, true, kj::none, "hyperdrive_connect"_kjc);
 
   kj::HttpHeaderTable headerTable;
   kj::HttpHeaders headers(headerTable);
diff --git a/src/workerd/api/web-socket.c++ b/src/workerd/api/web-socket.c++
index 8d3d7fcf8f4..06a97c0e204 100644
--- a/src/workerd/api/web-socket.c++
+++ b/src/workerd/api/web-socket.c++
@@ -205,7 +205,7 @@ jsg::Ref<WebSocket> WebSocket::constructor(jsg::Lock& js,
       urlRecord.fragment == kj::none, DOMSyntaxError, wsErr, "The url fragment must be empty.");
 
   kj::HttpHeaders headers(context.getHeaderTable());
-  auto client = context.getHttpClient(0, false, kj::none, "WebSocket::constructor"_kjc);
+  auto client = context.getHttpClient(0, false, kj::none, "websocket_open"_kjc);
 
   // Set protocols header if necessary.
   KJ_IF_SOME(variant, protocols) {