Skip to content

ref(cloudflare): Use the shared request handler wrapper - #25588

Open
isaacs wants to merge 2 commits into
developfrom
isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c
Open

isaacs wants to merge 2 commits into
developfrom
isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c

Conversation

@isaacs

@isaacs isaacs commented Oct 20, 2026 •

Copy link
Copy Markdown
Member

Moves Cloudflare's wrapRequestHandler onto wrapServerRequestHandler, which Deno.serve and Bun.serve use since the previous PRs. Cloudflare keeps only what is unique to it: client init, the cf and cloud resource contexts, the protocol from cf.httpProtocol, the isStreamingResponse option, captureErrors, and the flush through waitUntil, which skips the dispose for a 101 response. The helpers that only the old code used (captureIncomingRequestBody, shouldCreateIncomingRequestSpan, getIncomingRequestSpanHooks and addRequest) are gone.

wrapRequestHandler must run on workers without the nodejs_compat flag, such as Shopify Oxygen, and every @sentry/server-utils entry loads node:async_hooks. So the wrapper moves to a new entry, @sentry/server-utils/request-handler, with no Node.js imports. Deno and Bun import it from there too. Cloudflare's module graph test allows this one entry, and a new test in server-utils walks the entry's module graph and fails on any Node.js import.

The wrapper gets three optional fields: isStreamingResponse, onDone (called once when the request is done, with the response if there is one), and a mechanism that can be left out to not capture errors.

For streamed responses, the shared stream monitor replaces Cloudflare's TransformStream. Workers with a compatibility date before 2022-11-30 cannot construct a ReadableStream without the streams_enable_constructors flag, so the wrapper then ends at handler return, as the TransformStream fallback did. The monitor now locks the source body only in start(), so the original response stays usable in that case. The wrapper builds the new response from the original one, which keeps encodeBody: 'manual'.

Visible changes for Cloudflare:

  • Request spans set client.address from CF-Connecting-IP (or another forwarding header), as on the other runtimes. This follows dataCollection.userInfo, which is true by default.
  • Request spans get the response header attributes, and events get the response context.
  • An error from the source of a streamed response is captured (unless captureErrors is false), and the span gets an error status.
  • If the user removed httpServerIntegration, request bodies follow dataCollection.httpBodies. Before, the SDK attached no body.

The minified withSentry bundle grows by about 2.4 KB (212,385 to 214,853 bytes), under the 211 KiB limit. Most of it is the request session and client address code, which Cloudflare now shares.

Fixes #25577
Fixes JS-3975

@linear-code

linear-code Bot commented Oct 20, 2026

Copy link
Copy Markdown

JS-3975

@isaacs
isaacs added this pull request to stack #25589 October 20, 2026 22:30

@cursor cursor Bot left a comment •

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stale Bugbot comment from a previous run.

Comment thread packages/cloudflare/src/wrapRequestHandlerWithInit.ts
@github-actions

github-actions Bot commented Oct 20, 2026 •

Copy link
Copy Markdown
Contributor

size-limit report 📦

Compared: c78f1ba (PR test merge using develop at c125a5d)

Against: c125a5d (develop) · base run #63627

✅ Baseline matches: this diff contains only this PR's changes.

Path Size % Change Change
@sentry/browser 29.98 kB - -
@sentry/browser - with treeshaking flags 28.13 kB - -
@sentry/browser - with treeshaking flags tracing without tracing 28.03 kB - -
@sentry/browser (incl. Tracing) 52.17 kB - -
@sentry/browser (incl. Tracing + Span Streaming) 52.18 kB - -
@sentry/browser (incl. Tracing, Profiling) 55.12 kB - -
@sentry/browser (incl. Tracing, Replay) 91.97 kB - -
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags 80.86 kB - -
@sentry/browser (incl. Tracing, Replay with Canvas) 96.7 kB - -
@sentry/browser (incl. Tracing, Replay, Feedback) 109.64 kB - -
@sentry/browser (incl. Feedback) 47.51 kB - -
@sentry/browser (incl. sendFeedback) 35.05 kB - -
@sentry/browser (incl. FeedbackAsync) 40.15 kB - -
@sentry/browser (incl. Metrics) 31.01 kB - -
@sentry/browser (incl. Logs) 31.28 kB - -
@sentry/browser (incl. Metrics & Logs) 31.94 kB - -
@sentry/react 31.81 kB - -
@sentry/react (incl. Tracing) 54.5 kB - -
@sentry/vue 38.14 kB - -
@sentry/vue (incl. Tracing) 55.11 kB - -
@sentry/svelte 30.01 kB - -
@sentry/remix (Remix 3 client bundle) 57.19 kB - -
CDN Bundle 31.76 kB - -
CDN Bundle (incl. Tracing) 52.71 kB - -
CDN Bundle (incl. Logs, Metrics) 33.95 kB - -
CDN Bundle (incl. Tracing, Logs, Metrics) 54.66 kB - -
CDN Bundle (incl. Replay, Logs, Metrics) 74.93 kB - -
CDN Bundle (incl. Tracing, Replay) 90.41 kB - -
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) 92.33 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback) 96.55 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) 98.5 kB - -
CDN Bundle - uncompressed 93.51 kB - -
CDN Bundle (incl. Tracing) - uncompressed 156.36 kB - -
CDN Bundle (incl. Logs, Metrics) - uncompressed 100.06 kB - -
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed 162.33 kB - -
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed 230.28 kB - -
CDN Bundle (incl. Tracing, Replay) - uncompressed 276.71 kB - -
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed 282.66 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed 290.41 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed 296.35 kB - -
@sentry/nextjs (client) 57.38 kB - -
@sentry/sveltekit (client) 52.55 kB - -
@sentry/core/server 43.62 kB - -
@sentry/core/browser 13.81 kB - -
@sentry/node 153.93 kB -0.01% -1 B 🔽
@sentry/node/import (ESM hook with diagnostics-channel injection) 81.58 kB - -
@sentry/node - without tracing 95.48 kB - -
@sentry/node - without channel injection 134.59 kB - -
@sentry/aws-serverless 103.61 kB - -
@sentry/cloudflare (withSentry) - minified 199.94 kB +1.36% +2.67 kB 🔺
@sentry/cloudflare (withSentry) 497.07 kB +1.43% +6.99 kB 🔺
@sentry/nextjs/cloudflare (withSentry) - minified 220.51 kB +1.23% +2.66 kB 🔺

View base workflow run

@isaacs
isaacs force-pushed the isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c branch from fc30522 to 5d3ee29 Compare October 21, 2026 01:06
@isaacs
isaacs marked this pull request as ready for review October 21, 2026 01:07
@isaacs
isaacs requested a review from a team as a code owner October 21, 2026 01:07
@isaacs
isaacs requested review from JPeer264 and andreiborza and removed request for a team October 21, 2026 01:07
@isaacs
isaacs force-pushed the isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c branch from 5d3ee29 to 7a1874d Compare October 21, 2026 01:07
@isaacs
isaacs requested a review from a team as a code owner October 21, 2026 01:13
@isaacs
isaacs requested review from chargome and nicohrubec and removed request for a team October 21, 2026 01:13
@isaacs
isaacs force-pushed the isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c branch from 7a1874d to 9e86e46 Compare October 21, 2026 01:13
@isaacs
isaacs force-pushed the isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c branch 2 times, most recently from a650894 to 66b9312 Compare October 21, 2026 01:20

@cursor cursor Bot left a comment •

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stale Bugbot comment from a previous run.

@isaacs
isaacs force-pushed the isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c branch from a1a478b to f0da1bc Compare October 21, 2026 04:14
@isaacs
isaacs force-pushed the isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c branch from f0da1bc to 128c6ee Compare October 21, 2026 17:15

@cursor cursor Bot left a comment •

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stale Bugbot comment from a previous run.

@isaacs
isaacs force-pushed the isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c branch from 128c6ee to 411a6ac Compare October 21, 2026 17:28
@github-actions

github-actions Bot commented Oct 21, 2026 •

Copy link
Copy Markdown
Contributor

Optional E2E tests

Some optional checks were not successful. They do not block the merge. 3 not successful, 62 successful. See the run.

Check Status
❌ CI: Optional E2E Tests / E2E node-eve (latest) Test (optional) Failing after 2m Details
❌ CI: Optional E2E Tests / E2E node-anthropic-send-to-sentry Test (optional) Failing after 3m Details
❌ CI: Optional E2E Tests / E2E node-anthropic-send-to-sentry (latest) Test (optional) Failing after 1m Details
Successful checks
Check Status
✅ CI: Optional E2E Tests / E2E debug-id-sourcemaps Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E cloudflare-flue-send-to-sentry Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E cloudflare-mastra Test (optional) Successful in 31s Details
✅ CI: Optional E2E Tests / E2E cloudflare-think (ai v6) Test (optional) Successful in 56s Details
✅ CI: Optional E2E Tests / E2E astro-7 Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E cloudflare-pi-durable Test (optional) Successful in 34s Details
✅ CI: Optional E2E Tests / E2E nextjs-15 (latest) Test (optional) Successful in 6m Details
✅ CI: Optional E2E Tests / E2E nextjs-16-tunnel (cloudflare) Test (optional) Successful in 4m Details
✅ CI: Optional E2E Tests / E2E angular (canary) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nextjs-14 (latest) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E cloudflare-think Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nextjs-16 (vinext) Test (optional) Successful in 4m Details
✅ CI: Optional E2E Tests / E2E cloudflare-pi-durable (latest) Test (optional) Successful in 3m Details
✅ CI: Optional E2E Tests / E2E node-flue Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E cloudflare-workers-send-to-sentry Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E angular (canary) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nextjs-orpc Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nextjs-14 (canary) Test (optional) Successful in 5m Details
✅ CI: Optional E2E Tests / E2E node-fastify-6 Test (optional) Successful in 27s Details
✅ CI: Optional E2E Tests / E2E astro-7-static Test (optional) Successful in 5m Details
✅ CI: Optional E2E Tests / E2E deno (latest) Test (optional) Successful in 56s Details
✅ CI: Optional E2E Tests / E2E react-send-to-sentry Test (optional) Successful in 3m Details
✅ CI: Optional E2E Tests / E2E node-express-send-to-sentry-static Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nextjs-15 (turbo) Test (optional) Successful in 5m Details
✅ CI: Optional E2E Tests / E2E node-mastra (latest) Test (optional) Successful in 57s Details
✅ CI: Optional E2E Tests / E2E gen-ai-libraries Test (optional) Successful in 3m Details
✅ CI: Optional E2E Tests / E2E nuxt-3 (canary) Test (optional) Successful in 3m Details
✅ CI: Optional E2E Tests / E2E node-openai-send-to-sentry (latest) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E node-openai-decisions-send-to-sentry (latest) Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E node-express-send-to-sentry Test (optional) Successful in 5m Details
✅ CI: Optional E2E Tests / E2E node-pi-durable Test (optional) Successful in 27s Details
✅ CI: Optional E2E Tests / E2E node-express-mcp-v2 Test (optional) Successful in 24s Details
✅ CI: Optional E2E Tests / E2E gen-ai-libraries (cloudflare) Test (optional) Successful in 4m Details
✅ CI: Optional E2E Tests / E2E solidstart-2 Test (optional) Successful in 38s Details
✅ CI: Optional E2E Tests / E2E tanstackstart-react-cloudflare Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E node-openai-send-to-sentry Test (optional) Successful in 5m Details
✅ CI: Optional E2E Tests / E2E nextjs-16 (canary, turbopack) Test (optional) Successful in 4m Details
✅ CI: Optional E2E Tests / E2E node-openai-decisions-send-to-sentry Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nuxt-5-sourcemaps (client source maps kept) Test (optional) Successful in 51s Details
✅ CI: Optional E2E Tests / E2E nuxt-4-static (canary) Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E nextjs-16 (vinext, bun) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nuxt-5-sourcemaps Test (optional) Successful in 3m Details
✅ CI: Optional E2E Tests / E2E nuxt-4 (canary) Test (optional) Successful in 3m Details
✅ CI: Optional E2E Tests / E2E nextjs-16-standalone (canary, turbopack) Test (optional) Successful in 3m Details
✅ CI: Optional E2E Tests / E2E node-eve Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E supabase-nextjs Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E node-flue (latest) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E node-express-mcp-v1 Test (optional) Successful in 4m Details
✅ CI: Optional E2E Tests / E2E react-router-7-framework-instrumentation Test (optional) Successful in 5m Details
✅ CI: Optional E2E Tests / E2E nextjs-16 (cloudflare, latest) Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E nuxt-5-sourcemaps (static / nuxt generate) Test (optional) Successful in 28s Details
✅ CI: Optional E2E Tests / E2E nuxt-5 Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E vue-3 (canary) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nextjs-16 (canary, webpack) Test (optional) Successful in 7m Details
✅ CI: Optional E2E Tests / E2E tanstackstart-react-sourcemaps Test (optional) Successful in 4m Details
✅ CI: Optional E2E Tests / E2E node-mastra Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nextjs-16 (deno) Test (optional) Successful in 5m Details
✅ CI: Optional E2E Tests / E2E node-fastify-6 (tracer provider) Test (optional) Successful in 23s Details
✅ CI: Optional E2E Tests / E2E node-eve (orchestrion) Test (optional) Successful in 43s Details
✅ CI: Optional E2E Tests / E2E node-pi-durable (latest) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E cloudflare-agent Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E vue-3 (no Options API) Test (optional) Successful in 1m Details

@isaacs
isaacs force-pushed the isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c branch from 411a6ac to a18c1c2 Compare October 21, 2026 18:35
@isaacs
isaacs force-pushed the isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c branch from a18c1c2 to f81ddfd Compare October 21, 2026 18:37
@isaacs
isaacs force-pushed the isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c branch 2 times, most recently from 14b8f95 to 9ff7d48 Compare October 22, 2026 15:37
@isaacs
isaacs force-pushed the isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c branch 4 times, most recently from c731f41 to 07870f8 Compare October 23, 2026 20:54
@isaacs
isaacs force-pushed the isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c branch 2 times, most recently from 931c710 to 946efb9 Compare October 26, 2026 18:17
@isaacs
isaacs force-pushed the isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c branch from 946efb9 to 5e42003 Compare October 26, 2026 18:21

@cursor cursor Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 5e42003. Configure here.

Comment thread packages/cloudflare/src/integrations/httpServer.ts
@isaacs
isaacs force-pushed the isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c branch 2 times, most recently from 3c42ed4 to 0ec0e9c Compare October 26, 2026 19:35
Base automatically changed from isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-b to develop October 26, 2026 23:27
isaacs and others added 2 commits October 26, 2026 16:27
Moves Cloudflare's `wrapRequestHandler` onto `wrapServerRequestHandler`,
which `Deno.serve` and `Bun.serve` use since the previous PRs. Cloudflare
keeps only what is unique to it: client init, the `cf` and cloud
resource contexts, the protocol from `cf.httpProtocol`, the
`isStreamingResponse` option, `captureErrors`, and the flush through
`waitUntil`, which skips the dispose for a 101 response. The helpers
that only the old code used (`captureIncomingRequestBody`,
`shouldCreateIncomingRequestSpan`, `getIncomingRequestSpanHooks` and
`addRequest`) are gone.

`wrapRequestHandler` must run on workers without the `nodejs_compat`
flag, such as Shopify Oxygen, and every `@sentry/server-utils` entry
loads `node:async_hooks`. So the wrapper moves to a new entry,
`@sentry/server-utils/request-handler`, with no Node.js imports. Deno
and Bun import it from there too. Cloudflare's module graph test allows
this one entry, and a new test in server-utils walks the entry's module
graph and fails on any Node.js import.

The wrapper gets three optional fields: `isStreamingResponse`, `onDone`
(called once when the request is done, with the response if there is
one), and a `mechanism` that can be left out to not capture errors.

For streamed responses, the shared stream monitor replaces Cloudflare's
`TransformStream`. Workers with a compatibility date before 2022-11-30
cannot construct a `ReadableStream` without the
`streams_enable_constructors` flag, so the wrapper then ends at handler
return, as the `TransformStream` fallback did. The monitor now locks the
source body only in `start()`, so the original response stays usable in
that case. The wrapper builds the new response from the original one,
which keeps `encodeBody: 'manual'`.

Visible changes for Cloudflare:

- Request spans set `client.address` from `CF-Connecting-IP` (or
  another forwarding header), as on the other runtimes. This follows
  `dataCollection.userInfo`, which is `true` by default.
- Request spans get the response header attributes, and events get the
  `response` context.
- An error from the source of a streamed response is captured (unless
  `captureErrors` is `false`), and the span gets an error status.
- If the user removed `httpServerIntegration`, request bodies follow
  `dataCollection.httpBodies`. Before, the SDK attached no body.

The minified `withSentry` bundle grows by about 2.4 KB (212,385 to
214,853 bytes), under the 211 KiB limit. Most of it is the request
session and client address code, which Cloudflare now shares.

Fixes #25577
Fixes JS-3975

Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
…ncLocalStorage

Without `AsyncLocalStorage` (for example on Shopify Oxygen, or on
Workers without `nodejs_compat`), the SDK uses the stack fallback, and
`withInvocationIsolationScope` does not fork. The scope it passes to its
callback is a clone that is not the current isolation scope. The shared
request handler wrote the request data and body to that clone, so an
event captured in the handler, which reads the current scope, had no
request body. The `hydrogen-react-router-7` E2E test caught this.

The handler now gets the current isolation scope. With
`AsyncLocalStorage`, that is the same scope as before. Without it, the
request data goes where the body went before the move to the shared
handler, and events now also get the request URL and method.

Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
@isaacs
isaacs force-pushed the isaacschlueter/js-3975-share-one-request-handler-wrapper-across-denoserve-bunserve-c branch from 0ec0e9c to 06363f7 Compare October 26, 2026 23:27

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Share one  Request  handler wrapper across Deno.serve, Bun.serve and Cloudflare

1 participant