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

.github/workflows/build.yml

@@ -782,8 +782,8 @@ jobs:
 
   job_node_integration_tests:
     name:
-      Node (${{ matrix.node }})${{ (matrix.typescript && format(' (TS {0})', matrix.typescript)) || '' }}${{
-      (matrix.use_orchestrion && format(' (Orchestrion)', matrix.use_orchestrion)) || '' }} Integration Tests
+      Node (${{ matrix.node }})${{ (matrix.typescript && format(' (TS {0})', matrix.typescript)) || '' }} Integration
+      Tests
     needs: [job_get_metadata, job_build]
     if: needs.job_build.outputs.changed_node_integration == 'true' || github.event_name != 'pull_request'
     runs-on: ubuntu-24.04
@@ -794,21 +794,10 @@ jobs:
         node: [20.19, 22, 24, 26]
         typescript:
           - false
-        use_orchestrion:
-          - false
         include:
           # Only check typescript for latest version (to streamline CI)
           - node: 24
             typescript: '5.0'
-          # No need to test orchestrion for v18
-          - node: 20.19
-            use_orchestrion: 'true'
-          - node: 22
-            use_orchestrion: 'true'
-          - node: 24
-            use_orchestrion: 'true'
-          - node: 26
-            use_orchestrion: 'true'
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v7
@@ -844,8 +833,6 @@ jobs:
       - name: Run integration tests
         working-directory: dev-packages/node-integration-tests
         run: yarn test
-        env:
-          INJECT_ORCHESTRION: ${{ matrix.use_orchestrion }}
 
   job_cloudflare_integration_tests:
     name: Cloudflare Integration Tests

.size-limit.js

@@ -381,16 +381,7 @@ module.exports = [
     import: createImport('init'),
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '131 KB',
-    disablePlugins: ['@size-limit/esbuild'],
-  },
-  {
-    name: '@sentry/node (incl. diagnostics channel injection)',
-    path: 'packages/node/build/esm/index.js',
-    import: createImport('init', 'experimentalUseDiagnosticsChannelInjection'),
-    ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
-    gzip: true,
-    limit: '154 KB',
+    limit: '141 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -406,7 +397,7 @@ module.exports = [
     path: 'packages/node/build/esm/index.js',
     import: createImport('initWithoutDefaultIntegrations', 'getDefaultIntegrationsWithoutPerformance'),
     gzip: true,
-    limit: '80 KB',
+    limit: '81 KB',
     disablePlugins: ['@size-limit/esbuild'],
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     modifyWebpackConfig: function (config) {

dev-packages/e2e-tests/test-applications/astro-7-orchestrion/sentry.server.config.js

@@ -1,11 +1,7 @@
 import * as Sentry from '@sentry/astro';
-import { experimentalUseDiagnosticsChannelInjection } from '@sentry/node';
-
-// Registers the diagnostics-channel subscribers that turn the build-time
-// injected channel events (from the orchestrion Vite plugin) into Sentry spans.
-// Must run before Sentry.init()
-experimentalUseDiagnosticsChannelInjection();
 
+// Channel-based auto-instrumentation is the default: the SDK subscribes to the build-time injected
+// channel events (from the orchestrion Vite plugin) and turns them into Sentry spans.
 Sentry.init({
   dsn: import.meta.env.PUBLIC_E2E_TEST_DSN,
   environment: 'qa',

dev-packages/e2e-tests/test-applications/create-remix-app-v2/instrument.server.cjs

@@ -1,15 +1,5 @@
 const Sentry = require('@sentry/remix');
 
-const injectOrchestrion = process.env.INJECT_ORCHESTRION === 'true';
-
-if (injectOrchestrion) {
-  // Opt into diagnostics-channel-based auto-instrumentation. This registers the
-  // channel subscribers (e.g. for mysql and ioredis) that turn the
-  // diagnostics-channel events - injected at build time by the orchestrion Vite
-  // plugin (see vite.config.ts) - into Sentry spans. Must run before Sentry.init().
-  Sentry.experimentalUseDiagnosticsChannelInjection();
-}
-
 Sentry.init({
   tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
   environment: 'qa', // dynamic sampling bias to keep transactions

dev-packages/e2e-tests/test-applications/nestjs-11/tests/transactions.test.ts

@@ -106,7 +106,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
           span_id: expect.stringMatching(/[a-f0-9]{16}/),
           trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           data: {
-            'sentry.origin': 'auto.http.otel.nestjs',
+            'sentry.origin': 'auto.http.orchestrion.nestjs',
             'sentry.op': 'handler.nestjs',
             component: '@nestjs/core',
             'nestjs.version': expect.any(String),
@@ -118,7 +118,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
           start_timestamp: expect.any(Number),
           timestamp: expect.any(Number),
           status: 'ok',
-          origin: 'auto.http.otel.nestjs',
+          origin: 'auto.http.orchestrion.nestjs',
           op: 'handler.nestjs',
         },
       ]),
@@ -154,15 +154,15 @@ test('API route transaction includes nest middleware span. Spans created in and
           trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           data: {
             'sentry.op': 'middleware.nestjs',
-            'sentry.origin': 'auto.middleware.nestjs',
+            'sentry.origin': 'auto.middleware.orchestrion.nestjs',
           },
           description: 'ExampleMiddleware',
           parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
           start_timestamp: expect.any(Number),
           timestamp: expect.any(Number),
           status: 'ok',
           op: 'middleware.nestjs',
-          origin: 'auto.middleware.nestjs',
+          origin: 'auto.middleware.orchestrion.nestjs',
         },
       ]),
     }),
@@ -234,15 +234,15 @@ test('API route transaction includes nest guard span and span started in guard i
           trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           data: {
             'sentry.op': 'middleware.nestjs',
-            'sentry.origin': 'auto.middleware.nestjs.guard',
+            'sentry.origin': 'auto.middleware.orchestrion.nestjs.guard',
           },
           description: 'ExampleGuard',
           parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
           start_timestamp: expect.any(Number),
           timestamp: expect.any(Number),
           status: 'ok',
           op: 'middleware.nestjs',
-          origin: 'auto.middleware.nestjs.guard',
+          origin: 'auto.middleware.orchestrion.nestjs.guard',
         },
       ]),
     }),
@@ -298,15 +298,15 @@ test('API route transaction includes nest pipe span for valid request', async ({
           trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           data: {
             'sentry.op': 'middleware.nestjs',
-            'sentry.origin': 'auto.middleware.nestjs.pipe',
+            'sentry.origin': 'auto.middleware.orchestrion.nestjs.pipe',
           },
           description: 'ParseIntPipe',
           parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
           start_timestamp: expect.any(Number),
           timestamp: expect.any(Number),
           status: 'ok',
           op: 'middleware.nestjs',
-          origin: 'auto.middleware.nestjs.pipe',
+          origin: 'auto.middleware.orchestrion.nestjs.pipe',
         },
       ]),
     }),
@@ -335,15 +335,15 @@ test('API route transaction includes nest pipe span for invalid request', async
           trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           data: {
             'sentry.op': 'middleware.nestjs',
-            'sentry.origin': 'auto.middleware.nestjs.pipe',
+            'sentry.origin': 'auto.middleware.orchestrion.nestjs.pipe',
           },
           description: 'ParseIntPipe',
           parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
           start_timestamp: expect.any(Number),
           timestamp: expect.any(Number),
           status: 'internal_error',
           op: 'middleware.nestjs',
-          origin: 'auto.middleware.nestjs.pipe',
+          origin: 'auto.middleware.orchestrion.nestjs.pipe',
         },
       ]),
     }),
@@ -374,30 +374,30 @@ test('API route transaction includes nest interceptor spans before route executi
           trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           data: {
             'sentry.op': 'middleware.nestjs',
-            'sentry.origin': 'auto.middleware.nestjs.interceptor',
+            'sentry.origin': 'auto.middleware.orchestrion.nestjs.interceptor',
           },
           description: 'ExampleInterceptor1',
           parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
           start_timestamp: expect.any(Number),
           timestamp: expect.any(Number),
           status: 'ok',
           op: 'middleware.nestjs',
-          origin: 'auto.middleware.nestjs.interceptor',
+          origin: 'auto.middleware.orchestrion.nestjs.interceptor',
         },
         {
           span_id: expect.stringMatching(/[a-f0-9]{16}/),
           trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           data: {
             'sentry.op': 'middleware.nestjs',
-            'sentry.origin': 'auto.middleware.nestjs.interceptor',
+            'sentry.origin': 'auto.middleware.orchestrion.nestjs.interceptor',
           },
           description: 'ExampleInterceptor2',
           parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
           start_timestamp: expect.any(Number),
           timestamp: expect.any(Number),
           status: 'ok',
           op: 'middleware.nestjs',
-          origin: 'auto.middleware.nestjs.interceptor',
+          origin: 'auto.middleware.orchestrion.nestjs.interceptor',
         },
       ]),
     }),
@@ -492,15 +492,15 @@ test('API route transaction includes exactly one nest interceptor span after rou
           trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           data: {
             'sentry.op': 'middleware.nestjs',
-            'sentry.origin': 'auto.middleware.nestjs.interceptor',
+            'sentry.origin': 'auto.middleware.orchestrion.nestjs.interceptor',
           },
           description: 'Interceptors - After Route',
           parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
           start_timestamp: expect.any(Number),
           timestamp: expect.any(Number),
           status: 'ok',
           op: 'middleware.nestjs',
-          origin: 'auto.middleware.nestjs.interceptor',
+          origin: 'auto.middleware.orchestrion.nestjs.interceptor',
         },
       ]),
     }),
@@ -574,15 +574,15 @@ test('API route transaction includes nest async interceptor spans before route e
           trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           data: {
             'sentry.op': 'middleware.nestjs',
-            'sentry.origin': 'auto.middleware.nestjs.interceptor',
+            'sentry.origin': 'auto.middleware.orchestrion.nestjs.interceptor',
           },
           description: 'AsyncInterceptor',
           parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
           start_timestamp: expect.any(Number),
           timestamp: expect.any(Number),
           status: 'ok',
           op: 'middleware.nestjs',
-          origin: 'auto.middleware.nestjs.interceptor',
+          origin: 'auto.middleware.orchestrion.nestjs.interceptor',
         },
       ]),
     }),
@@ -659,15 +659,15 @@ test('API route transaction includes exactly one nest async interceptor span aft
           trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           data: {
             'sentry.op': 'middleware.nestjs',
-            'sentry.origin': 'auto.middleware.nestjs.interceptor',
+            'sentry.origin': 'auto.middleware.orchestrion.nestjs.interceptor',
           },
           description: 'Interceptors - After Route',
           parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
           start_timestamp: expect.any(Number),
           timestamp: expect.any(Number),
           status: 'ok',
           op: 'middleware.nestjs',
-          origin: 'auto.middleware.nestjs.interceptor',
+          origin: 'auto.middleware.orchestrion.nestjs.interceptor',
         },
       ]),
     }),