Skip to content

fix(cloudflare): move Sentry flush from onToolComplete to main handler #622

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
dcramer merged 1 commit into from
Nov 1, 2025
Merged

fix(cloudflare): move Sentry flush from onToolComplete to main handler #622

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
7 changes: 5 additions & 2 deletions packages/mcp-cloudflare/src/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const addCorsHeaders = (response: Response): Response => {
// Wrap OAuth Provider to restrict CORS headers on public metadata endpoints
// OAuth Provider v0.0.12 adds overly permissive CORS (allows all methods/headers).
// We override with secure headers for .well-known endpoints and add CORS to robots.txt/llms.txt.
const corsWrappedOAuthProvider = {
const wrappedOAuthProvider = {
fetch: async (request: Request, env: Env, ctx: ExecutionContext) => {
const url = new URL(request.url);

Expand Down Expand Up @@ -85,6 +85,9 @@ const corsWrappedOAuthProvider = {

const response = await oAuthProvider.fetch(request, env, ctx);

// Flush buffered logs before Worker terminates
ctx.waitUntil(Sentry.flush(2000));

// Add CORS headers to public metadata endpoints
if (isPublicMetadataEndpoint(url.pathname)) {
return addCorsHeaders(response);
Expand All @@ -96,5 +99,5 @@ const corsWrappedOAuthProvider = {

export default Sentry.withSentry(
getSentryConfig,
corsWrappedOAuthProvider,
wrappedOAuthProvider,
) satisfies ExportedHandler<Env>;
12 changes: 1 addition & 11 deletions packages/mcp-cloudflare/src/server/lib/mcp-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
* - No session state required - each request is independent
*/

import * as Sentry from "@sentry/cloudflare";
import { experimental_createMcpHandler as createMcpHandler } from "agents/mcp";
import { buildServer } from "@sentry/mcp-server/server";
import {
Expand Down Expand Up @@ -169,21 +168,12 @@ const mcpHandler: ExportedHandler<Env> = {
const server = buildServer({
context: serverContext,
tools: isAgentMode ? agentTools : undefined,
onToolComplete: () => {
// Flush Sentry events after tool execution
ctx.waitUntil(Sentry.flush(2000));
},
});

// Run MCP handler - context already captured in closures
const response = await createMcpHandler(server, {
return createMcpHandler(server, {
route: url.pathname,
})(request, env, ctx);

// Flush buffered logs before Worker terminates
ctx.waitUntil(Sentry.flush(2000));

return response;
},
};

Expand Down