Skip to content

feat(node)!: Make channel-based instrumentation the default#22501

Open
andreiborza wants to merge 41 commits into
developfrom
ab/channel-based-default
Open

feat(node)!: Make channel-based instrumentation the default#22501
andreiborza wants to merge 41 commits into
developfrom
ab/channel-based-default

Conversation

@andreiborza

@andreiborza andreiborza commented Jul 22, 2026

Copy link
Copy Markdown
Member

What

Make orchestrion diagnostics-channel instrumentation the default in @sentry/node and remove the experimentalUseDiagnosticsChannelInjection() opt-in.

Why

The channel-based instrumentations shipped opt-in in v10. Making them the default in v11 unlocks instrumentation at run and build time.

Removal of the vendored OTel/IITM code is intentionally out of scope; it is tracked separately as follow-up.

Closes: #22345

Comment thread packages/aws-serverless/src/init.ts
Comment thread packages/node/src/sdk/index.ts
@github-actions

github-actions Bot commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

Path Size % Change Change
@sentry/browser 27.95 kB - -
@sentry/browser - with treeshaking flags 26.39 kB - -
@sentry/browser (incl. Tracing) 46.41 kB - -
@sentry/browser (incl. Tracing + Span Streaming) 48.18 kB - -
@sentry/browser (incl. Tracing, Profiling) 51.21 kB - -
@sentry/browser (incl. Tracing, Replay) 85.69 kB - -
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags 75.33 kB - -
@sentry/browser (incl. Tracing, Replay with Canvas) 90.4 kB - -
@sentry/browser (incl. Tracing, Replay, Feedback) 103.06 kB - -
@sentry/browser (incl. Feedback) 45.13 kB - -
@sentry/browser (incl. sendFeedback) 32.74 kB - -
@sentry/browser (incl. FeedbackAsync) 37.8 kB - -
@sentry/browser (incl. Metrics) 29.04 kB - -
@sentry/browser (incl. Logs) 29.26 kB - -
@sentry/browser (incl. Metrics & Logs) 29.97 kB - -
@sentry/react 29.75 kB - -
@sentry/react (incl. Tracing) 48.71 kB - -
@sentry/vue 33.38 kB - -
@sentry/vue (incl. Tracing) 48.4 kB - -
@sentry/svelte 27.97 kB - -
CDN Bundle 30.28 kB - -
CDN Bundle (incl. Tracing) 48.26 kB - -
CDN Bundle (incl. Logs, Metrics) 31.85 kB - -
CDN Bundle (incl. Tracing, Logs, Metrics) 49.58 kB - -
CDN Bundle (incl. Replay, Logs, Metrics) 71.13 kB - -
CDN Bundle (incl. Tracing, Replay) 85.83 kB - -
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) 87.14 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback) 91.6 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) 92.89 kB - -
CDN Bundle - uncompressed 90.15 kB - -
CDN Bundle (incl. Tracing) - uncompressed 145.22 kB - -
CDN Bundle (incl. Logs, Metrics) - uncompressed 94.86 kB - -
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed 149.2 kB - -
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed 219.62 kB - -
CDN Bundle (incl. Tracing, Replay) - uncompressed 264.46 kB - -
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed 268.42 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed 278.16 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed 282.11 kB - -
@sentry/nextjs (client) 51.24 kB - -
@sentry/sveltekit (client) 46.84 kB - -
@sentry/core/server 80.05 kB - -
@sentry/core/browser 52.01 kB - -
@sentry/node 136.09 kB +10.52% +12.95 kB 🔺
⛔️ @sentry/node (incl. diagnostics channel injection) (max: null) 0 B removed removed
@sentry/node/import (ESM hook with diagnostics-channel injection) 166 B - -
@sentry/node - without tracing 97.04 kB +32.39% +23.74 kB 🔺
@sentry/aws-serverless 105.1 kB +26.92% +22.29 kB 🔺
@sentry/cloudflare (withSentry) - minified 197.05 kB - -
@sentry/cloudflare (withSentry) 484.73 kB - -

View base workflow run

Comment thread packages/nextjs/src/server/index.ts Outdated
Comment thread packages/node/src/integrations/tracing/mysql/index.ts
Comment thread packages/node/src/integrations/tracing/express.ts
Comment thread packages/node/src/integrations/tracing/index.ts
Comment thread dev-packages/e2e-tests/test-applications/node-express/tests/trpc.test.ts Outdated
Comment thread packages/nextjs/src/server/index.ts Outdated
@andreiborza
andreiborza force-pushed the ab/channel-based-default branch from 921217b to e9cde04 Compare July 23, 2026 11:56
Comment thread packages/node/src/integrations/tracing/express.ts Outdated
Comment thread packages/nextjs/src/server/index.ts Outdated
Comment thread packages/node/src/integrations/tracing/index.ts
@andreiborza
andreiborza force-pushed the ab/channel-based-default branch from 404fb86 to c9a6733 Compare July 24, 2026 09:07

@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 11d7697. Configure here.

Comment thread packages/node/src/integrations/tracing/redis/index.ts
andreiborza and others added 5 commits July 24, 2026 19:24
Make orchestrion diagnostics-channel injection the default in `@sentry/node`
and remove the `experimentalUseDiagnosticsChannelInjection()` opt-in.

`Sentry.init()` now installs the channel-injection module hooks unconditionally
when span recording is enabled, so the opt-in function, its loader indirection,
and the name-based OTel->channel integration swap are gone. The self-selecting
`dataloader` and `knex` integrations pick the channel path automatically now
that `isOrchestrionInjected()` is true by default.

Redis stays a composite integration: the native diagnostics-channel subscribers
(node-redis >=5.12, ioredis >=5.11, batches) plus the orchestrion subscribers
for the older ranges, all sharing the node cache `responseHook`. The vendored
OTel patchers only run on runtimes without `tracingChannel` (Node <18.19).

BREAKING CHANGE: `experimentalUseDiagnosticsChannelInjection()`,
`diagnosticsChannelInjectionIntegrations()`, `isDiagnosticsChannelInjectionEnabled()`
and `applyDiagnosticsChannelInjectionIntegrations()` are removed from
`@sentry/node`. Channel-based instrumentation is now always on; no opt-in call
is needed.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…hooks

parseFloat of an invalid env value yields NaN, which is not nullish, so
hasSpansEnabled would treat tracing as enabled and disagree with @sentry/node.
Mirror node's getTracesSampleRate and drop non-finite env values.
develop's hook-registration rework (#22443) resolves the bundled-pnpm specifier
via absolute-path webpack externals and dropped the tracingHooksDir option from
registerDiagnosticsChannelInjection and the _sentryOrchestrionTracingHooksDir
build var. Remove the now-broken nextjs workaround that relied on them; node's
init registers the hooks and the externals keep them resolvable.
After rebasing onto develop, the orchestrion runtime chain is bundled into the
node builds (no longer lazy-loaded), growing @sentry/node (141->158 KB),
@sentry/node without tracing (81->97 KB), and @sentry/aws-serverless
(89->106 KB).
CI-measured @sentry/node without tracing (97032B) edged just over the 97 KB
limit; CI gzip runs slightly larger than local. Bump without-tracing to 98 KB
and @sentry/node to 159 KB for margin.
getAutoPerformanceIntegrations now uses the channel integrations from
@sentry/server-utils/orchestrion directly instead of routing through the thin
@sentry/node wrappers. Redis and Fastify keep their node wrappers (cache
responseHook wiring; Fastify v3/v4 coverage). The wrapper files and their public
exports are unchanged; removing them and the vendored OTel is tracked in JS-3074.
@andreiborza
andreiborza force-pushed the ab/channel-based-default branch from 9bd4d80 to 4dab6a2 Compare July 24, 2026 17:24
@andreiborza
andreiborza force-pushed the ab/channel-based-default branch from d7aa19a to 50303d9 Compare July 24, 2026 20:05
Comment on lines +5 to +7
"sentryTest": {
"skip": true
},

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.

/preload is going away so I'm just skipping here.

Comment on lines +5 to +7
"sentryTest": {
"skip": true
},

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.

/preload is going away so I'm just skipping here.

Comment on lines +5 to +7
"sentryTest": {
"skip": true
},

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.

Bring your own OTel will change and so the test apps need a bigger overhaul. Skipping for now.

Comment on lines +5 to +7
"sentryTest": {
"skip": true
},

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.

Bring your own OTel will change and so the test apps need a bigger overhaul. Skipping for now.

Comment on lines 66 to 68
export function isOrchestrionEnabled(): boolean {
return process.env.INJECT_ORCHESTRION === 'true' || process.env.INJECT_ORCHESTRION === '1';
return true;
}

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.

This will be removed in the follow-up where we remove the iitm instrumentations.

Comment on lines 68 to 70
export function isOrchestrionEnabled(): boolean {
return process.env.INJECT_ORCHESTRION === 'true' || process.env.INJECT_ORCHESTRION === '1';
return true;
}

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.

This will be removed in the follow-up where we remove the iitm instrumentations.

Comment on lines +76 to +77
// The streamlined `Fastify` integration covers fastify `>=3.21.0 <6`; `instrumentFastifyV3`
// fills the remaining early-v3 gap (`>=3.0.0 <3.21.0`), so it stays preloaded here.

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.

This will be removed in the follow-up where we delete iitm instrumentations.

@andreiborza
andreiborza marked this pull request as ready for review July 24, 2026 22:14
@andreiborza
andreiborza requested review from a team as code owners July 24, 2026 22:14
@andreiborza
andreiborza requested review from JPeer264, chargome, isaacs and nicohrubec and removed request for a team July 24, 2026 22:14
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.

Make channel-based instrumentations the default in v11

1 participant