fixup! fix(cloudflare): Missing events inside waitUntil

Author: JPeer264

dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/index.test.ts

@@ -49,7 +49,8 @@ test('sends spans for MCP tool calls', async ({ baseURL }) => {
     typeof mcpEvent === 'string' ||
     !('contexts' in mcpEvent) ||
     typeof requestEvent === 'string' ||
-    !('contexts' in requestEvent)
+    !('contexts' in requestEvent) ||
+    !('spans' in requestEvent)
   ) {
     throw new Error("Events don't have contexts");
   }
@@ -71,21 +72,55 @@ test('sends spans for MCP tool calls', async ({ baseURL }) => {
       'url.port': '38787',
       'url.scheme': 'http:',
       'server.address': 'localhost',
-      'http.request.body.size': 120,
       'user_agent.original': 'node',
-      'http.request.header.content_type': 'application/json',
       'network.protocol.name': 'HTTP/1.1',
-      'mcp.server.extra': ' /|\ ^._.^ /|\ ',
-      'http.response.status_code': 200,
     }),
     op: 'http.server',
-    status: 'ok',
     origin: 'auto.http.cloudflare',
   });
 
+  expect(requestEvent.spans).toEqual([
+    {
+      data: {
+        'sentry.origin': 'auto.http.cloudflare',
+        'sentry.op': 'http.server',
+        'sentry.source': 'url',
+        'http.request.method': 'POST',
+        'url.path': '/mcp',
+        'url.full': 'http://localhost:38787/mcp',
+        'url.port': '38787',
+        'url.scheme': 'http:',
+        'server.address': 'localhost',
+        'http.request.body.size': 120,
+        'user_agent.original': 'node',
+        'http.request.header.accept': 'application/json, text/event-stream',
+        'http.request.header.accept_encoding': 'br, gzip',
+        'http.request.header.accept_language': '*',
+        'http.request.header.cf_connecting_ip': '::1',
+        'http.request.header.content_length': '120',
+        'http.request.header.content_type': 'application/json',
+        'http.request.header.host': 'localhost:38787',
+        'http.request.header.sec_fetch_mode': 'cors',
+        'http.request.header.user_agent': 'node',
+        'network.protocol.name': 'HTTP/1.1',
+        'mcp.server.extra': ' /|\ ^._.^ /|\ ',
+        'http.response.status_code': 200,
+      },
+      description: 'fetch',
+      op: 'http.server',
+      parent_span_id: expect.any(String),
+      span_id: expect.any(String),
+      start_timestamp: expect.any(Number),
+      status: 'ok',
+      timestamp: expect.any(Number),
+      trace_id: expect.any(String),
+      origin: 'auto.http.cloudflare',
+    },
+  ]);
+
   expect(mcpEvent.contexts?.trace).toEqual({
     trace_id: expect.any(String),
-    parent_span_id: requestEvent.contexts?.trace?.span_id,
+    parent_span_id: requestEvent.spans?.[0]?.span_id,
     span_id: expect.any(String),
     op: 'mcp.server',
     origin: 'auto.function.mcp_server',

dev-packages/e2e-tests/test-applications/cloudflare-workers/tests/index.test.ts

@@ -137,23 +137,34 @@ test.only('waitUntil', async ({ baseURL }) => {
   // Transaction trace context (root span - no status/response code, those are on the fetch child span)
   expect(transactionEvent.contexts?.trace).toMatchObject({
     op: 'http.server',
-    status: 'ok',
     origin: 'auto.http.cloudflare',
     data: expect.objectContaining({
       'sentry.op': 'http.server',
       'sentry.origin': 'auto.http.cloudflare',
-      'http.request.method': 'GET',
       'url.path': '/waitUntil',
-      'http.response.status_code': 200,
     }),
   });
 
+  expect(transactionEvent.contexts?.trace).not.toEqual(
+    expect.objectContaining({
+      data: expect.objectContaining({
+        'http.request.method': 'GET',
+        'http.response.status_code': 200,
+      }),
+    }),
+  );
+
   expect(transactionEvent.spans).toEqual([
     expect.objectContaining({
+      status: 'ok',
       description: 'fetch',
       op: 'http.server',
       origin: 'auto.http.cloudflare',
       parent_span_id: transactionEvent.contexts?.trace?.span_id,
+      data: expect.objectContaining({
+        'http.request.method': 'GET',
+        'http.response.status_code': 200,
+      }),
     }),
     expect.objectContaining({
       description: 'waitUntil',

packages/cloudflare/src/request.ts

@@ -120,7 +120,6 @@ export function wrapRequestHandler(
 
             try {
               res = await handler();
-              setHttpStatus(rootSpan, res.status);
               setHttpStatus(fetchSpan, res.status);
 
               // After the handler runs, the span name might have been updated by nested instrumentation

packages/cloudflare/test/durableobject.test.ts

@@ -161,8 +161,10 @@ describe('instrumentDurableObjectWithSentry', () => {
     const after = flush.mock.calls.length;
     const delta = after - before;
 
-    // Verify that exactly one flush call was made during this test
-    expect(delta).toBe(1);
+    // Verify that two flush calls were made during this test
+    // The first flush is called when the response is captured
+    // The second flush is called when the waitUntil promises are finished
+    expect(delta).toBe(2);
   });
 
   describe('instrumentPrototypeMethods option', () => {

packages/cloudflare/test/handler.test.ts

@@ -161,7 +161,7 @@ describe('withSentry', () => {
       expect(waitUntil).toBeCalled();
       vi.advanceTimersToNextTimer().runAllTimers();
       await Promise.all(waits);
-      expect(flush).toHaveBeenCalledOnce();
+      expect(flush).toHaveBeenCalledTimes(2);
     });
   });