From 2696fafa23137a33270737ed1d403d2ee2acb126 Mon Sep 17 00:00:00 2001
From: JPeer264 <jan.peer@sentry.io>
Date: Tue, 1 Sep 2026 12:22:00 +0200
Subject: [PATCH] test(e2e): Port cloudflare-mcp-agent to span streaming

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../cloudflare-mcp-agent/src/index.ts         |  2 -
 .../cloudflare-mcp-agent/tests/index.test.ts  | 54 ++++++++-----------
 2 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp-agent/src/index.ts b/dev-packages/e2e-tests/test-applications/cloudflare-mcp-agent/src/index.ts
index 3c760e643ef7..aa0978a0ac76 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-mcp-agent/src/index.ts
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-mcp-agent/src/index.ts
@@ -50,7 +50,6 @@ class MyMCPAgentBase extends McpAgent<Env, unknown, Record<string, unknown>> {
 
 export const MyMCPAgent = Sentry.instrumentDurableObjectWithSentry(
   (env: Env) => ({
-    traceLifecycle: 'static',
     dsn: env.E2E_TEST_DSN,
     environment: 'qa',
     tunnel: `http://localhost:3031/`,
@@ -71,7 +70,6 @@ export const MyMCPAgent = Sentry.instrumentDurableObjectWithSentry(
 
 export default Sentry.withSentry(
   (env: Env) => ({
-    traceLifecycle: 'static',
     dsn: env.E2E_TEST_DSN,
     environment: 'qa',
     tunnel: `http://localhost:3031/`,
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp-agent/tests/index.test.ts b/dev-packages/e2e-tests/test-applications/cloudflare-mcp-agent/tests/index.test.ts
index 7ea37fec65f3..245052db147a 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-mcp-agent/tests/index.test.ts
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-mcp-agent/tests/index.test.ts
@@ -1,16 +1,9 @@
 import { expect, test } from '@playwright/test';
-import { waitForRequest } from '@sentry-internal/test-utils';
+import { waitForStreamedSpan } from '@sentry-internal/test-utils';
 
 test('sends spans for MCP tool calls via MCPAgent (DurableObject)', async ({ baseURL }) => {
   const privateMessage = 'cloudflare-agent-private-capture-policy-message';
-  const mcpToolWaiter = waitForRequest('cloudflare-mcp-agent', event => {
-    const transaction = event.envelope[1][0][1];
-    return (
-      typeof transaction !== 'string' &&
-      'transaction' in transaction &&
-      transaction.transaction === 'tools/call my-tool'
-    );
-  });
+  const mcpSpanPromise = waitForStreamedSpan('cloudflare-mcp-agent', span => span.name === 'tools/call my-tool');
 
   // Step 1: Initialize the MCP session
   const initResponse = await fetch(`${baseURL}/mcp`, {
@@ -76,30 +69,29 @@ test('sends spans for MCP tool calls via MCPAgent (DurableObject)', async ({ bas
   expect(response.status).toBe(200);
   await expect(response.text()).resolves.toContain(`Tool my-tool: ${privateMessage}`);
 
-  const mcpData = await mcpToolWaiter;
-  const mcpEvent = mcpData.envelope[1][0][1];
-  const traceData = mcpEvent.contexts?.trace?.data;
+  const mcpSpan = await mcpSpanPromise;
 
-  expect(mcpEvent.contexts?.trace?.trace_id).toBe(mcpData.envelope[0].trace.trace_id);
-  expect(mcpEvent.contexts?.trace).toEqual({
-    trace_id: expect.any(String),
-    parent_span_id: expect.any(String),
-    span_id: expect.any(String),
-    op: 'mcp.server',
-    origin: 'auto.function.mcp_server',
+  expect(mcpSpan).toEqual({
+    trace_id: expect.stringMatching(/^[a-f0-9]{32}$/),
+    parent_span_id: expect.stringMatching(/^[a-f0-9]{16}$/),
+    span_id: expect.stringMatching(/^[a-f0-9]{16}$/),
+    name: 'tools/call my-tool',
+    start_timestamp: expect.any(Number),
+    end_timestamp: expect.any(Number),
     status: 'ok',
-    data: expect.objectContaining({
-      'sentry.origin': 'auto.function.mcp_server',
-      'sentry.op': 'mcp.server',
-      'mcp.method.name': 'tools/call',
-      'mcp.tool.name': 'my-tool',
-      'mcp.tool.extra': 'from-mcpagent',
-      'mcp.tool.result.content_count': 1,
-      'mcp.tool.result.content_type': 'text',
+    is_segment: true,
+    attributes: expect.objectContaining({
+      'sentry.origin': { value: 'auto.function.mcp_server', type: 'string' },
+      'sentry.op': { value: 'mcp.server', type: 'string' },
+      'mcp.method.name': { value: 'tools/call', type: 'string' },
+      'mcp.tool.name': { value: 'my-tool', type: 'string' },
+      'mcp.tool.extra': { value: 'from-mcpagent', type: 'string' },
+      'mcp.tool.result.content_count': { value: 1, type: 'integer' },
+      'mcp.tool.result.content_type': { value: 'text', type: 'string' },
     }),
   });
-  expect(traceData?.['mcp.request.argument.message']).toBeUndefined();
-  expect(traceData?.['mcp.tool.result.content']).toBeUndefined();
-  expect(traceData?.['mcp.tool.input']).toBeUndefined();
-  expect(JSON.stringify(traceData)).not.toContain(privateMessage);
+  expect(mcpSpan.attributes['mcp.request.argument.message']).toBeUndefined();
+  expect(mcpSpan.attributes['mcp.tool.result.content']).toBeUndefined();
+  expect(mcpSpan.attributes['mcp.tool.input']).toBeUndefined();
+  expect(JSON.stringify(mcpSpan.attributes)).not.toContain(privateMessage);
 });