Skip to content

feat(core): Add the primitives to answer managed tunnel requests in the runtimes - #25997

Open
logaretm wants to merge 9 commits into
developfrom
awad/runtime-tunnel-core
Open

logaretm wants to merge 9 commits into
developfrom
awad/runtime-tunnel-core

Conversation

@logaretm

@logaretm logaretm commented Nov 2, 2026 •

Copy link
Copy Markdown
Member

These series of PRs re-work the new tunnel implementation a second time, it acts as improvement because none of the changes are breaking.

What's different?

The new approach here, sets us up to intercept the tunnel request on the runtime level. This means it is much earlier than the current middleware approach, the tunnel request shouldn't hit the user application at all.

This allows the serveTunnelIntegration to be able to set up the tunnel handling on its own without requiring the user to add a manual handler on their own.

For frameworks it doesn't change much, but for arbitrary server setups, it becomes much easier:

// that's it!
Sentry.init({
  integrations: [
    Sentry.serveTunnelIntegration()
  ]
});

There is no need to setup routes or handlers unless the user explicity turns it off by either not using the integration or by turning the interception off.

// integration still adds some needed ignoreSpan rules
// to avoid tunnel requests from showing up in their traces
Sentry.serveTunnelIntegration({ intercept: false })

This PR

This PR adds primitive utilities and adjusts the API in a way to make it setup the changes up the stack.

@logaretm
logaretm added this pull request to stack #26002 November 2, 2026 19:44
@logaretm logaretm changed the title awad/runtime tunnel core feat(core): Add the primitives to answer managed tunnel requests in the runtimes Nov 2, 2026
@github-actions

github-actions Bot commented Nov 2, 2026 •

Copy link
Copy Markdown
Contributor

size-limit report 📦

Compared: 6b4fa76 (PR test merge using develop at a1162e3)

Against: a1162e3 (develop) · base run #65032

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

Path Size % Change Change
@sentry/browser 30.4 kB - -
@sentry/browser - with treeshaking flags 28.54 kB - -
@sentry/browser - with treeshaking flags tracing without tracing 28.43 kB - -
@sentry/browser (incl. Tracing) 52.73 kB - -
@sentry/browser (incl. Tracing + Span Streaming) 52.73 kB - -
@sentry/browser (incl. Tracing, Profiling) 55.7 kB - -
@sentry/browser (incl. Tracing, Replay) 93.03 kB - -
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags 81.63 kB - -
@sentry/browser (incl. Tracing, Replay with Canvas) 97.78 kB - -
@sentry/browser (incl. Tracing, Replay, Feedback) 110.77 kB - -
@sentry/browser (incl. Feedback) 47.98 kB - -
@sentry/browser (incl. sendFeedback) 35.5 kB - -
@sentry/browser (incl. FeedbackAsync) 40.61 kB - -
@sentry/browser (incl. Metrics) 31.44 kB - -
@sentry/browser (incl. Logs) 31.73 kB - -
@sentry/browser (incl. Metrics & Logs) 32.45 kB - -
@sentry/react 32.29 kB - -
@sentry/react (incl. Tracing) 55.1 kB - -
@sentry/vue 38.67 kB - -
@sentry/vue (incl. Tracing) 55.75 kB - -
@sentry/svelte 30.43 kB - -
@sentry/remix (Remix 3 client bundle) 57.82 kB - -
CDN Bundle 32.19 kB - -
CDN Bundle (incl. Tracing) 53.26 kB - -
CDN Bundle (incl. Logs, Metrics) 34.47 kB - -
CDN Bundle (incl. Tracing, Logs, Metrics) 55.2 kB - -
CDN Bundle (incl. Replay, Logs, Metrics) 75.88 kB - -
CDN Bundle (incl. Tracing, Replay) 91.47 kB - -
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) 93.4 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback) 97.58 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) 99.58 kB - -
CDN Bundle - uncompressed 94.67 kB - -
CDN Bundle (incl. Tracing) - uncompressed 157.67 kB - -
CDN Bundle (incl. Logs, Metrics) - uncompressed 101.14 kB - -
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed 163.41 kB - -
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed 232.71 kB - -
CDN Bundle (incl. Tracing, Replay) - uncompressed 279.36 kB - -
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed 285.08 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed 293.06 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed 298.77 kB - -
@sentry/nextjs (client) 58.05 kB - -
@sentry/sveltekit (client) 53.24 kB - -
@sentry/core/server 44.59 kB +0.78% +343 B 🔺
@sentry/core/browser 13.93 kB - -
@sentry/node 156.24 kB +0.2% +301 B 🔺
@sentry/node/import (ESM hook with diagnostics-channel injection) 82.28 kB +0.01% +1 B 🔺
@sentry/node - without tracing 97.16 kB +0.28% +266 B 🔺
@sentry/node - without channel injection 136.55 kB +0.21% +274 B 🔺
@sentry/aws-serverless 105.39 kB +0.28% +294 B 🔺
@sentry/cloudflare (withSentry) - minified 201.54 kB +0.44% +869 B 🔺
@sentry/cloudflare (withSentry) 500.79 kB +0.35% +1.74 kB 🔺
@sentry/nextjs/cloudflare (withSentry) - minified 222.09 kB +0.4% +869 B 🔺

View base workflow run

@github-actions

github-actions Bot commented Nov 2, 2026 •

Copy link
Copy Markdown
Contributor

Optional E2E tests

Some optional checks were not successful. They do not block the merge. 6 not successful, 49 successful. See the run.

Check Status
❌ CI: Optional E2E Tests / E2E cloudflare-pi-durable (latest) Test (optional) Failing after 18s Details
❌ CI: Optional E2E Tests / E2E gen-ai-libraries (latest) Test (optional) Failing after 28s Details
❌ CI: Optional E2E Tests / E2E nuxt-5 (tunnel-dev) Test (optional) Failing after 2m Details
❌ CI: Optional E2E Tests / E2E node-pi-durable (latest) Test (optional) Failing after 31s Details
❌ CI: Optional E2E Tests / E2E nuxt-5 Test (optional) Failing after 2m Details
❌ CI: Optional E2E Tests / E2E node-flue (latest) Test (optional) Failing after 17s Details
Successful checks
Check Status
✅ CI: Optional E2E Tests / E2E cloudflare-agent Test (optional) Successful in 26s Details
✅ CI: Optional E2E Tests / E2E gen-ai-libraries (cloudflare) Test (optional) Successful in 28s Details
✅ CI: Optional E2E Tests / E2E gen-ai-libraries Test (optional) Successful in 31s Details
✅ CI: Optional E2E Tests / E2E node-fastify-6 (tracer provider) Test (optional) Successful in 23s Details
✅ CI: Optional E2E Tests / E2E astro-7-static Test (optional) Successful in 52s Details
✅ CI: Optional E2E Tests / E2E nextjs-15 (turbo) Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E debug-id-sourcemaps Test (optional) Successful in 27s Details
✅ CI: Optional E2E Tests / E2E nestjs-12 (latest) Test (optional) Successful in 29s Details
✅ CI: Optional E2E Tests / E2E cloudflare-flue-send-to-sentry Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E node-eve Test (optional) Successful in 46s Details
✅ CI: Optional E2E Tests / E2E nextjs-15 (latest) Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E nextjs-orpc Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E cloudflare-think (ai v6) Test (optional) Successful in 43s Details
✅ CI: Optional E2E Tests / E2E react-router-7-framework-instrumentation Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E astro-7 Test (optional) Successful in 58s Details
✅ CI: Optional E2E Tests / E2E cloudflare-think Test (optional) Successful in 37s Details
✅ CI: Optional E2E Tests / E2E cloudflare-workers-send-to-sentry Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E deno (latest) Test (optional) Successful in 53s Details
✅ CI: Optional E2E Tests / E2E cloudflare-mastra Test (optional) Successful in 28s Details
✅ CI: Optional E2E Tests / E2E node-eve (latest) Test (optional) Successful in 48s Details
✅ CI: Optional E2E Tests / E2E cloudflare-pi-durable Test (optional) Successful in 23s Details
✅ CI: Optional E2E Tests / E2E nextjs-14 (latest) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nextjs-16-tunnel (cloudflare) Test (optional) Successful in 40s Details
✅ CI: Optional E2E Tests / E2E node-express-mcp-v1 Test (optional) Successful in 30s Details
✅ CI: Optional E2E Tests / E2E node-openai-decisions (latest) Test (optional) Successful in 20s Details
✅ CI: Optional E2E Tests / E2E nextjs-16 (cloudflare, latest) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nextjs-16 (deno) Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E node-eve (orchestrion) Test (optional) Successful in 43s Details
✅ CI: Optional E2E Tests / E2E nextjs-16 (vinext) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E node-fastify-6 Test (optional) Successful in 45s Details
✅ CI: Optional E2E Tests / E2E node-flue Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E node-openai-decisions Test (optional) Successful in 18s Details
✅ CI: Optional E2E Tests / E2E node-express-mcp-v2 Test (optional) Successful in 18s Details
✅ CI: Optional E2E Tests / E2E nextjs-16 (vinext, bun) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E node-mastra (latest) Test (optional) Successful in 53s Details
✅ CI: Optional E2E Tests / E2E node-pi-durable Test (optional) Successful in 23s Details
✅ CI: Optional E2E Tests / E2E nuxt-5-sourcemaps (static / nuxt generate) Test (optional) Successful in 20s Details
✅ CI: Optional E2E Tests / E2E node-express-send-to-sentry-static Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nuxt-5-sourcemaps Test (optional) Successful in 23s Details
✅ CI: Optional E2E Tests / E2E node-express-send-to-sentry Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E vue-3 (no Options API) Test (optional) Successful in 57s Details
✅ CI: Optional E2E Tests / E2E react-send-to-sentry Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E node-mastra Test (optional) Successful in 44s Details
✅ CI: Optional E2E Tests / E2E tanstackstart-react (latest) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E tanstackstart-react-cloudflare Test (optional) Successful in 25s Details
✅ CI: Optional E2E Tests / E2E tanstackstart-react-sourcemaps Test (optional) Successful in 19s Details
✅ CI: Optional E2E Tests / E2E supabase-nextjs Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nuxt-5-sourcemaps (client source maps kept) Test (optional) Successful in 26s Details
✅ CI: Optional E2E Tests / E2E solidstart-2 Test (optional) Successful in 39s Details

@logaretm
logaretm force-pushed the awad/runtime-tunnel-core branch from 651bd2c to 3907e5e Compare November 2, 2026 21:29
@logaretm
logaretm marked this pull request as ready for review November 3, 2026 04:32
@logaretm
logaretm requested review from a team as code owners November 3, 2026 04:32
@logaretm
logaretm requested review from Lms24, andreiborza, isaacs, msonnb, nicohrubec and s1gr1d and removed request for a team November 3, 2026 04:32

@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/core/src/utils/tunnelServer.ts Resolved
…he runtimes

Matching and answering helpers for the tunnel `serveTunnelIntegration` serves, which never throw into the
server, the `intercept` option, and the managed tunnel state on the global carrier so every copy of core sees
it. Tunnel requests record no span, session or request data.
@logaretm
logaretm force-pushed the awad/runtime-tunnel-core branch from cc77ce5 to f70a9da Compare November 4, 2026 17:25

@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 4 potential issues.

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


if (!client || !markRequest(request)) {
// Tunnel requests get no isolation scope, session or span, whether the SDK or the app answers them.
if (!client || isServedTunnelRequest(request) || !markRequest(request)) {

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Tunnel skip pollutes default isolation scope

Medium Severity

Skipping isolation-scope setup for served tunnel requests leaves those requests on the default isolation scope. Until runtime intercept is wired, the app still handles them, so middleware that calls setUser or setTag can leak that data onto the default scope. The next request clones that scope and can inherit the wrong user or tags.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit f70a9da. Configure here.

}

return originalEmit.call(this, event, ...data);
} as HttpServer['emit'];

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Tunnel emit wrap is not restored

Medium Severity

instrumentTunnelServer wraps server.emit only once and then ignores that server forever. If anything later replaces emit (NestJS is known to fork it), HTTP instrumentation re-wraps the replacement but the tunnel interceptor does not, so tunnel requests start reaching the app again.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit f70a9da. Configure here.

export function getServedTunnelMatch(request: TunnelRequestLike): ServedTunnel | undefined {
const servedTunnel = matchServedTunnel(request);

return servedTunnel?.intercept ? servedTunnel : undefined;

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Intercept false 404s React Router tunnel

Medium Severity

handleServedTunnelRequest now returns undefined when intercept is false, but React Router still registers dedicated tunnel routes whose action maps that undefined to a 404. Users who turn intercept off to serve the tunnel themselves get 404s on the tunnel path instead of reaching their handler.

Additional Locations (1)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit f70a9da. Configure here.

} finally {
config.onDone?.(response);
}
}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Tunnel check ignores provided client

Low Severity

This is more an "is this necessary" check than a hard violation: the new isServedTunnelRequest call uses getClient() internally even though wrapServerRequestHandler already has config.client. On Cloudflare, this wrapper exists specifically because getClient() can miss the per-request client, so tunnel requests may still get sessions, spans, and body capture.

Fix in Cursor Fix in Web

Triggered by project rule: PR Review Guidelines for Cursor Bot

Reviewed by Cursor Bugbot for commit f70a9da. Configure here.

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.

1 participant