Skip to content

feat(cloudflare): Add incoming request span options to httpServerIntegration - #25582

Open
isaacs wants to merge 1 commit into
isaacschlueter/js-3970-node-add-onspanend-to-httpintegrationfrom
isaacschlueter/js-3971-cloudflare-add-ignoreincomingrequests-ignorestaticassets
Open

isaacs wants to merge 1 commit into
isaacschlueter/js-3970-node-add-onspanend-to-httpintegrationfrom
isaacschlueter/js-3971-cloudflare-add-ignoreincomingrequests-ignorestaticassets

Conversation

@isaacs

@isaacs isaacs commented Oct 20, 2026 •

Copy link
Copy Markdown
Member

Cloudflare's httpServerIntegration took only the body capture options. A user could not skip spans for one route, such as a health check, or change the request span from the request or the response. Node, Deno and Bun all allow this.

httpServerIntegration now accepts ignoreIncomingRequests, ignoreStaticAssets, spans, onSpanCreated and onSpanEnd. They use the same names and behavior as denoServeIntegration and bunServerIntegration, and the callbacks receive the web Request. The shared ServerRequestOptions check for Cloudflare now lists only the session options, which a worker cannot support because it has no long-lived process to run the flush timer.

When the SDK skips the span, it still continues the incoming trace, attaches request data and the body, and captures errors. It also still waits for a streamed response to finish before it flushes. For a streamed response, onSpanEnd runs when the stream finishes. It does not run when the handler throws. A callback that throws does not fail the request.

ignoreRequestBody also no longer fails the request when it throws. The SDK skips the body instead, so it cannot leak data that the filter was meant to hide. Deno and Bun already do this.

Two defaults change behavior:

  • ignoreStaticAssets defaults to true, so GET requests for files such as favicon.ico or *.js no longer create spans.
  • spans defaults to the client's tracing configuration, so the SDK no longer starts request spans when tracing is disabled.

Fixes #25573
Fixes JS-3971

@linear-code

linear-code Bot commented Oct 20, 2026

Copy link
Copy Markdown

JS-3971

@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.

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 f8fed4d. Configure here.

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

github-actions Bot commented Oct 20, 2026 •

Copy link
Copy Markdown
Contributor

size-limit report 📦

Compared: 56fab70 (PR test merge using develop at f2434ff)

Against: b3e0c9e (develop) · base run #63030

⚠️ Baseline mismatch: 7 develop commit(s) in the PR build are missing from the baseline. Their size changes also affect this comparison. Compare commits. Re-run once develop's baseline build for f2434ff finishes.

Path Size % Change Change
@sentry/browser 29.91 kB - -
@sentry/browser - with treeshaking flags 28.05 kB - -
@sentry/browser - with treeshaking flags tracing without tracing 27.95 kB - -
@sentry/browser (incl. Tracing) 52.1 kB - -
@sentry/browser (incl. Tracing + Span Streaming) 52.1 kB - -
@sentry/browser (incl. Tracing, Profiling) 55.05 kB - -
@sentry/browser (incl. Tracing, Replay) 91.85 kB - -
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags 80.72 kB - -
@sentry/browser (incl. Tracing, Replay with Canvas) 96.58 kB - -
@sentry/browser (incl. Tracing, Replay, Feedback) 109.52 kB - -
@sentry/browser (incl. Feedback) 47.42 kB - -
@sentry/browser (incl. sendFeedback) 34.97 kB - -
@sentry/browser (incl. FeedbackAsync) 40.07 kB - -
@sentry/browser (incl. Metrics) 30.93 kB - -
@sentry/browser (incl. Logs) 31.21 kB - -
@sentry/browser (incl. Metrics & Logs) 31.84 kB - -
@sentry/react 31.74 kB - -
@sentry/react (incl. Tracing) 54.42 kB - -
@sentry/vue 38.07 kB - -
@sentry/vue (incl. Tracing) 55.03 kB - -
@sentry/svelte 29.93 kB - -
@sentry/remix (Remix 3 client bundle) 57.11 kB - -
CDN Bundle 31.67 kB - -
CDN Bundle (incl. Tracing) 52.61 kB - -
CDN Bundle (incl. Logs, Metrics) 33.87 kB - -
CDN Bundle (incl. Tracing, Logs, Metrics) 54.55 kB - -
CDN Bundle (incl. Replay, Logs, Metrics) 74.79 kB - -
CDN Bundle (incl. Tracing, Replay) 90.28 kB - -
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) 92.21 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback) 96.42 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) 98.37 kB - -
CDN Bundle - uncompressed 93.29 kB - -
CDN Bundle (incl. Tracing) - uncompressed 156.14 kB - -
CDN Bundle (incl. Logs, Metrics) - uncompressed 99.84 kB - -
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed 162.11 kB - -
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed 229.88 kB - -
CDN Bundle (incl. Tracing, Replay) - uncompressed 276.31 kB - -
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed 282.26 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed 290.01 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed 295.96 kB - -
@sentry/nextjs (client) 57.31 kB - -
@sentry/sveltekit (client) 52.48 kB - -
@sentry/core/server 41.85 kB - -
@sentry/core/browser 13.81 kB - -
@sentry/node 152.7 kB +0.02% +27 B 🔺
@sentry/node/import (ESM hook with diagnostics-channel injection) 81.58 kB -0.01% -1 B 🔽
@sentry/node - without tracing 94.25 kB +0.01% +4 B 🔺
@sentry/node - without channel injection 133.38 kB +0.02% +26 B 🔺
@sentry/aws-serverless 102.5 kB +0.02% +20 B 🔺
@sentry/cloudflare (withSentry) - minified 212.5 kB +0.66% +1.39 kB 🔺
@sentry/cloudflare (withSentry) 526.86 kB +0.58% +3.03 kB 🔺
@sentry/nextjs/cloudflare (withSentry) - minified 232.06 kB +0.58% +1.32 kB 🔺

View base workflow run

@isaacs
isaacs marked this pull request as ready for review October 21, 2026 00:35
@isaacs
isaacs requested a review from a team as a code owner October 21, 2026 00:35
@isaacs
isaacs requested review from JPeer264 and mydea and removed request for a team October 21, 2026 00:35
@isaacs
isaacs force-pushed the isaacschlueter/js-3971-cloudflare-add-ignoreincomingrequests-ignorestaticassets branch from 97cb62a to a96f52e Compare October 21, 2026 01:07
@isaacs
isaacs requested a review from a team as a code owner October 21, 2026 01:12
@isaacs
isaacs requested review from s1gr1d and removed request for a team October 21, 2026 01:12
@isaacs
isaacs force-pushed the isaacschlueter/js-3971-cloudflare-add-ignoreincomingrequests-ignorestaticassets branch from a96f52e to 2ceb825 Compare October 21, 2026 01:12
@isaacs
isaacs force-pushed the isaacschlueter/js-3971-cloudflare-add-ignoreincomingrequests-ignorestaticassets branch from 2ceb825 to 227d2e4 Compare October 21, 2026 01:15

@JPeer264 JPeer264 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Code looks good overall. Just not approving yet until the one comment is clarified

* Whether to create a span for the incoming request, based on the HttpServer integration config.
* Called internally by `wrapRequestHandler`.
*/
export function shouldCreateIncomingRequestSpan(client: Client | undefined, request: Request): boolean {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Same answer, I guess. We should either do this for all 3, or none of them, but Node already behaves this way, and it seems low risk.

In fact, for Cloudflare, this affects even less traffic, since typically the Worker typically won't be responsible for serving static files anyway, I would imagine?

In any event, we should definitely keep the machinery, and either leave the default on all three true (to match node) or false (to prevent a behavior change, and flip to true in v12).

Probably the sensible way to approach this is another deliberate PR on top of (or after) this stack, which sets the default to false, if that's how we want to go.

@isaacs
isaacs force-pushed the isaacschlueter/js-3971-cloudflare-add-ignoreincomingrequests-ignorestaticassets branch from 227d2e4 to 9703086 Compare October 21, 2026 14:16
@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. 10 failing, 22 successful. See the run.

Check Status
❌ CI: Optional E2E Tests / E2E cloudflare-pi-durable Test (optional) Failing after 3m Details
❌ CI: Optional E2E Tests / E2E cloudflare-pi-durable (latest) Test (optional) Failing after 17s Details
❌ CI: Optional E2E Tests / E2E nextjs-16 (vinext) Test (optional) Failing after 1m Details
❌ CI: Optional E2E Tests / E2E nextjs-16 (vinext, bun) Test (optional) Failing after 3m Details
❌ CI: Optional E2E Tests / E2E nextjs-16 (cloudflare, latest) Test (optional) Failing after 2m Details
❌ CI: Optional E2E Tests / E2E nextjs-16 (canary, webpack) Test (optional) Failing after 24s Details
❌ CI: Optional E2E Tests / E2E nextjs-16 (canary, turbopack) Test (optional) Failing after 1m Details
❌ CI: Optional E2E Tests / E2E nextjs-16 (deno) Test (optional) Failing after 2m Details
❌ CI: Optional E2E Tests / E2E cloudflare-flue-send-to-sentry Test (optional) Failing after 59s Details
❌ CI: Optional E2E Tests / E2E nextjs-16-tunnel (cloudflare) Test (optional) Failing after 39s Details
Successful checks
Check Status
✅ CI: Optional E2E Tests / E2E gen-ai-libraries (cloudflare) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E cloudflare-agent Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E cloudflare-think (ai v6) Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E nextjs-15 (latest) Test (optional) Successful in 4m Details
✅ CI: Optional E2E Tests / E2E gen-ai-libraries Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E cloudflare-mastra Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E nextjs-15 (turbo) Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E nextjs-14 (canary) Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E nuxt-5 Test (optional) Successful in 4m Details
✅ CI: Optional E2E Tests / E2E cloudflare-think Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E nuxt-3 (canary) Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E nextjs-16-standalone (canary, turbopack) Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E nuxt-4 (canary) Test (optional) Successful in 3m Details
✅ CI: Optional E2E Tests / E2E nuxt-5-sourcemaps Test (optional) Successful in 3m Details
✅ CI: Optional E2E Tests / E2E nextjs-14 (latest) Test (optional) Successful in 4m Details
✅ CI: Optional E2E Tests / E2E tanstackstart-react-cloudflare Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nuxt-5-sourcemaps (client source maps kept) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nextjs-orpc Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E nuxt-4-static (canary) Test (optional) Successful in 3m Details
✅ CI: Optional E2E Tests / E2E cloudflare-workers-send-to-sentry Test (optional) Successful in 5m Details
✅ CI: Optional E2E Tests / E2E nuxt-5-sourcemaps (static / nuxt generate) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E supabase-nextjs Test (optional) Successful in 1m Details

@isaacs
isaacs force-pushed the isaacschlueter/js-3971-cloudflare-add-ignoreincomingrequests-ignorestaticassets branch from 9703086 to 3dc6a19 Compare October 21, 2026 16:45
@isaacs
isaacs force-pushed the isaacschlueter/js-3971-cloudflare-add-ignoreincomingrequests-ignorestaticassets branch from 3dc6a19 to 8e70a78 Compare October 21, 2026 16:56
@isaacs
isaacs force-pushed the isaacschlueter/js-3971-cloudflare-add-ignoreincomingrequests-ignorestaticassets branch from 8e70a78 to 0df3e5e Compare October 21, 2026 17:26
@isaacs
isaacs force-pushed the isaacschlueter/js-3971-cloudflare-add-ignoreincomingrequests-ignorestaticassets branch from 47f73c6 to 931b7ed Compare October 21, 2026 18:27
…egration`

Cloudflare's `httpServerIntegration` took only the body capture
options. A user could not skip spans for one route, such as a health
check, or change the request span from the request or the response.
Node, Deno and Bun all allow this.

`httpServerIntegration` now accepts `ignoreIncomingRequests`,
`ignoreStaticAssets`, `spans`, `onSpanCreated` and `onSpanEnd`. They
use the same names and behavior as `denoServeIntegration` and
`bunServerIntegration`, and the callbacks receive the web `Request`.
The shared `ServerRequestOptions` check for Cloudflare now lists only
the session options, which a worker cannot support because it has no
long-lived process to run the flush timer.

When the SDK skips the span, it still continues the incoming trace,
attaches request data and the body, and captures errors. It also still
waits for a streamed response to finish before it flushes. For a
streamed response, `onSpanEnd` runs when the stream finishes. It does
not run when the handler throws. A callback that throws does not fail
the request.

`ignoreRequestBody` also no longer fails the request when it throws.
The SDK skips the body instead, so it cannot leak data that the filter
was meant to hide. Deno and Bun already do this.

Two defaults change behavior:

- `ignoreStaticAssets` defaults to `true`, so `GET` requests for files
  such as `favicon.ico` or `*.js` no longer create spans.
- `spans` defaults to the client's tracing configuration, so the SDK no
  longer starts request spans when tracing is disabled.

Fixes #25573
Fixes JS-3971

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@isaacs
isaacs force-pushed the isaacschlueter/js-3971-cloudflare-add-ignoreincomingrequests-ignorestaticassets branch from 931b7ed to 6d40485 Compare October 21, 2026 18:39

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.

cloudflare: add ignoreIncomingRequests ,  ignoreStaticAssets ,  spans ,  onSpanCreated ,  onSpanEnd

2 participants