Add tracing span parameters to getActor operations

src/workerd/io/io-channels.h

@@ -190,15 +190,16 @@ class IoChannelFactory {
   };
 
   virtual kj::Own<ActorChannel> getGlobalActor(uint channel, const ActorIdFactory::ActorId& id,
-      kj::Maybe<kj::String> locationHint, ActorGetMode mode) = 0;
+      kj::Maybe<kj::String> locationHint, ActorGetMode mode, SpanParent parentSpan) = 0;
   // Get an actor stub from the given namespace for the actor with the given ID.
   //
   // `id` must have been constructed using one of the `ActorIdFactory` instances corresponding to
   // one of the worker's bindings, however it doesn't necessarily have to be from the the correct
   // `ActorIdFactory` -- if it's from some other factory, the method will throw an appropriate
   // exception.
 
-  virtual kj::Own<ActorChannel> getColoLocalActor(uint channel, kj::StringPtr id) = 0;
+  virtual kj::Own<ActorChannel> getColoLocalActor(uint channel, kj::StringPtr id,
+      SpanParent parentSpan) = 0;
   // Get an actor stub from the given namespace for the actor with the given name.
 };
 

src/workerd/io/io-context.h

@@ -809,10 +809,11 @@ class IoContext final: public kj::Refcounted, private kj::TaskSet::ErrorHandler
   kj::Own<IoChannelFactory::ActorChannel> getGlobalActorChannel(
         uint channel, const ActorIdFactory::ActorId& id, kj::Maybe<kj::String> locationHint,
         ActorGetMode mode) {
-    return getIoChannelFactory().getGlobalActor(channel, id, kj::mv(locationHint), mode);
+    return getIoChannelFactory().getGlobalActor(channel, id, kj::mv(locationHint), mode,
+        getCurrentTraceSpan());
   }
   kj::Own<IoChannelFactory::ActorChannel> getColoLocalActorChannel(uint channel, kj::StringPtr id) {
-    return getIoChannelFactory().getColoLocalActor(channel, id);
+    return getIoChannelFactory().getColoLocalActor(channel, id, getCurrentTraceSpan());
   }
 
   kj::Own<CacheClient> getCacheClient();

src/workerd/server/server.c++

@@ -1708,7 +1708,7 @@ private:
   }
 
   kj::Own<ActorChannel> getGlobalActor(uint channel, const ActorIdFactory::ActorId& id,
-      kj::Maybe<kj::String> locationHint, ActorGetMode mode) override {
+      kj::Maybe<kj::String> locationHint, ActorGetMode mode, SpanParent parentSpan) override {
     JSG_REQUIRE(mode == ActorGetMode::GET_OR_CREATE, Error,
         "workerd only supports GET_OR_CREATE mode for getting actor stubs");
     auto& channels = KJ_REQUIRE_NONNULL(ioChannels.tryGet<LinkedIoChannels>(),
@@ -1721,7 +1721,8 @@ private:
     return ns.getActorChannel(id.clone());
   }
 
-  kj::Own<ActorChannel> getColoLocalActor(uint channel, kj::StringPtr id) override {
+  kj::Own<ActorChannel> getColoLocalActor(uint channel, kj::StringPtr id,
+      SpanParent parentSpan) override {
     auto& channels = KJ_REQUIRE_NONNULL(ioChannels.tryGet<LinkedIoChannels>(),
         "link() has not been called");
 

src/workerd/tests/test-fixture.c++

@@ -78,11 +78,12 @@ struct DummyIoChannelFactory final: public IoChannelFactory {
   }
 
   kj::Own<ActorChannel> getGlobalActor(uint channel, const ActorIdFactory::ActorId& id,
-      kj::Maybe<kj::String> locationHint, ActorGetMode mode) override {
+      kj::Maybe<kj::String> locationHint, ActorGetMode mode, SpanParent parentSpan) override {
     KJ_FAIL_REQUIRE("no actor channels");
   }
 
-  kj::Own<ActorChannel> getColoLocalActor(uint channel, kj::StringPtr id) override {
+  kj::Own<ActorChannel> getColoLocalActor(uint channel, kj::StringPtr id,
+      SpanParent parentSpan) override {
     KJ_FAIL_REQUIRE("no actor channels");
   }