Merge branch 'develop' into feat/mcp-register-api-support

Author: betegon

.github/workflows/validate-pr.yml

@@ -10,7 +10,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: getsentry/github-workflows/validate-pr@0b52fc6a867b744dcbdf5d25c18bc8d1c95710e1
+      - uses: getsentry/github-workflows/validate-pr@71588ddf95134f804e82c5970a8098588e2eaecd
         with:
           app-id: ${{ vars.SDK_MAINTAINER_BOT_APP_ID }}
           private-key: ${{ secrets.SDK_MAINTAINER_BOT_PRIVATE_KEY }}

dev-packages/cloudflare-integration-tests/suites/double-instrumentation/index.ts

@@ -0,0 +1,21 @@
+import * as Sentry from '@sentry/cloudflare';
+
+interface Env {
+  SENTRY_DSN: string;
+}
+
+const handler = {
+  async fetch(request: Request, _env: Env, _ctx: ExecutionContext) {
+    if (request.url.includes('/error')) {
+      throw new Error('Test error from double-instrumented worker');
+    }
+    return new Response('ok');
+  },
+};
+
+// Deliberately call withSentry twice on the same handler object.
+// This simulates scenarios where the module is re-evaluated or the handler
+// is wrapped multiple times. The SDK should handle this gracefully
+// without double-wrapping (which would cause duplicate error reports).
+const once = Sentry.withSentry((env: Env) => ({ dsn: env.SENTRY_DSN }), handler);
+export default Sentry.withSentry((env: Env) => ({ dsn: env.SENTRY_DSN }), once);

dev-packages/cloudflare-integration-tests/suites/double-instrumentation/test.ts

@@ -0,0 +1,38 @@
+import { expect, it } from 'vitest';
+import { eventEnvelope } from '../../expect';
+import { createRunner } from '../../runner';
+
+it('Only sends one error event when withSentry is called twice', async ({ signal }) => {
+  const runner = createRunner(__dirname)
+    .expect(
+      eventEnvelope({
+        level: 'error',
+        exception: {
+          values: [
+            {
+              type: 'Error',
+              value: 'Test error from double-instrumented worker',
+              stacktrace: {
+                frames: expect.any(Array),
+              },
+              mechanism: { type: 'auto.http.cloudflare', handled: false },
+            },
+          ],
+        },
+        request: {
+          headers: expect.any(Object),
+          method: 'GET',
+          url: expect.any(String),
+        },
+      }),
+    )
+    .start(signal);
+  await runner.makeRequest('get', '/error', { expectError: true });
+  await runner.completed();
+});
+
+it('Successful response works when withSentry is called twice', async ({ signal }) => {
+  const runner = createRunner(__dirname).start(signal);
+  const response = await runner.makeRequest<string>('get', '/');
+  expect(response).toBe('ok');
+});

dev-packages/cloudflare-integration-tests/suites/double-instrumentation/wrangler.jsonc

@@ -0,0 +1,6 @@
+{
+  "name": "worker-name",
+  "compatibility_date": "2025-06-17",
+  "main": "index.ts",
+  "compatibility_flags": ["nodejs_compat"],
+}

dev-packages/cloudflare-integration-tests/suites/tracing/durableobject-spans/index.ts

@@ -0,0 +1,46 @@
+import * as Sentry from '@sentry/cloudflare';
+import { DurableObject } from 'cloudflare:workers';
+
+interface Env {
+  SENTRY_DSN: string;
+  TEST_DURABLE_OBJECT: DurableObjectNamespace;
+}
+
+class TestDurableObjectBase extends DurableObject<Env> {
+  public constructor(ctx: DurableObjectState, env: Env) {
+    super(ctx, env);
+  }
+
+  // eslint-disable-next-line @typescript-eslint/explicit-member-accessibility
+  async doWork(): Promise<string> {
+    const results: string[] = [];
+
+    for (let i = 1; i <= 5; i++) {
+      await Sentry.startSpan({ name: `task-${i}`, op: 'task' }, async () => {
+        // Simulate async work
+        await new Promise<void>(resolve => setTimeout(resolve, 1));
+        results.push(`done-${i}`);
+      });
+    }
+
+    return results.join(',');
+  }
+}
+
+export const TestDurableObject = Sentry.instrumentDurableObjectWithSentry(
+  (env: Env) => ({
+    dsn: env.SENTRY_DSN,
+    tracesSampleRate: 1.0,
+    instrumentPrototypeMethods: true,
+  }),
+  TestDurableObjectBase,
+);
+
+export default {
+  async fetch(_request: Request, env: Env): Promise<Response> {
+    const id: DurableObjectId = env.TEST_DURABLE_OBJECT.idFromName('test');
+    const stub = env.TEST_DURABLE_OBJECT.get(id) as unknown as TestDurableObjectBase;
+    const result = await stub.doWork();
+    return new Response(result);
+  },
+};

dev-packages/cloudflare-integration-tests/suites/tracing/durableobject-spans/test.ts

@@ -0,0 +1,54 @@
+import { expect, it } from 'vitest';
+import { createRunner } from '../../../runner';
+
+// Regression test for https://github.com/getsentry/sentry-javascript/issues/20030
+// When a Durable Object method calls Sentry.startSpan multiple times, those spans
+// must appear as children of the DO transaction. The first invocation always worked;
+// the second invocation on the same DO instance previously lost its child spans
+// because the client was disposed after the first call.
+it('sends child spans on repeated Durable Object calls', async ({ signal }) => {
+  function assertDoWorkEnvelope(envelope: unknown): void {
+    const transactionEvent = (envelope as any)[1]?.[0]?.[1];
+
+    expect(transactionEvent).toEqual(
+      expect.objectContaining({
+        transaction: 'doWork',
+        contexts: expect.objectContaining({
+          trace: expect.objectContaining({
+            op: 'rpc',
+            origin: 'auto.faas.cloudflare.durable_object',
+          }),
+        }),
+      }),
+    );
+
+    // All 5 child spans should be present
+    expect(transactionEvent.spans).toHaveLength(5);
+    expect(transactionEvent.spans).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ description: 'task-1', op: 'task' }),
+        expect.objectContaining({ description: 'task-2', op: 'task' }),
+        expect.objectContaining({ description: 'task-3', op: 'task' }),
+        expect.objectContaining({ description: 'task-4', op: 'task' }),
+        expect.objectContaining({ description: 'task-5', op: 'task' }),
+      ]),
+    );
+
+    // All child spans share the root trace_id
+    const rootTraceId = transactionEvent.contexts?.trace?.trace_id;
+    expect(rootTraceId).toBeDefined();
+    for (const span of transactionEvent.spans) {
+      expect(span.trace_id).toBe(rootTraceId);
+    }
+  }
+
+  // Expect 5 transaction envelopes — one per call.
+  const runner = createRunner(__dirname).expectN(5, assertDoWorkEnvelope).start(signal);
+
+  await runner.makeRequest('get', '/');
+  await runner.makeRequest('get', '/');
+  await runner.makeRequest('get', '/');
+  await runner.makeRequest('get', '/');
+  await runner.makeRequest('get', '/');
+  await runner.completed();
+});

dev-packages/cloudflare-integration-tests/suites/tracing/durableobject-spans/wrangler.jsonc

@@ -0,0 +1,20 @@
+{
+  "name": "worker-name",
+  "main": "index.ts",
+  "compatibility_date": "2025-06-17",
+  "migrations": [
+    {
+      "new_sqlite_classes": ["TestDurableObject"],
+      "tag": "v1",
+    },
+  ],
+  "durable_objects": {
+    "bindings": [
+      {
+        "class_name": "TestDurableObject",
+        "name": "TEST_DURABLE_OBJECT",
+      },
+    ],
+  },
+  "compatibility_flags": ["nodejs_als"],
+}

dev-packages/cloudflare-integration-tests/suites/tracing/durableobject/wrangler.jsonc

@@ -17,7 +17,4 @@
     ],
   },
   "compatibility_flags": ["nodejs_als"],
-  "vars": {
-    "SENTRY_DSN": "https://932e620ee3921c3b4a61c72558ad88ce@o447951.ingest.us.sentry.io/4509553159831552",
-  },
 }

dev-packages/cloudflare-integration-tests/suites/tracing/worker-service-binding/wrangler-sub-worker.jsonc

@@ -3,7 +3,4 @@
   "main": "index-sub-worker.ts",
   "compatibility_date": "2025-06-17",
   "compatibility_flags": ["nodejs_als"],
-  "vars": {
-    "SENTRY_DSN": "https://932e620ee3921c3b4a61c72558ad88ce@o447951.ingest.us.sentry.io/4509553159831552",
-  },
 }

dev-packages/cloudflare-integration-tests/suites/tracing/worker-service-binding/wrangler.jsonc

@@ -3,9 +3,6 @@
   "main": "index.ts",
   "compatibility_date": "2025-06-17",
   "compatibility_flags": ["nodejs_als"],
-  "vars": {
-    "SENTRY_DSN": "https://932e620ee3921c3b4a61c72558ad88ce@o447951.ingest.us.sentry.io/4509553159831552",
-  },
   "services": [
     {
       "binding": "ANOTHER_WORKER",