test(e2e): Port cloudflare-mcp to span streaming#23858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JPeer264 merged 1 commit into from
Sep 2, 2026
+58 −83
Merged

test(e2e): Port cloudflare-mcp to span streaming #23858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,6 @@ const mcpHandler = createMcpHandler(createServer, {

export default Sentry.withSentry(
(env: Env) => ({
traceLifecycle: 'static',
dsn: env.E2E_TEST_DSN,
environment: 'qa', // dynamic sampling bias to keep transactions
tunnel: `http://localhost:3031/`, // proxy server
Expand Down
140 changes: 58 additions & 82 deletions dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/index.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,17 @@
import { expect, test } from '@playwright/test';
import { waitForRequest } from '@sentry-internal/test-utils';
import { getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';

const APP_NAME = 'cloudflare-mcp';

function getTransaction(eventData: Awaited<ReturnType<typeof waitForRequest>>) {
const event = eventData.envelope[1][0][1];
return typeof event !== 'string' && 'transaction' in event ? event : undefined;
}

function requireTransaction(eventData: Awaited<ReturnType<typeof waitForRequest>>) {
const event = getTransaction(eventData);
if (!event) {
throw new Error('Expected a transaction event');
}
return event;
}

test.describe.configure({ mode: 'serial' });

test('sends spans for MCP 2026-07-28 tool calls', async ({ baseURL }) => {
const url = `${baseURL}/mcp?protocol=modern`;
const requestWaiter = waitForRequest(APP_NAME, eventData => {
const event = getTransaction(eventData);
return event?.transaction === 'POST /mcp' && event.contexts?.trace?.data?.['url.full'] === url;
const requestSpanPromise = waitForStreamedSpan(APP_NAME, span => {
return getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.full']?.value === url;
});
const mcpWaiter = waitForRequest(APP_NAME, eventData => {
const event = getTransaction(eventData);
return (
event?.transaction === 'tools/call my-tool' &&
event.contexts?.trace?.data?.['mcp.protocol.version'] === '2026-07-28'
);
const mcpSpanPromise = waitForStreamedSpan(APP_NAME, span => {
return span.name === 'tools/call my-tool' && span.attributes['mcp.protocol.version']?.value === '2026-07-28';
});

const response = await fetch(url, {
Expand DownExpand Up@@ -72,61 +54,56 @@ test('sends spans for MCP 2026-07-28 tool calls', async ({ baseURL }) => {
},
});

const requestData = await requestWaiter;
const mcpData = await mcpWaiter;
const requestEvent = requireTransaction(requestData);
const mcpEvent = requireTransaction(mcpData);
const requestTrace = requestEvent.contexts?.trace;
const mcpTrace = mcpEvent.contexts?.trace;
const requestSpan = await requestSpanPromise;
const mcpSpan = await mcpSpanPromise;

// With span streaming, URL-sourced `http.server` spans are named by method only.
expect(requestSpan.name).toBe('POST');
expect(requestSpan.status).toBe('ok');
expect(requestSpan.attributes['sentry.origin']?.value).toBe('auto.http.cloudflare');
expect(requestSpan.attributes['sentry.op']?.value).toBe('http.server');
expect(requestSpan.attributes['sentry.segment.name.source']?.value).toBe('url');
expect(requestSpan.attributes['http.request.method']?.value).toBe('POST');
expect(requestSpan.attributes['url.path']?.value).toBe('/mcp');
expect(requestSpan.attributes['url.full']?.value).toBe(url);
expect(requestSpan.attributes['url.port']?.value).toBe('38787');
expect(requestSpan.attributes['url.scheme']?.value).toBe('http:');
expect(requestSpan.attributes['server.address']?.value).toBe('localhost');
expect(requestSpan.attributes['http.request.body.size']?.value).toBe(341);
expect(requestSpan.attributes['user_agent.original']?.value).toBe('node');
expect(requestSpan.attributes['http.request.header.content_type']?.value).toBe('application/json');
expect(requestSpan.attributes['network.protocol.name']?.value).toBe('http');
expect(requestSpan.attributes['network.protocol.version']?.value).toBe('1.1');
expect(requestSpan.attributes['http.response.status_code']?.value).toBe(200);
expect(requestSpan.attributes['mcp.server.extra']?.value).toBe(' /|\ ^._.^ /|\ ');

expect(requestTrace?.op).toBe('http.server');
expect(requestTrace?.origin).toBe('auto.http.cloudflare');
expect(requestTrace?.status).toBe('ok');
expect(requestTrace?.data?.['sentry.origin']).toBe('auto.http.cloudflare');
expect(requestTrace?.data?.['sentry.op']).toBe('http.server');
expect(requestTrace?.data?.['sentry.segment.name.source']).toBe('url');
expect(requestTrace?.data?.['http.request.method']).toBe('POST');
expect(requestTrace?.data?.['url.path']).toBe('/mcp');
expect(requestTrace?.data?.['url.full']).toBe(url);
expect(requestTrace?.data?.['url.port']).toBe('38787');
expect(requestTrace?.data?.['url.scheme']).toBe('http:');
expect(requestTrace?.data?.['server.address']).toBe('localhost');
expect(requestTrace?.data?.['http.request.body.size']).toBe(341);
expect(requestTrace?.data?.['user_agent.original']).toBe('node');
expect(requestTrace?.data?.['http.request.header.content_type']).toBe('application/json');
expect(requestTrace?.data?.['network.protocol.name']).toBe('http');
expect(requestTrace?.data?.['network.protocol.version']).toBe('1.1');
expect(requestTrace?.data?.['http.response.status_code']).toBe(200);
expect(requestTrace?.data?.['mcp.server.extra']).toBe(' /|\ ^._.^ /|\ ');
expect(mcpTrace?.trace_id).toBe(requestTrace?.trace_id);
expect(mcpTrace?.trace_id).toBe((mcpData.envelope[0].trace as { trace_id: string }).trace_id);
expect(mcpTrace?.parent_span_id).toBe(requestTrace?.span_id);
expect(requestData.envelope[0].event_id).not.toBe(mcpData.envelope[0].event_id);
expect(mcpTrace?.op).toBe('mcp.server');
expect(mcpTrace?.origin).toBe('auto.function.mcp_server');
expect(mcpTrace?.status).toBe('ok');
expect(mcpTrace?.data?.['mcp.transport']).toBe('PerRequestHTTPServerTransport');
expect(mcpTrace?.data?.['network.transport']).toBe('tcp');
expect(mcpTrace?.data?.['mcp.protocol.version']).toBe('2026-07-28');
expect(mcpTrace?.data?.['mcp.client.name']).toBe('cloudflare-modern-client');
expect(mcpTrace?.data?.['mcp.client.version']).toBe('2.0.0');
expect(mcpTrace?.data?.['mcp.server.name']).toBe('cloudflare-mcp');
expect(mcpTrace?.data?.['mcp.server.version']).toBe('2.0.0');
expect(mcpTrace?.data?.['mcp.method.name']).toBe('tools/call');
expect(mcpTrace?.data?.['mcp.request.id']).toBe('modern-tool-call');
expect(mcpTrace?.data?.['mcp.tool.name']).toBe('my-tool');
expect(mcpTrace?.data?.['mcp.request.argument.message']).toBe('"ʕっ•ᴥ•ʔっ"');
expect(mcpTrace?.data?.['mcp.tool.result.content_count']).toBe(1);
expect(mcpTrace?.data?.['mcp.tool.result.content']).toBe('Tool my-tool: ʕっ•ᴥ•ʔっ');
expect(mcpSpan.trace_id).toBe(requestSpan.trace_id);
expect(mcpSpan.parent_span_id).toBe(requestSpan.span_id);
expect(mcpSpan.span_id).not.toBe(requestSpan.span_id);
expect(mcpSpan.status).toBe('ok');
expect(mcpSpan.attributes['sentry.op']?.value).toBe('mcp.server');
expect(mcpSpan.attributes['sentry.origin']?.value).toBe('auto.function.mcp_server');
expect(mcpSpan.attributes['mcp.transport']?.value).toBe('PerRequestHTTPServerTransport');
expect(mcpSpan.attributes['network.transport']?.value).toBe('tcp');
expect(mcpSpan.attributes['mcp.protocol.version']?.value).toBe('2026-07-28');
expect(mcpSpan.attributes['mcp.client.name']?.value).toBe('cloudflare-modern-client');
expect(mcpSpan.attributes['mcp.client.version']?.value).toBe('2.0.0');
expect(mcpSpan.attributes['mcp.server.name']?.value).toBe('cloudflare-mcp');
expect(mcpSpan.attributes['mcp.server.version']?.value).toBe('2.0.0');
expect(mcpSpan.attributes['mcp.method.name']?.value).toBe('tools/call');
expect(mcpSpan.attributes['mcp.request.id']?.value).toBe('modern-tool-call');
expect(mcpSpan.attributes['mcp.tool.name']?.value).toBe('my-tool');
expect(mcpSpan.attributes['mcp.request.argument.message']?.value).toBe('"ʕっ•ᴥ•ʔっ"');
expect(mcpSpan.attributes['mcp.tool.result.content_count']?.value).toBe(1);
expect(mcpSpan.attributes['mcp.tool.result.content']?.value).toBe('Tool my-tool: ʕっ•ᴥ•ʔっ');
});

test('keeps sending spans for legacy-compatible MCP tool calls', async ({ baseURL }) => {
const url = `${baseURL}/mcp?protocol=legacy`;
const mcpWaiter = waitForRequest(APP_NAME, eventData => {
const event = getTransaction(eventData);
const mcpSpanPromise = waitForStreamedSpan(APP_NAME, span => {
return (
event?.transaction === 'tools/call my-tool' &&
event.contexts?.trace?.data?.['mcp.request.argument.message'] === '"legacy protocol request"'
span.name === 'tools/call my-tool' &&
span.attributes['mcp.request.argument.message']?.value === '"legacy protocol request"'
);
});

Expand All@@ -151,15 +128,14 @@ test('keeps sending spans for legacy-compatible MCP tool calls', async ({ baseUR

expect(response.status).toBe(200);

const mcpEvent = requireTransaction(await mcpWaiter);
const trace = mcpEvent.contexts?.trace;
const mcpSpan = await mcpSpanPromise;

expect(trace?.op).toBe('mcp.server');
expect(trace?.status).toBe('ok');
expect(trace?.data?.['mcp.transport']).toBe('WebStandardStreamableHTTPServerTransport');
expect(trace?.data?.['mcp.method.name']).toBe('tools/call');
expect(trace?.data?.['mcp.request.id']).toBe('legacy-tool-call');
expect(trace?.data?.['mcp.tool.name']).toBe('my-tool');
expect(trace?.data?.['mcp.protocol.version']).toBeUndefined();
expect(trace?.data?.['mcp.tool.result.content']).toBe('Tool my-tool: legacy protocol request');
expect(getSpanOp(mcpSpan)).toBe('mcp.server');
expect(mcpSpan.status).toBe('ok');
expect(mcpSpan.attributes['mcp.transport']?.value).toBe('WebStandardStreamableHTTPServerTransport');
expect(mcpSpan.attributes['mcp.method.name']?.value).toBe('tools/call');
expect(mcpSpan.attributes['mcp.request.id']?.value).toBe('legacy-tool-call');
expect(mcpSpan.attributes['mcp.tool.name']?.value).toBe('my-tool');
expect(mcpSpan.attributes['mcp.tool.result.content']?.value).toBe('Tool my-tool: legacy protocol request');
expect(mcpSpan.attributes['mcp.protocol.version']).toBeUndefined();
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
test(e2e): Port cloudflare-mcp to span streaming#23858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

JPeer264
merged 1 commit into

from

Sep 2, 2026

+58

−83

 Merged


test(e2e): Port cloudflare-mcp to span streaming
#23858
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,6 @@ const mcpHandler = createMcpHandler(createServer, {

export default Sentry.withSentry(
 (env: Env) => ({
 traceLifecycle: 'static',
 dsn: env.E2E_TEST_DSN,
 environment: 'qa', // dynamic sampling bias to keep transactions
 tunnel: `http://localhost:3031/`, // proxy server
Expand Down

140 changes: 58 additions & 82 deletions
dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,35 +1,17 @@
import { expect, test } from '@playwright/test';
import { waitForRequest } from '@sentry-internal/test-utils';
import { getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';

const APP_NAME = 'cloudflare-mcp';

function getTransaction(eventData: Awaited<ReturnType<typeof waitForRequest>>) {
 const event = eventData.envelope[1][0][1];
 return typeof event !== 'string' && 'transaction' in event ? event : undefined;
}

function requireTransaction(eventData: Awaited<ReturnType<typeof waitForRequest>>) {
 const event = getTransaction(eventData);
 if (!event) {
 throw new Error('Expected a transaction event');
 }
 return event;
}

test.describe.configure({ mode: 'serial' });

test('sends spans for MCP 2026-07-28 tool calls', async ({ baseURL }) => {
 const url = `${baseURL}/mcp?protocol=modern`;
 const requestWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 return event?.transaction === 'POST /mcp' && event.contexts?.trace?.data?.['url.full'] === url;
 const requestSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.full']?.value === url;
 });
 const mcpWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 return (
 event?.transaction === 'tools/call my-tool' &&
 event.contexts?.trace?.data?.['mcp.protocol.version'] === '2026-07-28'
 );
 const mcpSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return span.name === 'tools/call my-tool' && span.attributes['mcp.protocol.version']?.value === '2026-07-28';
 });

 const response = await fetch(url, {
Expand DownExpand Up@@ -72,61 +54,56 @@ test('sends spans for MCP 2026-07-28 tool calls', async ({ baseURL }) => {
 },
 });

 const requestData = await requestWaiter;
 const mcpData = await mcpWaiter;
 const requestEvent = requireTransaction(requestData);
 const mcpEvent = requireTransaction(mcpData);
 const requestTrace = requestEvent.contexts?.trace;
 const mcpTrace = mcpEvent.contexts?.trace;
 const requestSpan = await requestSpanPromise;
 const mcpSpan = await mcpSpanPromise;

 // With span streaming, URL-sourced `http.server` spans are named by method only.
 expect(requestSpan.name).toBe('POST');
 expect(requestSpan.status).toBe('ok');
 expect(requestSpan.attributes['sentry.origin']?.value).toBe('auto.http.cloudflare');
 expect(requestSpan.attributes['sentry.op']?.value).toBe('http.server');
 expect(requestSpan.attributes['sentry.segment.name.source']?.value).toBe('url');
 expect(requestSpan.attributes['http.request.method']?.value).toBe('POST');
 expect(requestSpan.attributes['url.path']?.value).toBe('/mcp');
 expect(requestSpan.attributes['url.full']?.value).toBe(url);
 expect(requestSpan.attributes['url.port']?.value).toBe('38787');
 expect(requestSpan.attributes['url.scheme']?.value).toBe('http:');
 expect(requestSpan.attributes['server.address']?.value).toBe('localhost');
 expect(requestSpan.attributes['http.request.body.size']?.value).toBe(341);
 expect(requestSpan.attributes['user_agent.original']?.value).toBe('node');
 expect(requestSpan.attributes['http.request.header.content_type']?.value).toBe('application/json');
 expect(requestSpan.attributes['network.protocol.name']?.value).toBe('http');
 expect(requestSpan.attributes['network.protocol.version']?.value).toBe('1.1');
 expect(requestSpan.attributes['http.response.status_code']?.value).toBe(200);
 expect(requestSpan.attributes['mcp.server.extra']?.value).toBe(' /|\ ^._.^ /|\ ');

 expect(requestTrace?.op).toBe('http.server');
 expect(requestTrace?.origin).toBe('auto.http.cloudflare');
 expect(requestTrace?.status).toBe('ok');
 expect(requestTrace?.data?.['sentry.origin']).toBe('auto.http.cloudflare');
 expect(requestTrace?.data?.['sentry.op']).toBe('http.server');
 expect(requestTrace?.data?.['sentry.segment.name.source']).toBe('url');
 expect(requestTrace?.data?.['http.request.method']).toBe('POST');
 expect(requestTrace?.data?.['url.path']).toBe('/mcp');
 expect(requestTrace?.data?.['url.full']).toBe(url);
 expect(requestTrace?.data?.['url.port']).toBe('38787');
 expect(requestTrace?.data?.['url.scheme']).toBe('http:');
 expect(requestTrace?.data?.['server.address']).toBe('localhost');
 expect(requestTrace?.data?.['http.request.body.size']).toBe(341);
 expect(requestTrace?.data?.['user_agent.original']).toBe('node');
 expect(requestTrace?.data?.['http.request.header.content_type']).toBe('application/json');
 expect(requestTrace?.data?.['network.protocol.name']).toBe('http');
 expect(requestTrace?.data?.['network.protocol.version']).toBe('1.1');
 expect(requestTrace?.data?.['http.response.status_code']).toBe(200);
 expect(requestTrace?.data?.['mcp.server.extra']).toBe(' /|\ ^._.^ /|\ ');
 expect(mcpTrace?.trace_id).toBe(requestTrace?.trace_id);
 expect(mcpTrace?.trace_id).toBe((mcpData.envelope[0].trace as { trace_id: string }).trace_id);
 expect(mcpTrace?.parent_span_id).toBe(requestTrace?.span_id);
 expect(requestData.envelope[0].event_id).not.toBe(mcpData.envelope[0].event_id);
 expect(mcpTrace?.op).toBe('mcp.server');
 expect(mcpTrace?.origin).toBe('auto.function.mcp_server');
 expect(mcpTrace?.status).toBe('ok');
 expect(mcpTrace?.data?.['mcp.transport']).toBe('PerRequestHTTPServerTransport');
 expect(mcpTrace?.data?.['network.transport']).toBe('tcp');
 expect(mcpTrace?.data?.['mcp.protocol.version']).toBe('2026-07-28');
 expect(mcpTrace?.data?.['mcp.client.name']).toBe('cloudflare-modern-client');
 expect(mcpTrace?.data?.['mcp.client.version']).toBe('2.0.0');
 expect(mcpTrace?.data?.['mcp.server.name']).toBe('cloudflare-mcp');
 expect(mcpTrace?.data?.['mcp.server.version']).toBe('2.0.0');
 expect(mcpTrace?.data?.['mcp.method.name']).toBe('tools/call');
 expect(mcpTrace?.data?.['mcp.request.id']).toBe('modern-tool-call');
 expect(mcpTrace?.data?.['mcp.tool.name']).toBe('my-tool');
 expect(mcpTrace?.data?.['mcp.request.argument.message']).toBe('"ʕっ•ᴥ•ʔっ"');
 expect(mcpTrace?.data?.['mcp.tool.result.content_count']).toBe(1);
 expect(mcpTrace?.data?.['mcp.tool.result.content']).toBe('Tool my-tool: ʕっ•ᴥ•ʔっ');
 expect(mcpSpan.trace_id).toBe(requestSpan.trace_id);
 expect(mcpSpan.parent_span_id).toBe(requestSpan.span_id);
 expect(mcpSpan.span_id).not.toBe(requestSpan.span_id);
 expect(mcpSpan.status).toBe('ok');
 expect(mcpSpan.attributes['sentry.op']?.value).toBe('mcp.server');
 expect(mcpSpan.attributes['sentry.origin']?.value).toBe('auto.function.mcp_server');
 expect(mcpSpan.attributes['mcp.transport']?.value).toBe('PerRequestHTTPServerTransport');
 expect(mcpSpan.attributes['network.transport']?.value).toBe('tcp');
 expect(mcpSpan.attributes['mcp.protocol.version']?.value).toBe('2026-07-28');
 expect(mcpSpan.attributes['mcp.client.name']?.value).toBe('cloudflare-modern-client');
 expect(mcpSpan.attributes['mcp.client.version']?.value).toBe('2.0.0');
 expect(mcpSpan.attributes['mcp.server.name']?.value).toBe('cloudflare-mcp');
 expect(mcpSpan.attributes['mcp.server.version']?.value).toBe('2.0.0');
 expect(mcpSpan.attributes['mcp.method.name']?.value).toBe('tools/call');
 expect(mcpSpan.attributes['mcp.request.id']?.value).toBe('modern-tool-call');
 expect(mcpSpan.attributes['mcp.tool.name']?.value).toBe('my-tool');
 expect(mcpSpan.attributes['mcp.request.argument.message']?.value).toBe('"ʕっ•ᴥ•ʔっ"');
 expect(mcpSpan.attributes['mcp.tool.result.content_count']?.value).toBe(1);
 expect(mcpSpan.attributes['mcp.tool.result.content']?.value).toBe('Tool my-tool: ʕっ•ᴥ•ʔっ');
});

test('keeps sending spans for legacy-compatible MCP tool calls', async ({ baseURL }) => {
 const url = `${baseURL}/mcp?protocol=legacy`;
 const mcpWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 const mcpSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return (
event?.transaction === 'tools/call my-tool' &&
event.contexts?.trace?.data?.['mcp.request.argument.message'] === '"legacy protocol request"'
span.name === 'tools/call my-tool' &&
span.attributes['mcp.request.argument.message']?.value === '"legacy protocol request"'
 );
 });

Expand All@@ -151,15 +128,14 @@ test('keeps sending spans for legacy-compatible MCP tool calls', async ({ baseUR

 expect(response.status).toBe(200);

 const mcpEvent = requireTransaction(await mcpWaiter);
 const trace = mcpEvent.contexts?.trace;
 const mcpSpan = await mcpSpanPromise;

 expect(trace?.op).toBe('mcp.server');
 expect(trace?.status).toBe('ok');
 expect(trace?.data?.['mcp.transport']).toBe('WebStandardStreamableHTTPServerTransport');
 expect(trace?.data?.['mcp.method.name']).toBe('tools/call');
 expect(trace?.data?.['mcp.request.id']).toBe('legacy-tool-call');
 expect(trace?.data?.['mcp.tool.name']).toBe('my-tool');
 expect(trace?.data?.['mcp.protocol.version']).toBeUndefined();
 expect(trace?.data?.['mcp.tool.result.content']).toBe('Tool my-tool: legacy protocol request');
 expect(getSpanOp(mcpSpan)).toBe('mcp.server');
 expect(mcpSpan.status).toBe('ok');
 expect(mcpSpan.attributes['mcp.transport']?.value).toBe('WebStandardStreamableHTTPServerTransport');
 expect(mcpSpan.attributes['mcp.method.name']?.value).toBe('tools/call');
 expect(mcpSpan.attributes['mcp.request.id']?.value).toBe('legacy-tool-call');
 expect(mcpSpan.attributes['mcp.tool.name']?.value).toBe('my-tool');
 expect(mcpSpan.attributes['mcp.tool.result.content']?.value).toBe('Tool my-tool: legacy protocol request');
 expect(mcpSpan.attributes['mcp.protocol.version']).toBeUndefined();
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(e2e): Port cloudflare-mcp to span streaming#23858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

JPeer264
merged 1 commit into

from

Sep 2, 2026

+58

−83

 Merged


test(e2e): Port cloudflare-mcp to span streaming
#23858
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,6 @@ const mcpHandler = createMcpHandler(createServer, {

export default Sentry.withSentry(
 (env: Env) => ({
 traceLifecycle: 'static',
 dsn: env.E2E_TEST_DSN,
 environment: 'qa', // dynamic sampling bias to keep transactions
 tunnel: `http://localhost:3031/`, // proxy server
Expand Down

140 changes: 58 additions & 82 deletions
dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,35 +1,17 @@
import { expect, test } from '@playwright/test';
import { waitForRequest } from '@sentry-internal/test-utils';
import { getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';

const APP_NAME = 'cloudflare-mcp';

function getTransaction(eventData: Awaited<ReturnType<typeof waitForRequest>>) {
 const event = eventData.envelope[1][0][1];
 return typeof event !== 'string' && 'transaction' in event ? event : undefined;
}

function requireTransaction(eventData: Awaited<ReturnType<typeof waitForRequest>>) {
 const event = getTransaction(eventData);
 if (!event) {
 throw new Error('Expected a transaction event');
 }
 return event;
}

test.describe.configure({ mode: 'serial' });

test('sends spans for MCP 2026-07-28 tool calls', async ({ baseURL }) => {
 const url = `${baseURL}/mcp?protocol=modern`;
 const requestWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 return event?.transaction === 'POST /mcp' && event.contexts?.trace?.data?.['url.full'] === url;
 const requestSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.full']?.value === url;
 });
 const mcpWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 return (
 event?.transaction === 'tools/call my-tool' &&
 event.contexts?.trace?.data?.['mcp.protocol.version'] === '2026-07-28'
 );
 const mcpSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return span.name === 'tools/call my-tool' && span.attributes['mcp.protocol.version']?.value === '2026-07-28';
 });

 const response = await fetch(url, {
Expand DownExpand Up@@ -72,61 +54,56 @@ test('sends spans for MCP 2026-07-28 tool calls', async ({ baseURL }) => {
 },
 });

 const requestData = await requestWaiter;
 const mcpData = await mcpWaiter;
 const requestEvent = requireTransaction(requestData);
 const mcpEvent = requireTransaction(mcpData);
 const requestTrace = requestEvent.contexts?.trace;
 const mcpTrace = mcpEvent.contexts?.trace;
 const requestSpan = await requestSpanPromise;
 const mcpSpan = await mcpSpanPromise;

 // With span streaming, URL-sourced `http.server` spans are named by method only.
 expect(requestSpan.name).toBe('POST');
 expect(requestSpan.status).toBe('ok');
 expect(requestSpan.attributes['sentry.origin']?.value).toBe('auto.http.cloudflare');
 expect(requestSpan.attributes['sentry.op']?.value).toBe('http.server');
 expect(requestSpan.attributes['sentry.segment.name.source']?.value).toBe('url');
 expect(requestSpan.attributes['http.request.method']?.value).toBe('POST');
 expect(requestSpan.attributes['url.path']?.value).toBe('/mcp');
 expect(requestSpan.attributes['url.full']?.value).toBe(url);
 expect(requestSpan.attributes['url.port']?.value).toBe('38787');
 expect(requestSpan.attributes['url.scheme']?.value).toBe('http:');
 expect(requestSpan.attributes['server.address']?.value).toBe('localhost');
 expect(requestSpan.attributes['http.request.body.size']?.value).toBe(341);
 expect(requestSpan.attributes['user_agent.original']?.value).toBe('node');
 expect(requestSpan.attributes['http.request.header.content_type']?.value).toBe('application/json');
 expect(requestSpan.attributes['network.protocol.name']?.value).toBe('http');
 expect(requestSpan.attributes['network.protocol.version']?.value).toBe('1.1');
 expect(requestSpan.attributes['http.response.status_code']?.value).toBe(200);
 expect(requestSpan.attributes['mcp.server.extra']?.value).toBe(' /|\ ^._.^ /|\ ');

 expect(requestTrace?.op).toBe('http.server');
 expect(requestTrace?.origin).toBe('auto.http.cloudflare');
 expect(requestTrace?.status).toBe('ok');
 expect(requestTrace?.data?.['sentry.origin']).toBe('auto.http.cloudflare');
 expect(requestTrace?.data?.['sentry.op']).toBe('http.server');
 expect(requestTrace?.data?.['sentry.segment.name.source']).toBe('url');
 expect(requestTrace?.data?.['http.request.method']).toBe('POST');
 expect(requestTrace?.data?.['url.path']).toBe('/mcp');
 expect(requestTrace?.data?.['url.full']).toBe(url);
 expect(requestTrace?.data?.['url.port']).toBe('38787');
 expect(requestTrace?.data?.['url.scheme']).toBe('http:');
 expect(requestTrace?.data?.['server.address']).toBe('localhost');
 expect(requestTrace?.data?.['http.request.body.size']).toBe(341);
 expect(requestTrace?.data?.['user_agent.original']).toBe('node');
 expect(requestTrace?.data?.['http.request.header.content_type']).toBe('application/json');
 expect(requestTrace?.data?.['network.protocol.name']).toBe('http');
 expect(requestTrace?.data?.['network.protocol.version']).toBe('1.1');
 expect(requestTrace?.data?.['http.response.status_code']).toBe(200);
 expect(requestTrace?.data?.['mcp.server.extra']).toBe(' /|\ ^._.^ /|\ ');
 expect(mcpTrace?.trace_id).toBe(requestTrace?.trace_id);
 expect(mcpTrace?.trace_id).toBe((mcpData.envelope[0].trace as { trace_id: string }).trace_id);
 expect(mcpTrace?.parent_span_id).toBe(requestTrace?.span_id);
 expect(requestData.envelope[0].event_id).not.toBe(mcpData.envelope[0].event_id);
 expect(mcpTrace?.op).toBe('mcp.server');
 expect(mcpTrace?.origin).toBe('auto.function.mcp_server');
 expect(mcpTrace?.status).toBe('ok');
 expect(mcpTrace?.data?.['mcp.transport']).toBe('PerRequestHTTPServerTransport');
 expect(mcpTrace?.data?.['network.transport']).toBe('tcp');
 expect(mcpTrace?.data?.['mcp.protocol.version']).toBe('2026-07-28');
 expect(mcpTrace?.data?.['mcp.client.name']).toBe('cloudflare-modern-client');
 expect(mcpTrace?.data?.['mcp.client.version']).toBe('2.0.0');
 expect(mcpTrace?.data?.['mcp.server.name']).toBe('cloudflare-mcp');
 expect(mcpTrace?.data?.['mcp.server.version']).toBe('2.0.0');
 expect(mcpTrace?.data?.['mcp.method.name']).toBe('tools/call');
 expect(mcpTrace?.data?.['mcp.request.id']).toBe('modern-tool-call');
 expect(mcpTrace?.data?.['mcp.tool.name']).toBe('my-tool');
 expect(mcpTrace?.data?.['mcp.request.argument.message']).toBe('"ʕっ•ᴥ•ʔっ"');
 expect(mcpTrace?.data?.['mcp.tool.result.content_count']).toBe(1);
 expect(mcpTrace?.data?.['mcp.tool.result.content']).toBe('Tool my-tool: ʕっ•ᴥ•ʔっ');
 expect(mcpSpan.trace_id).toBe(requestSpan.trace_id);
 expect(mcpSpan.parent_span_id).toBe(requestSpan.span_id);
 expect(mcpSpan.span_id).not.toBe(requestSpan.span_id);
 expect(mcpSpan.status).toBe('ok');
 expect(mcpSpan.attributes['sentry.op']?.value).toBe('mcp.server');
 expect(mcpSpan.attributes['sentry.origin']?.value).toBe('auto.function.mcp_server');
 expect(mcpSpan.attributes['mcp.transport']?.value).toBe('PerRequestHTTPServerTransport');
 expect(mcpSpan.attributes['network.transport']?.value).toBe('tcp');
 expect(mcpSpan.attributes['mcp.protocol.version']?.value).toBe('2026-07-28');
 expect(mcpSpan.attributes['mcp.client.name']?.value).toBe('cloudflare-modern-client');
 expect(mcpSpan.attributes['mcp.client.version']?.value).toBe('2.0.0');
 expect(mcpSpan.attributes['mcp.server.name']?.value).toBe('cloudflare-mcp');
 expect(mcpSpan.attributes['mcp.server.version']?.value).toBe('2.0.0');
 expect(mcpSpan.attributes['mcp.method.name']?.value).toBe('tools/call');
 expect(mcpSpan.attributes['mcp.request.id']?.value).toBe('modern-tool-call');
 expect(mcpSpan.attributes['mcp.tool.name']?.value).toBe('my-tool');
 expect(mcpSpan.attributes['mcp.request.argument.message']?.value).toBe('"ʕっ•ᴥ•ʔっ"');
 expect(mcpSpan.attributes['mcp.tool.result.content_count']?.value).toBe(1);
 expect(mcpSpan.attributes['mcp.tool.result.content']?.value).toBe('Tool my-tool: ʕっ•ᴥ•ʔっ');
});

test('keeps sending spans for legacy-compatible MCP tool calls', async ({ baseURL }) => {
 const url = `${baseURL}/mcp?protocol=legacy`;
 const mcpWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 const mcpSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return (
event?.transaction === 'tools/call my-tool' &&
event.contexts?.trace?.data?.['mcp.request.argument.message'] === '"legacy protocol request"'
span.name === 'tools/call my-tool' &&
span.attributes['mcp.request.argument.message']?.value === '"legacy protocol request"'
 );
 });

Expand All@@ -151,15 +128,14 @@ test('keeps sending spans for legacy-compatible MCP tool calls', async ({ baseUR

 expect(response.status).toBe(200);

 const mcpEvent = requireTransaction(await mcpWaiter);
 const trace = mcpEvent.contexts?.trace;
 const mcpSpan = await mcpSpanPromise;

 expect(trace?.op).toBe('mcp.server');
 expect(trace?.status).toBe('ok');
 expect(trace?.data?.['mcp.transport']).toBe('WebStandardStreamableHTTPServerTransport');
 expect(trace?.data?.['mcp.method.name']).toBe('tools/call');
 expect(trace?.data?.['mcp.request.id']).toBe('legacy-tool-call');
 expect(trace?.data?.['mcp.tool.name']).toBe('my-tool');
 expect(trace?.data?.['mcp.protocol.version']).toBeUndefined();
 expect(trace?.data?.['mcp.tool.result.content']).toBe('Tool my-tool: legacy protocol request');
 expect(getSpanOp(mcpSpan)).toBe('mcp.server');
 expect(mcpSpan.status).toBe('ok');
 expect(mcpSpan.attributes['mcp.transport']?.value).toBe('WebStandardStreamableHTTPServerTransport');
 expect(mcpSpan.attributes['mcp.method.name']?.value).toBe('tools/call');
 expect(mcpSpan.attributes['mcp.request.id']?.value).toBe('legacy-tool-call');
 expect(mcpSpan.attributes['mcp.tool.name']?.value).toBe('my-tool');
 expect(mcpSpan.attributes['mcp.tool.result.content']?.value).toBe('Tool my-tool: legacy protocol request');
 expect(mcpSpan.attributes['mcp.protocol.version']).toBeUndefined();
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(e2e): Port cloudflare-mcp to span streaming#23858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

JPeer264
merged 1 commit into

from

Sep 2, 2026

+58

−83

 Merged


test(e2e): Port cloudflare-mcp to span streaming
#23858
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,6 @@ const mcpHandler = createMcpHandler(createServer, {

export default Sentry.withSentry(
 (env: Env) => ({
 traceLifecycle: 'static',
 dsn: env.E2E_TEST_DSN,
 environment: 'qa', // dynamic sampling bias to keep transactions
 tunnel: `http://localhost:3031/`, // proxy server
Expand Down

140 changes: 58 additions & 82 deletions
dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,35 +1,17 @@
import { expect, test } from '@playwright/test';
import { waitForRequest } from '@sentry-internal/test-utils';
import { getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';

const APP_NAME = 'cloudflare-mcp';

function getTransaction(eventData: Awaited<ReturnType<typeof waitForRequest>>) {
 const event = eventData.envelope[1][0][1];
 return typeof event !== 'string' && 'transaction' in event ? event : undefined;
}

function requireTransaction(eventData: Awaited<ReturnType<typeof waitForRequest>>) {
 const event = getTransaction(eventData);
 if (!event) {
 throw new Error('Expected a transaction event');
 }
 return event;
}

test.describe.configure({ mode: 'serial' });

test('sends spans for MCP 2026-07-28 tool calls', async ({ baseURL }) => {
 const url = `${baseURL}/mcp?protocol=modern`;
 const requestWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 return event?.transaction === 'POST /mcp' && event.contexts?.trace?.data?.['url.full'] === url;
 const requestSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.full']?.value === url;
 });
 const mcpWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 return (
 event?.transaction === 'tools/call my-tool' &&
 event.contexts?.trace?.data?.['mcp.protocol.version'] === '2026-07-28'
 );
 const mcpSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return span.name === 'tools/call my-tool' && span.attributes['mcp.protocol.version']?.value === '2026-07-28';
 });

 const response = await fetch(url, {
Expand DownExpand Up@@ -72,61 +54,56 @@ test('sends spans for MCP 2026-07-28 tool calls', async ({ baseURL }) => {
 },
 });

 const requestData = await requestWaiter;
 const mcpData = await mcpWaiter;
 const requestEvent = requireTransaction(requestData);
 const mcpEvent = requireTransaction(mcpData);
 const requestTrace = requestEvent.contexts?.trace;
 const mcpTrace = mcpEvent.contexts?.trace;
 const requestSpan = await requestSpanPromise;
 const mcpSpan = await mcpSpanPromise;

 // With span streaming, URL-sourced `http.server` spans are named by method only.
 expect(requestSpan.name).toBe('POST');
 expect(requestSpan.status).toBe('ok');
 expect(requestSpan.attributes['sentry.origin']?.value).toBe('auto.http.cloudflare');
 expect(requestSpan.attributes['sentry.op']?.value).toBe('http.server');
 expect(requestSpan.attributes['sentry.segment.name.source']?.value).toBe('url');
 expect(requestSpan.attributes['http.request.method']?.value).toBe('POST');
 expect(requestSpan.attributes['url.path']?.value).toBe('/mcp');
 expect(requestSpan.attributes['url.full']?.value).toBe(url);
 expect(requestSpan.attributes['url.port']?.value).toBe('38787');
 expect(requestSpan.attributes['url.scheme']?.value).toBe('http:');
 expect(requestSpan.attributes['server.address']?.value).toBe('localhost');
 expect(requestSpan.attributes['http.request.body.size']?.value).toBe(341);
 expect(requestSpan.attributes['user_agent.original']?.value).toBe('node');
 expect(requestSpan.attributes['http.request.header.content_type']?.value).toBe('application/json');
 expect(requestSpan.attributes['network.protocol.name']?.value).toBe('http');
 expect(requestSpan.attributes['network.protocol.version']?.value).toBe('1.1');
 expect(requestSpan.attributes['http.response.status_code']?.value).toBe(200);
 expect(requestSpan.attributes['mcp.server.extra']?.value).toBe(' /|\ ^._.^ /|\ ');

 expect(requestTrace?.op).toBe('http.server');
 expect(requestTrace?.origin).toBe('auto.http.cloudflare');
 expect(requestTrace?.status).toBe('ok');
 expect(requestTrace?.data?.['sentry.origin']).toBe('auto.http.cloudflare');
 expect(requestTrace?.data?.['sentry.op']).toBe('http.server');
 expect(requestTrace?.data?.['sentry.segment.name.source']).toBe('url');
 expect(requestTrace?.data?.['http.request.method']).toBe('POST');
 expect(requestTrace?.data?.['url.path']).toBe('/mcp');
 expect(requestTrace?.data?.['url.full']).toBe(url);
 expect(requestTrace?.data?.['url.port']).toBe('38787');
 expect(requestTrace?.data?.['url.scheme']).toBe('http:');
 expect(requestTrace?.data?.['server.address']).toBe('localhost');
 expect(requestTrace?.data?.['http.request.body.size']).toBe(341);
 expect(requestTrace?.data?.['user_agent.original']).toBe('node');
 expect(requestTrace?.data?.['http.request.header.content_type']).toBe('application/json');
 expect(requestTrace?.data?.['network.protocol.name']).toBe('http');
 expect(requestTrace?.data?.['network.protocol.version']).toBe('1.1');
 expect(requestTrace?.data?.['http.response.status_code']).toBe(200);
 expect(requestTrace?.data?.['mcp.server.extra']).toBe(' /|\ ^._.^ /|\ ');
 expect(mcpTrace?.trace_id).toBe(requestTrace?.trace_id);
 expect(mcpTrace?.trace_id).toBe((mcpData.envelope[0].trace as { trace_id: string }).trace_id);
 expect(mcpTrace?.parent_span_id).toBe(requestTrace?.span_id);
 expect(requestData.envelope[0].event_id).not.toBe(mcpData.envelope[0].event_id);
 expect(mcpTrace?.op).toBe('mcp.server');
 expect(mcpTrace?.origin).toBe('auto.function.mcp_server');
 expect(mcpTrace?.status).toBe('ok');
 expect(mcpTrace?.data?.['mcp.transport']).toBe('PerRequestHTTPServerTransport');
 expect(mcpTrace?.data?.['network.transport']).toBe('tcp');
 expect(mcpTrace?.data?.['mcp.protocol.version']).toBe('2026-07-28');
 expect(mcpTrace?.data?.['mcp.client.name']).toBe('cloudflare-modern-client');
 expect(mcpTrace?.data?.['mcp.client.version']).toBe('2.0.0');
 expect(mcpTrace?.data?.['mcp.server.name']).toBe('cloudflare-mcp');
 expect(mcpTrace?.data?.['mcp.server.version']).toBe('2.0.0');
 expect(mcpTrace?.data?.['mcp.method.name']).toBe('tools/call');
 expect(mcpTrace?.data?.['mcp.request.id']).toBe('modern-tool-call');
 expect(mcpTrace?.data?.['mcp.tool.name']).toBe('my-tool');
 expect(mcpTrace?.data?.['mcp.request.argument.message']).toBe('"ʕっ•ᴥ•ʔっ"');
 expect(mcpTrace?.data?.['mcp.tool.result.content_count']).toBe(1);
 expect(mcpTrace?.data?.['mcp.tool.result.content']).toBe('Tool my-tool: ʕっ•ᴥ•ʔっ');
 expect(mcpSpan.trace_id).toBe(requestSpan.trace_id);
 expect(mcpSpan.parent_span_id).toBe(requestSpan.span_id);
 expect(mcpSpan.span_id).not.toBe(requestSpan.span_id);
 expect(mcpSpan.status).toBe('ok');
 expect(mcpSpan.attributes['sentry.op']?.value).toBe('mcp.server');
 expect(mcpSpan.attributes['sentry.origin']?.value).toBe('auto.function.mcp_server');
 expect(mcpSpan.attributes['mcp.transport']?.value).toBe('PerRequestHTTPServerTransport');
 expect(mcpSpan.attributes['network.transport']?.value).toBe('tcp');
 expect(mcpSpan.attributes['mcp.protocol.version']?.value).toBe('2026-07-28');
 expect(mcpSpan.attributes['mcp.client.name']?.value).toBe('cloudflare-modern-client');
 expect(mcpSpan.attributes['mcp.client.version']?.value).toBe('2.0.0');
 expect(mcpSpan.attributes['mcp.server.name']?.value).toBe('cloudflare-mcp');
 expect(mcpSpan.attributes['mcp.server.version']?.value).toBe('2.0.0');
 expect(mcpSpan.attributes['mcp.method.name']?.value).toBe('tools/call');
 expect(mcpSpan.attributes['mcp.request.id']?.value).toBe('modern-tool-call');
 expect(mcpSpan.attributes['mcp.tool.name']?.value).toBe('my-tool');
 expect(mcpSpan.attributes['mcp.request.argument.message']?.value).toBe('"ʕっ•ᴥ•ʔっ"');
 expect(mcpSpan.attributes['mcp.tool.result.content_count']?.value).toBe(1);
 expect(mcpSpan.attributes['mcp.tool.result.content']?.value).toBe('Tool my-tool: ʕっ•ᴥ•ʔっ');
});

test('keeps sending spans for legacy-compatible MCP tool calls', async ({ baseURL }) => {
 const url = `${baseURL}/mcp?protocol=legacy`;
 const mcpWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 const mcpSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return (
event?.transaction === 'tools/call my-tool' &&
event.contexts?.trace?.data?.['mcp.request.argument.message'] === '"legacy protocol request"'
span.name === 'tools/call my-tool' &&
span.attributes['mcp.request.argument.message']?.value === '"legacy protocol request"'
 );
 });

Expand All@@ -151,15 +128,14 @@ test('keeps sending spans for legacy-compatible MCP tool calls', async ({ baseUR

 expect(response.status).toBe(200);

 const mcpEvent = requireTransaction(await mcpWaiter);
 const trace = mcpEvent.contexts?.trace;
 const mcpSpan = await mcpSpanPromise;

 expect(trace?.op).toBe('mcp.server');
 expect(trace?.status).toBe('ok');
 expect(trace?.data?.['mcp.transport']).toBe('WebStandardStreamableHTTPServerTransport');
 expect(trace?.data?.['mcp.method.name']).toBe('tools/call');
 expect(trace?.data?.['mcp.request.id']).toBe('legacy-tool-call');
 expect(trace?.data?.['mcp.tool.name']).toBe('my-tool');
 expect(trace?.data?.['mcp.protocol.version']).toBeUndefined();
 expect(trace?.data?.['mcp.tool.result.content']).toBe('Tool my-tool: legacy protocol request');
 expect(getSpanOp(mcpSpan)).toBe('mcp.server');
 expect(mcpSpan.status).toBe('ok');
 expect(mcpSpan.attributes['mcp.transport']?.value).toBe('WebStandardStreamableHTTPServerTransport');
 expect(mcpSpan.attributes['mcp.method.name']?.value).toBe('tools/call');
 expect(mcpSpan.attributes['mcp.request.id']?.value).toBe('legacy-tool-call');
 expect(mcpSpan.attributes['mcp.tool.name']?.value).toBe('my-tool');
 expect(mcpSpan.attributes['mcp.tool.result.content']?.value).toBe('Tool my-tool: legacy protocol request');
 expect(mcpSpan.attributes['mcp.protocol.version']).toBeUndefined();
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
test(e2e): Port cloudflare-mcp to span streaming#23858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

JPeer264
merged 1 commit into

from

Sep 2, 2026

+58

−83

 Merged


test(e2e): Port cloudflare-mcp to span streaming
#23858
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,6 @@ const mcpHandler = createMcpHandler(createServer, {

export default Sentry.withSentry(
 (env: Env) => ({
 traceLifecycle: 'static',
 dsn: env.E2E_TEST_DSN,
 environment: 'qa', // dynamic sampling bias to keep transactions
 tunnel: `http://localhost:3031/`, // proxy server
Expand Down

140 changes: 58 additions & 82 deletions
dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,35 +1,17 @@
import { expect, test } from '@playwright/test';
import { waitForRequest } from '@sentry-internal/test-utils';
import { getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';

const APP_NAME = 'cloudflare-mcp';

function getTransaction(eventData: Awaited<ReturnType<typeof waitForRequest>>) {
 const event = eventData.envelope[1][0][1];
 return typeof event !== 'string' && 'transaction' in event ? event : undefined;
}

function requireTransaction(eventData: Awaited<ReturnType<typeof waitForRequest>>) {
 const event = getTransaction(eventData);
 if (!event) {
 throw new Error('Expected a transaction event');
 }
 return event;
}

test.describe.configure({ mode: 'serial' });

test('sends spans for MCP 2026-07-28 tool calls', async ({ baseURL }) => {
 const url = `${baseURL}/mcp?protocol=modern`;
 const requestWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 return event?.transaction === 'POST /mcp' && event.contexts?.trace?.data?.['url.full'] === url;
 const requestSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.full']?.value === url;
 });
 const mcpWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 return (
 event?.transaction === 'tools/call my-tool' &&
 event.contexts?.trace?.data?.['mcp.protocol.version'] === '2026-07-28'
 );
 const mcpSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return span.name === 'tools/call my-tool' && span.attributes['mcp.protocol.version']?.value === '2026-07-28';
 });

 const response = await fetch(url, {
Expand DownExpand Up@@ -72,61 +54,56 @@ test('sends spans for MCP 2026-07-28 tool calls', async ({ baseURL }) => {
 },
 });

 const requestData = await requestWaiter;
 const mcpData = await mcpWaiter;
 const requestEvent = requireTransaction(requestData);
 const mcpEvent = requireTransaction(mcpData);
 const requestTrace = requestEvent.contexts?.trace;
 const mcpTrace = mcpEvent.contexts?.trace;
 const requestSpan = await requestSpanPromise;
 const mcpSpan = await mcpSpanPromise;

 // With span streaming, URL-sourced `http.server` spans are named by method only.
 expect(requestSpan.name).toBe('POST');
 expect(requestSpan.status).toBe('ok');
 expect(requestSpan.attributes['sentry.origin']?.value).toBe('auto.http.cloudflare');
 expect(requestSpan.attributes['sentry.op']?.value).toBe('http.server');
 expect(requestSpan.attributes['sentry.segment.name.source']?.value).toBe('url');
 expect(requestSpan.attributes['http.request.method']?.value).toBe('POST');
 expect(requestSpan.attributes['url.path']?.value).toBe('/mcp');
 expect(requestSpan.attributes['url.full']?.value).toBe(url);
 expect(requestSpan.attributes['url.port']?.value).toBe('38787');
 expect(requestSpan.attributes['url.scheme']?.value).toBe('http:');
 expect(requestSpan.attributes['server.address']?.value).toBe('localhost');
 expect(requestSpan.attributes['http.request.body.size']?.value).toBe(341);
 expect(requestSpan.attributes['user_agent.original']?.value).toBe('node');
 expect(requestSpan.attributes['http.request.header.content_type']?.value).toBe('application/json');
 expect(requestSpan.attributes['network.protocol.name']?.value).toBe('http');
 expect(requestSpan.attributes['network.protocol.version']?.value).toBe('1.1');
 expect(requestSpan.attributes['http.response.status_code']?.value).toBe(200);
 expect(requestSpan.attributes['mcp.server.extra']?.value).toBe(' /|\ ^._.^ /|\ ');

 expect(requestTrace?.op).toBe('http.server');
 expect(requestTrace?.origin).toBe('auto.http.cloudflare');
 expect(requestTrace?.status).toBe('ok');
 expect(requestTrace?.data?.['sentry.origin']).toBe('auto.http.cloudflare');
 expect(requestTrace?.data?.['sentry.op']).toBe('http.server');
 expect(requestTrace?.data?.['sentry.segment.name.source']).toBe('url');
 expect(requestTrace?.data?.['http.request.method']).toBe('POST');
 expect(requestTrace?.data?.['url.path']).toBe('/mcp');
 expect(requestTrace?.data?.['url.full']).toBe(url);
 expect(requestTrace?.data?.['url.port']).toBe('38787');
 expect(requestTrace?.data?.['url.scheme']).toBe('http:');
 expect(requestTrace?.data?.['server.address']).toBe('localhost');
 expect(requestTrace?.data?.['http.request.body.size']).toBe(341);
 expect(requestTrace?.data?.['user_agent.original']).toBe('node');
 expect(requestTrace?.data?.['http.request.header.content_type']).toBe('application/json');
 expect(requestTrace?.data?.['network.protocol.name']).toBe('http');
 expect(requestTrace?.data?.['network.protocol.version']).toBe('1.1');
 expect(requestTrace?.data?.['http.response.status_code']).toBe(200);
 expect(requestTrace?.data?.['mcp.server.extra']).toBe(' /|\ ^._.^ /|\ ');
 expect(mcpTrace?.trace_id).toBe(requestTrace?.trace_id);
 expect(mcpTrace?.trace_id).toBe((mcpData.envelope[0].trace as { trace_id: string }).trace_id);
 expect(mcpTrace?.parent_span_id).toBe(requestTrace?.span_id);
 expect(requestData.envelope[0].event_id).not.toBe(mcpData.envelope[0].event_id);
 expect(mcpTrace?.op).toBe('mcp.server');
 expect(mcpTrace?.origin).toBe('auto.function.mcp_server');
 expect(mcpTrace?.status).toBe('ok');
 expect(mcpTrace?.data?.['mcp.transport']).toBe('PerRequestHTTPServerTransport');
 expect(mcpTrace?.data?.['network.transport']).toBe('tcp');
 expect(mcpTrace?.data?.['mcp.protocol.version']).toBe('2026-07-28');
 expect(mcpTrace?.data?.['mcp.client.name']).toBe('cloudflare-modern-client');
 expect(mcpTrace?.data?.['mcp.client.version']).toBe('2.0.0');
 expect(mcpTrace?.data?.['mcp.server.name']).toBe('cloudflare-mcp');
 expect(mcpTrace?.data?.['mcp.server.version']).toBe('2.0.0');
 expect(mcpTrace?.data?.['mcp.method.name']).toBe('tools/call');
 expect(mcpTrace?.data?.['mcp.request.id']).toBe('modern-tool-call');
 expect(mcpTrace?.data?.['mcp.tool.name']).toBe('my-tool');
 expect(mcpTrace?.data?.['mcp.request.argument.message']).toBe('"ʕっ•ᴥ•ʔっ"');
 expect(mcpTrace?.data?.['mcp.tool.result.content_count']).toBe(1);
 expect(mcpTrace?.data?.['mcp.tool.result.content']).toBe('Tool my-tool: ʕっ•ᴥ•ʔっ');
 expect(mcpSpan.trace_id).toBe(requestSpan.trace_id);
 expect(mcpSpan.parent_span_id).toBe(requestSpan.span_id);
 expect(mcpSpan.span_id).not.toBe(requestSpan.span_id);
 expect(mcpSpan.status).toBe('ok');
 expect(mcpSpan.attributes['sentry.op']?.value).toBe('mcp.server');
 expect(mcpSpan.attributes['sentry.origin']?.value).toBe('auto.function.mcp_server');
 expect(mcpSpan.attributes['mcp.transport']?.value).toBe('PerRequestHTTPServerTransport');
 expect(mcpSpan.attributes['network.transport']?.value).toBe('tcp');
 expect(mcpSpan.attributes['mcp.protocol.version']?.value).toBe('2026-07-28');
 expect(mcpSpan.attributes['mcp.client.name']?.value).toBe('cloudflare-modern-client');
 expect(mcpSpan.attributes['mcp.client.version']?.value).toBe('2.0.0');
 expect(mcpSpan.attributes['mcp.server.name']?.value).toBe('cloudflare-mcp');
 expect(mcpSpan.attributes['mcp.server.version']?.value).toBe('2.0.0');
 expect(mcpSpan.attributes['mcp.method.name']?.value).toBe('tools/call');
 expect(mcpSpan.attributes['mcp.request.id']?.value).toBe('modern-tool-call');
 expect(mcpSpan.attributes['mcp.tool.name']?.value).toBe('my-tool');
 expect(mcpSpan.attributes['mcp.request.argument.message']?.value).toBe('"ʕっ•ᴥ•ʔっ"');
 expect(mcpSpan.attributes['mcp.tool.result.content_count']?.value).toBe(1);
 expect(mcpSpan.attributes['mcp.tool.result.content']?.value).toBe('Tool my-tool: ʕっ•ᴥ•ʔっ');
});

test('keeps sending spans for legacy-compatible MCP tool calls', async ({ baseURL }) => {
 const url = `${baseURL}/mcp?protocol=legacy`;
 const mcpWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 const mcpSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return (
event?.transaction === 'tools/call my-tool' &&
event.contexts?.trace?.data?.['mcp.request.argument.message'] === '"legacy protocol request"'
span.name === 'tools/call my-tool' &&
span.attributes['mcp.request.argument.message']?.value === '"legacy protocol request"'
 );
 });

Expand All@@ -151,15 +128,14 @@ test('keeps sending spans for legacy-compatible MCP tool calls', async ({ baseUR

 expect(response.status).toBe(200);

 const mcpEvent = requireTransaction(await mcpWaiter);
 const trace = mcpEvent.contexts?.trace;
 const mcpSpan = await mcpSpanPromise;

 expect(trace?.op).toBe('mcp.server');
 expect(trace?.status).toBe('ok');
 expect(trace?.data?.['mcp.transport']).toBe('WebStandardStreamableHTTPServerTransport');
 expect(trace?.data?.['mcp.method.name']).toBe('tools/call');
 expect(trace?.data?.['mcp.request.id']).toBe('legacy-tool-call');
 expect(trace?.data?.['mcp.tool.name']).toBe('my-tool');
 expect(trace?.data?.['mcp.protocol.version']).toBeUndefined();
 expect(trace?.data?.['mcp.tool.result.content']).toBe('Tool my-tool: legacy protocol request');
 expect(getSpanOp(mcpSpan)).toBe('mcp.server');
 expect(mcpSpan.status).toBe('ok');
 expect(mcpSpan.attributes['mcp.transport']?.value).toBe('WebStandardStreamableHTTPServerTransport');
 expect(mcpSpan.attributes['mcp.method.name']?.value).toBe('tools/call');
 expect(mcpSpan.attributes['mcp.request.id']?.value).toBe('legacy-tool-call');
 expect(mcpSpan.attributes['mcp.tool.name']?.value).toBe('my-tool');
 expect(mcpSpan.attributes['mcp.tool.result.content']?.value).toBe('Tool my-tool: legacy protocol request');
 expect(mcpSpan.attributes['mcp.protocol.version']).toBeUndefined();
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(e2e): Port cloudflare-mcp to span streaming#23858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

JPeer264
merged 1 commit into

from

Sep 2, 2026

+58

−83

 Merged


test(e2e): Port cloudflare-mcp to span streaming
#23858
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,6 @@ const mcpHandler = createMcpHandler(createServer, {

export default Sentry.withSentry(
 (env: Env) => ({
 traceLifecycle: 'static',
 dsn: env.E2E_TEST_DSN,
 environment: 'qa', // dynamic sampling bias to keep transactions
 tunnel: `http://localhost:3031/`, // proxy server
Expand Down

140 changes: 58 additions & 82 deletions
dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,35 +1,17 @@
import { expect, test } from '@playwright/test';
import { waitForRequest } from '@sentry-internal/test-utils';
import { getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';

const APP_NAME = 'cloudflare-mcp';

function getTransaction(eventData: Awaited<ReturnType<typeof waitForRequest>>) {
 const event = eventData.envelope[1][0][1];
 return typeof event !== 'string' && 'transaction' in event ? event : undefined;
}

function requireTransaction(eventData: Awaited<ReturnType<typeof waitForRequest>>) {
 const event = getTransaction(eventData);
 if (!event) {
 throw new Error('Expected a transaction event');
 }
 return event;
}

test.describe.configure({ mode: 'serial' });

test('sends spans for MCP 2026-07-28 tool calls', async ({ baseURL }) => {
 const url = `${baseURL}/mcp?protocol=modern`;
 const requestWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 return event?.transaction === 'POST /mcp' && event.contexts?.trace?.data?.['url.full'] === url;
 const requestSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.full']?.value === url;
 });
 const mcpWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 return (
 event?.transaction === 'tools/call my-tool' &&
 event.contexts?.trace?.data?.['mcp.protocol.version'] === '2026-07-28'
 );
 const mcpSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return span.name === 'tools/call my-tool' && span.attributes['mcp.protocol.version']?.value === '2026-07-28';
 });

 const response = await fetch(url, {
Expand DownExpand Up@@ -72,61 +54,56 @@ test('sends spans for MCP 2026-07-28 tool calls', async ({ baseURL }) => {
 },
 });

 const requestData = await requestWaiter;
 const mcpData = await mcpWaiter;
 const requestEvent = requireTransaction(requestData);
 const mcpEvent = requireTransaction(mcpData);
 const requestTrace = requestEvent.contexts?.trace;
 const mcpTrace = mcpEvent.contexts?.trace;
 const requestSpan = await requestSpanPromise;
 const mcpSpan = await mcpSpanPromise;

 // With span streaming, URL-sourced `http.server` spans are named by method only.
 expect(requestSpan.name).toBe('POST');
 expect(requestSpan.status).toBe('ok');
 expect(requestSpan.attributes['sentry.origin']?.value).toBe('auto.http.cloudflare');
 expect(requestSpan.attributes['sentry.op']?.value).toBe('http.server');
 expect(requestSpan.attributes['sentry.segment.name.source']?.value).toBe('url');
 expect(requestSpan.attributes['http.request.method']?.value).toBe('POST');
 expect(requestSpan.attributes['url.path']?.value).toBe('/mcp');
 expect(requestSpan.attributes['url.full']?.value).toBe(url);
 expect(requestSpan.attributes['url.port']?.value).toBe('38787');
 expect(requestSpan.attributes['url.scheme']?.value).toBe('http:');
 expect(requestSpan.attributes['server.address']?.value).toBe('localhost');
 expect(requestSpan.attributes['http.request.body.size']?.value).toBe(341);
 expect(requestSpan.attributes['user_agent.original']?.value).toBe('node');
 expect(requestSpan.attributes['http.request.header.content_type']?.value).toBe('application/json');
 expect(requestSpan.attributes['network.protocol.name']?.value).toBe('http');
 expect(requestSpan.attributes['network.protocol.version']?.value).toBe('1.1');
 expect(requestSpan.attributes['http.response.status_code']?.value).toBe(200);
 expect(requestSpan.attributes['mcp.server.extra']?.value).toBe(' /|\ ^._.^ /|\ ');

 expect(requestTrace?.op).toBe('http.server');
 expect(requestTrace?.origin).toBe('auto.http.cloudflare');
 expect(requestTrace?.status).toBe('ok');
 expect(requestTrace?.data?.['sentry.origin']).toBe('auto.http.cloudflare');
 expect(requestTrace?.data?.['sentry.op']).toBe('http.server');
 expect(requestTrace?.data?.['sentry.segment.name.source']).toBe('url');
 expect(requestTrace?.data?.['http.request.method']).toBe('POST');
 expect(requestTrace?.data?.['url.path']).toBe('/mcp');
 expect(requestTrace?.data?.['url.full']).toBe(url);
 expect(requestTrace?.data?.['url.port']).toBe('38787');
 expect(requestTrace?.data?.['url.scheme']).toBe('http:');
 expect(requestTrace?.data?.['server.address']).toBe('localhost');
 expect(requestTrace?.data?.['http.request.body.size']).toBe(341);
 expect(requestTrace?.data?.['user_agent.original']).toBe('node');
 expect(requestTrace?.data?.['http.request.header.content_type']).toBe('application/json');
 expect(requestTrace?.data?.['network.protocol.name']).toBe('http');
 expect(requestTrace?.data?.['network.protocol.version']).toBe('1.1');
 expect(requestTrace?.data?.['http.response.status_code']).toBe(200);
 expect(requestTrace?.data?.['mcp.server.extra']).toBe(' /|\ ^._.^ /|\ ');
 expect(mcpTrace?.trace_id).toBe(requestTrace?.trace_id);
 expect(mcpTrace?.trace_id).toBe((mcpData.envelope[0].trace as { trace_id: string }).trace_id);
 expect(mcpTrace?.parent_span_id).toBe(requestTrace?.span_id);
 expect(requestData.envelope[0].event_id).not.toBe(mcpData.envelope[0].event_id);
 expect(mcpTrace?.op).toBe('mcp.server');
 expect(mcpTrace?.origin).toBe('auto.function.mcp_server');
 expect(mcpTrace?.status).toBe('ok');
 expect(mcpTrace?.data?.['mcp.transport']).toBe('PerRequestHTTPServerTransport');
 expect(mcpTrace?.data?.['network.transport']).toBe('tcp');
 expect(mcpTrace?.data?.['mcp.protocol.version']).toBe('2026-07-28');
 expect(mcpTrace?.data?.['mcp.client.name']).toBe('cloudflare-modern-client');
 expect(mcpTrace?.data?.['mcp.client.version']).toBe('2.0.0');
 expect(mcpTrace?.data?.['mcp.server.name']).toBe('cloudflare-mcp');
 expect(mcpTrace?.data?.['mcp.server.version']).toBe('2.0.0');
 expect(mcpTrace?.data?.['mcp.method.name']).toBe('tools/call');
 expect(mcpTrace?.data?.['mcp.request.id']).toBe('modern-tool-call');
 expect(mcpTrace?.data?.['mcp.tool.name']).toBe('my-tool');
 expect(mcpTrace?.data?.['mcp.request.argument.message']).toBe('"ʕっ•ᴥ•ʔっ"');
 expect(mcpTrace?.data?.['mcp.tool.result.content_count']).toBe(1);
 expect(mcpTrace?.data?.['mcp.tool.result.content']).toBe('Tool my-tool: ʕっ•ᴥ•ʔっ');
 expect(mcpSpan.trace_id).toBe(requestSpan.trace_id);
 expect(mcpSpan.parent_span_id).toBe(requestSpan.span_id);
 expect(mcpSpan.span_id).not.toBe(requestSpan.span_id);
 expect(mcpSpan.status).toBe('ok');
 expect(mcpSpan.attributes['sentry.op']?.value).toBe('mcp.server');
 expect(mcpSpan.attributes['sentry.origin']?.value).toBe('auto.function.mcp_server');
 expect(mcpSpan.attributes['mcp.transport']?.value).toBe('PerRequestHTTPServerTransport');
 expect(mcpSpan.attributes['network.transport']?.value).toBe('tcp');
 expect(mcpSpan.attributes['mcp.protocol.version']?.value).toBe('2026-07-28');
 expect(mcpSpan.attributes['mcp.client.name']?.value).toBe('cloudflare-modern-client');
 expect(mcpSpan.attributes['mcp.client.version']?.value).toBe('2.0.0');
 expect(mcpSpan.attributes['mcp.server.name']?.value).toBe('cloudflare-mcp');
 expect(mcpSpan.attributes['mcp.server.version']?.value).toBe('2.0.0');
 expect(mcpSpan.attributes['mcp.method.name']?.value).toBe('tools/call');
 expect(mcpSpan.attributes['mcp.request.id']?.value).toBe('modern-tool-call');
 expect(mcpSpan.attributes['mcp.tool.name']?.value).toBe('my-tool');
 expect(mcpSpan.attributes['mcp.request.argument.message']?.value).toBe('"ʕっ•ᴥ•ʔっ"');
 expect(mcpSpan.attributes['mcp.tool.result.content_count']?.value).toBe(1);
 expect(mcpSpan.attributes['mcp.tool.result.content']?.value).toBe('Tool my-tool: ʕっ•ᴥ•ʔっ');
});

test('keeps sending spans for legacy-compatible MCP tool calls', async ({ baseURL }) => {
 const url = `${baseURL}/mcp?protocol=legacy`;
 const mcpWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 const mcpSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return (
event?.transaction === 'tools/call my-tool' &&
event.contexts?.trace?.data?.['mcp.request.argument.message'] === '"legacy protocol request"'
span.name === 'tools/call my-tool' &&
span.attributes['mcp.request.argument.message']?.value === '"legacy protocol request"'
 );
 });

Expand All@@ -151,15 +128,14 @@ test('keeps sending spans for legacy-compatible MCP tool calls', async ({ baseUR

 expect(response.status).toBe(200);

 const mcpEvent = requireTransaction(await mcpWaiter);
 const trace = mcpEvent.contexts?.trace;
 const mcpSpan = await mcpSpanPromise;

 expect(trace?.op).toBe('mcp.server');
 expect(trace?.status).toBe('ok');
 expect(trace?.data?.['mcp.transport']).toBe('WebStandardStreamableHTTPServerTransport');
 expect(trace?.data?.['mcp.method.name']).toBe('tools/call');
 expect(trace?.data?.['mcp.request.id']).toBe('legacy-tool-call');
 expect(trace?.data?.['mcp.tool.name']).toBe('my-tool');
 expect(trace?.data?.['mcp.protocol.version']).toBeUndefined();
 expect(trace?.data?.['mcp.tool.result.content']).toBe('Tool my-tool: legacy protocol request');
 expect(getSpanOp(mcpSpan)).toBe('mcp.server');
 expect(mcpSpan.status).toBe('ok');
 expect(mcpSpan.attributes['mcp.transport']?.value).toBe('WebStandardStreamableHTTPServerTransport');
 expect(mcpSpan.attributes['mcp.method.name']?.value).toBe('tools/call');
 expect(mcpSpan.attributes['mcp.request.id']?.value).toBe('legacy-tool-call');
 expect(mcpSpan.attributes['mcp.tool.name']?.value).toBe('my-tool');
 expect(mcpSpan.attributes['mcp.tool.result.content']?.value).toBe('Tool my-tool: legacy protocol request');
 expect(mcpSpan.attributes['mcp.protocol.version']).toBeUndefined();
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(e2e): Port cloudflare-mcp to span streaming#23858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

JPeer264
merged 1 commit into

from

Sep 2, 2026

+58

−83

 Merged


test(e2e): Port cloudflare-mcp to span streaming
#23858
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,6 @@ const mcpHandler = createMcpHandler(createServer, {

export default Sentry.withSentry(
 (env: Env) => ({
 traceLifecycle: 'static',
 dsn: env.E2E_TEST_DSN,
 environment: 'qa', // dynamic sampling bias to keep transactions
 tunnel: `http://localhost:3031/`, // proxy server
Expand Down

140 changes: 58 additions & 82 deletions
dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,35 +1,17 @@
import { expect, test } from '@playwright/test';
import { waitForRequest } from '@sentry-internal/test-utils';
import { getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';

const APP_NAME = 'cloudflare-mcp';

function getTransaction(eventData: Awaited<ReturnType<typeof waitForRequest>>) {
 const event = eventData.envelope[1][0][1];
 return typeof event !== 'string' && 'transaction' in event ? event : undefined;
}

function requireTransaction(eventData: Awaited<ReturnType<typeof waitForRequest>>) {
 const event = getTransaction(eventData);
 if (!event) {
 throw new Error('Expected a transaction event');
 }
 return event;
}

test.describe.configure({ mode: 'serial' });

test('sends spans for MCP 2026-07-28 tool calls', async ({ baseURL }) => {
 const url = `${baseURL}/mcp?protocol=modern`;
 const requestWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 return event?.transaction === 'POST /mcp' && event.contexts?.trace?.data?.['url.full'] === url;
 const requestSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.full']?.value === url;
 });
 const mcpWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 return (
 event?.transaction === 'tools/call my-tool' &&
 event.contexts?.trace?.data?.['mcp.protocol.version'] === '2026-07-28'
 );
 const mcpSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return span.name === 'tools/call my-tool' && span.attributes['mcp.protocol.version']?.value === '2026-07-28';
 });

 const response = await fetch(url, {
Expand DownExpand Up@@ -72,61 +54,56 @@ test('sends spans for MCP 2026-07-28 tool calls', async ({ baseURL }) => {
 },
 });

 const requestData = await requestWaiter;
 const mcpData = await mcpWaiter;
 const requestEvent = requireTransaction(requestData);
 const mcpEvent = requireTransaction(mcpData);
 const requestTrace = requestEvent.contexts?.trace;
 const mcpTrace = mcpEvent.contexts?.trace;
 const requestSpan = await requestSpanPromise;
 const mcpSpan = await mcpSpanPromise;

 // With span streaming, URL-sourced `http.server` spans are named by method only.
 expect(requestSpan.name).toBe('POST');
 expect(requestSpan.status).toBe('ok');
 expect(requestSpan.attributes['sentry.origin']?.value).toBe('auto.http.cloudflare');
 expect(requestSpan.attributes['sentry.op']?.value).toBe('http.server');
 expect(requestSpan.attributes['sentry.segment.name.source']?.value).toBe('url');
 expect(requestSpan.attributes['http.request.method']?.value).toBe('POST');
 expect(requestSpan.attributes['url.path']?.value).toBe('/mcp');
 expect(requestSpan.attributes['url.full']?.value).toBe(url);
 expect(requestSpan.attributes['url.port']?.value).toBe('38787');
 expect(requestSpan.attributes['url.scheme']?.value).toBe('http:');
 expect(requestSpan.attributes['server.address']?.value).toBe('localhost');
 expect(requestSpan.attributes['http.request.body.size']?.value).toBe(341);
 expect(requestSpan.attributes['user_agent.original']?.value).toBe('node');
 expect(requestSpan.attributes['http.request.header.content_type']?.value).toBe('application/json');
 expect(requestSpan.attributes['network.protocol.name']?.value).toBe('http');
 expect(requestSpan.attributes['network.protocol.version']?.value).toBe('1.1');
 expect(requestSpan.attributes['http.response.status_code']?.value).toBe(200);
 expect(requestSpan.attributes['mcp.server.extra']?.value).toBe(' /|\ ^._.^ /|\ ');

 expect(requestTrace?.op).toBe('http.server');
 expect(requestTrace?.origin).toBe('auto.http.cloudflare');
 expect(requestTrace?.status).toBe('ok');
 expect(requestTrace?.data?.['sentry.origin']).toBe('auto.http.cloudflare');
 expect(requestTrace?.data?.['sentry.op']).toBe('http.server');
 expect(requestTrace?.data?.['sentry.segment.name.source']).toBe('url');
 expect(requestTrace?.data?.['http.request.method']).toBe('POST');
 expect(requestTrace?.data?.['url.path']).toBe('/mcp');
 expect(requestTrace?.data?.['url.full']).toBe(url);
 expect(requestTrace?.data?.['url.port']).toBe('38787');
 expect(requestTrace?.data?.['url.scheme']).toBe('http:');
 expect(requestTrace?.data?.['server.address']).toBe('localhost');
 expect(requestTrace?.data?.['http.request.body.size']).toBe(341);
 expect(requestTrace?.data?.['user_agent.original']).toBe('node');
 expect(requestTrace?.data?.['http.request.header.content_type']).toBe('application/json');
 expect(requestTrace?.data?.['network.protocol.name']).toBe('http');
 expect(requestTrace?.data?.['network.protocol.version']).toBe('1.1');
 expect(requestTrace?.data?.['http.response.status_code']).toBe(200);
 expect(requestTrace?.data?.['mcp.server.extra']).toBe(' /|\ ^._.^ /|\ ');
 expect(mcpTrace?.trace_id).toBe(requestTrace?.trace_id);
 expect(mcpTrace?.trace_id).toBe((mcpData.envelope[0].trace as { trace_id: string }).trace_id);
 expect(mcpTrace?.parent_span_id).toBe(requestTrace?.span_id);
 expect(requestData.envelope[0].event_id).not.toBe(mcpData.envelope[0].event_id);
 expect(mcpTrace?.op).toBe('mcp.server');
 expect(mcpTrace?.origin).toBe('auto.function.mcp_server');
 expect(mcpTrace?.status).toBe('ok');
 expect(mcpTrace?.data?.['mcp.transport']).toBe('PerRequestHTTPServerTransport');
 expect(mcpTrace?.data?.['network.transport']).toBe('tcp');
 expect(mcpTrace?.data?.['mcp.protocol.version']).toBe('2026-07-28');
 expect(mcpTrace?.data?.['mcp.client.name']).toBe('cloudflare-modern-client');
 expect(mcpTrace?.data?.['mcp.client.version']).toBe('2.0.0');
 expect(mcpTrace?.data?.['mcp.server.name']).toBe('cloudflare-mcp');
 expect(mcpTrace?.data?.['mcp.server.version']).toBe('2.0.0');
 expect(mcpTrace?.data?.['mcp.method.name']).toBe('tools/call');
 expect(mcpTrace?.data?.['mcp.request.id']).toBe('modern-tool-call');
 expect(mcpTrace?.data?.['mcp.tool.name']).toBe('my-tool');
 expect(mcpTrace?.data?.['mcp.request.argument.message']).toBe('"ʕっ•ᴥ•ʔっ"');
 expect(mcpTrace?.data?.['mcp.tool.result.content_count']).toBe(1);
 expect(mcpTrace?.data?.['mcp.tool.result.content']).toBe('Tool my-tool: ʕっ•ᴥ•ʔっ');
 expect(mcpSpan.trace_id).toBe(requestSpan.trace_id);
 expect(mcpSpan.parent_span_id).toBe(requestSpan.span_id);
 expect(mcpSpan.span_id).not.toBe(requestSpan.span_id);
 expect(mcpSpan.status).toBe('ok');
 expect(mcpSpan.attributes['sentry.op']?.value).toBe('mcp.server');
 expect(mcpSpan.attributes['sentry.origin']?.value).toBe('auto.function.mcp_server');
 expect(mcpSpan.attributes['mcp.transport']?.value).toBe('PerRequestHTTPServerTransport');
 expect(mcpSpan.attributes['network.transport']?.value).toBe('tcp');
 expect(mcpSpan.attributes['mcp.protocol.version']?.value).toBe('2026-07-28');
 expect(mcpSpan.attributes['mcp.client.name']?.value).toBe('cloudflare-modern-client');
 expect(mcpSpan.attributes['mcp.client.version']?.value).toBe('2.0.0');
 expect(mcpSpan.attributes['mcp.server.name']?.value).toBe('cloudflare-mcp');
 expect(mcpSpan.attributes['mcp.server.version']?.value).toBe('2.0.0');
 expect(mcpSpan.attributes['mcp.method.name']?.value).toBe('tools/call');
 expect(mcpSpan.attributes['mcp.request.id']?.value).toBe('modern-tool-call');
 expect(mcpSpan.attributes['mcp.tool.name']?.value).toBe('my-tool');
 expect(mcpSpan.attributes['mcp.request.argument.message']?.value).toBe('"ʕっ•ᴥ•ʔっ"');
 expect(mcpSpan.attributes['mcp.tool.result.content_count']?.value).toBe(1);
 expect(mcpSpan.attributes['mcp.tool.result.content']?.value).toBe('Tool my-tool: ʕっ•ᴥ•ʔっ');
});

test('keeps sending spans for legacy-compatible MCP tool calls', async ({ baseURL }) => {
 const url = `${baseURL}/mcp?protocol=legacy`;
 const mcpWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 const mcpSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return (
event?.transaction === 'tools/call my-tool' &&
event.contexts?.trace?.data?.['mcp.request.argument.message'] === '"legacy protocol request"'
span.name === 'tools/call my-tool' &&
span.attributes['mcp.request.argument.message']?.value === '"legacy protocol request"'
 );
 });

Expand All@@ -151,15 +128,14 @@ test('keeps sending spans for legacy-compatible MCP tool calls', async ({ baseUR

 expect(response.status).toBe(200);

 const mcpEvent = requireTransaction(await mcpWaiter);
 const trace = mcpEvent.contexts?.trace;
 const mcpSpan = await mcpSpanPromise;

 expect(trace?.op).toBe('mcp.server');
 expect(trace?.status).toBe('ok');
 expect(trace?.data?.['mcp.transport']).toBe('WebStandardStreamableHTTPServerTransport');
 expect(trace?.data?.['mcp.method.name']).toBe('tools/call');
 expect(trace?.data?.['mcp.request.id']).toBe('legacy-tool-call');
 expect(trace?.data?.['mcp.tool.name']).toBe('my-tool');
 expect(trace?.data?.['mcp.protocol.version']).toBeUndefined();
 expect(trace?.data?.['mcp.tool.result.content']).toBe('Tool my-tool: legacy protocol request');
 expect(getSpanOp(mcpSpan)).toBe('mcp.server');
 expect(mcpSpan.status).toBe('ok');
 expect(mcpSpan.attributes['mcp.transport']?.value).toBe('WebStandardStreamableHTTPServerTransport');
 expect(mcpSpan.attributes['mcp.method.name']?.value).toBe('tools/call');
 expect(mcpSpan.attributes['mcp.request.id']?.value).toBe('legacy-tool-call');
 expect(mcpSpan.attributes['mcp.tool.name']?.value).toBe('my-tool');
 expect(mcpSpan.attributes['mcp.tool.result.content']?.value).toBe('Tool my-tool: legacy protocol request');
 expect(mcpSpan.attributes['mcp.protocol.version']).toBeUndefined();
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
test(e2e): Port cloudflare-mcp to span streaming#23858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

JPeer264
merged 1 commit into

from

Sep 2, 2026

+58

−83

 Merged


test(e2e): Port cloudflare-mcp to span streaming
#23858
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,6 @@ const mcpHandler = createMcpHandler(createServer, {

export default Sentry.withSentry(
 (env: Env) => ({
 traceLifecycle: 'static',
 dsn: env.E2E_TEST_DSN,
 environment: 'qa', // dynamic sampling bias to keep transactions
 tunnel: `http://localhost:3031/`, // proxy server
Expand Down

140 changes: 58 additions & 82 deletions
dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,35 +1,17 @@
import { expect, test } from '@playwright/test';
import { waitForRequest } from '@sentry-internal/test-utils';
import { getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';

const APP_NAME = 'cloudflare-mcp';

function getTransaction(eventData: Awaited<ReturnType<typeof waitForRequest>>) {
 const event = eventData.envelope[1][0][1];
 return typeof event !== 'string' && 'transaction' in event ? event : undefined;
}

function requireTransaction(eventData: Awaited<ReturnType<typeof waitForRequest>>) {
 const event = getTransaction(eventData);
 if (!event) {
 throw new Error('Expected a transaction event');
 }
 return event;
}

test.describe.configure({ mode: 'serial' });

test('sends spans for MCP 2026-07-28 tool calls', async ({ baseURL }) => {
 const url = `${baseURL}/mcp?protocol=modern`;
 const requestWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 return event?.transaction === 'POST /mcp' && event.contexts?.trace?.data?.['url.full'] === url;
 const requestSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.full']?.value === url;
 });
 const mcpWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 return (
 event?.transaction === 'tools/call my-tool' &&
 event.contexts?.trace?.data?.['mcp.protocol.version'] === '2026-07-28'
 );
 const mcpSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return span.name === 'tools/call my-tool' && span.attributes['mcp.protocol.version']?.value === '2026-07-28';
 });

 const response = await fetch(url, {
Expand DownExpand Up@@ -72,61 +54,56 @@ test('sends spans for MCP 2026-07-28 tool calls', async ({ baseURL }) => {
 },
 });

 const requestData = await requestWaiter;
 const mcpData = await mcpWaiter;
 const requestEvent = requireTransaction(requestData);
 const mcpEvent = requireTransaction(mcpData);
 const requestTrace = requestEvent.contexts?.trace;
 const mcpTrace = mcpEvent.contexts?.trace;
 const requestSpan = await requestSpanPromise;
 const mcpSpan = await mcpSpanPromise;

 // With span streaming, URL-sourced `http.server` spans are named by method only.
 expect(requestSpan.name).toBe('POST');
 expect(requestSpan.status).toBe('ok');
 expect(requestSpan.attributes['sentry.origin']?.value).toBe('auto.http.cloudflare');
 expect(requestSpan.attributes['sentry.op']?.value).toBe('http.server');
 expect(requestSpan.attributes['sentry.segment.name.source']?.value).toBe('url');
 expect(requestSpan.attributes['http.request.method']?.value).toBe('POST');
 expect(requestSpan.attributes['url.path']?.value).toBe('/mcp');
 expect(requestSpan.attributes['url.full']?.value).toBe(url);
 expect(requestSpan.attributes['url.port']?.value).toBe('38787');
 expect(requestSpan.attributes['url.scheme']?.value).toBe('http:');
 expect(requestSpan.attributes['server.address']?.value).toBe('localhost');
 expect(requestSpan.attributes['http.request.body.size']?.value).toBe(341);
 expect(requestSpan.attributes['user_agent.original']?.value).toBe('node');
 expect(requestSpan.attributes['http.request.header.content_type']?.value).toBe('application/json');
 expect(requestSpan.attributes['network.protocol.name']?.value).toBe('http');
 expect(requestSpan.attributes['network.protocol.version']?.value).toBe('1.1');
 expect(requestSpan.attributes['http.response.status_code']?.value).toBe(200);
 expect(requestSpan.attributes['mcp.server.extra']?.value).toBe(' /|\ ^._.^ /|\ ');

 expect(requestTrace?.op).toBe('http.server');
 expect(requestTrace?.origin).toBe('auto.http.cloudflare');
 expect(requestTrace?.status).toBe('ok');
 expect(requestTrace?.data?.['sentry.origin']).toBe('auto.http.cloudflare');
 expect(requestTrace?.data?.['sentry.op']).toBe('http.server');
 expect(requestTrace?.data?.['sentry.segment.name.source']).toBe('url');
 expect(requestTrace?.data?.['http.request.method']).toBe('POST');
 expect(requestTrace?.data?.['url.path']).toBe('/mcp');
 expect(requestTrace?.data?.['url.full']).toBe(url);
 expect(requestTrace?.data?.['url.port']).toBe('38787');
 expect(requestTrace?.data?.['url.scheme']).toBe('http:');
 expect(requestTrace?.data?.['server.address']).toBe('localhost');
 expect(requestTrace?.data?.['http.request.body.size']).toBe(341);
 expect(requestTrace?.data?.['user_agent.original']).toBe('node');
 expect(requestTrace?.data?.['http.request.header.content_type']).toBe('application/json');
 expect(requestTrace?.data?.['network.protocol.name']).toBe('http');
 expect(requestTrace?.data?.['network.protocol.version']).toBe('1.1');
 expect(requestTrace?.data?.['http.response.status_code']).toBe(200);
 expect(requestTrace?.data?.['mcp.server.extra']).toBe(' /|\ ^._.^ /|\ ');
 expect(mcpTrace?.trace_id).toBe(requestTrace?.trace_id);
 expect(mcpTrace?.trace_id).toBe((mcpData.envelope[0].trace as { trace_id: string }).trace_id);
 expect(mcpTrace?.parent_span_id).toBe(requestTrace?.span_id);
 expect(requestData.envelope[0].event_id).not.toBe(mcpData.envelope[0].event_id);
 expect(mcpTrace?.op).toBe('mcp.server');
 expect(mcpTrace?.origin).toBe('auto.function.mcp_server');
 expect(mcpTrace?.status).toBe('ok');
 expect(mcpTrace?.data?.['mcp.transport']).toBe('PerRequestHTTPServerTransport');
 expect(mcpTrace?.data?.['network.transport']).toBe('tcp');
 expect(mcpTrace?.data?.['mcp.protocol.version']).toBe('2026-07-28');
 expect(mcpTrace?.data?.['mcp.client.name']).toBe('cloudflare-modern-client');
 expect(mcpTrace?.data?.['mcp.client.version']).toBe('2.0.0');
 expect(mcpTrace?.data?.['mcp.server.name']).toBe('cloudflare-mcp');
 expect(mcpTrace?.data?.['mcp.server.version']).toBe('2.0.0');
 expect(mcpTrace?.data?.['mcp.method.name']).toBe('tools/call');
 expect(mcpTrace?.data?.['mcp.request.id']).toBe('modern-tool-call');
 expect(mcpTrace?.data?.['mcp.tool.name']).toBe('my-tool');
 expect(mcpTrace?.data?.['mcp.request.argument.message']).toBe('"ʕっ•ᴥ•ʔっ"');
 expect(mcpTrace?.data?.['mcp.tool.result.content_count']).toBe(1);
 expect(mcpTrace?.data?.['mcp.tool.result.content']).toBe('Tool my-tool: ʕっ•ᴥ•ʔっ');
 expect(mcpSpan.trace_id).toBe(requestSpan.trace_id);
 expect(mcpSpan.parent_span_id).toBe(requestSpan.span_id);
 expect(mcpSpan.span_id).not.toBe(requestSpan.span_id);
 expect(mcpSpan.status).toBe('ok');
 expect(mcpSpan.attributes['sentry.op']?.value).toBe('mcp.server');
 expect(mcpSpan.attributes['sentry.origin']?.value).toBe('auto.function.mcp_server');
 expect(mcpSpan.attributes['mcp.transport']?.value).toBe('PerRequestHTTPServerTransport');
 expect(mcpSpan.attributes['network.transport']?.value).toBe('tcp');
 expect(mcpSpan.attributes['mcp.protocol.version']?.value).toBe('2026-07-28');
 expect(mcpSpan.attributes['mcp.client.name']?.value).toBe('cloudflare-modern-client');
 expect(mcpSpan.attributes['mcp.client.version']?.value).toBe('2.0.0');
 expect(mcpSpan.attributes['mcp.server.name']?.value).toBe('cloudflare-mcp');
 expect(mcpSpan.attributes['mcp.server.version']?.value).toBe('2.0.0');
 expect(mcpSpan.attributes['mcp.method.name']?.value).toBe('tools/call');
 expect(mcpSpan.attributes['mcp.request.id']?.value).toBe('modern-tool-call');
 expect(mcpSpan.attributes['mcp.tool.name']?.value).toBe('my-tool');
 expect(mcpSpan.attributes['mcp.request.argument.message']?.value).toBe('"ʕっ•ᴥ•ʔっ"');
 expect(mcpSpan.attributes['mcp.tool.result.content_count']?.value).toBe(1);
 expect(mcpSpan.attributes['mcp.tool.result.content']?.value).toBe('Tool my-tool: ʕっ•ᴥ•ʔっ');
});

test('keeps sending spans for legacy-compatible MCP tool calls', async ({ baseURL }) => {
 const url = `${baseURL}/mcp?protocol=legacy`;
 const mcpWaiter = waitForRequest(APP_NAME, eventData => {
 const event = getTransaction(eventData);
 const mcpSpanPromise = waitForStreamedSpan(APP_NAME, span => {
 return (
event?.transaction === 'tools/call my-tool' &&
event.contexts?.trace?.data?.['mcp.request.argument.message'] === '"legacy protocol request"'
span.name === 'tools/call my-tool' &&
span.attributes['mcp.request.argument.message']?.value === '"legacy protocol request"'
 );
 });

Expand All@@ -151,15 +128,14 @@ test('keeps sending spans for legacy-compatible MCP tool calls', async ({ baseUR

 expect(response.status).toBe(200);

 const mcpEvent = requireTransaction(await mcpWaiter);
 const trace = mcpEvent.contexts?.trace;
 const mcpSpan = await mcpSpanPromise;

 expect(trace?.op).toBe('mcp.server');
 expect(trace?.status).toBe('ok');
 expect(trace?.data?.['mcp.transport']).toBe('WebStandardStreamableHTTPServerTransport');
 expect(trace?.data?.['mcp.method.name']).toBe('tools/call');
 expect(trace?.data?.['mcp.request.id']).toBe('legacy-tool-call');
 expect(trace?.data?.['mcp.tool.name']).toBe('my-tool');
 expect(trace?.data?.['mcp.protocol.version']).toBeUndefined();
 expect(trace?.data?.['mcp.tool.result.content']).toBe('Tool my-tool: legacy protocol request');
 expect(getSpanOp(mcpSpan)).toBe('mcp.server');
 expect(mcpSpan.status).toBe('ok');
 expect(mcpSpan.attributes['mcp.transport']?.value).toBe('WebStandardStreamableHTTPServerTransport');
 expect(mcpSpan.attributes['mcp.method.name']?.value).toBe('tools/call');
 expect(mcpSpan.attributes['mcp.request.id']?.value).toBe('legacy-tool-call');
 expect(mcpSpan.attributes['mcp.tool.name']?.value).toBe('my-tool');
 expect(mcpSpan.attributes['mcp.tool.result.content']?.value).toBe('Tool my-tool: legacy protocol request');
 expect(mcpSpan.attributes['mcp.protocol.version']).toBeUndefined();
});
Loading