Skip to content

Commit 4366338

Browse files
JPeer264JPeer264
committed
fix(cloudflare): Wait for async events to finish
1 parent f31b899 commit 4366338

File tree

66 files changed

+591
-89
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+591
-89
lines changed

‎dev-packages/e2e-tests/test-applications/cloudflare-mcp/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.wrangler

‎dev-packages/e2e-tests/test-applications/cloudflare-mcp/.npmrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@sentry:registry=http://127.0.0.1:4873
2+
@sentry-internal:registry=http://127.0.0.1:4873

‎dev-packages/e2e-tests/test-applications/cloudflare-mcp/package.json‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"name": "cloudflare-mcp",
3+
"version": "0.0.0",
4+
"private": true,
5+
"scripts": {
6+
"deploy": "wrangler deploy",
7+
"dev": "wrangler dev --var \"E2E_TEST_DSN:$E2E_TEST_DSN\" --log-level=$(test $CI && echo 'none' || echo 'log')",
8+
"build": "wrangler deploy --dry-run",
9+
"test": "vitest --run",
10+
"typecheck": "tsc --noEmit",
11+
"cf-typegen": "wrangler types",
12+
"test:build": "pnpm install && pnpm build",
13+
"test:assert": "pnpm typecheck && pnpm test:dev && pnpm test:prod",
14+
"test:prod": "TEST_ENV=production playwright test",
15+
"test:dev": "TEST_ENV=development playwright test"
16+
},
17+
"dependencies": {
18+
"@modelcontextprotocol/sdk": "^1.22.0",
19+
"@sentry/cloudflare": "latest || *",
20+
"agents": "^0.2.23",
21+
"zod": "^3.25.76"
22+
},
23+
"devDependencies": {
24+
"@cloudflare/vitest-pool-workers": "^0.8.19",
25+
"@cloudflare/workers-types": "^4.20240725.0",
26+
"@playwright/test": "~1.50.0",
27+
"@sentry-internal/test-utils": "link:../../../test-utils",
28+
"typescript": "^5.5.2",
29+
"vitest": "~3.2.0",
30+
"wrangler": "^4.23.0",
31+
"ws": "^8.18.3"
32+
},
33+
"volta": {
34+
"extends": "../../package.json"
35+
},
36+
"pnpm": {
37+
"overrides": {
38+
"strip-literal": "~2.0.0"
39+
}
40+
}
41+
}

‎dev-packages/e2e-tests/test-applications/cloudflare-mcp/playwright.config.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { getPlaywrightConfig } from '@sentry-internal/test-utils';
2+
const testEnv = process.env.TEST_ENV;
3+
4+
if (!testEnv) {
5+
throw new Error('No test env defined');
6+
}
7+
8+
const APP_PORT = 38787;
9+
10+
const config = getPlaywrightConfig(
11+
{
12+
startCommand: `pnpm dev --port ${APP_PORT}`,
13+
port: APP_PORT,
14+
},
15+
{
16+
// This comes with the risk of tests leaking into each other but the tests run quite slow so we should parallelize
17+
workers: '100%',
18+
retries: 0,
19+
},
20+
);
21+
22+
export default config;

‎dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/env.d.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Generated by Wrangler on Mon Jul 29 2024 21:44:31 GMT-0400 (Eastern Daylight Time)
2+
// by running `wrangler types`
3+
4+
interface Env {
5+
E2E_TEST_DSN: '';
6+
MY_DURABLE_OBJECT: DurableObjectNamespace;
7+
}

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

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
/**
2+
* Welcome to Cloudflare Workers! This is your first worker.
3+
*
4+
* - Run `npm run dev` in your terminal to start a development server
5+
* - Open a browser tab at http://localhost:8787/ to see your worker in action
6+
* - Run `npm run deploy` to publish your worker
7+
*
8+
* Bind resources to your worker in `wrangler.toml`. After adding bindings, a type definition for the
9+
* `Env` object can be regenerated with `npm run cf-typegen`.
10+
*
11+
* Learn more at https://developers.cloudflare.com/workers/
12+
*/
13+
import * as Sentry from '@sentry/cloudflare';
14+
import { createMcpHandler } from 'agents/mcp';
15+
import * as z from 'zod';
16+
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
17+
18+
export default Sentry.withSentry(
19+
(env: Env) => ({
20+
dsn: env.E2E_TEST_DSN,
21+
environment: 'qa', // dynamic sampling bias to keep transactions
22+
tunnel: `http://localhost:3031/`, // proxy server
23+
tracesSampleRate: 1.0,
24+
sendDefaultPii: true,
25+
debug: true,
26+
transportOptions: {
27+
// We are doing a lot of events at once in this test
28+
bufferSize: 1000,
29+
},
30+
}),
31+
{
32+
async fetch(request, env, ctx) {
33+
const server = new McpServer({
34+
name: 'cloudflare-mcp',
35+
version: '1.0.0',
36+
});
37+
38+
const span = Sentry.getActiveSpan();
39+
40+
if (span) {
41+
span.setAttribute('mcp.server.extra', ' /|\ ^._.^ /|\ ');
42+
}
43+
44+
server.registerTool(
45+
'my-tool',
46+
{
47+
title: 'My Tool',
48+
description: 'My Tool Description',
49+
inputSchema: {
50+
message: z.string(),
51+
},
52+
},
53+
async ({ message }) => {
54+
const span = Sentry.getActiveSpan();
55+
56+
// simulate a long running tool
57+
await new Promise(resolve => setTimeout(resolve, 500));
58+
59+
if (span) {
60+
span.setAttribute('mcp.tool.name', 'my-tool');
61+
span.setAttribute('mcp.tool.extra', 'ƸӜƷ');
62+
span.setAttribute('mcp.tool.input', JSON.stringify({ message }));
63+
}
64+
65+
return {
66+
content: [
67+
{
68+
type: 'text' as const,
69+
text: `Tool my-tool: ${message}`,
70+
},
71+
],
72+
};
73+
},
74+
);
75+
76+
const handler = createMcpHandler(Sentry.wrapMcpServerWithSentry(server), {
77+
route: '/mcp',
78+
});
79+
80+
return handler(request, env, ctx);
81+
},
82+
} satisfies ExportedHandler<Env>,
83+
);

‎dev-packages/e2e-tests/test-applications/cloudflare-mcp/start-event-proxy.mjs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { startEventProxyServer } from '@sentry-internal/test-utils';
2+
3+
startEventProxyServer({
4+
port: 3031,
5+
proxyServerName: 'cloudflare-mcp',
6+
});

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

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
import { expect, test } from '@playwright/test';
2+
import { waitForRequest } from '@sentry-internal/test-utils';
3+
4+
test('sends spans for MCP tool calls', async ({ baseURL }) => {
5+
const spanRequestWaiter = waitForRequest('cloudflare-mcp', event => {
6+
const transaction = event.envelope[1][0][1];
7+
return typeof transaction !== 'string' && 'transaction' in transaction && transaction.transaction === 'POST /mcp';
8+
});
9+
10+
const spanMcpWaiter = waitForRequest('cloudflare-mcp', event => {
11+
const transaction = event.envelope[1][0][1];
12+
return (
13+
typeof transaction !== 'string' &&
14+
'transaction' in transaction &&
15+
transaction.transaction === 'tools/call my-tool'
16+
);
17+
});
18+
19+
const response = await fetch(`${baseURL}/mcp`, {
20+
method: 'POST',
21+
headers: {
22+
'Content-Type': 'application/json',
23+
Accept: 'application/json, text/event-stream',
24+
},
25+
body: JSON.stringify({
26+
jsonrpc: '2.0',
27+
id: 1,
28+
method: 'tools/call',
29+
params: {
30+
name: 'my-tool',
31+
arguments: {
32+
message: 'ʕっ•ᴥ•ʔっ',
33+
},
34+
},
35+
}),
36+
});
37+
38+
expect(response.status).toBe(200);
39+
40+
const requestData = await spanRequestWaiter;
41+
const mcpData = await spanMcpWaiter;
42+
43+
const requestEvent = requestData.envelope[1][0][1];
44+
const mcpEvent = mcpData.envelope[1][0][1];
45+
46+
// Check that the events have contexts
47+
// this is for TypeScript type safety
48+
if (
49+
typeof mcpEvent === 'string' ||
50+
!('contexts' in mcpEvent) ||
51+
typeof requestEvent === 'string' ||
52+
!('contexts' in requestEvent)
53+
) {
54+
throw new Error("Events don't have contexts");
55+
}
56+
57+
expect(mcpEvent.contexts?.trace?.trace_id).toBe((mcpData.envelope[0].trace as any).trace_id);
58+
expect(requestData.envelope[0].event_id).not.toBe(mcpData.envelope[0].event_id);
59+
60+
expect(requestEvent.contexts?.trace).toEqual({
61+
span_id: expect.any(String),
62+
trace_id: expect.any(String),
63+
data: expect.objectContaining({
64+
'sentry.origin': 'auto.http.cloudflare',
65+
'sentry.op': 'http.server',
66+
'sentry.source': 'url',
67+
'sentry.sample_rate': 1,
68+
'http.request.method': 'POST',
69+
'url.path': '/mcp',
70+
'url.full': 'http://localhost:38787/mcp',
71+
'url.port': '38787',
72+
'url.scheme': 'http:',
73+
'server.address': 'localhost',
74+
'http.request.body.size': 120,
75+
'user_agent.original': 'node',
76+
'http.request.header.content_type': 'application/json',
77+
'network.protocol.name': 'HTTP/1.1',
78+
'mcp.server.extra': ' /|\ ^._.^ /|\ ',
79+
'http.response.status_code': 200,
80+
}),
81+
op: 'http.server',
82+
status: 'ok',
83+
origin: 'auto.http.cloudflare',
84+
});
85+
86+
expect(mcpEvent.contexts?.trace).toEqual({
87+
trace_id: expect.any(String),
88+
parent_span_id: requestEvent.contexts?.trace?.span_id,
89+
span_id: expect.any(String),
90+
op: 'mcp.server',
91+
origin: 'auto.function.mcp_server',
92+
data: {
93+
'sentry.origin': 'auto.function.mcp_server',
94+
'sentry.op': 'mcp.server',
95+
'sentry.source': 'route',
96+
'mcp.transport': 'WorkerTransport',
97+
'network.transport': 'unknown',
98+
'network.protocol.version': '2.0',
99+
'mcp.method.name': 'tools/call',
100+
'mcp.request.id': '1',
101+
'mcp.tool.name': 'my-tool',
102+
'mcp.request.argument.message': '"ʕっ•ᴥ•ʔっ"',
103+
'mcp.tool.extra': 'ƸӜƷ',
104+
'mcp.tool.input': '{"message":"ʕっ•ᴥ•ʔっ"}',
105+
'mcp.tool.result.content_count': 1,
106+
'mcp.tool.result.content_type': 'text',
107+
'mcp.tool.result.content': 'Tool my-tool: ʕっ•ᴥ•ʔっ',
108+
},
109+
});
110+
});

‎dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/tsconfig.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"extends": "../tsconfig.json",
3+
"compilerOptions": {
4+
"types": ["@cloudflare/vitest-pool-workers"]
5+
},
6+
"include": ["./**/*.ts", "../worker-configuration.d.ts"],
7+
"exclude": []
8+
}

‎dev-packages/e2e-tests/test-applications/cloudflare-mcp/tsconfig.json‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"compilerOptions": {
3+
/* Visit https://aka.ms/tsconfig.json to read more about this file */
4+
5+
/* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
6+
"target": "es2021",
7+
/* Specify a set of bundled library declaration files that describe the target runtime environment. */
8+
"lib": ["es2021"],
9+
/* Specify what JSX code is generated. */
10+
"jsx": "react-jsx",
11+
12+
/* Specify what module code is generated. */
13+
"module": "es2022",
14+
/* Specify how TypeScript looks up a file from a given module specifier. */
15+
"moduleResolution": "Bundler",
16+
/* Enable importing .json files */
17+
"resolveJsonModule": true,
18+
19+
/* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */
20+
"allowJs": true,
21+
/* Enable error reporting in type-checked JavaScript files. */
22+
"checkJs": false,
23+
24+
/* Disable emitting files from a compilation. */
25+
"noEmit": true,
26+
27+
/* Ensure that each file can be safely transpiled without relying on other imports. */
28+
"isolatedModules": true,
29+
/* Allow 'import x from y' when a module doesn't have a default export. */
30+
"allowSyntheticDefaultImports": true,
31+
/* Ensure that casing is correct in imports. */
32+
"forceConsistentCasingInFileNames": true,
33+
34+
/* Enable all strict type-checking options. */
35+
"strict": true,
36+
37+
/* Skip type checking all .d.ts files. */
38+
"skipLibCheck": true,
39+
"types": ["@cloudflare/workers-types/experimental"]
40+
},
41+
"exclude": ["test"],
42+
"include": ["src/**/*.ts"]
43+
}

0 commit comments

Comments
 (0)