feat(node): Experimentally add orchestrion support

.size-limit.js

@@ -394,6 +394,23 @@ module.exports = [
  limit: '136 KB',
  disablePlugins: ['@size-limit/esbuild'],
  },
+ {
+ name: '@sentry/node/import (ESM hook with diagnostics-channel injection)',
+ path: ['node_modules/@apm-js-collab/tracing-hooks/hook.mjs', 'packages/node/build/import-hook.mjs'],
+ ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
+ gzip: true,
+ limit: '100 KB',
+ disablePlugins: ['@size-limit/esbuild'],
+ },
+ {
+ name: '@sentry/node/light',
+ path: 'packages/node-core/build/esm/light/index.js',
+ import: createImport('init'),
+ ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
+ gzip: true,
+ limit: '100 KB',
+ disablePlugins: ['@size-limit/esbuild'],
+ },
  {
  name: '@sentry/node - without tracing',
  path: 'packages/node/build/esm/index.js',

dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

@@ -21,6 +21,10 @@ const NODE_EXPORTS_IGNORE = [
  'SentryContextManager',
  'validateOpenTelemetrySetup',
  'preloadOpenTelemetry',
+ // Experimental, Node-runtime-only opt-in (diagnostics-channel injection); it
+ // registers Node module hooks and is not surfaced through the framework /
+ // serverless SDKs.
+ 'experimentalUseDiagnosticsChannelInjection',
  // Internal helper only needed within integrations (e.g. bunRuntimeMetricsIntegration)
  '_INTERNAL_normalizeCollectionInterval',
 ];

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/package.json

@@ -0,0 +1,26 @@
+{
+ "name": "node-express-orchestrion-cjs-app",
+ "version": "1.0.0",
+ "private": true,
+ "type": "commonjs",
+ "scripts": {
+ "start": "node --import @sentry/node/import ./src/app.js",
+ "test": "playwright test",
+ "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+ "test:build": "pnpm install",
+ "test:assert": "pnpm test"
+ },
+ "dependencies": {
+ "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+ "express": "^5.1.0",
+ "mysql": "2.18.1"
+ },
+ "devDependencies": {
+ "@playwright/test": "~1.56.0",
+ "@sentry-internal/test-utils": "link:../../../test-utils",
+ "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ }
+}

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+ startCommand: `pnpm start`,
+});
+
+export default config;

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/src/app.js

@@ -0,0 +1,73 @@
+const Sentry = require('@sentry/node');
+
+// The channels are injected by `node --import @sentry/node/import` (see the
+// `start` script); opting in via this method makes the SDK subscribe to
+// them instead of using the OTel instrumentation.
+Sentry.experimentalUseDiagnosticsChannelInjection();
+
+Sentry.init({
+ environment: 'qa', // dynamic sampling bias to keep transactions
+ dsn: process.env.E2E_TEST_DSN,
+ debug: !!process.env.DEBUG,
+ tunnel: `http://localhost:3031/`, // proxy server
+ tracesSampleRate: 1,
+});
+
+const express = require('express');
+const mysql = require('mysql');
+
+const connection = mysql.createConnection({
+ user: 'root',
+ password: 'docker',
+});
+
+const app = express();
+const port = 3030;
+
+app.get('/test-success', function (req, res) {
+ res.send({ version: 'v1' });
+});
+
+app.get('/test-param/:param', function (req, res) {
+ res.send({ paramWas: req.params.param });
+});
+
+app.get('/test-mysql', function (req, res) {
+ connection.query('SELECT 1 + 1 AS solution', function () {
+ connection.query('SELECT NOW()', ['1', '2'], () => {
+ res.send({ status: 'ok' });
+ });
+ });
+});
+
+app.get('/test-transaction', function (_req, res) {
+ Sentry.startSpan({ name: 'test-span' }, () => undefined);
+
+ res.send({ status: 'ok' });
+});
+
+app.get('/test-error', async function (req, res) {
+ const exceptionId = Sentry.captureException(new Error('This is an error'));
+
+ await Sentry.flush(2000);
+
+ res.send({ exceptionId });
+});
+
+app.get('/test-exception/:id', function (req, _res) {
+ throw new Error(`This is an exception with id ${req.params.id}`);
+});
+
+Sentry.setupExpressErrorHandler(app);
+
+// @ts-ignore
+app.use(function onError(err, req, res, next) {
+ // The error id is attached to `res.sentry` to be returned
+ // and optionally displayed to the user for support.
+ res.statusCode = 500;
+ res.end(res.sentry + '\n');
+});
+
+app.listen(port, () => {
+ console.log(`Example app listening on port ${port}`);
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/start-event-proxy.mjs

@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+ port: 3031,
+ proxyServerName: 'node-express-orchestrion-cjs',
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/tests/errors.test.ts

@@ -0,0 +1,29 @@
+import { expect, test } from '@playwright/test';
+import { waitForError } from '@sentry-internal/test-utils';
+
+test('Sends correct error event', async ({ baseURL }) => {
+ const errorEventPromise = waitForError('node-express-orchestrion-cjs', event => {
+ return !event.type && event.exception?.values?.[0]?.value === 'This is an exception with id 123';
+ });
+
+ await fetch(`${baseURL}/test-exception/123`);
+
+ const errorEvent = await errorEventPromise;
+
+ expect(errorEvent.exception?.values).toHaveLength(1);
+ expect(errorEvent.exception?.values?.[0]?.value).toBe('This is an exception with id 123');
+
+ expect(errorEvent.request).toEqual({
+ method: 'GET',
+ cookies: {},
+ headers: expect.any(Object),
+ url: 'http://localhost:3030/test-exception/123',
+ });
+
+ expect(errorEvent.transaction).toEqual('GET /test-exception/:id');
+
+ expect(errorEvent.contexts?.trace).toEqual({
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ });
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/tests/transactions.test.ts

@@ -0,0 +1,154 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Sends an API route transaction', async ({ baseURL }) => {
+ const pageloadTransactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return (
+ transactionEvent?.contexts?.trace?.op === 'http.server' &&
+ transactionEvent?.transaction === 'GET /test-transaction'
+ );
+ });
+
+ await fetch(`${baseURL}/test-transaction`);
+
+ const transactionEvent = await pageloadTransactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace).toEqual({
+ data: {
+ 'sentry.source': 'route',
+ 'sentry.origin': 'auto.http.otel.http',
+ 'sentry.op': 'http.server',
+ 'sentry.sample_rate': 1,
+ url: 'http://localhost:3030/test-transaction',
+ 'otel.kind': 'SERVER',
+ 'http.response.status_code': 200,
+ 'http.url': 'http://localhost:3030/test-transaction',
+ 'http.host': 'localhost:3030',
+ 'net.host.name': 'localhost',
+ 'http.method': 'GET',
+ 'http.scheme': 'http',
+ 'http.target': '/test-transaction',
+ 'http.user_agent': 'node',
+ 'http.flavor': '1.1',
+ 'net.transport': 'ip_tcp',
+ 'net.host.ip': expect.any(String),
+ 'net.host.port': expect.any(Number),
+ 'net.peer.ip': expect.any(String),
+ 'net.peer.port': expect.any(Number),
+ 'http.status_code': 200,
+ 'http.status_text': 'OK',
+ 'http.route': '/test-transaction',
+ 'http.request.header.accept': '*/*',
+ 'http.request.header.accept_encoding': 'gzip, deflate',
+ 'http.request.header.accept_language': '*',
+ 'http.request.header.connection': 'keep-alive',
+ 'http.request.header.host': expect.any(String),
+ 'http.request.header.sec_fetch_mode': 'cors',
+ 'http.request.header.user_agent': 'node',
+ },
+ op: 'http.server',
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ status: 'ok',
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ origin: 'auto.http.otel.http',
+ });
+
+ expect(transactionEvent.contexts?.response).toEqual({
+ status_code: 200,
+ });
+
+ expect(transactionEvent).toEqual(
+ expect.objectContaining({
+ transaction: 'GET /test-transaction',
+ type: 'transaction',
+ transaction_info: {
+ source: 'route',
+ },
+ }),
+ );
+
+ const spans = transactionEvent.spans || [];
+
+ // Manually started span
+ expect(spans).toContainEqual({
+ data: { 'sentry.origin': 'manual' },
+ description: 'test-span',
+ origin: 'manual',
+ parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ start_timestamp: expect.any(Number),
+ status: 'ok',
+ timestamp: expect.any(Number),
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ });
+
+ // auto instrumented span
+ expect(spans).toContainEqual({
+ data: {
+ 'sentry.origin': 'auto.http.express',
+ 'sentry.op': 'request_handler.express',
+ 'http.route': '/test-transaction',
+ 'express.name': '/test-transaction',
+ 'express.type': 'request_handler',
+ },
+ description: '/test-transaction',
+ op: 'request_handler.express',
+ origin: 'auto.http.express',
+ parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ start_timestamp: expect.any(Number),
+ status: 'ok',
+ timestamp: expect.any(Number),
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ });
+});
+
+test('Sends an API route transaction for an errored route', async ({ baseURL }) => {
+ const transactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return (
+ transactionEvent.contexts?.trace?.op === 'http.server' &&
+ transactionEvent.transaction === 'GET /test-exception/:id' &&
+ transactionEvent.request?.url === 'http://localhost:3030/test-exception/777'
+ );
+ });
+
+ await fetch(`${baseURL}/test-exception/777`);
+
+ const transactionEvent = await transactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+ expect(transactionEvent.transaction).toEqual('GET /test-exception/:id');
+ expect(transactionEvent.contexts?.trace?.status).toEqual('internal_error');
+ expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(500);
+});
+
+test('Instruments MySQL via Orchestrion', async ({ baseURL }) => {
+ const transactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return transactionEvent.contexts?.trace?.op === 'http.server' && transactionEvent.transaction === 'GET /test-mysql';
+ });
+
+ await fetch(`${baseURL}/test-mysql`);
+
+ const transactionEvent = await transactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+ expect(transactionEvent.transaction).toEqual('GET /test-mysql');
+ expect(transactionEvent.contexts?.trace?.status).toEqual('ok');
+ expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(200);
+
+ const spans = transactionEvent.spans || [];
+ expect(spans).toContainEqual(
+ expect.objectContaining({
+ op: 'db',
+ origin: 'auto.db.orchestrion.mysql',
+ description: 'SELECT 1 + 1 AS solution',
+ }),
+ );
+ expect(spans).toContainEqual(
+ expect.objectContaining({
+ op: 'db',
+ origin: 'auto.db.orchestrion.mysql',
+ description: 'SELECT NOW()',
+ }),
+ );
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-express-orchestrion/package.json

@@ -0,0 +1,26 @@
+{
+ "name": "node-express-orchestrion-app",
+ "version": "1.0.0",
+ "private": true,
+ "type": "module",
+ "scripts": {
+ "start": "node --import ./src/instrument.mjs ./src/app.mjs",
+ "test": "playwright test",
+ "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+ "test:build": "pnpm install",
+ "test:assert": "pnpm test"
+ },
+ "dependencies": {
+ "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+ "express": "^5.1.0",
+ "mysql": "2.18.1"
+ },
+ "devDependencies": {
+ "@playwright/test": "~1.56.0",
+ "@sentry-internal/test-utils": "link:../../../test-utils",
+ "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ }
+}

dev-packages/e2e-tests/test-applications/node-express-orchestrion/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+ startCommand: `pnpm start`,
+});
+
+export default config;

.size-limit.js

@@ -394,6 +394,23 @@ module.exports = [
  limit: '136 KB',
  disablePlugins: ['@size-limit/esbuild'],
  },
+ {
+ name: '@sentry/node/import (ESM hook with diagnostics-channel injection)',
+ path: ['node_modules/@apm-js-collab/tracing-hooks/hook.mjs', 'packages/node/build/import-hook.mjs'],
+ ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
+ gzip: true,
+ limit: '100 KB',
+ disablePlugins: ['@size-limit/esbuild'],
+ },
+ {
+ name: '@sentry/node/light',
+ path: 'packages/node-core/build/esm/light/index.js',
+ import: createImport('init'),
+ ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
+ gzip: true,
+ limit: '100 KB',
+ disablePlugins: ['@size-limit/esbuild'],
+ },
  {
  name: '@sentry/node - without tracing',
  path: 'packages/node/build/esm/index.js',

dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

@@ -21,6 +21,10 @@ const NODE_EXPORTS_IGNORE = [
  'SentryContextManager',
  'validateOpenTelemetrySetup',
  'preloadOpenTelemetry',
+ // Experimental, Node-runtime-only opt-in (diagnostics-channel injection); it
+ // registers Node module hooks and is not surfaced through the framework /
+ // serverless SDKs.
+ 'experimentalUseDiagnosticsChannelInjection',
  // Internal helper only needed within integrations (e.g. bunRuntimeMetricsIntegration)
  '_INTERNAL_normalizeCollectionInterval',
 ];

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/package.json

@@ -0,0 +1,26 @@
+{
+ "name": "node-express-orchestrion-cjs-app",
+ "version": "1.0.0",
+ "private": true,
+ "type": "commonjs",
+ "scripts": {
+ "start": "node --import @sentry/node/import ./src/app.js",
+ "test": "playwright test",
+ "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+ "test:build": "pnpm install",
+ "test:assert": "pnpm test"
+ },
+ "dependencies": {
+ "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+ "express": "^5.1.0",
+ "mysql": "2.18.1"
+ },
+ "devDependencies": {
+ "@playwright/test": "~1.56.0",
+ "@sentry-internal/test-utils": "link:../../../test-utils",
+ "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ }
+}

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+ startCommand: `pnpm start`,
+});
+
+export default config;

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/src/app.js

@@ -0,0 +1,73 @@
+const Sentry = require('@sentry/node');
+
+// The channels are injected by `node --import @sentry/node/import` (see the
+// `start` script); opting in via this method makes the SDK subscribe to
+// them instead of using the OTel instrumentation.
+Sentry.experimentalUseDiagnosticsChannelInjection();
+
+Sentry.init({
+ environment: 'qa', // dynamic sampling bias to keep transactions
+ dsn: process.env.E2E_TEST_DSN,
+ debug: !!process.env.DEBUG,
+ tunnel: `http://localhost:3031/`, // proxy server
+ tracesSampleRate: 1,
+});
+
+const express = require('express');
+const mysql = require('mysql');
+
+const connection = mysql.createConnection({
+ user: 'root',
+ password: 'docker',
+});
+
+const app = express();
+const port = 3030;
+
+app.get('/test-success', function (req, res) {
+ res.send({ version: 'v1' });
+});
+
+app.get('/test-param/:param', function (req, res) {
+ res.send({ paramWas: req.params.param });
+});
+
+app.get('/test-mysql', function (req, res) {
+ connection.query('SELECT 1 + 1 AS solution', function () {
+ connection.query('SELECT NOW()', ['1', '2'], () => {
+ res.send({ status: 'ok' });
+ });
+ });
+});
+
+app.get('/test-transaction', function (_req, res) {
+ Sentry.startSpan({ name: 'test-span' }, () => undefined);
+
+ res.send({ status: 'ok' });
+});
+
+app.get('/test-error', async function (req, res) {
+ const exceptionId = Sentry.captureException(new Error('This is an error'));
+
+ await Sentry.flush(2000);
+
+ res.send({ exceptionId });
+});
+
+app.get('/test-exception/:id', function (req, _res) {
+ throw new Error(`This is an exception with id ${req.params.id}`);
+});
+
+Sentry.setupExpressErrorHandler(app);
+
+// @ts-ignore
+app.use(function onError(err, req, res, next) {
+ // The error id is attached to `res.sentry` to be returned
+ // and optionally displayed to the user for support.
+ res.statusCode = 500;
+ res.end(res.sentry + '\n');
+});
+
+app.listen(port, () => {
+ console.log(`Example app listening on port ${port}`);
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/start-event-proxy.mjs

@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+ port: 3031,
+ proxyServerName: 'node-express-orchestrion-cjs',
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/tests/errors.test.ts

@@ -0,0 +1,29 @@
+import { expect, test } from '@playwright/test';
+import { waitForError } from '@sentry-internal/test-utils';
+
+test('Sends correct error event', async ({ baseURL }) => {
+ const errorEventPromise = waitForError('node-express-orchestrion-cjs', event => {
+ return !event.type && event.exception?.values?.[0]?.value === 'This is an exception with id 123';
+ });
+
+ await fetch(`${baseURL}/test-exception/123`);
+
+ const errorEvent = await errorEventPromise;
+
+ expect(errorEvent.exception?.values).toHaveLength(1);
+ expect(errorEvent.exception?.values?.[0]?.value).toBe('This is an exception with id 123');
+
+ expect(errorEvent.request).toEqual({
+ method: 'GET',
+ cookies: {},
+ headers: expect.any(Object),
+ url: 'http://localhost:3030/test-exception/123',
+ });
+
+ expect(errorEvent.transaction).toEqual('GET /test-exception/:id');
+
+ expect(errorEvent.contexts?.trace).toEqual({
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ });
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/tests/transactions.test.ts

@@ -0,0 +1,154 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Sends an API route transaction', async ({ baseURL }) => {
+ const pageloadTransactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return (
+ transactionEvent?.contexts?.trace?.op === 'http.server' &&
+ transactionEvent?.transaction === 'GET /test-transaction'
+ );
+ });
+
+ await fetch(`${baseURL}/test-transaction`);
+
+ const transactionEvent = await pageloadTransactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace).toEqual({
+ data: {
+ 'sentry.source': 'route',
+ 'sentry.origin': 'auto.http.otel.http',
+ 'sentry.op': 'http.server',
+ 'sentry.sample_rate': 1,
+ url: 'http://localhost:3030/test-transaction',
+ 'otel.kind': 'SERVER',
+ 'http.response.status_code': 200,
+ 'http.url': 'http://localhost:3030/test-transaction',
+ 'http.host': 'localhost:3030',
+ 'net.host.name': 'localhost',
+ 'http.method': 'GET',
+ 'http.scheme': 'http',
+ 'http.target': '/test-transaction',
+ 'http.user_agent': 'node',
+ 'http.flavor': '1.1',
+ 'net.transport': 'ip_tcp',
+ 'net.host.ip': expect.any(String),
+ 'net.host.port': expect.any(Number),
+ 'net.peer.ip': expect.any(String),
+ 'net.peer.port': expect.any(Number),
+ 'http.status_code': 200,
+ 'http.status_text': 'OK',
+ 'http.route': '/test-transaction',
+ 'http.request.header.accept': '*/*',
+ 'http.request.header.accept_encoding': 'gzip, deflate',
+ 'http.request.header.accept_language': '*',
+ 'http.request.header.connection': 'keep-alive',
+ 'http.request.header.host': expect.any(String),
+ 'http.request.header.sec_fetch_mode': 'cors',
+ 'http.request.header.user_agent': 'node',
+ },
+ op: 'http.server',
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ status: 'ok',
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ origin: 'auto.http.otel.http',
+ });
+
+ expect(transactionEvent.contexts?.response).toEqual({
+ status_code: 200,
+ });
+
+ expect(transactionEvent).toEqual(
+ expect.objectContaining({
+ transaction: 'GET /test-transaction',
+ type: 'transaction',
+ transaction_info: {
+ source: 'route',
+ },
+ }),
+ );
+
+ const spans = transactionEvent.spans || [];
+
+ // Manually started span
+ expect(spans).toContainEqual({
+ data: { 'sentry.origin': 'manual' },
+ description: 'test-span',
+ origin: 'manual',
+ parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ start_timestamp: expect.any(Number),
+ status: 'ok',
+ timestamp: expect.any(Number),
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ });
+
+ // auto instrumented span
+ expect(spans).toContainEqual({
+ data: {
+ 'sentry.origin': 'auto.http.express',
+ 'sentry.op': 'request_handler.express',
+ 'http.route': '/test-transaction',
+ 'express.name': '/test-transaction',
+ 'express.type': 'request_handler',
+ },
+ description: '/test-transaction',
+ op: 'request_handler.express',
+ origin: 'auto.http.express',
+ parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ start_timestamp: expect.any(Number),
+ status: 'ok',
+ timestamp: expect.any(Number),
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ });
+});
+
+test('Sends an API route transaction for an errored route', async ({ baseURL }) => {
+ const transactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return (
+ transactionEvent.contexts?.trace?.op === 'http.server' &&
+ transactionEvent.transaction === 'GET /test-exception/:id' &&
+ transactionEvent.request?.url === 'http://localhost:3030/test-exception/777'
+ );
+ });
+
+ await fetch(`${baseURL}/test-exception/777`);
+
+ const transactionEvent = await transactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+ expect(transactionEvent.transaction).toEqual('GET /test-exception/:id');
+ expect(transactionEvent.contexts?.trace?.status).toEqual('internal_error');
+ expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(500);
+});
+
+test('Instruments MySQL via Orchestrion', async ({ baseURL }) => {
+ const transactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return transactionEvent.contexts?.trace?.op === 'http.server' && transactionEvent.transaction === 'GET /test-mysql';
+ });
+
+ await fetch(`${baseURL}/test-mysql`);
+
+ const transactionEvent = await transactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+ expect(transactionEvent.transaction).toEqual('GET /test-mysql');
+ expect(transactionEvent.contexts?.trace?.status).toEqual('ok');
+ expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(200);
+
+ const spans = transactionEvent.spans || [];
+ expect(spans).toContainEqual(
+ expect.objectContaining({
+ op: 'db',
+ origin: 'auto.db.orchestrion.mysql',
+ description: 'SELECT 1 + 1 AS solution',
+ }),
+ );
+ expect(spans).toContainEqual(
+ expect.objectContaining({
+ op: 'db',
+ origin: 'auto.db.orchestrion.mysql',
+ description: 'SELECT NOW()',
+ }),
+ );
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-express-orchestrion/package.json

@@ -0,0 +1,26 @@
+{
+ "name": "node-express-orchestrion-app",
+ "version": "1.0.0",
+ "private": true,
+ "type": "module",
+ "scripts": {
+ "start": "node --import ./src/instrument.mjs ./src/app.mjs",
+ "test": "playwright test",
+ "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+ "test:build": "pnpm install",
+ "test:assert": "pnpm test"
+ },
+ "dependencies": {
+ "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+ "express": "^5.1.0",
+ "mysql": "2.18.1"
+ },
+ "devDependencies": {
+ "@playwright/test": "~1.56.0",
+ "@sentry-internal/test-utils": "link:../../../test-utils",
+ "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ }
+}

dev-packages/e2e-tests/test-applications/node-express-orchestrion/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+ startCommand: `pnpm start`,
+});
+
+export default config;

.size-limit.js

@@ -394,6 +394,23 @@ module.exports = [
  limit: '136 KB',
  disablePlugins: ['@size-limit/esbuild'],
  },
+ {
+ name: '@sentry/node/import (ESM hook with diagnostics-channel injection)',
+ path: ['node_modules/@apm-js-collab/tracing-hooks/hook.mjs', 'packages/node/build/import-hook.mjs'],
+ ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
+ gzip: true,
+ limit: '100 KB',
+ disablePlugins: ['@size-limit/esbuild'],
+ },
+ {
+ name: '@sentry/node/light',
+ path: 'packages/node-core/build/esm/light/index.js',
+ import: createImport('init'),
+ ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
+ gzip: true,
+ limit: '100 KB',
+ disablePlugins: ['@size-limit/esbuild'],
+ },
  {
  name: '@sentry/node - without tracing',
  path: 'packages/node/build/esm/index.js',

dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

@@ -21,6 +21,10 @@ const NODE_EXPORTS_IGNORE = [
  'SentryContextManager',
  'validateOpenTelemetrySetup',
  'preloadOpenTelemetry',
+ // Experimental, Node-runtime-only opt-in (diagnostics-channel injection); it
+ // registers Node module hooks and is not surfaced through the framework /
+ // serverless SDKs.
+ 'experimentalUseDiagnosticsChannelInjection',
  // Internal helper only needed within integrations (e.g. bunRuntimeMetricsIntegration)
  '_INTERNAL_normalizeCollectionInterval',
 ];

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/package.json

@@ -0,0 +1,26 @@
+{
+ "name": "node-express-orchestrion-cjs-app",
+ "version": "1.0.0",
+ "private": true,
+ "type": "commonjs",
+ "scripts": {
+ "start": "node --import @sentry/node/import ./src/app.js",
+ "test": "playwright test",
+ "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+ "test:build": "pnpm install",
+ "test:assert": "pnpm test"
+ },
+ "dependencies": {
+ "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+ "express": "^5.1.0",
+ "mysql": "2.18.1"
+ },
+ "devDependencies": {
+ "@playwright/test": "~1.56.0",
+ "@sentry-internal/test-utils": "link:../../../test-utils",
+ "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ }
+}

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+ startCommand: `pnpm start`,
+});
+
+export default config;

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/src/app.js

@@ -0,0 +1,73 @@
+const Sentry = require('@sentry/node');
+
+// The channels are injected by `node --import @sentry/node/import` (see the
+// `start` script); opting in via this method makes the SDK subscribe to
+// them instead of using the OTel instrumentation.
+Sentry.experimentalUseDiagnosticsChannelInjection();
+
+Sentry.init({
+ environment: 'qa', // dynamic sampling bias to keep transactions
+ dsn: process.env.E2E_TEST_DSN,
+ debug: !!process.env.DEBUG,
+ tunnel: `http://localhost:3031/`, // proxy server
+ tracesSampleRate: 1,
+});
+
+const express = require('express');
+const mysql = require('mysql');
+
+const connection = mysql.createConnection({
+ user: 'root',
+ password: 'docker',
+});
+
+const app = express();
+const port = 3030;
+
+app.get('/test-success', function (req, res) {
+ res.send({ version: 'v1' });
+});
+
+app.get('/test-param/:param', function (req, res) {
+ res.send({ paramWas: req.params.param });
+});
+
+app.get('/test-mysql', function (req, res) {
+ connection.query('SELECT 1 + 1 AS solution', function () {
+ connection.query('SELECT NOW()', ['1', '2'], () => {
+ res.send({ status: 'ok' });
+ });
+ });
+});
+
+app.get('/test-transaction', function (_req, res) {
+ Sentry.startSpan({ name: 'test-span' }, () => undefined);
+
+ res.send({ status: 'ok' });
+});
+
+app.get('/test-error', async function (req, res) {
+ const exceptionId = Sentry.captureException(new Error('This is an error'));
+
+ await Sentry.flush(2000);
+
+ res.send({ exceptionId });
+});
+
+app.get('/test-exception/:id', function (req, _res) {
+ throw new Error(`This is an exception with id ${req.params.id}`);
+});
+
+Sentry.setupExpressErrorHandler(app);
+
+// @ts-ignore
+app.use(function onError(err, req, res, next) {
+ // The error id is attached to `res.sentry` to be returned
+ // and optionally displayed to the user for support.
+ res.statusCode = 500;
+ res.end(res.sentry + '\n');
+});
+
+app.listen(port, () => {
+ console.log(`Example app listening on port ${port}`);
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/start-event-proxy.mjs

@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+ port: 3031,
+ proxyServerName: 'node-express-orchestrion-cjs',
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/tests/errors.test.ts

@@ -0,0 +1,29 @@
+import { expect, test } from '@playwright/test';
+import { waitForError } from '@sentry-internal/test-utils';
+
+test('Sends correct error event', async ({ baseURL }) => {
+ const errorEventPromise = waitForError('node-express-orchestrion-cjs', event => {
+ return !event.type && event.exception?.values?.[0]?.value === 'This is an exception with id 123';
+ });
+
+ await fetch(`${baseURL}/test-exception/123`);
+
+ const errorEvent = await errorEventPromise;
+
+ expect(errorEvent.exception?.values).toHaveLength(1);
+ expect(errorEvent.exception?.values?.[0]?.value).toBe('This is an exception with id 123');
+
+ expect(errorEvent.request).toEqual({
+ method: 'GET',
+ cookies: {},
+ headers: expect.any(Object),
+ url: 'http://localhost:3030/test-exception/123',
+ });
+
+ expect(errorEvent.transaction).toEqual('GET /test-exception/:id');
+
+ expect(errorEvent.contexts?.trace).toEqual({
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ });
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/tests/transactions.test.ts

@@ -0,0 +1,154 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Sends an API route transaction', async ({ baseURL }) => {
+ const pageloadTransactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return (
+ transactionEvent?.contexts?.trace?.op === 'http.server' &&
+ transactionEvent?.transaction === 'GET /test-transaction'
+ );
+ });
+
+ await fetch(`${baseURL}/test-transaction`);
+
+ const transactionEvent = await pageloadTransactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace).toEqual({
+ data: {
+ 'sentry.source': 'route',
+ 'sentry.origin': 'auto.http.otel.http',
+ 'sentry.op': 'http.server',
+ 'sentry.sample_rate': 1,
+ url: 'http://localhost:3030/test-transaction',
+ 'otel.kind': 'SERVER',
+ 'http.response.status_code': 200,
+ 'http.url': 'http://localhost:3030/test-transaction',
+ 'http.host': 'localhost:3030',
+ 'net.host.name': 'localhost',
+ 'http.method': 'GET',
+ 'http.scheme': 'http',
+ 'http.target': '/test-transaction',
+ 'http.user_agent': 'node',
+ 'http.flavor': '1.1',
+ 'net.transport': 'ip_tcp',
+ 'net.host.ip': expect.any(String),
+ 'net.host.port': expect.any(Number),
+ 'net.peer.ip': expect.any(String),
+ 'net.peer.port': expect.any(Number),
+ 'http.status_code': 200,
+ 'http.status_text': 'OK',
+ 'http.route': '/test-transaction',
+ 'http.request.header.accept': '*/*',
+ 'http.request.header.accept_encoding': 'gzip, deflate',
+ 'http.request.header.accept_language': '*',
+ 'http.request.header.connection': 'keep-alive',
+ 'http.request.header.host': expect.any(String),
+ 'http.request.header.sec_fetch_mode': 'cors',
+ 'http.request.header.user_agent': 'node',
+ },
+ op: 'http.server',
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ status: 'ok',
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ origin: 'auto.http.otel.http',
+ });
+
+ expect(transactionEvent.contexts?.response).toEqual({
+ status_code: 200,
+ });
+
+ expect(transactionEvent).toEqual(
+ expect.objectContaining({
+ transaction: 'GET /test-transaction',
+ type: 'transaction',
+ transaction_info: {
+ source: 'route',
+ },
+ }),
+ );
+
+ const spans = transactionEvent.spans || [];
+
+ // Manually started span
+ expect(spans).toContainEqual({
+ data: { 'sentry.origin': 'manual' },
+ description: 'test-span',
+ origin: 'manual',
+ parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ start_timestamp: expect.any(Number),
+ status: 'ok',
+ timestamp: expect.any(Number),
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ });
+
+ // auto instrumented span
+ expect(spans).toContainEqual({
+ data: {
+ 'sentry.origin': 'auto.http.express',
+ 'sentry.op': 'request_handler.express',
+ 'http.route': '/test-transaction',
+ 'express.name': '/test-transaction',
+ 'express.type': 'request_handler',
+ },
+ description: '/test-transaction',
+ op: 'request_handler.express',
+ origin: 'auto.http.express',
+ parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ start_timestamp: expect.any(Number),
+ status: 'ok',
+ timestamp: expect.any(Number),
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ });
+});
+
+test('Sends an API route transaction for an errored route', async ({ baseURL }) => {
+ const transactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return (
+ transactionEvent.contexts?.trace?.op === 'http.server' &&
+ transactionEvent.transaction === 'GET /test-exception/:id' &&
+ transactionEvent.request?.url === 'http://localhost:3030/test-exception/777'
+ );
+ });
+
+ await fetch(`${baseURL}/test-exception/777`);
+
+ const transactionEvent = await transactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+ expect(transactionEvent.transaction).toEqual('GET /test-exception/:id');
+ expect(transactionEvent.contexts?.trace?.status).toEqual('internal_error');
+ expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(500);
+});
+
+test('Instruments MySQL via Orchestrion', async ({ baseURL }) => {
+ const transactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return transactionEvent.contexts?.trace?.op === 'http.server' && transactionEvent.transaction === 'GET /test-mysql';
+ });
+
+ await fetch(`${baseURL}/test-mysql`);
+
+ const transactionEvent = await transactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+ expect(transactionEvent.transaction).toEqual('GET /test-mysql');
+ expect(transactionEvent.contexts?.trace?.status).toEqual('ok');
+ expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(200);
+
+ const spans = transactionEvent.spans || [];
+ expect(spans).toContainEqual(
+ expect.objectContaining({
+ op: 'db',
+ origin: 'auto.db.orchestrion.mysql',
+ description: 'SELECT 1 + 1 AS solution',
+ }),
+ );
+ expect(spans).toContainEqual(
+ expect.objectContaining({
+ op: 'db',
+ origin: 'auto.db.orchestrion.mysql',
+ description: 'SELECT NOW()',
+ }),
+ );
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-express-orchestrion/package.json

@@ -0,0 +1,26 @@
+{
+ "name": "node-express-orchestrion-app",
+ "version": "1.0.0",
+ "private": true,
+ "type": "module",
+ "scripts": {
+ "start": "node --import ./src/instrument.mjs ./src/app.mjs",
+ "test": "playwright test",
+ "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+ "test:build": "pnpm install",
+ "test:assert": "pnpm test"
+ },
+ "dependencies": {
+ "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+ "express": "^5.1.0",
+ "mysql": "2.18.1"
+ },
+ "devDependencies": {
+ "@playwright/test": "~1.56.0",
+ "@sentry-internal/test-utils": "link:../../../test-utils",
+ "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ }
+}

dev-packages/e2e-tests/test-applications/node-express-orchestrion/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+ startCommand: `pnpm start`,
+});
+
+export default config;

.size-limit.js

@@ -394,6 +394,23 @@ module.exports = [
  limit: '136 KB',
  disablePlugins: ['@size-limit/esbuild'],
  },
+ {
+ name: '@sentry/node/import (ESM hook with diagnostics-channel injection)',
+ path: ['node_modules/@apm-js-collab/tracing-hooks/hook.mjs', 'packages/node/build/import-hook.mjs'],
+ ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
+ gzip: true,
+ limit: '100 KB',
+ disablePlugins: ['@size-limit/esbuild'],
+ },
+ {
+ name: '@sentry/node/light',
+ path: 'packages/node-core/build/esm/light/index.js',
+ import: createImport('init'),
+ ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
+ gzip: true,
+ limit: '100 KB',
+ disablePlugins: ['@size-limit/esbuild'],
+ },
  {
  name: '@sentry/node - without tracing',
  path: 'packages/node/build/esm/index.js',

dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

@@ -21,6 +21,10 @@ const NODE_EXPORTS_IGNORE = [
  'SentryContextManager',
  'validateOpenTelemetrySetup',
  'preloadOpenTelemetry',
+ // Experimental, Node-runtime-only opt-in (diagnostics-channel injection); it
+ // registers Node module hooks and is not surfaced through the framework /
+ // serverless SDKs.
+ 'experimentalUseDiagnosticsChannelInjection',
  // Internal helper only needed within integrations (e.g. bunRuntimeMetricsIntegration)
  '_INTERNAL_normalizeCollectionInterval',
 ];

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/package.json

@@ -0,0 +1,26 @@
+{
+ "name": "node-express-orchestrion-cjs-app",
+ "version": "1.0.0",
+ "private": true,
+ "type": "commonjs",
+ "scripts": {
+ "start": "node --import @sentry/node/import ./src/app.js",
+ "test": "playwright test",
+ "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+ "test:build": "pnpm install",
+ "test:assert": "pnpm test"
+ },
+ "dependencies": {
+ "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+ "express": "^5.1.0",
+ "mysql": "2.18.1"
+ },
+ "devDependencies": {
+ "@playwright/test": "~1.56.0",
+ "@sentry-internal/test-utils": "link:../../../test-utils",
+ "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ }
+}

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+ startCommand: `pnpm start`,
+});
+
+export default config;

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/src/app.js

@@ -0,0 +1,73 @@
+const Sentry = require('@sentry/node');
+
+// The channels are injected by `node --import @sentry/node/import` (see the
+// `start` script); opting in via this method makes the SDK subscribe to
+// them instead of using the OTel instrumentation.
+Sentry.experimentalUseDiagnosticsChannelInjection();
+
+Sentry.init({
+ environment: 'qa', // dynamic sampling bias to keep transactions
+ dsn: process.env.E2E_TEST_DSN,
+ debug: !!process.env.DEBUG,
+ tunnel: `http://localhost:3031/`, // proxy server
+ tracesSampleRate: 1,
+});
+
+const express = require('express');
+const mysql = require('mysql');
+
+const connection = mysql.createConnection({
+ user: 'root',
+ password: 'docker',
+});
+
+const app = express();
+const port = 3030;
+
+app.get('/test-success', function (req, res) {
+ res.send({ version: 'v1' });
+});
+
+app.get('/test-param/:param', function (req, res) {
+ res.send({ paramWas: req.params.param });
+});
+
+app.get('/test-mysql', function (req, res) {
+ connection.query('SELECT 1 + 1 AS solution', function () {
+ connection.query('SELECT NOW()', ['1', '2'], () => {
+ res.send({ status: 'ok' });
+ });
+ });
+});
+
+app.get('/test-transaction', function (_req, res) {
+ Sentry.startSpan({ name: 'test-span' }, () => undefined);
+
+ res.send({ status: 'ok' });
+});
+
+app.get('/test-error', async function (req, res) {
+ const exceptionId = Sentry.captureException(new Error('This is an error'));
+
+ await Sentry.flush(2000);
+
+ res.send({ exceptionId });
+});
+
+app.get('/test-exception/:id', function (req, _res) {
+ throw new Error(`This is an exception with id ${req.params.id}`);
+});
+
+Sentry.setupExpressErrorHandler(app);
+
+// @ts-ignore
+app.use(function onError(err, req, res, next) {
+ // The error id is attached to `res.sentry` to be returned
+ // and optionally displayed to the user for support.
+ res.statusCode = 500;
+ res.end(res.sentry + '\n');
+});
+
+app.listen(port, () => {
+ console.log(`Example app listening on port ${port}`);
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/start-event-proxy.mjs

@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+ port: 3031,
+ proxyServerName: 'node-express-orchestrion-cjs',
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/tests/errors.test.ts

@@ -0,0 +1,29 @@
+import { expect, test } from '@playwright/test';
+import { waitForError } from '@sentry-internal/test-utils';
+
+test('Sends correct error event', async ({ baseURL }) => {
+ const errorEventPromise = waitForError('node-express-orchestrion-cjs', event => {
+ return !event.type && event.exception?.values?.[0]?.value === 'This is an exception with id 123';
+ });
+
+ await fetch(`${baseURL}/test-exception/123`);
+
+ const errorEvent = await errorEventPromise;
+
+ expect(errorEvent.exception?.values).toHaveLength(1);
+ expect(errorEvent.exception?.values?.[0]?.value).toBe('This is an exception with id 123');
+
+ expect(errorEvent.request).toEqual({
+ method: 'GET',
+ cookies: {},
+ headers: expect.any(Object),
+ url: 'http://localhost:3030/test-exception/123',
+ });
+
+ expect(errorEvent.transaction).toEqual('GET /test-exception/:id');
+
+ expect(errorEvent.contexts?.trace).toEqual({
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ });
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/tests/transactions.test.ts

@@ -0,0 +1,154 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Sends an API route transaction', async ({ baseURL }) => {
+ const pageloadTransactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return (
+ transactionEvent?.contexts?.trace?.op === 'http.server' &&
+ transactionEvent?.transaction === 'GET /test-transaction'
+ );
+ });
+
+ await fetch(`${baseURL}/test-transaction`);
+
+ const transactionEvent = await pageloadTransactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace).toEqual({
+ data: {
+ 'sentry.source': 'route',
+ 'sentry.origin': 'auto.http.otel.http',
+ 'sentry.op': 'http.server',
+ 'sentry.sample_rate': 1,
+ url: 'http://localhost:3030/test-transaction',
+ 'otel.kind': 'SERVER',
+ 'http.response.status_code': 200,
+ 'http.url': 'http://localhost:3030/test-transaction',
+ 'http.host': 'localhost:3030',
+ 'net.host.name': 'localhost',
+ 'http.method': 'GET',
+ 'http.scheme': 'http',
+ 'http.target': '/test-transaction',
+ 'http.user_agent': 'node',
+ 'http.flavor': '1.1',
+ 'net.transport': 'ip_tcp',
+ 'net.host.ip': expect.any(String),
+ 'net.host.port': expect.any(Number),
+ 'net.peer.ip': expect.any(String),
+ 'net.peer.port': expect.any(Number),
+ 'http.status_code': 200,
+ 'http.status_text': 'OK',
+ 'http.route': '/test-transaction',
+ 'http.request.header.accept': '*/*',
+ 'http.request.header.accept_encoding': 'gzip, deflate',
+ 'http.request.header.accept_language': '*',
+ 'http.request.header.connection': 'keep-alive',
+ 'http.request.header.host': expect.any(String),
+ 'http.request.header.sec_fetch_mode': 'cors',
+ 'http.request.header.user_agent': 'node',
+ },
+ op: 'http.server',
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ status: 'ok',
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ origin: 'auto.http.otel.http',
+ });
+
+ expect(transactionEvent.contexts?.response).toEqual({
+ status_code: 200,
+ });
+
+ expect(transactionEvent).toEqual(
+ expect.objectContaining({
+ transaction: 'GET /test-transaction',
+ type: 'transaction',
+ transaction_info: {
+ source: 'route',
+ },
+ }),
+ );
+
+ const spans = transactionEvent.spans || [];
+
+ // Manually started span
+ expect(spans).toContainEqual({
+ data: { 'sentry.origin': 'manual' },
+ description: 'test-span',
+ origin: 'manual',
+ parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ start_timestamp: expect.any(Number),
+ status: 'ok',
+ timestamp: expect.any(Number),
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ });
+
+ // auto instrumented span
+ expect(spans).toContainEqual({
+ data: {
+ 'sentry.origin': 'auto.http.express',
+ 'sentry.op': 'request_handler.express',
+ 'http.route': '/test-transaction',
+ 'express.name': '/test-transaction',
+ 'express.type': 'request_handler',
+ },
+ description: '/test-transaction',
+ op: 'request_handler.express',
+ origin: 'auto.http.express',
+ parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ start_timestamp: expect.any(Number),
+ status: 'ok',
+ timestamp: expect.any(Number),
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ });
+});
+
+test('Sends an API route transaction for an errored route', async ({ baseURL }) => {
+ const transactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return (
+ transactionEvent.contexts?.trace?.op === 'http.server' &&
+ transactionEvent.transaction === 'GET /test-exception/:id' &&
+ transactionEvent.request?.url === 'http://localhost:3030/test-exception/777'
+ );
+ });
+
+ await fetch(`${baseURL}/test-exception/777`);
+
+ const transactionEvent = await transactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+ expect(transactionEvent.transaction).toEqual('GET /test-exception/:id');
+ expect(transactionEvent.contexts?.trace?.status).toEqual('internal_error');
+ expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(500);
+});
+
+test('Instruments MySQL via Orchestrion', async ({ baseURL }) => {
+ const transactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return transactionEvent.contexts?.trace?.op === 'http.server' && transactionEvent.transaction === 'GET /test-mysql';
+ });
+
+ await fetch(`${baseURL}/test-mysql`);
+
+ const transactionEvent = await transactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+ expect(transactionEvent.transaction).toEqual('GET /test-mysql');
+ expect(transactionEvent.contexts?.trace?.status).toEqual('ok');
+ expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(200);
+
+ const spans = transactionEvent.spans || [];
+ expect(spans).toContainEqual(
+ expect.objectContaining({
+ op: 'db',
+ origin: 'auto.db.orchestrion.mysql',
+ description: 'SELECT 1 + 1 AS solution',
+ }),
+ );
+ expect(spans).toContainEqual(
+ expect.objectContaining({
+ op: 'db',
+ origin: 'auto.db.orchestrion.mysql',
+ description: 'SELECT NOW()',
+ }),
+ );
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-express-orchestrion/package.json

@@ -0,0 +1,26 @@
+{
+ "name": "node-express-orchestrion-app",
+ "version": "1.0.0",
+ "private": true,
+ "type": "module",
+ "scripts": {
+ "start": "node --import ./src/instrument.mjs ./src/app.mjs",
+ "test": "playwright test",
+ "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+ "test:build": "pnpm install",
+ "test:assert": "pnpm test"
+ },
+ "dependencies": {
+ "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+ "express": "^5.1.0",
+ "mysql": "2.18.1"
+ },
+ "devDependencies": {
+ "@playwright/test": "~1.56.0",
+ "@sentry-internal/test-utils": "link:../../../test-utils",
+ "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ }
+}

dev-packages/e2e-tests/test-applications/node-express-orchestrion/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+ startCommand: `pnpm start`,
+});
+
+export default config;

.size-limit.js

@@ -394,6 +394,23 @@ module.exports = [
  limit: '136 KB',
  disablePlugins: ['@size-limit/esbuild'],
  },
+ {
+ name: '@sentry/node/import (ESM hook with diagnostics-channel injection)',
+ path: ['node_modules/@apm-js-collab/tracing-hooks/hook.mjs', 'packages/node/build/import-hook.mjs'],
+ ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
+ gzip: true,
+ limit: '100 KB',
+ disablePlugins: ['@size-limit/esbuild'],
+ },
+ {
+ name: '@sentry/node/light',
+ path: 'packages/node-core/build/esm/light/index.js',
+ import: createImport('init'),
+ ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
+ gzip: true,
+ limit: '100 KB',
+ disablePlugins: ['@size-limit/esbuild'],
+ },
  {
  name: '@sentry/node - without tracing',
  path: 'packages/node/build/esm/index.js',

dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

@@ -21,6 +21,10 @@ const NODE_EXPORTS_IGNORE = [
  'SentryContextManager',
  'validateOpenTelemetrySetup',
  'preloadOpenTelemetry',
+ // Experimental, Node-runtime-only opt-in (diagnostics-channel injection); it
+ // registers Node module hooks and is not surfaced through the framework /
+ // serverless SDKs.
+ 'experimentalUseDiagnosticsChannelInjection',
  // Internal helper only needed within integrations (e.g. bunRuntimeMetricsIntegration)
  '_INTERNAL_normalizeCollectionInterval',
 ];

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/package.json

@@ -0,0 +1,26 @@
+{
+ "name": "node-express-orchestrion-cjs-app",
+ "version": "1.0.0",
+ "private": true,
+ "type": "commonjs",
+ "scripts": {
+ "start": "node --import @sentry/node/import ./src/app.js",
+ "test": "playwright test",
+ "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+ "test:build": "pnpm install",
+ "test:assert": "pnpm test"
+ },
+ "dependencies": {
+ "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+ "express": "^5.1.0",
+ "mysql": "2.18.1"
+ },
+ "devDependencies": {
+ "@playwright/test": "~1.56.0",
+ "@sentry-internal/test-utils": "link:../../../test-utils",
+ "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ }
+}

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+ startCommand: `pnpm start`,
+});
+
+export default config;

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/src/app.js

@@ -0,0 +1,73 @@
+const Sentry = require('@sentry/node');
+
+// The channels are injected by `node --import @sentry/node/import` (see the
+// `start` script); opting in via this method makes the SDK subscribe to
+// them instead of using the OTel instrumentation.
+Sentry.experimentalUseDiagnosticsChannelInjection();
+
+Sentry.init({
+ environment: 'qa', // dynamic sampling bias to keep transactions
+ dsn: process.env.E2E_TEST_DSN,
+ debug: !!process.env.DEBUG,
+ tunnel: `http://localhost:3031/`, // proxy server
+ tracesSampleRate: 1,
+});
+
+const express = require('express');
+const mysql = require('mysql');
+
+const connection = mysql.createConnection({
+ user: 'root',
+ password: 'docker',
+});
+
+const app = express();
+const port = 3030;
+
+app.get('/test-success', function (req, res) {
+ res.send({ version: 'v1' });
+});
+
+app.get('/test-param/:param', function (req, res) {
+ res.send({ paramWas: req.params.param });
+});
+
+app.get('/test-mysql', function (req, res) {
+ connection.query('SELECT 1 + 1 AS solution', function () {
+ connection.query('SELECT NOW()', ['1', '2'], () => {
+ res.send({ status: 'ok' });
+ });
+ });
+});
+
+app.get('/test-transaction', function (_req, res) {
+ Sentry.startSpan({ name: 'test-span' }, () => undefined);
+
+ res.send({ status: 'ok' });
+});
+
+app.get('/test-error', async function (req, res) {
+ const exceptionId = Sentry.captureException(new Error('This is an error'));
+
+ await Sentry.flush(2000);
+
+ res.send({ exceptionId });
+});
+
+app.get('/test-exception/:id', function (req, _res) {
+ throw new Error(`This is an exception with id ${req.params.id}`);
+});
+
+Sentry.setupExpressErrorHandler(app);
+
+// @ts-ignore
+app.use(function onError(err, req, res, next) {
+ // The error id is attached to `res.sentry` to be returned
+ // and optionally displayed to the user for support.
+ res.statusCode = 500;
+ res.end(res.sentry + '\n');
+});
+
+app.listen(port, () => {
+ console.log(`Example app listening on port ${port}`);
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/start-event-proxy.mjs

@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+ port: 3031,
+ proxyServerName: 'node-express-orchestrion-cjs',
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/tests/errors.test.ts

@@ -0,0 +1,29 @@
+import { expect, test } from '@playwright/test';
+import { waitForError } from '@sentry-internal/test-utils';
+
+test('Sends correct error event', async ({ baseURL }) => {
+ const errorEventPromise = waitForError('node-express-orchestrion-cjs', event => {
+ return !event.type && event.exception?.values?.[0]?.value === 'This is an exception with id 123';
+ });
+
+ await fetch(`${baseURL}/test-exception/123`);
+
+ const errorEvent = await errorEventPromise;
+
+ expect(errorEvent.exception?.values).toHaveLength(1);
+ expect(errorEvent.exception?.values?.[0]?.value).toBe('This is an exception with id 123');
+
+ expect(errorEvent.request).toEqual({
+ method: 'GET',
+ cookies: {},
+ headers: expect.any(Object),
+ url: 'http://localhost:3030/test-exception/123',
+ });
+
+ expect(errorEvent.transaction).toEqual('GET /test-exception/:id');
+
+ expect(errorEvent.contexts?.trace).toEqual({
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ });
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/tests/transactions.test.ts

@@ -0,0 +1,154 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Sends an API route transaction', async ({ baseURL }) => {
+ const pageloadTransactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return (
+ transactionEvent?.contexts?.trace?.op === 'http.server' &&
+ transactionEvent?.transaction === 'GET /test-transaction'
+ );
+ });
+
+ await fetch(`${baseURL}/test-transaction`);
+
+ const transactionEvent = await pageloadTransactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace).toEqual({
+ data: {
+ 'sentry.source': 'route',
+ 'sentry.origin': 'auto.http.otel.http',
+ 'sentry.op': 'http.server',
+ 'sentry.sample_rate': 1,
+ url: 'http://localhost:3030/test-transaction',
+ 'otel.kind': 'SERVER',
+ 'http.response.status_code': 200,
+ 'http.url': 'http://localhost:3030/test-transaction',
+ 'http.host': 'localhost:3030',
+ 'net.host.name': 'localhost',
+ 'http.method': 'GET',
+ 'http.scheme': 'http',
+ 'http.target': '/test-transaction',
+ 'http.user_agent': 'node',
+ 'http.flavor': '1.1',
+ 'net.transport': 'ip_tcp',
+ 'net.host.ip': expect.any(String),
+ 'net.host.port': expect.any(Number),
+ 'net.peer.ip': expect.any(String),
+ 'net.peer.port': expect.any(Number),
+ 'http.status_code': 200,
+ 'http.status_text': 'OK',
+ 'http.route': '/test-transaction',
+ 'http.request.header.accept': '*/*',
+ 'http.request.header.accept_encoding': 'gzip, deflate',
+ 'http.request.header.accept_language': '*',
+ 'http.request.header.connection': 'keep-alive',
+ 'http.request.header.host': expect.any(String),
+ 'http.request.header.sec_fetch_mode': 'cors',
+ 'http.request.header.user_agent': 'node',
+ },
+ op: 'http.server',
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ status: 'ok',
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ origin: 'auto.http.otel.http',
+ });
+
+ expect(transactionEvent.contexts?.response).toEqual({
+ status_code: 200,
+ });
+
+ expect(transactionEvent).toEqual(
+ expect.objectContaining({
+ transaction: 'GET /test-transaction',
+ type: 'transaction',
+ transaction_info: {
+ source: 'route',
+ },
+ }),
+ );
+
+ const spans = transactionEvent.spans || [];
+
+ // Manually started span
+ expect(spans).toContainEqual({
+ data: { 'sentry.origin': 'manual' },
+ description: 'test-span',
+ origin: 'manual',
+ parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ start_timestamp: expect.any(Number),
+ status: 'ok',
+ timestamp: expect.any(Number),
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ });
+
+ // auto instrumented span
+ expect(spans).toContainEqual({
+ data: {
+ 'sentry.origin': 'auto.http.express',
+ 'sentry.op': 'request_handler.express',
+ 'http.route': '/test-transaction',
+ 'express.name': '/test-transaction',
+ 'express.type': 'request_handler',
+ },
+ description: '/test-transaction',
+ op: 'request_handler.express',
+ origin: 'auto.http.express',
+ parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ start_timestamp: expect.any(Number),
+ status: 'ok',
+ timestamp: expect.any(Number),
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ });
+});
+
+test('Sends an API route transaction for an errored route', async ({ baseURL }) => {
+ const transactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return (
+ transactionEvent.contexts?.trace?.op === 'http.server' &&
+ transactionEvent.transaction === 'GET /test-exception/:id' &&
+ transactionEvent.request?.url === 'http://localhost:3030/test-exception/777'
+ );
+ });
+
+ await fetch(`${baseURL}/test-exception/777`);
+
+ const transactionEvent = await transactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+ expect(transactionEvent.transaction).toEqual('GET /test-exception/:id');
+ expect(transactionEvent.contexts?.trace?.status).toEqual('internal_error');
+ expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(500);
+});
+
+test('Instruments MySQL via Orchestrion', async ({ baseURL }) => {
+ const transactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return transactionEvent.contexts?.trace?.op === 'http.server' && transactionEvent.transaction === 'GET /test-mysql';
+ });
+
+ await fetch(`${baseURL}/test-mysql`);
+
+ const transactionEvent = await transactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+ expect(transactionEvent.transaction).toEqual('GET /test-mysql');
+ expect(transactionEvent.contexts?.trace?.status).toEqual('ok');
+ expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(200);
+
+ const spans = transactionEvent.spans || [];
+ expect(spans).toContainEqual(
+ expect.objectContaining({
+ op: 'db',
+ origin: 'auto.db.orchestrion.mysql',
+ description: 'SELECT 1 + 1 AS solution',
+ }),
+ );
+ expect(spans).toContainEqual(
+ expect.objectContaining({
+ op: 'db',
+ origin: 'auto.db.orchestrion.mysql',
+ description: 'SELECT NOW()',
+ }),
+ );
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-express-orchestrion/package.json

@@ -0,0 +1,26 @@
+{
+ "name": "node-express-orchestrion-app",
+ "version": "1.0.0",
+ "private": true,
+ "type": "module",
+ "scripts": {
+ "start": "node --import ./src/instrument.mjs ./src/app.mjs",
+ "test": "playwright test",
+ "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+ "test:build": "pnpm install",
+ "test:assert": "pnpm test"
+ },
+ "dependencies": {
+ "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+ "express": "^5.1.0",
+ "mysql": "2.18.1"
+ },
+ "devDependencies": {
+ "@playwright/test": "~1.56.0",
+ "@sentry-internal/test-utils": "link:../../../test-utils",
+ "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ }
+}

dev-packages/e2e-tests/test-applications/node-express-orchestrion/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+ startCommand: `pnpm start`,
+});
+
+export default config;

.size-limit.js

@@ -394,6 +394,23 @@ module.exports = [
  limit: '136 KB',
  disablePlugins: ['@size-limit/esbuild'],
  },
+ {
+ name: '@sentry/node/import (ESM hook with diagnostics-channel injection)',
+ path: ['node_modules/@apm-js-collab/tracing-hooks/hook.mjs', 'packages/node/build/import-hook.mjs'],
+ ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
+ gzip: true,
+ limit: '100 KB',
+ disablePlugins: ['@size-limit/esbuild'],
+ },
+ {
+ name: '@sentry/node/light',
+ path: 'packages/node-core/build/esm/light/index.js',
+ import: createImport('init'),
+ ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
+ gzip: true,
+ limit: '100 KB',
+ disablePlugins: ['@size-limit/esbuild'],
+ },
  {
  name: '@sentry/node - without tracing',
  path: 'packages/node/build/esm/index.js',

dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

@@ -21,6 +21,10 @@ const NODE_EXPORTS_IGNORE = [
  'SentryContextManager',
  'validateOpenTelemetrySetup',
  'preloadOpenTelemetry',
+ // Experimental, Node-runtime-only opt-in (diagnostics-channel injection); it
+ // registers Node module hooks and is not surfaced through the framework /
+ // serverless SDKs.
+ 'experimentalUseDiagnosticsChannelInjection',
  // Internal helper only needed within integrations (e.g. bunRuntimeMetricsIntegration)
  '_INTERNAL_normalizeCollectionInterval',
 ];

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/package.json

@@ -0,0 +1,26 @@
+{
+ "name": "node-express-orchestrion-cjs-app",
+ "version": "1.0.0",
+ "private": true,
+ "type": "commonjs",
+ "scripts": {
+ "start": "node --import @sentry/node/import ./src/app.js",
+ "test": "playwright test",
+ "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+ "test:build": "pnpm install",
+ "test:assert": "pnpm test"
+ },
+ "dependencies": {
+ "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+ "express": "^5.1.0",
+ "mysql": "2.18.1"
+ },
+ "devDependencies": {
+ "@playwright/test": "~1.56.0",
+ "@sentry-internal/test-utils": "link:../../../test-utils",
+ "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ }
+}

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+ startCommand: `pnpm start`,
+});
+
+export default config;

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/src/app.js

@@ -0,0 +1,73 @@
+const Sentry = require('@sentry/node');
+
+// The channels are injected by `node --import @sentry/node/import` (see the
+// `start` script); opting in via this method makes the SDK subscribe to
+// them instead of using the OTel instrumentation.
+Sentry.experimentalUseDiagnosticsChannelInjection();
+
+Sentry.init({
+ environment: 'qa', // dynamic sampling bias to keep transactions
+ dsn: process.env.E2E_TEST_DSN,
+ debug: !!process.env.DEBUG,
+ tunnel: `http://localhost:3031/`, // proxy server
+ tracesSampleRate: 1,
+});
+
+const express = require('express');
+const mysql = require('mysql');
+
+const connection = mysql.createConnection({
+ user: 'root',
+ password: 'docker',
+});
+
+const app = express();
+const port = 3030;
+
+app.get('/test-success', function (req, res) {
+ res.send({ version: 'v1' });
+});
+
+app.get('/test-param/:param', function (req, res) {
+ res.send({ paramWas: req.params.param });
+});
+
+app.get('/test-mysql', function (req, res) {
+ connection.query('SELECT 1 + 1 AS solution', function () {
+ connection.query('SELECT NOW()', ['1', '2'], () => {
+ res.send({ status: 'ok' });
+ });
+ });
+});
+
+app.get('/test-transaction', function (_req, res) {
+ Sentry.startSpan({ name: 'test-span' }, () => undefined);
+
+ res.send({ status: 'ok' });
+});
+
+app.get('/test-error', async function (req, res) {
+ const exceptionId = Sentry.captureException(new Error('This is an error'));
+
+ await Sentry.flush(2000);
+
+ res.send({ exceptionId });
+});
+
+app.get('/test-exception/:id', function (req, _res) {
+ throw new Error(`This is an exception with id ${req.params.id}`);
+});
+
+Sentry.setupExpressErrorHandler(app);
+
+// @ts-ignore
+app.use(function onError(err, req, res, next) {
+ // The error id is attached to `res.sentry` to be returned
+ // and optionally displayed to the user for support.
+ res.statusCode = 500;
+ res.end(res.sentry + '\n');
+});
+
+app.listen(port, () => {
+ console.log(`Example app listening on port ${port}`);
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/start-event-proxy.mjs

@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+ port: 3031,
+ proxyServerName: 'node-express-orchestrion-cjs',
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/tests/errors.test.ts

@@ -0,0 +1,29 @@
+import { expect, test } from '@playwright/test';
+import { waitForError } from '@sentry-internal/test-utils';
+
+test('Sends correct error event', async ({ baseURL }) => {
+ const errorEventPromise = waitForError('node-express-orchestrion-cjs', event => {
+ return !event.type && event.exception?.values?.[0]?.value === 'This is an exception with id 123';
+ });
+
+ await fetch(`${baseURL}/test-exception/123`);
+
+ const errorEvent = await errorEventPromise;
+
+ expect(errorEvent.exception?.values).toHaveLength(1);
+ expect(errorEvent.exception?.values?.[0]?.value).toBe('This is an exception with id 123');
+
+ expect(errorEvent.request).toEqual({
+ method: 'GET',
+ cookies: {},
+ headers: expect.any(Object),
+ url: 'http://localhost:3030/test-exception/123',
+ });
+
+ expect(errorEvent.transaction).toEqual('GET /test-exception/:id');
+
+ expect(errorEvent.contexts?.trace).toEqual({
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ });
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/tests/transactions.test.ts

@@ -0,0 +1,154 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Sends an API route transaction', async ({ baseURL }) => {
+ const pageloadTransactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return (
+ transactionEvent?.contexts?.trace?.op === 'http.server' &&
+ transactionEvent?.transaction === 'GET /test-transaction'
+ );
+ });
+
+ await fetch(`${baseURL}/test-transaction`);
+
+ const transactionEvent = await pageloadTransactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace).toEqual({
+ data: {
+ 'sentry.source': 'route',
+ 'sentry.origin': 'auto.http.otel.http',
+ 'sentry.op': 'http.server',
+ 'sentry.sample_rate': 1,
+ url: 'http://localhost:3030/test-transaction',
+ 'otel.kind': 'SERVER',
+ 'http.response.status_code': 200,
+ 'http.url': 'http://localhost:3030/test-transaction',
+ 'http.host': 'localhost:3030',
+ 'net.host.name': 'localhost',
+ 'http.method': 'GET',
+ 'http.scheme': 'http',
+ 'http.target': '/test-transaction',
+ 'http.user_agent': 'node',
+ 'http.flavor': '1.1',
+ 'net.transport': 'ip_tcp',
+ 'net.host.ip': expect.any(String),
+ 'net.host.port': expect.any(Number),
+ 'net.peer.ip': expect.any(String),
+ 'net.peer.port': expect.any(Number),
+ 'http.status_code': 200,
+ 'http.status_text': 'OK',
+ 'http.route': '/test-transaction',
+ 'http.request.header.accept': '*/*',
+ 'http.request.header.accept_encoding': 'gzip, deflate',
+ 'http.request.header.accept_language': '*',
+ 'http.request.header.connection': 'keep-alive',
+ 'http.request.header.host': expect.any(String),
+ 'http.request.header.sec_fetch_mode': 'cors',
+ 'http.request.header.user_agent': 'node',
+ },
+ op: 'http.server',
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ status: 'ok',
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ origin: 'auto.http.otel.http',
+ });
+
+ expect(transactionEvent.contexts?.response).toEqual({
+ status_code: 200,
+ });
+
+ expect(transactionEvent).toEqual(
+ expect.objectContaining({
+ transaction: 'GET /test-transaction',
+ type: 'transaction',
+ transaction_info: {
+ source: 'route',
+ },
+ }),
+ );
+
+ const spans = transactionEvent.spans || [];
+
+ // Manually started span
+ expect(spans).toContainEqual({
+ data: { 'sentry.origin': 'manual' },
+ description: 'test-span',
+ origin: 'manual',
+ parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ start_timestamp: expect.any(Number),
+ status: 'ok',
+ timestamp: expect.any(Number),
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ });
+
+ // auto instrumented span
+ expect(spans).toContainEqual({
+ data: {
+ 'sentry.origin': 'auto.http.express',
+ 'sentry.op': 'request_handler.express',
+ 'http.route': '/test-transaction',
+ 'express.name': '/test-transaction',
+ 'express.type': 'request_handler',
+ },
+ description: '/test-transaction',
+ op: 'request_handler.express',
+ origin: 'auto.http.express',
+ parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ start_timestamp: expect.any(Number),
+ status: 'ok',
+ timestamp: expect.any(Number),
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ });
+});
+
+test('Sends an API route transaction for an errored route', async ({ baseURL }) => {
+ const transactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return (
+ transactionEvent.contexts?.trace?.op === 'http.server' &&
+ transactionEvent.transaction === 'GET /test-exception/:id' &&
+ transactionEvent.request?.url === 'http://localhost:3030/test-exception/777'
+ );
+ });
+
+ await fetch(`${baseURL}/test-exception/777`);
+
+ const transactionEvent = await transactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+ expect(transactionEvent.transaction).toEqual('GET /test-exception/:id');
+ expect(transactionEvent.contexts?.trace?.status).toEqual('internal_error');
+ expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(500);
+});
+
+test('Instruments MySQL via Orchestrion', async ({ baseURL }) => {
+ const transactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return transactionEvent.contexts?.trace?.op === 'http.server' && transactionEvent.transaction === 'GET /test-mysql';
+ });
+
+ await fetch(`${baseURL}/test-mysql`);
+
+ const transactionEvent = await transactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+ expect(transactionEvent.transaction).toEqual('GET /test-mysql');
+ expect(transactionEvent.contexts?.trace?.status).toEqual('ok');
+ expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(200);
+
+ const spans = transactionEvent.spans || [];
+ expect(spans).toContainEqual(
+ expect.objectContaining({
+ op: 'db',
+ origin: 'auto.db.orchestrion.mysql',
+ description: 'SELECT 1 + 1 AS solution',
+ }),
+ );
+ expect(spans).toContainEqual(
+ expect.objectContaining({
+ op: 'db',
+ origin: 'auto.db.orchestrion.mysql',
+ description: 'SELECT NOW()',
+ }),
+ );
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-express-orchestrion/package.json

@@ -0,0 +1,26 @@
+{
+ "name": "node-express-orchestrion-app",
+ "version": "1.0.0",
+ "private": true,
+ "type": "module",
+ "scripts": {
+ "start": "node --import ./src/instrument.mjs ./src/app.mjs",
+ "test": "playwright test",
+ "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+ "test:build": "pnpm install",
+ "test:assert": "pnpm test"
+ },
+ "dependencies": {
+ "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+ "express": "^5.1.0",
+ "mysql": "2.18.1"
+ },
+ "devDependencies": {
+ "@playwright/test": "~1.56.0",
+ "@sentry-internal/test-utils": "link:../../../test-utils",
+ "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ }
+}

dev-packages/e2e-tests/test-applications/node-express-orchestrion/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+ startCommand: `pnpm start`,
+});
+
+export default config;

.size-limit.js

@@ -394,6 +394,23 @@ module.exports = [
  limit: '136 KB',
  disablePlugins: ['@size-limit/esbuild'],
  },
+ {
+ name: '@sentry/node/import (ESM hook with diagnostics-channel injection)',
+ path: ['node_modules/@apm-js-collab/tracing-hooks/hook.mjs', 'packages/node/build/import-hook.mjs'],
+ ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
+ gzip: true,
+ limit: '100 KB',
+ disablePlugins: ['@size-limit/esbuild'],
+ },
+ {
+ name: '@sentry/node/light',
+ path: 'packages/node-core/build/esm/light/index.js',
+ import: createImport('init'),
+ ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
+ gzip: true,
+ limit: '100 KB',
+ disablePlugins: ['@size-limit/esbuild'],
+ },
  {
  name: '@sentry/node - without tracing',
  path: 'packages/node/build/esm/index.js',

dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

@@ -21,6 +21,10 @@ const NODE_EXPORTS_IGNORE = [
  'SentryContextManager',
  'validateOpenTelemetrySetup',
  'preloadOpenTelemetry',
+ // Experimental, Node-runtime-only opt-in (diagnostics-channel injection); it
+ // registers Node module hooks and is not surfaced through the framework /
+ // serverless SDKs.
+ 'experimentalUseDiagnosticsChannelInjection',
  // Internal helper only needed within integrations (e.g. bunRuntimeMetricsIntegration)
  '_INTERNAL_normalizeCollectionInterval',
 ];

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/package.json

@@ -0,0 +1,26 @@
+{
+ "name": "node-express-orchestrion-cjs-app",
+ "version": "1.0.0",
+ "private": true,
+ "type": "commonjs",
+ "scripts": {
+ "start": "node --import @sentry/node/import ./src/app.js",
+ "test": "playwright test",
+ "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+ "test:build": "pnpm install",
+ "test:assert": "pnpm test"
+ },
+ "dependencies": {
+ "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+ "express": "^5.1.0",
+ "mysql": "2.18.1"
+ },
+ "devDependencies": {
+ "@playwright/test": "~1.56.0",
+ "@sentry-internal/test-utils": "link:../../../test-utils",
+ "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ }
+}

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+ startCommand: `pnpm start`,
+});
+
+export default config;

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/src/app.js

@@ -0,0 +1,73 @@
+const Sentry = require('@sentry/node');
+
+// The channels are injected by `node --import @sentry/node/import` (see the
+// `start` script); opting in via this method makes the SDK subscribe to
+// them instead of using the OTel instrumentation.
+Sentry.experimentalUseDiagnosticsChannelInjection();
+
+Sentry.init({
+ environment: 'qa', // dynamic sampling bias to keep transactions
+ dsn: process.env.E2E_TEST_DSN,
+ debug: !!process.env.DEBUG,
+ tunnel: `http://localhost:3031/`, // proxy server
+ tracesSampleRate: 1,
+});
+
+const express = require('express');
+const mysql = require('mysql');
+
+const connection = mysql.createConnection({
+ user: 'root',
+ password: 'docker',
+});
+
+const app = express();
+const port = 3030;
+
+app.get('/test-success', function (req, res) {
+ res.send({ version: 'v1' });
+});
+
+app.get('/test-param/:param', function (req, res) {
+ res.send({ paramWas: req.params.param });
+});
+
+app.get('/test-mysql', function (req, res) {
+ connection.query('SELECT 1 + 1 AS solution', function () {
+ connection.query('SELECT NOW()', ['1', '2'], () => {
+ res.send({ status: 'ok' });
+ });
+ });
+});
+
+app.get('/test-transaction', function (_req, res) {
+ Sentry.startSpan({ name: 'test-span' }, () => undefined);
+
+ res.send({ status: 'ok' });
+});
+
+app.get('/test-error', async function (req, res) {
+ const exceptionId = Sentry.captureException(new Error('This is an error'));
+
+ await Sentry.flush(2000);
+
+ res.send({ exceptionId });
+});
+
+app.get('/test-exception/:id', function (req, _res) {
+ throw new Error(`This is an exception with id ${req.params.id}`);
+});
+
+Sentry.setupExpressErrorHandler(app);
+
+// @ts-ignore
+app.use(function onError(err, req, res, next) {
+ // The error id is attached to `res.sentry` to be returned
+ // and optionally displayed to the user for support.
+ res.statusCode = 500;
+ res.end(res.sentry + '\n');
+});
+
+app.listen(port, () => {
+ console.log(`Example app listening on port ${port}`);
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/start-event-proxy.mjs

@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+ port: 3031,
+ proxyServerName: 'node-express-orchestrion-cjs',
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/tests/errors.test.ts

@@ -0,0 +1,29 @@
+import { expect, test } from '@playwright/test';
+import { waitForError } from '@sentry-internal/test-utils';
+
+test('Sends correct error event', async ({ baseURL }) => {
+ const errorEventPromise = waitForError('node-express-orchestrion-cjs', event => {
+ return !event.type && event.exception?.values?.[0]?.value === 'This is an exception with id 123';
+ });
+
+ await fetch(`${baseURL}/test-exception/123`);
+
+ const errorEvent = await errorEventPromise;
+
+ expect(errorEvent.exception?.values).toHaveLength(1);
+ expect(errorEvent.exception?.values?.[0]?.value).toBe('This is an exception with id 123');
+
+ expect(errorEvent.request).toEqual({
+ method: 'GET',
+ cookies: {},
+ headers: expect.any(Object),
+ url: 'http://localhost:3030/test-exception/123',
+ });
+
+ expect(errorEvent.transaction).toEqual('GET /test-exception/:id');
+
+ expect(errorEvent.contexts?.trace).toEqual({
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ });
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/tests/transactions.test.ts

@@ -0,0 +1,154 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Sends an API route transaction', async ({ baseURL }) => {
+ const pageloadTransactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return (
+ transactionEvent?.contexts?.trace?.op === 'http.server' &&
+ transactionEvent?.transaction === 'GET /test-transaction'
+ );
+ });
+
+ await fetch(`${baseURL}/test-transaction`);
+
+ const transactionEvent = await pageloadTransactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace).toEqual({
+ data: {
+ 'sentry.source': 'route',
+ 'sentry.origin': 'auto.http.otel.http',
+ 'sentry.op': 'http.server',
+ 'sentry.sample_rate': 1,
+ url: 'http://localhost:3030/test-transaction',
+ 'otel.kind': 'SERVER',
+ 'http.response.status_code': 200,
+ 'http.url': 'http://localhost:3030/test-transaction',
+ 'http.host': 'localhost:3030',
+ 'net.host.name': 'localhost',
+ 'http.method': 'GET',
+ 'http.scheme': 'http',
+ 'http.target': '/test-transaction',
+ 'http.user_agent': 'node',
+ 'http.flavor': '1.1',
+ 'net.transport': 'ip_tcp',
+ 'net.host.ip': expect.any(String),
+ 'net.host.port': expect.any(Number),
+ 'net.peer.ip': expect.any(String),
+ 'net.peer.port': expect.any(Number),
+ 'http.status_code': 200,
+ 'http.status_text': 'OK',
+ 'http.route': '/test-transaction',
+ 'http.request.header.accept': '*/*',
+ 'http.request.header.accept_encoding': 'gzip, deflate',
+ 'http.request.header.accept_language': '*',
+ 'http.request.header.connection': 'keep-alive',
+ 'http.request.header.host': expect.any(String),
+ 'http.request.header.sec_fetch_mode': 'cors',
+ 'http.request.header.user_agent': 'node',
+ },
+ op: 'http.server',
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ status: 'ok',
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ origin: 'auto.http.otel.http',
+ });
+
+ expect(transactionEvent.contexts?.response).toEqual({
+ status_code: 200,
+ });
+
+ expect(transactionEvent).toEqual(
+ expect.objectContaining({
+ transaction: 'GET /test-transaction',
+ type: 'transaction',
+ transaction_info: {
+ source: 'route',
+ },
+ }),
+ );
+
+ const spans = transactionEvent.spans || [];
+
+ // Manually started span
+ expect(spans).toContainEqual({
+ data: { 'sentry.origin': 'manual' },
+ description: 'test-span',
+ origin: 'manual',
+ parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ start_timestamp: expect.any(Number),
+ status: 'ok',
+ timestamp: expect.any(Number),
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ });
+
+ // auto instrumented span
+ expect(spans).toContainEqual({
+ data: {
+ 'sentry.origin': 'auto.http.express',
+ 'sentry.op': 'request_handler.express',
+ 'http.route': '/test-transaction',
+ 'express.name': '/test-transaction',
+ 'express.type': 'request_handler',
+ },
+ description: '/test-transaction',
+ op: 'request_handler.express',
+ origin: 'auto.http.express',
+ parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ start_timestamp: expect.any(Number),
+ status: 'ok',
+ timestamp: expect.any(Number),
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ });
+});
+
+test('Sends an API route transaction for an errored route', async ({ baseURL }) => {
+ const transactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return (
+ transactionEvent.contexts?.trace?.op === 'http.server' &&
+ transactionEvent.transaction === 'GET /test-exception/:id' &&
+ transactionEvent.request?.url === 'http://localhost:3030/test-exception/777'
+ );
+ });
+
+ await fetch(`${baseURL}/test-exception/777`);
+
+ const transactionEvent = await transactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+ expect(transactionEvent.transaction).toEqual('GET /test-exception/:id');
+ expect(transactionEvent.contexts?.trace?.status).toEqual('internal_error');
+ expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(500);
+});
+
+test('Instruments MySQL via Orchestrion', async ({ baseURL }) => {
+ const transactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return transactionEvent.contexts?.trace?.op === 'http.server' && transactionEvent.transaction === 'GET /test-mysql';
+ });
+
+ await fetch(`${baseURL}/test-mysql`);
+
+ const transactionEvent = await transactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+ expect(transactionEvent.transaction).toEqual('GET /test-mysql');
+ expect(transactionEvent.contexts?.trace?.status).toEqual('ok');
+ expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(200);
+
+ const spans = transactionEvent.spans || [];
+ expect(spans).toContainEqual(
+ expect.objectContaining({
+ op: 'db',
+ origin: 'auto.db.orchestrion.mysql',
+ description: 'SELECT 1 + 1 AS solution',
+ }),
+ );
+ expect(spans).toContainEqual(
+ expect.objectContaining({
+ op: 'db',
+ origin: 'auto.db.orchestrion.mysql',
+ description: 'SELECT NOW()',
+ }),
+ );
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-express-orchestrion/package.json

@@ -0,0 +1,26 @@
+{
+ "name": "node-express-orchestrion-app",
+ "version": "1.0.0",
+ "private": true,
+ "type": "module",
+ "scripts": {
+ "start": "node --import ./src/instrument.mjs ./src/app.mjs",
+ "test": "playwright test",
+ "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+ "test:build": "pnpm install",
+ "test:assert": "pnpm test"
+ },
+ "dependencies": {
+ "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+ "express": "^5.1.0",
+ "mysql": "2.18.1"
+ },
+ "devDependencies": {
+ "@playwright/test": "~1.56.0",
+ "@sentry-internal/test-utils": "link:../../../test-utils",
+ "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ }
+}

dev-packages/e2e-tests/test-applications/node-express-orchestrion/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+ startCommand: `pnpm start`,
+});
+
+export default config;

.size-limit.js

@@ -394,6 +394,23 @@ module.exports = [
  limit: '136 KB',
  disablePlugins: ['@size-limit/esbuild'],
  },
+ {
+ name: '@sentry/node/import (ESM hook with diagnostics-channel injection)',
+ path: ['node_modules/@apm-js-collab/tracing-hooks/hook.mjs', 'packages/node/build/import-hook.mjs'],
+ ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
+ gzip: true,
+ limit: '100 KB',
+ disablePlugins: ['@size-limit/esbuild'],
+ },
+ {
+ name: '@sentry/node/light',
+ path: 'packages/node-core/build/esm/light/index.js',
+ import: createImport('init'),
+ ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
+ gzip: true,
+ limit: '100 KB',
+ disablePlugins: ['@size-limit/esbuild'],
+ },
  {
  name: '@sentry/node - without tracing',
  path: 'packages/node/build/esm/index.js',

dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

@@ -21,6 +21,10 @@ const NODE_EXPORTS_IGNORE = [
  'SentryContextManager',
  'validateOpenTelemetrySetup',
  'preloadOpenTelemetry',
+ // Experimental, Node-runtime-only opt-in (diagnostics-channel injection); it
+ // registers Node module hooks and is not surfaced through the framework /
+ // serverless SDKs.
+ 'experimentalUseDiagnosticsChannelInjection',
  // Internal helper only needed within integrations (e.g. bunRuntimeMetricsIntegration)
  '_INTERNAL_normalizeCollectionInterval',
 ];

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/package.json

@@ -0,0 +1,26 @@
+{
+ "name": "node-express-orchestrion-cjs-app",
+ "version": "1.0.0",
+ "private": true,
+ "type": "commonjs",
+ "scripts": {
+ "start": "node --import @sentry/node/import ./src/app.js",
+ "test": "playwright test",
+ "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+ "test:build": "pnpm install",
+ "test:assert": "pnpm test"
+ },
+ "dependencies": {
+ "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+ "express": "^5.1.0",
+ "mysql": "2.18.1"
+ },
+ "devDependencies": {
+ "@playwright/test": "~1.56.0",
+ "@sentry-internal/test-utils": "link:../../../test-utils",
+ "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ }
+}

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+ startCommand: `pnpm start`,
+});
+
+export default config;

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/src/app.js

@@ -0,0 +1,73 @@
+const Sentry = require('@sentry/node');
+
+// The channels are injected by `node --import @sentry/node/import` (see the
+// `start` script); opting in via this method makes the SDK subscribe to
+// them instead of using the OTel instrumentation.
+Sentry.experimentalUseDiagnosticsChannelInjection();
+
+Sentry.init({
+ environment: 'qa', // dynamic sampling bias to keep transactions
+ dsn: process.env.E2E_TEST_DSN,
+ debug: !!process.env.DEBUG,
+ tunnel: `http://localhost:3031/`, // proxy server
+ tracesSampleRate: 1,
+});
+
+const express = require('express');
+const mysql = require('mysql');
+
+const connection = mysql.createConnection({
+ user: 'root',
+ password: 'docker',
+});
+
+const app = express();
+const port = 3030;
+
+app.get('/test-success', function (req, res) {
+ res.send({ version: 'v1' });
+});
+
+app.get('/test-param/:param', function (req, res) {
+ res.send({ paramWas: req.params.param });
+});
+
+app.get('/test-mysql', function (req, res) {
+ connection.query('SELECT 1 + 1 AS solution', function () {
+ connection.query('SELECT NOW()', ['1', '2'], () => {
+ res.send({ status: 'ok' });
+ });
+ });
+});
+
+app.get('/test-transaction', function (_req, res) {
+ Sentry.startSpan({ name: 'test-span' }, () => undefined);
+
+ res.send({ status: 'ok' });
+});
+
+app.get('/test-error', async function (req, res) {
+ const exceptionId = Sentry.captureException(new Error('This is an error'));
+
+ await Sentry.flush(2000);
+
+ res.send({ exceptionId });
+});
+
+app.get('/test-exception/:id', function (req, _res) {
+ throw new Error(`This is an exception with id ${req.params.id}`);
+});
+
+Sentry.setupExpressErrorHandler(app);
+
+// @ts-ignore
+app.use(function onError(err, req, res, next) {
+ // The error id is attached to `res.sentry` to be returned
+ // and optionally displayed to the user for support.
+ res.statusCode = 500;
+ res.end(res.sentry + '\n');
+});
+
+app.listen(port, () => {
+ console.log(`Example app listening on port ${port}`);
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/start-event-proxy.mjs

@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+ port: 3031,
+ proxyServerName: 'node-express-orchestrion-cjs',
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/tests/errors.test.ts

@@ -0,0 +1,29 @@
+import { expect, test } from '@playwright/test';
+import { waitForError } from '@sentry-internal/test-utils';
+
+test('Sends correct error event', async ({ baseURL }) => {
+ const errorEventPromise = waitForError('node-express-orchestrion-cjs', event => {
+ return !event.type && event.exception?.values?.[0]?.value === 'This is an exception with id 123';
+ });
+
+ await fetch(`${baseURL}/test-exception/123`);
+
+ const errorEvent = await errorEventPromise;
+
+ expect(errorEvent.exception?.values).toHaveLength(1);
+ expect(errorEvent.exception?.values?.[0]?.value).toBe('This is an exception with id 123');
+
+ expect(errorEvent.request).toEqual({
+ method: 'GET',
+ cookies: {},
+ headers: expect.any(Object),
+ url: 'http://localhost:3030/test-exception/123',
+ });
+
+ expect(errorEvent.transaction).toEqual('GET /test-exception/:id');
+
+ expect(errorEvent.contexts?.trace).toEqual({
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ });
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion-cjs/tests/transactions.test.ts

@@ -0,0 +1,154 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Sends an API route transaction', async ({ baseURL }) => {
+ const pageloadTransactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return (
+ transactionEvent?.contexts?.trace?.op === 'http.server' &&
+ transactionEvent?.transaction === 'GET /test-transaction'
+ );
+ });
+
+ await fetch(`${baseURL}/test-transaction`);
+
+ const transactionEvent = await pageloadTransactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace).toEqual({
+ data: {
+ 'sentry.source': 'route',
+ 'sentry.origin': 'auto.http.otel.http',
+ 'sentry.op': 'http.server',
+ 'sentry.sample_rate': 1,
+ url: 'http://localhost:3030/test-transaction',
+ 'otel.kind': 'SERVER',
+ 'http.response.status_code': 200,
+ 'http.url': 'http://localhost:3030/test-transaction',
+ 'http.host': 'localhost:3030',
+ 'net.host.name': 'localhost',
+ 'http.method': 'GET',
+ 'http.scheme': 'http',
+ 'http.target': '/test-transaction',
+ 'http.user_agent': 'node',
+ 'http.flavor': '1.1',
+ 'net.transport': 'ip_tcp',
+ 'net.host.ip': expect.any(String),
+ 'net.host.port': expect.any(Number),
+ 'net.peer.ip': expect.any(String),
+ 'net.peer.port': expect.any(Number),
+ 'http.status_code': 200,
+ 'http.status_text': 'OK',
+ 'http.route': '/test-transaction',
+ 'http.request.header.accept': '*/*',
+ 'http.request.header.accept_encoding': 'gzip, deflate',
+ 'http.request.header.accept_language': '*',
+ 'http.request.header.connection': 'keep-alive',
+ 'http.request.header.host': expect.any(String),
+ 'http.request.header.sec_fetch_mode': 'cors',
+ 'http.request.header.user_agent': 'node',
+ },
+ op: 'http.server',
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ status: 'ok',
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ origin: 'auto.http.otel.http',
+ });
+
+ expect(transactionEvent.contexts?.response).toEqual({
+ status_code: 200,
+ });
+
+ expect(transactionEvent).toEqual(
+ expect.objectContaining({
+ transaction: 'GET /test-transaction',
+ type: 'transaction',
+ transaction_info: {
+ source: 'route',
+ },
+ }),
+ );
+
+ const spans = transactionEvent.spans || [];
+
+ // Manually started span
+ expect(spans).toContainEqual({
+ data: { 'sentry.origin': 'manual' },
+ description: 'test-span',
+ origin: 'manual',
+ parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ start_timestamp: expect.any(Number),
+ status: 'ok',
+ timestamp: expect.any(Number),
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ });
+
+ // auto instrumented span
+ expect(spans).toContainEqual({
+ data: {
+ 'sentry.origin': 'auto.http.express',
+ 'sentry.op': 'request_handler.express',
+ 'http.route': '/test-transaction',
+ 'express.name': '/test-transaction',
+ 'express.type': 'request_handler',
+ },
+ description: '/test-transaction',
+ op: 'request_handler.express',
+ origin: 'auto.http.express',
+ parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ span_id: expect.stringMatching(/[a-f0-9]{16}/),
+ start_timestamp: expect.any(Number),
+ status: 'ok',
+ timestamp: expect.any(Number),
+ trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+ });
+});
+
+test('Sends an API route transaction for an errored route', async ({ baseURL }) => {
+ const transactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return (
+ transactionEvent.contexts?.trace?.op === 'http.server' &&
+ transactionEvent.transaction === 'GET /test-exception/:id' &&
+ transactionEvent.request?.url === 'http://localhost:3030/test-exception/777'
+ );
+ });
+
+ await fetch(`${baseURL}/test-exception/777`);
+
+ const transactionEvent = await transactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+ expect(transactionEvent.transaction).toEqual('GET /test-exception/:id');
+ expect(transactionEvent.contexts?.trace?.status).toEqual('internal_error');
+ expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(500);
+});
+
+test('Instruments MySQL via Orchestrion', async ({ baseURL }) => {
+ const transactionEventPromise = waitForTransaction('node-express-orchestrion-cjs', transactionEvent => {
+ return transactionEvent.contexts?.trace?.op === 'http.server' && transactionEvent.transaction === 'GET /test-mysql';
+ });
+
+ await fetch(`${baseURL}/test-mysql`);
+
+ const transactionEvent = await transactionEventPromise;
+
+ expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+ expect(transactionEvent.transaction).toEqual('GET /test-mysql');
+ expect(transactionEvent.contexts?.trace?.status).toEqual('ok');
+ expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(200);
+
+ const spans = transactionEvent.spans || [];
+ expect(spans).toContainEqual(
+ expect.objectContaining({
+ op: 'db',
+ origin: 'auto.db.orchestrion.mysql',
+ description: 'SELECT 1 + 1 AS solution',
+ }),
+ );
+ expect(spans).toContainEqual(
+ expect.objectContaining({
+ op: 'db',
+ origin: 'auto.db.orchestrion.mysql',
+ description: 'SELECT NOW()',
+ }),
+ );
+});

dev-packages/e2e-tests/test-applications/node-express-orchestrion/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-express-orchestrion/package.json

@@ -0,0 +1,26 @@
+{
+ "name": "node-express-orchestrion-app",
+ "version": "1.0.0",
+ "private": true,
+ "type": "module",
+ "scripts": {
+ "start": "node --import ./src/instrument.mjs ./src/app.mjs",
+ "test": "playwright test",
+ "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+ "test:build": "pnpm install",
+ "test:assert": "pnpm test"
+ },
+ "dependencies": {
+ "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+ "express": "^5.1.0",
+ "mysql": "2.18.1"
+ },
+ "devDependencies": {
+ "@playwright/test": "~1.56.0",
+ "@sentry-internal/test-utils": "link:../../../test-utils",
+ "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ }
+}

dev-packages/e2e-tests/test-applications/node-express-orchestrion/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+ startCommand: `pnpm start`,
+});
+
+export default config;