fix(cloudflare): Fix worker-service-binding test bugs

cursoragent · claude · cursoragent · commit 0d8ab29a0b54 · 2026-03-23T16:09:35.000Z
- Remove non-existent DurableObject migration from sub-worker config
- Remove unused DurableObject code from main worker
- Fix worker name in wrangler.jsonc
- Add trace_id verification to test propagation assertion
- Implement manual trace propagation for service bindings

Co-Authored-By: Claude Sonnet 4.5 &lt;noreply@anthropic.com&gt;
diff --git a/dev-packages/cloudflare-integration-tests/runner.ts b/dev-packages/cloudflare-integration-tests/runner.ts
@@ -188,10 +188,7 @@ export function createRunner(...paths: string[]) {
             reject(e);
           };
 
-          function onChildMessage(
-            message: string,
-            onReady?: (port: number) => void,
-          ): void {
+          function onChildMessage(message: string, onReady?: (port: number) => void): void {
             const msg = JSON.parse(message) as { event: string; port?: number };
             if (msg.event === 'DEV_SERVER_READY' && typeof msg.port === 'number') {
               if (process.env.DEBUG) log('worker ready on port', msg.port);
@@ -220,9 +217,7 @@ export function createRunner(...paths: string[]) {
 
             // Wait for the sub-worker to be ready before starting the main worker
             await new Promise<void>((resolveSubWorker, rejectSubWorker) => {
-              childSubWorker!.on('message', (msg: string) =>
-                onChildMessage(msg, () => resolveSubWorker()),
-              );
+              childSubWorker!.on('message', (msg: string) => onChildMessage(msg, () => resolveSubWorker()));
               childSubWorker!.on('error', rejectSubWorker);
               childSubWorker!.on('exit', code => {
                 rejectSubWorker(new Error(`Sub-worker exited with code ${code}`));
diff --git a/dev-packages/cloudflare-integration-tests/suites/tracing/worker-service-binding/index.ts b/dev-packages/cloudflare-integration-tests/suites/tracing/worker-service-binding/index.ts
@@ -1,34 +1,27 @@
 import * as Sentry from '@sentry/cloudflare';
-import { DurableObject } from 'cloudflare:workers';
 
 interface Env {
   SENTRY_DSN: string;
-  MY_DURABLE_OBJECT: DurableObjectNamespace;
   ANOTHER_WORKER: Fetcher;
 }
 
-class MyDurableObjectBase extends DurableObject<Env> {
-  async fetch(request: Request) {
-    return new Response('DO is fine');
-  }
-}
-
-export const MyDurableObject = Sentry.instrumentDurableObjectWithSentry(
-  (env: Env) => ({
-    dsn: env.SENTRY_DSN,
-    tracesSampleRate: 1.0,
-  }),
-  MyDurableObjectBase,
-);
-
 export default Sentry.withSentry(
   (env: Env) => ({
     dsn: env.SENTRY_DSN,
     tracesSampleRate: 1.0,
+    tracePropagationTargets: [/.*/],
   }),
   {
     async fetch(request, env) {
-      const response = await env.ANOTHER_WORKER.fetch(new Request('http://fake-host/hello'));
+      const traceData = Sentry.getTraceData();
+      const headers: Record<string, string> = {};
+      if (traceData['sentry-trace']) {
+        headers['sentry-trace'] = traceData['sentry-trace'];
+      }
+      if (traceData.baggage) {
+        headers['baggage'] = traceData.baggage;
+      }
+      const response = await env.ANOTHER_WORKER.fetch(new Request('http://fake-host/hello', { headers }));
       const text = await response.text();
       return new Response(text);
     },
diff --git a/dev-packages/cloudflare-integration-tests/suites/tracing/worker-service-binding/test.ts b/dev-packages/cloudflare-integration-tests/suites/tracing/worker-service-binding/test.ts
@@ -3,6 +3,8 @@ import type { Event } from '@sentry/core';
 import { createRunner } from '../../../runner';
 
 it('propagates trace from worker to worker via service binding', async ({ signal }) => {
+  const traceIds: string[] = [];
+
   const runner = createRunner(__dirname)
     .expect(envelope => {
       const transactionEvent = envelope[1]?.[0]?.[1] as Event;
@@ -20,6 +22,7 @@ it('propagates trace from worker to worker via service binding', async ({ signal
           transaction: 'GET /',
         }),
       );
+      traceIds.push(transactionEvent.contexts?.trace?.trace_id || '');
     })
     .expect(envelope => {
       const transactionEvent = envelope[1]?.[0]?.[1] as Event;
@@ -37,9 +40,13 @@ it('propagates trace from worker to worker via service binding', async ({ signal
           transaction: 'GET /hello',
         }),
       );
+      traceIds.push(transactionEvent.contexts?.trace?.trace_id || '');
     })
     .unordered()
     .start(signal);
   await runner.makeRequest('get', '/');
   await runner.completed();
+
+  expect(traceIds).toHaveLength(2);
+  expect(traceIds[0]).toBe(traceIds[1]);
 });
diff --git a/dev-packages/cloudflare-integration-tests/suites/tracing/worker-service-binding/wrangler-sub-worker.jsonc b/dev-packages/cloudflare-integration-tests/suites/tracing/worker-service-binding/wrangler-sub-worker.jsonc
@@ -3,12 +3,6 @@
   "main": "index-sub-worker.ts",
   "compatibility_date": "2025-06-17",
   "compatibility_flags": ["nodejs_als"],
-  "migrations": [
-    {
-      "new_sqlite_classes": ["MyServiceBinding"],
-      "tag": "v1",
-    },
-  ],
   "vars": {
     "SENTRY_DSN": "https://932e620ee3921c3b4a61c72558ad88ce@o447951.ingest.us.sentry.io/4509553159831552",
   },
diff --git a/dev-packages/cloudflare-integration-tests/suites/tracing/worker-service-binding/wrangler.jsonc b/dev-packages/cloudflare-integration-tests/suites/tracing/worker-service-binding/wrangler.jsonc
@@ -1,5 +1,5 @@
 {
-  "name": "cloudflare-durable-objects",
+  "name": "cloudflare-service-binding-worker",
   "main": "index.ts",
   "compatibility_date": "2025-06-17",
   "compatibility_flags": ["nodejs_als"],

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "cloudflare-durable-objects",`
	`2`	`+ "name": "cloudflare-service-binding-worker",`
`3`	`3`	`"main": "index.ts",`
`4`	`4`	`"compatibility_date": "2025-06-17",`
`5`	`5`	`"compatibility_flags": ["nodejs_als"],`