[o11y][nfc] Emit jsRpc call attributes in standard test worker, use it for sql-test

Author: fhanau

src/workerd/api/tests/BUILD.bazel

@@ -124,6 +124,7 @@ wd_test(
     src = "sql-test.wd-test",
     args = ["--experimental"],
     data = [
+        "instrumentation-tail-worker.js",
         "sql-test.js",
         "sql-test-tail.js",
     ],

src/workerd/api/tests/actor-kv-test-tail.js

@@ -3,7 +3,7 @@ import {
   invocationPromises,
   spans,
   testTailHandler,
-} from 'test:instumentation-tail';
+} from 'test:instrumentation-tail';
 
 // Use shared instrumentation test tail worker
 export default testTailHandler;
@@ -27,10 +27,7 @@ export const test = {
     ];
 
     await Promise.allSettled(invocationPromises);
-    let received = Array.from(spans.values()).filter(
-      (span) => span.name !== 'jsRpcSession'
-    );
+    let received = Array.from(spans.values());
     assert.deepStrictEqual(received, expected);
-    return new Response('');
   },
 };

src/workerd/api/tests/actor-kv-test.wd-test

@@ -8,7 +8,7 @@ const config :Workerd.Config = (
   ],
   extensions = [ (
     modules = [
-      ( name = "test:instumentation-tail", esModule = embed "instrumentation-tail-worker.js" ),
+      ( name = "test:instrumentation-tail", esModule = embed "instrumentation-tail-worker.js" ),
     ]
   ) ]
 );

src/workerd/api/tests/analytics-engine-test.js

@@ -23,6 +23,5 @@ export default {
     });
 
     assert.equal(await isWritten(5000), true);
-    return new Response('');
   },
 };

src/workerd/api/tests/cache-instrumentation-test.js

@@ -6,7 +6,7 @@ import {
   invocationPromises,
   spans,
   testTailHandler,
-} from 'test:instumentation-tail';
+} from 'test:instrumentation-tail';
 
 // Use shared instrumentation test tail worker
 export default testTailHandler;

src/workerd/api/tests/cache-test.wd-test

@@ -23,7 +23,7 @@ const unitTests :Workerd.Config = (
   ],
   extensions = [ (
     modules = [
-      ( name = "test:instumentation-tail", esModule = embed "instrumentation-tail-worker.js" ),
+      ( name = "test:instrumentation-tail", esModule = embed "instrumentation-tail-worker.js" ),
     ]
   ) ]
 );

src/workerd/api/tests/instrumentation-tail-worker.js

@@ -32,14 +32,18 @@ export const testTailHandler = {
           });
           break;
         case 'attributes': {
-          // Filter out top-level attributes events (jsRpcSession span)
+          let span = spans.get(spanKey);
           if (event.spanContext.spanId === topLevelSpanId) {
-            // Ignore attributes for the top-level span
+            // top-level JsRpc method name attribute – transform into a span with the given name
+            const rpcMethodName = event.event.info.find(
+              (item) => item['name'] === 'jsrpc.method'
+            ).value;
+            span = { name: rpcMethodName };
+            spans.set(spanKey, span);
             break;
           }
 
           // attributes references an existing span via spanContext.spanId
-          let span = spans.get(spanKey);
           if (!span) {
             throw new Error(`Attributes event for unknown span: ${spanKey}`);
           }

src/workerd/api/tests/kv-instrumentation-test.js

@@ -6,7 +6,7 @@ import {
   invocationPromises,
   spans,
   testTailHandler,
-} from 'test:instumentation-tail';
+} from 'test:instrumentation-tail';
 
 // Use shared instrumentation test tail worker
 export default testTailHandler;
@@ -16,10 +16,10 @@ export const test = {
     // Wait for all the tailStream executions to finish
     await Promise.allSettled(invocationPromises);
 
-    // Recorded streaming tail worker events, in insertion order,
-    // filtering spans not associated with KV
-    let received = Array.from(spans.values()).filter(
-      (span) => span.name !== 'jsRpcSession'
+    // Recorded streaming tail worker events, in insertion order, filtering spans not associated
+    // with KV, including jsRpc calls
+    let received = Array.from(spans.values()).filter((span) =>
+      span.name.match('kv')
     );
 
     // spans emitted by kv-test.js in execution order

src/workerd/api/tests/kv-test.wd-test

@@ -17,7 +17,7 @@ const unitTests :Workerd.Config = (
   ],
   extensions = [ (
     modules = [
-      ( name = "test:instumentation-tail", esModule = embed "instrumentation-tail-worker.js" ),
+      ( name = "test:instrumentation-tail", esModule = embed "instrumentation-tail-worker.js" ),
     ]
   ) ]
 );

src/workerd/api/tests/r2-instrumentation-test.js

@@ -6,7 +6,7 @@ import {
   invocationPromises,
   spans,
   testTailHandler,
-} from 'test:instumentation-tail';
+} from 'test:instrumentation-tail';
 
 // Use shared instrumentation test tail worker
 export default testTailHandler;