test(node-integration): Remove isOrchestrionEnabled helper#23435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicohrubec merged 2 commits into from
Aug 20, 2026
Merged

test(node-integration): Remove isOrchestrionEnabled helper #23435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
584b3b5
ref(node-integration-tests): Remove tautological isOrchestrionEnabled…
nicohrubec Aug 14, 2026
faf4ecb
Merge branch 'develop' into nh/ref-remove-is-orchestrion-enabled
nicohrubec Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions dev-packages/node-integration-tests/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,17 +56,6 @@ export function getPortAppIsRunningOn(app: Express): number | undefined {
return app.port;
}

/**
* Whether channel-based (orchestrion diagnostics-channel) instrumentation is active.
*
* Channel-based instrumentation is the default in v11, so this is always `true`. Kept as a helper
* (rather than inlining `true`) so the suites' origin/shape selectors read intentionally; the OTel
* branches they still contain are dead and get removed alongside the vendored OTel code (JS-3074).
*/
export function isOrchestrionEnabled(): boolean {
return true;
}

/**
* Retries `probe` until it resolves, or throws once `timeout` ms elapse.
*
Expand Down
3 changes: 1 addition & 2 deletions dev-packages/node-integration-tests/suites/aws-serverless/aws-integration-streamed/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import type { SerializedStreamedSpanContainer } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// See the non-streamed `aws-integration` suite: only the origin differs between the OTel and
// orchestrion diagnostics-channel runs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.aws_sdk' : 'auto.otel.aws';
const ORIGIN = 'auto.aws.aws_sdk';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
Expand Down
3 changes: 1 addition & 2 deletions dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.aws_sdk' : 'auto.otel.aws';
const ORIGIN = 'auto.aws.aws_sdk';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
Expand Down
13 changes: 3 additions & 10 deletions dev-packages/node-integration-tests/suites/express/tracing/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { afterAll, describe, expect } from 'vitest';
import { assertSentryTransaction } from '../../../utils/assertions';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
import { isOrchestrionEnabled } from '../../../utils';

describe('express tracing', () => {
afterAll(() => {
Expand DownExpand Up@@ -98,15 +97,9 @@ describe('express tracing', () => {
// The handler delays its response by ~100ms (see scenario).
const routerDurationMs = ((routerSpan?.timestamp ?? 0) - (routerSpan?.start_timestamp ?? 0)) * 1000;

if (isOrchestrionEnabled()) {
// The orchestrion router span stays open until the response finishes, so
// it spans the whole sub-stack it dispatched (~the 100ms handler delay).
expect(routerDurationMs).toBeGreaterThan(50);
} else {
// The OTel integration ends router spans immediately, so the router span
// is a ~0ms marker regardless of how long its sub-stack runs.
expect(routerDurationMs).toBeLessThan(50);
}
// The router span stays open until the response finishes, so it spans the
// whole sub-stack it dispatched (~the 100ms handler delay).
expect(routerDurationMs).toBeGreaterThan(50);
},
})
.start();
Expand Down
30 changes: 0 additions & 30 deletions dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,25 +19,13 @@ import {
GEN_AI_USAGE_TOTAL_TOKENS,
} from '@sentry/conventions/attributes';
import { GEN_AI_REQUEST_STREAM_ATTRIBUTE } from '../../../../../packages/server-utils/src/ai/core/gen-ai-attributes';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('Anthropic integration', () => {
afterAll(() => {
cleanupChildProcesses();
});

const EXPECTED_MODEL_ERROR = {
exception: {
values: [
{
type: 'Error',
value: '404 Model not found',
},
],
},
};

const EXPECTED_STREAM_EVENT_HANDLER_MESSAGE = {
message: 'stream event from user-added event listener captured',
};
Expand DownExpand Up@@ -83,12 +71,6 @@ describe('Anthropic integration', () => {
test('creates anthropic related spans with genAI recording disabled', async () => {
const runner = createRunner();

// The orchestrion path only marks the errored span; unlike the OTel path it does not
// capture the handled `error-model` rejection as an event.
if (!isOrchestrionEnabled()) {
runner.expect({ event: EXPECTED_MODEL_ERROR });
}

await runner
.expect({ transaction: { transaction: 'main' } })
.expect({
Expand DownExpand Up@@ -124,12 +106,6 @@ describe('Anthropic integration', () => {
test('creates anthropic related spans with genAI recording enabled', async () => {
const runner = createRunner();

// The orchestrion path only marks the errored span; unlike the OTel path it does not
// capture the handled `error-model` rejection as an event.
if (!isOrchestrionEnabled()) {
runner.expect({ event: EXPECTED_MODEL_ERROR });
}

await runner
.expect({ transaction: { transaction: 'main' } })
.expect({
Expand DownExpand Up@@ -194,12 +170,6 @@ describe('Anthropic integration', () => {
test('creates anthropic related spans with custom options', async () => {
const runner = createRunner();

// The orchestrion path only marks the errored span; unlike the OTel path it does not
// capture the handled `error-model` rejection as an event.
if (!isOrchestrionEnabled()) {
runner.expect({ event: EXPECTED_MODEL_ERROR });
}

await runner
.expect({ transaction: { transaction: 'main' } })
.expect({
Expand Down
9 changes: 2 additions & 7 deletions dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Server start transaction (Apollo Server v5 no longer runs introspection query on start)
const EXPECTED_START_SERVER_TRANSACTION = {
transaction: 'Test Server Start',
};

// apollo uses graphql v16, so the default run instruments it via the vendored OTel patcher and the
// orchestrion run (auto-injected on CI) via the diagnostics-channel path. Both emit the same span
// name/status; the origin and the document attribute (`graphql.source` vs `graphql.document`) differ.
const orchestrion = isOrchestrionEnabled();
const ORIGIN = orchestrion ? 'auto.graphql.diagnostic_channel' : 'auto.graphql.otel.graphql';
const ORIGIN = 'auto.graphql.diagnostic_channel';

function graphqlExecuteSpan(opts: {
description: string;
Expand All@@ -28,7 +23,7 @@ function graphqlExecuteSpan(opts: {
data: expect.objectContaining({
'graphql.operation.type': operationType,
...(operationName ? { 'graphql.operation.name': operationName } : {}),
[orchestrion ? 'graphql.document' : 'graphql.source']: document,
'graphql.document': document,
'sentry.origin': ORIGIN,
}),
});
Expand Down
3 changes: 1 addition & 2 deletions dev-packages/node-integration-tests/suites/tracing/dataloader/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The span origin depends on which instrumentation is active. When the generic orchestrion run is
// enabled (via INJECT_ORCHESTRION) the OTel `Dataloader` integration is swapped for the
// diagnostics-channel one, which stamps a different origin.
const ORIGIN = isOrchestrionEnabled() ? 'auto.db.dataloader' : 'auto.db.otel.dataloader';
const ORIGIN = 'auto.db.dataloader';
const CACHE_GET_OP = 'cache.get';
const CACHE_MUTATION_OPS = { prime: 'cache.put', clear: 'cache.remove', clearAll: 'cache.remove' } as const;

Expand Down
7 changes: 1 addition & 6 deletions dev-packages/node-integration-tests/suites/tracing/hapi/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('hapi auto-instrumentation', () => {
afterAll(async () => {
cleanupChildProcesses();
});

// `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The
// orchestrion path keeps span ops/attributes identical to the OTel path; only
// the origin differs to signal the injection mechanism, so we branch on
// `isOrchestrionEnabled()`.
const origin = isOrchestrionEnabled() ? 'auto.http.hapi' : 'auto.http.otel.hapi';
const origin = 'auto.http.hapi';

const EXPECTED_TRANSACTION = {
transaction: 'GET /',
Expand Down
5 changes: 2 additions & 3 deletions dev-packages/node-integration-tests/suites/tracing/kafkajs/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests, describeWithDockerCompose } from '../../../utils/runner';

const producerOrigin = isOrchestrionEnabled() ? 'auto.kafkajs.producer' : 'auto.kafkajs.otel.producer';
const consumerOrigin = isOrchestrionEnabled() ? 'auto.kafkajs.consumer' : 'auto.kafkajs.otel.consumer';
const producerOrigin = 'auto.kafkajs.producer';
const consumerOrigin = 'auto.kafkajs.consumer';

describeWithDockerCompose('kafkajs', { workingDirectory: [__dirname] }, () => {
afterAll(() => {
Expand Down
3 changes: 1 addition & 2 deletions dev-packages/node-integration-tests/suites/tracing/knex/mysql2/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../../utils';
import { createEsmAndCjsTests, describeWithDockerCompose } from '../../../../utils/runner';

describeWithDockerCompose('knex auto instrumentation', { workingDirectory: [__dirname] }, () => {
// Update this if another knex version is installed
const KNEX_VERSION = '2.5.1';
const ORIGIN = isOrchestrionEnabled() ? 'auto.db.knex' : 'auto.db.otel.knex';
const ORIGIN = 'auto.db.knex';

describe('with `mysql2` client', () => {
createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
Expand Down
3 changes: 1 addition & 2 deletions dev-packages/node-integration-tests/suites/tracing/knex/pg/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../../utils';
import { createEsmAndCjsTests, describeWithDockerCompose } from '../../../../utils/runner';

describe('knex auto instrumentation', () => {
// Update this if another knex version is installed
const KNEX_VERSION = '2.5.1';
const ORIGIN = isOrchestrionEnabled() ? 'auto.db.knex' : 'auto.db.otel.knex';
const ORIGIN = 'auto.db.knex';

describeWithDockerCompose('with `pg` client', { workingDirectory: [__dirname] }, () => {
createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
Expand Down
7 changes: 1 addition & 6 deletions dev-packages/node-integration-tests/suites/tracing/koa/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('koa auto-instrumentation', () => {
afterAll(async () => {
cleanupChildProcesses();
});

// `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The
// orchestrion path keeps span ops/attributes identical to the OTel path; only
// the origin differs to signal the injection mechanism, so we branch on
// `isOrchestrionEnabled()`.
const origin = isOrchestrionEnabled() ? 'auto.http.koa' : 'auto.http.otel.koa';
const origin = 'auto.http.koa';

const EXPECTED_ERROR_EVENT = {
exception: {
Expand Down
47 changes: 20 additions & 27 deletions dev-packages/node-integration-tests/suites/tracing/lru-memoizer/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,34 @@
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
import { createCjsTests } from '../../../utils/runner/createEsmAndCjsTests';
import { isOrchestrionEnabled } from '../../../utils';

describe('lru-memoizer', () => {
afterAll(() => {
cleanupChildProcesses();
});

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('keeps outer context inside the memoized inner functions', async () => {
await createTestRunner()
.expect({
transaction: {
transaction: 'test-name',
contexts: {
trace: expect.objectContaining({
op: 'run',
data: expect.objectContaining({
'sentry.op': 'run',
'sentry.origin': 'manual',
'memoized.context_preserved': true,
}),
createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createTestRunner, test) => {
test('keeps outer context inside the memoized inner functions', async () => {
await createTestRunner()
.expect({
transaction: {
transaction: 'test-name',
contexts: {
trace: expect.objectContaining({
op: 'run',
data: expect.objectContaining({
'sentry.op': 'run',
'sentry.origin': 'manual',
'memoized.context_preserved': true,
}),
},
}),
},
})
.start()
.completed();
});
},
{ failsOnEsm: !isOrchestrionEnabled() },
);
},
})
.start()
.completed();
});
});

// CJS-only: the parallel scenario is flaky in ESM (see #21729).
createCjsTests(__dirname, 'scenario-parallel.mjs', 'instrument.mjs', (createTestRunner, test) => {
Expand Down
3 changes: 1 addition & 2 deletions dev-packages/node-integration-tests/suites/tracing/mongodb-v4/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 4 so the = 4.0 <6.4 callback-based command band and the
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v4 auto-instrumentation', () => {
cleanupChildProcesses();
});

const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
const origin = 'auto.db.mongo';

const spanFor = (operation: string): unknown =>
expect.objectContaining({
Expand Down
3 changes: 1 addition & 2 deletions dev-packages/node-integration-tests/suites/tracing/mongodb-v5/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 5 so the >= 4.0 < 6.4 callback-based command band and the
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v5 auto-instrumentation', () => {
cleanupChildProcesses();
});

const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
const origin = 'auto.db.mongo';

const spanFor = (operation: string): unknown =>
expect.objectContaining({
Expand Down
3 changes: 1 addition & 2 deletions dev-packages/node-integration-tests/suites/tracing/mongodb-v6/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 6 so the >= 6.4 promise-based `Connection.prototype.command`
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v6 auto-instrumentation', () => {
cleanupChildProcesses();
});

const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
const origin = 'auto.db.mongo';

// `db.statement` (scrubbed full command doc) and `db.connection_string` vary
// by driver version, so assert their presence rather than exact content;
Expand Down
3 changes: 1 addition & 2 deletions dev-packages/node-integration-tests/suites/tracing/mongodb-v7/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 7 so the >= 6.4 promise-based `Connection.prototype.command`
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v7 auto-instrumentation', () => {
cleanupChildProcesses();
});

const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
const origin = 'auto.db.mongo';

// `db.statement` (scrubbed full command doc) and `db.connection_string` vary
// by driver version, so assert their presence rather than exact content;
Expand Down
3 changes: 1 addition & 2 deletions dev-packages/node-integration-tests/suites/tracing/mongodb/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,10 @@ import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { assertSentryTransaction } from '../../../utils/assertions';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('MongoDB auto-instrumentation', () => {
const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
const origin = 'auto.db.mongo';
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
test(node-integration): Remove isOrchestrionEnabled helper#23435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicohrubec
merged 2 commits into

from

Aug 20, 2026
 Merged


test(node-integration): Remove isOrchestrionEnabled helper
#23435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
584b3b5

ref(node-integration-tests): Remove tautological isOrchestrionEnabled…


nicohrubec Aug 14, 2026
faf4ecb

Merge branch 'develop' into nh/ref-remove-is-orchestrion-enabled


nicohrubec Aug 20, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 0 additions & 11 deletions
dev-packages/node-integration-tests/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,17 +56,6 @@ export function getPortAppIsRunningOn(app: Express): number | undefined {
 return app.port;
}

/**
 * Whether channel-based (orchestrion diagnostics-channel) instrumentation is active.
 *
 * Channel-based instrumentation is the default in v11, so this is always `true`. Kept as a helper
 * (rather than inlining `true`) so the suites' origin/shape selectors read intentionally; the OTel
 * branches they still contain are dead and get removed alongside the vendored OTel code (JS-3074).
 */
export function isOrchestrionEnabled(): boolean {
 return true;
}

/**
 * Retries `probe` until it resolves, or throws once `timeout` ms elapse.
 *
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration-streamed/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import type { SerializedStreamedSpanContainer } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// See the non-streamed `aws-integration` suite: only the origin differs between the OTel and
// orchestrion diagnostics-channel runs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.aws_sdk' : 'auto.otel.aws';
const ORIGIN = 'auto.aws.aws_sdk';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.aws_sdk' : 'auto.otel.aws';
const ORIGIN = 'auto.aws.aws_sdk';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
Expand Down

13 changes: 3 additions & 10 deletions
dev-packages/node-integration-tests/suites/express/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { afterAll, describe, expect } from 'vitest';
import { assertSentryTransaction } from '../../../utils/assertions';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
import { isOrchestrionEnabled } from '../../../utils';

describe('express tracing', () => {
 afterAll(() => {
Expand DownExpand Up@@ -98,15 +97,9 @@ describe('express tracing', () => {
 // The handler delays its response by ~100ms (see scenario).
 const routerDurationMs = ((routerSpan?.timestamp ?? 0) - (routerSpan?.start_timestamp ?? 0)) * 1000;

 if (isOrchestrionEnabled()) {
 // The orchestrion router span stays open until the response finishes, so
 // it spans the whole sub-stack it dispatched (~the 100ms handler delay).
 expect(routerDurationMs).toBeGreaterThan(50);
 } else {
 // The OTel integration ends router spans immediately, so the router span
 // is a ~0ms marker regardless of how long its sub-stack runs.
 expect(routerDurationMs).toBeLessThan(50);
 }
 // The router span stays open until the response finishes, so it spans the
 // whole sub-stack it dispatched (~the 100ms handler delay).
 expect(routerDurationMs).toBeGreaterThan(50);
 },
 })
 .start();
Expand Down

30 changes: 0 additions & 30 deletions
dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,25 +19,13 @@ import {
 GEN_AI_USAGE_TOTAL_TOKENS,
} from '@sentry/conventions/attributes';
import { GEN_AI_REQUEST_STREAM_ATTRIBUTE } from '../../../../../packages/server-utils/src/ai/core/gen-ai-attributes';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('Anthropic integration', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 const EXPECTED_MODEL_ERROR = {
 exception: {
 values: [
 {
 type: 'Error',
 value: '404 Model not found',
 },
 ],
 },
 };

 const EXPECTED_STREAM_EVENT_HANDLER_MESSAGE = {
 message: 'stream event from user-added event listener captured',
 };
Expand DownExpand Up@@ -83,12 +71,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with genAI recording disabled', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand DownExpand Up@@ -124,12 +106,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with genAI recording enabled', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand DownExpand Up@@ -194,12 +170,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with custom options', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand Down

9 changes: 2 additions & 7 deletions
dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Server start transaction (Apollo Server v5 no longer runs introspection query on start)
const EXPECTED_START_SERVER_TRANSACTION = {
 transaction: 'Test Server Start',
};

// apollo uses graphql v16, so the default run instruments it via the vendored OTel patcher and the
// orchestrion run (auto-injected on CI) via the diagnostics-channel path. Both emit the same span
// name/status; the origin and the document attribute (`graphql.source` vs `graphql.document`) differ.
const orchestrion = isOrchestrionEnabled();
const ORIGIN = orchestrion ? 'auto.graphql.diagnostic_channel' : 'auto.graphql.otel.graphql';
const ORIGIN = 'auto.graphql.diagnostic_channel';

function graphqlExecuteSpan(opts: {
 description: string;
Expand All@@ -28,7 +23,7 @@ function graphqlExecuteSpan(opts: {
 data: expect.objectContaining({
 'graphql.operation.type': operationType,
 ...(operationName ? { 'graphql.operation.name': operationName } : {}),
[orchestrion ? 'graphql.document' : 'graphql.source']: document,
 'graphql.document': document,
 'sentry.origin': ORIGIN,
 }),
 });
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/dataloader/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The span origin depends on which instrumentation is active. When the generic orchestrion run is
// enabled (via INJECT_ORCHESTRION) the OTel `Dataloader` integration is swapped for the
// diagnostics-channel one, which stamps a different origin.
const ORIGIN = isOrchestrionEnabled() ? 'auto.db.dataloader' : 'auto.db.otel.dataloader';
const ORIGIN = 'auto.db.dataloader';
const CACHE_GET_OP = 'cache.get';
const CACHE_MUTATION_OPS = { prime: 'cache.put', clear: 'cache.remove', clearAll: 'cache.remove' } as const;

Expand Down

7 changes: 1 addition & 6 deletions
dev-packages/node-integration-tests/suites/tracing/hapi/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('hapi auto-instrumentation', () => {
 afterAll(async () => {
 cleanupChildProcesses();
 });

 // `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The
 // orchestrion path keeps span ops/attributes identical to the OTel path; only
 // the origin differs to signal the injection mechanism, so we branch on
 // `isOrchestrionEnabled()`.
 const origin = isOrchestrionEnabled() ? 'auto.http.hapi' : 'auto.http.otel.hapi';
 const origin = 'auto.http.hapi';

 const EXPECTED_TRANSACTION = {
 transaction: 'GET /',
Expand Down

5 changes: 2 additions & 3 deletions
dev-packages/node-integration-tests/suites/tracing/kafkajs/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests, describeWithDockerCompose } from '../../../utils/runner';

const producerOrigin = isOrchestrionEnabled() ? 'auto.kafkajs.producer' : 'auto.kafkajs.otel.producer';
const consumerOrigin = isOrchestrionEnabled() ? 'auto.kafkajs.consumer' : 'auto.kafkajs.otel.consumer';
const producerOrigin = 'auto.kafkajs.producer';
const consumerOrigin = 'auto.kafkajs.consumer';

describeWithDockerCompose('kafkajs', { workingDirectory: [__dirname] }, () => {
 afterAll(() => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/knex/mysql2/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../../utils';
import { createEsmAndCjsTests, describeWithDockerCompose } from '../../../../utils/runner';

describeWithDockerCompose('knex auto instrumentation', { workingDirectory: [__dirname] }, () => {
 // Update this if another knex version is installed
 const KNEX_VERSION = '2.5.1';
 const ORIGIN = isOrchestrionEnabled() ? 'auto.db.knex' : 'auto.db.otel.knex';
 const ORIGIN = 'auto.db.knex';

 describe('with `mysql2` client', () => {
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/knex/pg/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../../utils';
import { createEsmAndCjsTests, describeWithDockerCompose } from '../../../../utils/runner';

describe('knex auto instrumentation', () => {
 // Update this if another knex version is installed
 const KNEX_VERSION = '2.5.1';
 const ORIGIN = isOrchestrionEnabled() ? 'auto.db.knex' : 'auto.db.otel.knex';
 const ORIGIN = 'auto.db.knex';

 describeWithDockerCompose('with `pg` client', { workingDirectory: [__dirname] }, () => {
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
Expand Down

7 changes: 1 addition & 6 deletions
dev-packages/node-integration-tests/suites/tracing/koa/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('koa auto-instrumentation', () => {
 afterAll(async () => {
 cleanupChildProcesses();
 });

 // `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The
 // orchestrion path keeps span ops/attributes identical to the OTel path; only
 // the origin differs to signal the injection mechanism, so we branch on
 // `isOrchestrionEnabled()`.
 const origin = isOrchestrionEnabled() ? 'auto.http.koa' : 'auto.http.otel.koa';
 const origin = 'auto.http.koa';

 const EXPECTED_ERROR_EVENT = {
 exception: {
Expand Down

47 changes: 20 additions & 27 deletions
dev-packages/node-integration-tests/suites/tracing/lru-memoizer/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,34 @@
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
import { createCjsTests } from '../../../utils/runner/createEsmAndCjsTests';
import { isOrchestrionEnabled } from '../../../utils';

describe('lru-memoizer', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createTestRunner, test) => {
 test('keeps outer context inside the memoized inner functions', async () => {
 await createTestRunner()
 .expect({
 transaction: {
 transaction: 'test-name',
 contexts: {
 trace: expect.objectContaining({
 op: 'run',
 data: expect.objectContaining({
 'sentry.op': 'run',
 'sentry.origin': 'manual',
 'memoized.context_preserved': true,
 }),
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createTestRunner, test) => {
 test('keeps outer context inside the memoized inner functions', async () => {
 await createTestRunner()
 .expect({
 transaction: {
 transaction: 'test-name',
 contexts: {
 trace: expect.objectContaining({
 op: 'run',
 data: expect.objectContaining({
 'sentry.op': 'run',
 'sentry.origin': 'manual',
 'memoized.context_preserved': true,
 }),
 },
 }),
 },
 })
 .start()
 .completed();
 });
 },
 { failsOnEsm: !isOrchestrionEnabled() },
 );
 },
 })
 .start()
 .completed();
 });
 });

 // CJS-only: the parallel scenario is flaky in ESM (see #21729).
 createCjsTests(__dirname, 'scenario-parallel.mjs', 'instrument.mjs', (createTestRunner, test) => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v4/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 4 so the = 4.0 <6.4 callback-based command band and the
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v4 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 const spanFor = (operation: string): unknown =>
 expect.objectContaining({
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v5/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 5 so the >= 4.0 < 6.4 callback-based command band and the
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v5 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 const spanFor = (operation: string): unknown =>
 expect.objectContaining({
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v6/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 6 so the >= 6.4 promise-based `Connection.prototype.command`
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v6 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 // `db.statement` (scrubbed full command doc) and `db.connection_string` vary
 // by driver version, so assert their presence rather than exact content;
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v7/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 7 so the >= 6.4 promise-based `Connection.prototype.command`
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v7 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 // `db.statement` (scrubbed full command doc) and `db.connection_string` vary
 // by driver version, so assert their presence rather than exact content;
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,10 @@ import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { assertSentryTransaction } from '../../../utils/assertions';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('MongoDB auto-instrumentation', () => {
 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';
 let mongoServer: MongoMemoryServer;

 beforeAll(async () => {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(node-integration): Remove isOrchestrionEnabled helper#23435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicohrubec
merged 2 commits into

from

Aug 20, 2026
 Merged


test(node-integration): Remove isOrchestrionEnabled helper
#23435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
584b3b5

ref(node-integration-tests): Remove tautological isOrchestrionEnabled…


nicohrubec Aug 14, 2026
faf4ecb

Merge branch 'develop' into nh/ref-remove-is-orchestrion-enabled


nicohrubec Aug 20, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 0 additions & 11 deletions
dev-packages/node-integration-tests/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,17 +56,6 @@ export function getPortAppIsRunningOn(app: Express): number | undefined {
 return app.port;
}

/**
 * Whether channel-based (orchestrion diagnostics-channel) instrumentation is active.
 *
 * Channel-based instrumentation is the default in v11, so this is always `true`. Kept as a helper
 * (rather than inlining `true`) so the suites' origin/shape selectors read intentionally; the OTel
 * branches they still contain are dead and get removed alongside the vendored OTel code (JS-3074).
 */
export function isOrchestrionEnabled(): boolean {
 return true;
}

/**
 * Retries `probe` until it resolves, or throws once `timeout` ms elapse.
 *
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration-streamed/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import type { SerializedStreamedSpanContainer } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// See the non-streamed `aws-integration` suite: only the origin differs between the OTel and
// orchestrion diagnostics-channel runs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.aws_sdk' : 'auto.otel.aws';
const ORIGIN = 'auto.aws.aws_sdk';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.aws_sdk' : 'auto.otel.aws';
const ORIGIN = 'auto.aws.aws_sdk';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
Expand Down

13 changes: 3 additions & 10 deletions
dev-packages/node-integration-tests/suites/express/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { afterAll, describe, expect } from 'vitest';
import { assertSentryTransaction } from '../../../utils/assertions';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
import { isOrchestrionEnabled } from '../../../utils';

describe('express tracing', () => {
 afterAll(() => {
Expand DownExpand Up@@ -98,15 +97,9 @@ describe('express tracing', () => {
 // The handler delays its response by ~100ms (see scenario).
 const routerDurationMs = ((routerSpan?.timestamp ?? 0) - (routerSpan?.start_timestamp ?? 0)) * 1000;

 if (isOrchestrionEnabled()) {
 // The orchestrion router span stays open until the response finishes, so
 // it spans the whole sub-stack it dispatched (~the 100ms handler delay).
 expect(routerDurationMs).toBeGreaterThan(50);
 } else {
 // The OTel integration ends router spans immediately, so the router span
 // is a ~0ms marker regardless of how long its sub-stack runs.
 expect(routerDurationMs).toBeLessThan(50);
 }
 // The router span stays open until the response finishes, so it spans the
 // whole sub-stack it dispatched (~the 100ms handler delay).
 expect(routerDurationMs).toBeGreaterThan(50);
 },
 })
 .start();
Expand Down

30 changes: 0 additions & 30 deletions
dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,25 +19,13 @@ import {
 GEN_AI_USAGE_TOTAL_TOKENS,
} from '@sentry/conventions/attributes';
import { GEN_AI_REQUEST_STREAM_ATTRIBUTE } from '../../../../../packages/server-utils/src/ai/core/gen-ai-attributes';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('Anthropic integration', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 const EXPECTED_MODEL_ERROR = {
 exception: {
 values: [
 {
 type: 'Error',
 value: '404 Model not found',
 },
 ],
 },
 };

 const EXPECTED_STREAM_EVENT_HANDLER_MESSAGE = {
 message: 'stream event from user-added event listener captured',
 };
Expand DownExpand Up@@ -83,12 +71,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with genAI recording disabled', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand DownExpand Up@@ -124,12 +106,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with genAI recording enabled', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand DownExpand Up@@ -194,12 +170,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with custom options', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand Down

9 changes: 2 additions & 7 deletions
dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Server start transaction (Apollo Server v5 no longer runs introspection query on start)
const EXPECTED_START_SERVER_TRANSACTION = {
 transaction: 'Test Server Start',
};

// apollo uses graphql v16, so the default run instruments it via the vendored OTel patcher and the
// orchestrion run (auto-injected on CI) via the diagnostics-channel path. Both emit the same span
// name/status; the origin and the document attribute (`graphql.source` vs `graphql.document`) differ.
const orchestrion = isOrchestrionEnabled();
const ORIGIN = orchestrion ? 'auto.graphql.diagnostic_channel' : 'auto.graphql.otel.graphql';
const ORIGIN = 'auto.graphql.diagnostic_channel';

function graphqlExecuteSpan(opts: {
 description: string;
Expand All@@ -28,7 +23,7 @@ function graphqlExecuteSpan(opts: {
 data: expect.objectContaining({
 'graphql.operation.type': operationType,
 ...(operationName ? { 'graphql.operation.name': operationName } : {}),
[orchestrion ? 'graphql.document' : 'graphql.source']: document,
 'graphql.document': document,
 'sentry.origin': ORIGIN,
 }),
 });
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/dataloader/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The span origin depends on which instrumentation is active. When the generic orchestrion run is
// enabled (via INJECT_ORCHESTRION) the OTel `Dataloader` integration is swapped for the
// diagnostics-channel one, which stamps a different origin.
const ORIGIN = isOrchestrionEnabled() ? 'auto.db.dataloader' : 'auto.db.otel.dataloader';
const ORIGIN = 'auto.db.dataloader';
const CACHE_GET_OP = 'cache.get';
const CACHE_MUTATION_OPS = { prime: 'cache.put', clear: 'cache.remove', clearAll: 'cache.remove' } as const;

Expand Down

7 changes: 1 addition & 6 deletions
dev-packages/node-integration-tests/suites/tracing/hapi/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('hapi auto-instrumentation', () => {
 afterAll(async () => {
 cleanupChildProcesses();
 });

 // `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The
 // orchestrion path keeps span ops/attributes identical to the OTel path; only
 // the origin differs to signal the injection mechanism, so we branch on
 // `isOrchestrionEnabled()`.
 const origin = isOrchestrionEnabled() ? 'auto.http.hapi' : 'auto.http.otel.hapi';
 const origin = 'auto.http.hapi';

 const EXPECTED_TRANSACTION = {
 transaction: 'GET /',
Expand Down

5 changes: 2 additions & 3 deletions
dev-packages/node-integration-tests/suites/tracing/kafkajs/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests, describeWithDockerCompose } from '../../../utils/runner';

const producerOrigin = isOrchestrionEnabled() ? 'auto.kafkajs.producer' : 'auto.kafkajs.otel.producer';
const consumerOrigin = isOrchestrionEnabled() ? 'auto.kafkajs.consumer' : 'auto.kafkajs.otel.consumer';
const producerOrigin = 'auto.kafkajs.producer';
const consumerOrigin = 'auto.kafkajs.consumer';

describeWithDockerCompose('kafkajs', { workingDirectory: [__dirname] }, () => {
 afterAll(() => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/knex/mysql2/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../../utils';
import { createEsmAndCjsTests, describeWithDockerCompose } from '../../../../utils/runner';

describeWithDockerCompose('knex auto instrumentation', { workingDirectory: [__dirname] }, () => {
 // Update this if another knex version is installed
 const KNEX_VERSION = '2.5.1';
 const ORIGIN = isOrchestrionEnabled() ? 'auto.db.knex' : 'auto.db.otel.knex';
 const ORIGIN = 'auto.db.knex';

 describe('with `mysql2` client', () => {
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/knex/pg/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../../utils';
import { createEsmAndCjsTests, describeWithDockerCompose } from '../../../../utils/runner';

describe('knex auto instrumentation', () => {
 // Update this if another knex version is installed
 const KNEX_VERSION = '2.5.1';
 const ORIGIN = isOrchestrionEnabled() ? 'auto.db.knex' : 'auto.db.otel.knex';
 const ORIGIN = 'auto.db.knex';

 describeWithDockerCompose('with `pg` client', { workingDirectory: [__dirname] }, () => {
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
Expand Down

7 changes: 1 addition & 6 deletions
dev-packages/node-integration-tests/suites/tracing/koa/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('koa auto-instrumentation', () => {
 afterAll(async () => {
 cleanupChildProcesses();
 });

 // `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The
 // orchestrion path keeps span ops/attributes identical to the OTel path; only
 // the origin differs to signal the injection mechanism, so we branch on
 // `isOrchestrionEnabled()`.
 const origin = isOrchestrionEnabled() ? 'auto.http.koa' : 'auto.http.otel.koa';
 const origin = 'auto.http.koa';

 const EXPECTED_ERROR_EVENT = {
 exception: {
Expand Down

47 changes: 20 additions & 27 deletions
dev-packages/node-integration-tests/suites/tracing/lru-memoizer/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,34 @@
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
import { createCjsTests } from '../../../utils/runner/createEsmAndCjsTests';
import { isOrchestrionEnabled } from '../../../utils';

describe('lru-memoizer', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createTestRunner, test) => {
 test('keeps outer context inside the memoized inner functions', async () => {
 await createTestRunner()
 .expect({
 transaction: {
 transaction: 'test-name',
 contexts: {
 trace: expect.objectContaining({
 op: 'run',
 data: expect.objectContaining({
 'sentry.op': 'run',
 'sentry.origin': 'manual',
 'memoized.context_preserved': true,
 }),
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createTestRunner, test) => {
 test('keeps outer context inside the memoized inner functions', async () => {
 await createTestRunner()
 .expect({
 transaction: {
 transaction: 'test-name',
 contexts: {
 trace: expect.objectContaining({
 op: 'run',
 data: expect.objectContaining({
 'sentry.op': 'run',
 'sentry.origin': 'manual',
 'memoized.context_preserved': true,
 }),
 },
 }),
 },
 })
 .start()
 .completed();
 });
 },
 { failsOnEsm: !isOrchestrionEnabled() },
 );
 },
 })
 .start()
 .completed();
 });
 });

 // CJS-only: the parallel scenario is flaky in ESM (see #21729).
 createCjsTests(__dirname, 'scenario-parallel.mjs', 'instrument.mjs', (createTestRunner, test) => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v4/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 4 so the = 4.0 <6.4 callback-based command band and the
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v4 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 const spanFor = (operation: string): unknown =>
 expect.objectContaining({
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v5/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 5 so the >= 4.0 < 6.4 callback-based command band and the
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v5 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 const spanFor = (operation: string): unknown =>
 expect.objectContaining({
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v6/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 6 so the >= 6.4 promise-based `Connection.prototype.command`
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v6 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 // `db.statement` (scrubbed full command doc) and `db.connection_string` vary
 // by driver version, so assert their presence rather than exact content;
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v7/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 7 so the >= 6.4 promise-based `Connection.prototype.command`
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v7 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 // `db.statement` (scrubbed full command doc) and `db.connection_string` vary
 // by driver version, so assert their presence rather than exact content;
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,10 @@ import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { assertSentryTransaction } from '../../../utils/assertions';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('MongoDB auto-instrumentation', () => {
 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';
 let mongoServer: MongoMemoryServer;

 beforeAll(async () => {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(node-integration): Remove isOrchestrionEnabled helper#23435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicohrubec
merged 2 commits into

from

Aug 20, 2026
 Merged


test(node-integration): Remove isOrchestrionEnabled helper
#23435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
584b3b5

ref(node-integration-tests): Remove tautological isOrchestrionEnabled…


nicohrubec Aug 14, 2026
faf4ecb

Merge branch 'develop' into nh/ref-remove-is-orchestrion-enabled


nicohrubec Aug 20, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 0 additions & 11 deletions
dev-packages/node-integration-tests/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,17 +56,6 @@ export function getPortAppIsRunningOn(app: Express): number | undefined {
 return app.port;
}

/**
 * Whether channel-based (orchestrion diagnostics-channel) instrumentation is active.
 *
 * Channel-based instrumentation is the default in v11, so this is always `true`. Kept as a helper
 * (rather than inlining `true`) so the suites' origin/shape selectors read intentionally; the OTel
 * branches they still contain are dead and get removed alongside the vendored OTel code (JS-3074).
 */
export function isOrchestrionEnabled(): boolean {
 return true;
}

/**
 * Retries `probe` until it resolves, or throws once `timeout` ms elapse.
 *
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration-streamed/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import type { SerializedStreamedSpanContainer } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// See the non-streamed `aws-integration` suite: only the origin differs between the OTel and
// orchestrion diagnostics-channel runs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.aws_sdk' : 'auto.otel.aws';
const ORIGIN = 'auto.aws.aws_sdk';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.aws_sdk' : 'auto.otel.aws';
const ORIGIN = 'auto.aws.aws_sdk';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
Expand Down

13 changes: 3 additions & 10 deletions
dev-packages/node-integration-tests/suites/express/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { afterAll, describe, expect } from 'vitest';
import { assertSentryTransaction } from '../../../utils/assertions';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
import { isOrchestrionEnabled } from '../../../utils';

describe('express tracing', () => {
 afterAll(() => {
Expand DownExpand Up@@ -98,15 +97,9 @@ describe('express tracing', () => {
 // The handler delays its response by ~100ms (see scenario).
 const routerDurationMs = ((routerSpan?.timestamp ?? 0) - (routerSpan?.start_timestamp ?? 0)) * 1000;

 if (isOrchestrionEnabled()) {
 // The orchestrion router span stays open until the response finishes, so
 // it spans the whole sub-stack it dispatched (~the 100ms handler delay).
 expect(routerDurationMs).toBeGreaterThan(50);
 } else {
 // The OTel integration ends router spans immediately, so the router span
 // is a ~0ms marker regardless of how long its sub-stack runs.
 expect(routerDurationMs).toBeLessThan(50);
 }
 // The router span stays open until the response finishes, so it spans the
 // whole sub-stack it dispatched (~the 100ms handler delay).
 expect(routerDurationMs).toBeGreaterThan(50);
 },
 })
 .start();
Expand Down

30 changes: 0 additions & 30 deletions
dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,25 +19,13 @@ import {
 GEN_AI_USAGE_TOTAL_TOKENS,
} from '@sentry/conventions/attributes';
import { GEN_AI_REQUEST_STREAM_ATTRIBUTE } from '../../../../../packages/server-utils/src/ai/core/gen-ai-attributes';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('Anthropic integration', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 const EXPECTED_MODEL_ERROR = {
 exception: {
 values: [
 {
 type: 'Error',
 value: '404 Model not found',
 },
 ],
 },
 };

 const EXPECTED_STREAM_EVENT_HANDLER_MESSAGE = {
 message: 'stream event from user-added event listener captured',
 };
Expand DownExpand Up@@ -83,12 +71,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with genAI recording disabled', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand DownExpand Up@@ -124,12 +106,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with genAI recording enabled', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand DownExpand Up@@ -194,12 +170,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with custom options', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand Down

9 changes: 2 additions & 7 deletions
dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Server start transaction (Apollo Server v5 no longer runs introspection query on start)
const EXPECTED_START_SERVER_TRANSACTION = {
 transaction: 'Test Server Start',
};

// apollo uses graphql v16, so the default run instruments it via the vendored OTel patcher and the
// orchestrion run (auto-injected on CI) via the diagnostics-channel path. Both emit the same span
// name/status; the origin and the document attribute (`graphql.source` vs `graphql.document`) differ.
const orchestrion = isOrchestrionEnabled();
const ORIGIN = orchestrion ? 'auto.graphql.diagnostic_channel' : 'auto.graphql.otel.graphql';
const ORIGIN = 'auto.graphql.diagnostic_channel';

function graphqlExecuteSpan(opts: {
 description: string;
Expand All@@ -28,7 +23,7 @@ function graphqlExecuteSpan(opts: {
 data: expect.objectContaining({
 'graphql.operation.type': operationType,
 ...(operationName ? { 'graphql.operation.name': operationName } : {}),
[orchestrion ? 'graphql.document' : 'graphql.source']: document,
 'graphql.document': document,
 'sentry.origin': ORIGIN,
 }),
 });
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/dataloader/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The span origin depends on which instrumentation is active. When the generic orchestrion run is
// enabled (via INJECT_ORCHESTRION) the OTel `Dataloader` integration is swapped for the
// diagnostics-channel one, which stamps a different origin.
const ORIGIN = isOrchestrionEnabled() ? 'auto.db.dataloader' : 'auto.db.otel.dataloader';
const ORIGIN = 'auto.db.dataloader';
const CACHE_GET_OP = 'cache.get';
const CACHE_MUTATION_OPS = { prime: 'cache.put', clear: 'cache.remove', clearAll: 'cache.remove' } as const;

Expand Down

7 changes: 1 addition & 6 deletions
dev-packages/node-integration-tests/suites/tracing/hapi/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('hapi auto-instrumentation', () => {
 afterAll(async () => {
 cleanupChildProcesses();
 });

 // `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The
 // orchestrion path keeps span ops/attributes identical to the OTel path; only
 // the origin differs to signal the injection mechanism, so we branch on
 // `isOrchestrionEnabled()`.
 const origin = isOrchestrionEnabled() ? 'auto.http.hapi' : 'auto.http.otel.hapi';
 const origin = 'auto.http.hapi';

 const EXPECTED_TRANSACTION = {
 transaction: 'GET /',
Expand Down

5 changes: 2 additions & 3 deletions
dev-packages/node-integration-tests/suites/tracing/kafkajs/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests, describeWithDockerCompose } from '../../../utils/runner';

const producerOrigin = isOrchestrionEnabled() ? 'auto.kafkajs.producer' : 'auto.kafkajs.otel.producer';
const consumerOrigin = isOrchestrionEnabled() ? 'auto.kafkajs.consumer' : 'auto.kafkajs.otel.consumer';
const producerOrigin = 'auto.kafkajs.producer';
const consumerOrigin = 'auto.kafkajs.consumer';

describeWithDockerCompose('kafkajs', { workingDirectory: [__dirname] }, () => {
 afterAll(() => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/knex/mysql2/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../../utils';
import { createEsmAndCjsTests, describeWithDockerCompose } from '../../../../utils/runner';

describeWithDockerCompose('knex auto instrumentation', { workingDirectory: [__dirname] }, () => {
 // Update this if another knex version is installed
 const KNEX_VERSION = '2.5.1';
 const ORIGIN = isOrchestrionEnabled() ? 'auto.db.knex' : 'auto.db.otel.knex';
 const ORIGIN = 'auto.db.knex';

 describe('with `mysql2` client', () => {
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/knex/pg/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../../utils';
import { createEsmAndCjsTests, describeWithDockerCompose } from '../../../../utils/runner';

describe('knex auto instrumentation', () => {
 // Update this if another knex version is installed
 const KNEX_VERSION = '2.5.1';
 const ORIGIN = isOrchestrionEnabled() ? 'auto.db.knex' : 'auto.db.otel.knex';
 const ORIGIN = 'auto.db.knex';

 describeWithDockerCompose('with `pg` client', { workingDirectory: [__dirname] }, () => {
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
Expand Down

7 changes: 1 addition & 6 deletions
dev-packages/node-integration-tests/suites/tracing/koa/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('koa auto-instrumentation', () => {
 afterAll(async () => {
 cleanupChildProcesses();
 });

 // `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The
 // orchestrion path keeps span ops/attributes identical to the OTel path; only
 // the origin differs to signal the injection mechanism, so we branch on
 // `isOrchestrionEnabled()`.
 const origin = isOrchestrionEnabled() ? 'auto.http.koa' : 'auto.http.otel.koa';
 const origin = 'auto.http.koa';

 const EXPECTED_ERROR_EVENT = {
 exception: {
Expand Down

47 changes: 20 additions & 27 deletions
dev-packages/node-integration-tests/suites/tracing/lru-memoizer/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,34 @@
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
import { createCjsTests } from '../../../utils/runner/createEsmAndCjsTests';
import { isOrchestrionEnabled } from '../../../utils';

describe('lru-memoizer', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createTestRunner, test) => {
 test('keeps outer context inside the memoized inner functions', async () => {
 await createTestRunner()
 .expect({
 transaction: {
 transaction: 'test-name',
 contexts: {
 trace: expect.objectContaining({
 op: 'run',
 data: expect.objectContaining({
 'sentry.op': 'run',
 'sentry.origin': 'manual',
 'memoized.context_preserved': true,
 }),
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createTestRunner, test) => {
 test('keeps outer context inside the memoized inner functions', async () => {
 await createTestRunner()
 .expect({
 transaction: {
 transaction: 'test-name',
 contexts: {
 trace: expect.objectContaining({
 op: 'run',
 data: expect.objectContaining({
 'sentry.op': 'run',
 'sentry.origin': 'manual',
 'memoized.context_preserved': true,
 }),
 },
 }),
 },
 })
 .start()
 .completed();
 });
 },
 { failsOnEsm: !isOrchestrionEnabled() },
 );
 },
 })
 .start()
 .completed();
 });
 });

 // CJS-only: the parallel scenario is flaky in ESM (see #21729).
 createCjsTests(__dirname, 'scenario-parallel.mjs', 'instrument.mjs', (createTestRunner, test) => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v4/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 4 so the = 4.0 <6.4 callback-based command band and the
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v4 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 const spanFor = (operation: string): unknown =>
 expect.objectContaining({
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v5/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 5 so the >= 4.0 < 6.4 callback-based command band and the
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v5 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 const spanFor = (operation: string): unknown =>
 expect.objectContaining({
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v6/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 6 so the >= 6.4 promise-based `Connection.prototype.command`
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v6 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 // `db.statement` (scrubbed full command doc) and `db.connection_string` vary
 // by driver version, so assert their presence rather than exact content;
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v7/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 7 so the >= 6.4 promise-based `Connection.prototype.command`
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v7 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 // `db.statement` (scrubbed full command doc) and `db.connection_string` vary
 // by driver version, so assert their presence rather than exact content;
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,10 @@ import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { assertSentryTransaction } from '../../../utils/assertions';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('MongoDB auto-instrumentation', () => {
 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';
 let mongoServer: MongoMemoryServer;

 beforeAll(async () => {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
test(node-integration): Remove isOrchestrionEnabled helper#23435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicohrubec
merged 2 commits into

from

Aug 20, 2026
 Merged


test(node-integration): Remove isOrchestrionEnabled helper
#23435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
584b3b5

ref(node-integration-tests): Remove tautological isOrchestrionEnabled…


nicohrubec Aug 14, 2026
faf4ecb

Merge branch 'develop' into nh/ref-remove-is-orchestrion-enabled


nicohrubec Aug 20, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 0 additions & 11 deletions
dev-packages/node-integration-tests/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,17 +56,6 @@ export function getPortAppIsRunningOn(app: Express): number | undefined {
 return app.port;
}

/**
 * Whether channel-based (orchestrion diagnostics-channel) instrumentation is active.
 *
 * Channel-based instrumentation is the default in v11, so this is always `true`. Kept as a helper
 * (rather than inlining `true`) so the suites' origin/shape selectors read intentionally; the OTel
 * branches they still contain are dead and get removed alongside the vendored OTel code (JS-3074).
 */
export function isOrchestrionEnabled(): boolean {
 return true;
}

/**
 * Retries `probe` until it resolves, or throws once `timeout` ms elapse.
 *
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration-streamed/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import type { SerializedStreamedSpanContainer } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// See the non-streamed `aws-integration` suite: only the origin differs between the OTel and
// orchestrion diagnostics-channel runs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.aws_sdk' : 'auto.otel.aws';
const ORIGIN = 'auto.aws.aws_sdk';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.aws_sdk' : 'auto.otel.aws';
const ORIGIN = 'auto.aws.aws_sdk';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
Expand Down

13 changes: 3 additions & 10 deletions
dev-packages/node-integration-tests/suites/express/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { afterAll, describe, expect } from 'vitest';
import { assertSentryTransaction } from '../../../utils/assertions';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
import { isOrchestrionEnabled } from '../../../utils';

describe('express tracing', () => {
 afterAll(() => {
Expand DownExpand Up@@ -98,15 +97,9 @@ describe('express tracing', () => {
 // The handler delays its response by ~100ms (see scenario).
 const routerDurationMs = ((routerSpan?.timestamp ?? 0) - (routerSpan?.start_timestamp ?? 0)) * 1000;

 if (isOrchestrionEnabled()) {
 // The orchestrion router span stays open until the response finishes, so
 // it spans the whole sub-stack it dispatched (~the 100ms handler delay).
 expect(routerDurationMs).toBeGreaterThan(50);
 } else {
 // The OTel integration ends router spans immediately, so the router span
 // is a ~0ms marker regardless of how long its sub-stack runs.
 expect(routerDurationMs).toBeLessThan(50);
 }
 // The router span stays open until the response finishes, so it spans the
 // whole sub-stack it dispatched (~the 100ms handler delay).
 expect(routerDurationMs).toBeGreaterThan(50);
 },
 })
 .start();
Expand Down

30 changes: 0 additions & 30 deletions
dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,25 +19,13 @@ import {
 GEN_AI_USAGE_TOTAL_TOKENS,
} from '@sentry/conventions/attributes';
import { GEN_AI_REQUEST_STREAM_ATTRIBUTE } from '../../../../../packages/server-utils/src/ai/core/gen-ai-attributes';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('Anthropic integration', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 const EXPECTED_MODEL_ERROR = {
 exception: {
 values: [
 {
 type: 'Error',
 value: '404 Model not found',
 },
 ],
 },
 };

 const EXPECTED_STREAM_EVENT_HANDLER_MESSAGE = {
 message: 'stream event from user-added event listener captured',
 };
Expand DownExpand Up@@ -83,12 +71,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with genAI recording disabled', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand DownExpand Up@@ -124,12 +106,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with genAI recording enabled', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand DownExpand Up@@ -194,12 +170,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with custom options', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand Down

9 changes: 2 additions & 7 deletions
dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Server start transaction (Apollo Server v5 no longer runs introspection query on start)
const EXPECTED_START_SERVER_TRANSACTION = {
 transaction: 'Test Server Start',
};

// apollo uses graphql v16, so the default run instruments it via the vendored OTel patcher and the
// orchestrion run (auto-injected on CI) via the diagnostics-channel path. Both emit the same span
// name/status; the origin and the document attribute (`graphql.source` vs `graphql.document`) differ.
const orchestrion = isOrchestrionEnabled();
const ORIGIN = orchestrion ? 'auto.graphql.diagnostic_channel' : 'auto.graphql.otel.graphql';
const ORIGIN = 'auto.graphql.diagnostic_channel';

function graphqlExecuteSpan(opts: {
 description: string;
Expand All@@ -28,7 +23,7 @@ function graphqlExecuteSpan(opts: {
 data: expect.objectContaining({
 'graphql.operation.type': operationType,
 ...(operationName ? { 'graphql.operation.name': operationName } : {}),
[orchestrion ? 'graphql.document' : 'graphql.source']: document,
 'graphql.document': document,
 'sentry.origin': ORIGIN,
 }),
 });
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/dataloader/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The span origin depends on which instrumentation is active. When the generic orchestrion run is
// enabled (via INJECT_ORCHESTRION) the OTel `Dataloader` integration is swapped for the
// diagnostics-channel one, which stamps a different origin.
const ORIGIN = isOrchestrionEnabled() ? 'auto.db.dataloader' : 'auto.db.otel.dataloader';
const ORIGIN = 'auto.db.dataloader';
const CACHE_GET_OP = 'cache.get';
const CACHE_MUTATION_OPS = { prime: 'cache.put', clear: 'cache.remove', clearAll: 'cache.remove' } as const;

Expand Down

7 changes: 1 addition & 6 deletions
dev-packages/node-integration-tests/suites/tracing/hapi/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('hapi auto-instrumentation', () => {
 afterAll(async () => {
 cleanupChildProcesses();
 });

 // `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The
 // orchestrion path keeps span ops/attributes identical to the OTel path; only
 // the origin differs to signal the injection mechanism, so we branch on
 // `isOrchestrionEnabled()`.
 const origin = isOrchestrionEnabled() ? 'auto.http.hapi' : 'auto.http.otel.hapi';
 const origin = 'auto.http.hapi';

 const EXPECTED_TRANSACTION = {
 transaction: 'GET /',
Expand Down

5 changes: 2 additions & 3 deletions
dev-packages/node-integration-tests/suites/tracing/kafkajs/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests, describeWithDockerCompose } from '../../../utils/runner';

const producerOrigin = isOrchestrionEnabled() ? 'auto.kafkajs.producer' : 'auto.kafkajs.otel.producer';
const consumerOrigin = isOrchestrionEnabled() ? 'auto.kafkajs.consumer' : 'auto.kafkajs.otel.consumer';
const producerOrigin = 'auto.kafkajs.producer';
const consumerOrigin = 'auto.kafkajs.consumer';

describeWithDockerCompose('kafkajs', { workingDirectory: [__dirname] }, () => {
 afterAll(() => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/knex/mysql2/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../../utils';
import { createEsmAndCjsTests, describeWithDockerCompose } from '../../../../utils/runner';

describeWithDockerCompose('knex auto instrumentation', { workingDirectory: [__dirname] }, () => {
 // Update this if another knex version is installed
 const KNEX_VERSION = '2.5.1';
 const ORIGIN = isOrchestrionEnabled() ? 'auto.db.knex' : 'auto.db.otel.knex';
 const ORIGIN = 'auto.db.knex';

 describe('with `mysql2` client', () => {
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/knex/pg/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../../utils';
import { createEsmAndCjsTests, describeWithDockerCompose } from '../../../../utils/runner';

describe('knex auto instrumentation', () => {
 // Update this if another knex version is installed
 const KNEX_VERSION = '2.5.1';
 const ORIGIN = isOrchestrionEnabled() ? 'auto.db.knex' : 'auto.db.otel.knex';
 const ORIGIN = 'auto.db.knex';

 describeWithDockerCompose('with `pg` client', { workingDirectory: [__dirname] }, () => {
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
Expand Down

7 changes: 1 addition & 6 deletions
dev-packages/node-integration-tests/suites/tracing/koa/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('koa auto-instrumentation', () => {
 afterAll(async () => {
 cleanupChildProcesses();
 });

 // `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The
 // orchestrion path keeps span ops/attributes identical to the OTel path; only
 // the origin differs to signal the injection mechanism, so we branch on
 // `isOrchestrionEnabled()`.
 const origin = isOrchestrionEnabled() ? 'auto.http.koa' : 'auto.http.otel.koa';
 const origin = 'auto.http.koa';

 const EXPECTED_ERROR_EVENT = {
 exception: {
Expand Down

47 changes: 20 additions & 27 deletions
dev-packages/node-integration-tests/suites/tracing/lru-memoizer/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,34 @@
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
import { createCjsTests } from '../../../utils/runner/createEsmAndCjsTests';
import { isOrchestrionEnabled } from '../../../utils';

describe('lru-memoizer', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createTestRunner, test) => {
 test('keeps outer context inside the memoized inner functions', async () => {
 await createTestRunner()
 .expect({
 transaction: {
 transaction: 'test-name',
 contexts: {
 trace: expect.objectContaining({
 op: 'run',
 data: expect.objectContaining({
 'sentry.op': 'run',
 'sentry.origin': 'manual',
 'memoized.context_preserved': true,
 }),
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createTestRunner, test) => {
 test('keeps outer context inside the memoized inner functions', async () => {
 await createTestRunner()
 .expect({
 transaction: {
 transaction: 'test-name',
 contexts: {
 trace: expect.objectContaining({
 op: 'run',
 data: expect.objectContaining({
 'sentry.op': 'run',
 'sentry.origin': 'manual',
 'memoized.context_preserved': true,
 }),
 },
 }),
 },
 })
 .start()
 .completed();
 });
 },
 { failsOnEsm: !isOrchestrionEnabled() },
 );
 },
 })
 .start()
 .completed();
 });
 });

 // CJS-only: the parallel scenario is flaky in ESM (see #21729).
 createCjsTests(__dirname, 'scenario-parallel.mjs', 'instrument.mjs', (createTestRunner, test) => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v4/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 4 so the = 4.0 <6.4 callback-based command band and the
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v4 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 const spanFor = (operation: string): unknown =>
 expect.objectContaining({
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v5/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 5 so the >= 4.0 < 6.4 callback-based command band and the
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v5 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 const spanFor = (operation: string): unknown =>
 expect.objectContaining({
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v6/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 6 so the >= 6.4 promise-based `Connection.prototype.command`
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v6 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 // `db.statement` (scrubbed full command doc) and `db.connection_string` vary
 // by driver version, so assert their presence rather than exact content;
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v7/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 7 so the >= 6.4 promise-based `Connection.prototype.command`
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v7 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 // `db.statement` (scrubbed full command doc) and `db.connection_string` vary
 // by driver version, so assert their presence rather than exact content;
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,10 @@ import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { assertSentryTransaction } from '../../../utils/assertions';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('MongoDB auto-instrumentation', () => {
 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';
 let mongoServer: MongoMemoryServer;

 beforeAll(async () => {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(node-integration): Remove isOrchestrionEnabled helper#23435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicohrubec
merged 2 commits into

from

Aug 20, 2026
 Merged


test(node-integration): Remove isOrchestrionEnabled helper
#23435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
584b3b5

ref(node-integration-tests): Remove tautological isOrchestrionEnabled…


nicohrubec Aug 14, 2026
faf4ecb

Merge branch 'develop' into nh/ref-remove-is-orchestrion-enabled


nicohrubec Aug 20, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 0 additions & 11 deletions
dev-packages/node-integration-tests/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,17 +56,6 @@ export function getPortAppIsRunningOn(app: Express): number | undefined {
 return app.port;
}

/**
 * Whether channel-based (orchestrion diagnostics-channel) instrumentation is active.
 *
 * Channel-based instrumentation is the default in v11, so this is always `true`. Kept as a helper
 * (rather than inlining `true`) so the suites' origin/shape selectors read intentionally; the OTel
 * branches they still contain are dead and get removed alongside the vendored OTel code (JS-3074).
 */
export function isOrchestrionEnabled(): boolean {
 return true;
}

/**
 * Retries `probe` until it resolves, or throws once `timeout` ms elapse.
 *
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration-streamed/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import type { SerializedStreamedSpanContainer } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// See the non-streamed `aws-integration` suite: only the origin differs between the OTel and
// orchestrion diagnostics-channel runs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.aws_sdk' : 'auto.otel.aws';
const ORIGIN = 'auto.aws.aws_sdk';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.aws_sdk' : 'auto.otel.aws';
const ORIGIN = 'auto.aws.aws_sdk';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
Expand Down

13 changes: 3 additions & 10 deletions
dev-packages/node-integration-tests/suites/express/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { afterAll, describe, expect } from 'vitest';
import { assertSentryTransaction } from '../../../utils/assertions';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
import { isOrchestrionEnabled } from '../../../utils';

describe('express tracing', () => {
 afterAll(() => {
Expand DownExpand Up@@ -98,15 +97,9 @@ describe('express tracing', () => {
 // The handler delays its response by ~100ms (see scenario).
 const routerDurationMs = ((routerSpan?.timestamp ?? 0) - (routerSpan?.start_timestamp ?? 0)) * 1000;

 if (isOrchestrionEnabled()) {
 // The orchestrion router span stays open until the response finishes, so
 // it spans the whole sub-stack it dispatched (~the 100ms handler delay).
 expect(routerDurationMs).toBeGreaterThan(50);
 } else {
 // The OTel integration ends router spans immediately, so the router span
 // is a ~0ms marker regardless of how long its sub-stack runs.
 expect(routerDurationMs).toBeLessThan(50);
 }
 // The router span stays open until the response finishes, so it spans the
 // whole sub-stack it dispatched (~the 100ms handler delay).
 expect(routerDurationMs).toBeGreaterThan(50);
 },
 })
 .start();
Expand Down

30 changes: 0 additions & 30 deletions
dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,25 +19,13 @@ import {
 GEN_AI_USAGE_TOTAL_TOKENS,
} from '@sentry/conventions/attributes';
import { GEN_AI_REQUEST_STREAM_ATTRIBUTE } from '../../../../../packages/server-utils/src/ai/core/gen-ai-attributes';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('Anthropic integration', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 const EXPECTED_MODEL_ERROR = {
 exception: {
 values: [
 {
 type: 'Error',
 value: '404 Model not found',
 },
 ],
 },
 };

 const EXPECTED_STREAM_EVENT_HANDLER_MESSAGE = {
 message: 'stream event from user-added event listener captured',
 };
Expand DownExpand Up@@ -83,12 +71,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with genAI recording disabled', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand DownExpand Up@@ -124,12 +106,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with genAI recording enabled', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand DownExpand Up@@ -194,12 +170,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with custom options', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand Down

9 changes: 2 additions & 7 deletions
dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Server start transaction (Apollo Server v5 no longer runs introspection query on start)
const EXPECTED_START_SERVER_TRANSACTION = {
 transaction: 'Test Server Start',
};

// apollo uses graphql v16, so the default run instruments it via the vendored OTel patcher and the
// orchestrion run (auto-injected on CI) via the diagnostics-channel path. Both emit the same span
// name/status; the origin and the document attribute (`graphql.source` vs `graphql.document`) differ.
const orchestrion = isOrchestrionEnabled();
const ORIGIN = orchestrion ? 'auto.graphql.diagnostic_channel' : 'auto.graphql.otel.graphql';
const ORIGIN = 'auto.graphql.diagnostic_channel';

function graphqlExecuteSpan(opts: {
 description: string;
Expand All@@ -28,7 +23,7 @@ function graphqlExecuteSpan(opts: {
 data: expect.objectContaining({
 'graphql.operation.type': operationType,
 ...(operationName ? { 'graphql.operation.name': operationName } : {}),
[orchestrion ? 'graphql.document' : 'graphql.source']: document,
 'graphql.document': document,
 'sentry.origin': ORIGIN,
 }),
 });
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/dataloader/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The span origin depends on which instrumentation is active. When the generic orchestrion run is
// enabled (via INJECT_ORCHESTRION) the OTel `Dataloader` integration is swapped for the
// diagnostics-channel one, which stamps a different origin.
const ORIGIN = isOrchestrionEnabled() ? 'auto.db.dataloader' : 'auto.db.otel.dataloader';
const ORIGIN = 'auto.db.dataloader';
const CACHE_GET_OP = 'cache.get';
const CACHE_MUTATION_OPS = { prime: 'cache.put', clear: 'cache.remove', clearAll: 'cache.remove' } as const;

Expand Down

7 changes: 1 addition & 6 deletions
dev-packages/node-integration-tests/suites/tracing/hapi/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('hapi auto-instrumentation', () => {
 afterAll(async () => {
 cleanupChildProcesses();
 });

 // `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The
 // orchestrion path keeps span ops/attributes identical to the OTel path; only
 // the origin differs to signal the injection mechanism, so we branch on
 // `isOrchestrionEnabled()`.
 const origin = isOrchestrionEnabled() ? 'auto.http.hapi' : 'auto.http.otel.hapi';
 const origin = 'auto.http.hapi';

 const EXPECTED_TRANSACTION = {
 transaction: 'GET /',
Expand Down

5 changes: 2 additions & 3 deletions
dev-packages/node-integration-tests/suites/tracing/kafkajs/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests, describeWithDockerCompose } from '../../../utils/runner';

const producerOrigin = isOrchestrionEnabled() ? 'auto.kafkajs.producer' : 'auto.kafkajs.otel.producer';
const consumerOrigin = isOrchestrionEnabled() ? 'auto.kafkajs.consumer' : 'auto.kafkajs.otel.consumer';
const producerOrigin = 'auto.kafkajs.producer';
const consumerOrigin = 'auto.kafkajs.consumer';

describeWithDockerCompose('kafkajs', { workingDirectory: [__dirname] }, () => {
 afterAll(() => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/knex/mysql2/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../../utils';
import { createEsmAndCjsTests, describeWithDockerCompose } from '../../../../utils/runner';

describeWithDockerCompose('knex auto instrumentation', { workingDirectory: [__dirname] }, () => {
 // Update this if another knex version is installed
 const KNEX_VERSION = '2.5.1';
 const ORIGIN = isOrchestrionEnabled() ? 'auto.db.knex' : 'auto.db.otel.knex';
 const ORIGIN = 'auto.db.knex';

 describe('with `mysql2` client', () => {
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/knex/pg/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../../utils';
import { createEsmAndCjsTests, describeWithDockerCompose } from '../../../../utils/runner';

describe('knex auto instrumentation', () => {
 // Update this if another knex version is installed
 const KNEX_VERSION = '2.5.1';
 const ORIGIN = isOrchestrionEnabled() ? 'auto.db.knex' : 'auto.db.otel.knex';
 const ORIGIN = 'auto.db.knex';

 describeWithDockerCompose('with `pg` client', { workingDirectory: [__dirname] }, () => {
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
Expand Down

7 changes: 1 addition & 6 deletions
dev-packages/node-integration-tests/suites/tracing/koa/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('koa auto-instrumentation', () => {
 afterAll(async () => {
 cleanupChildProcesses();
 });

 // `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The
 // orchestrion path keeps span ops/attributes identical to the OTel path; only
 // the origin differs to signal the injection mechanism, so we branch on
 // `isOrchestrionEnabled()`.
 const origin = isOrchestrionEnabled() ? 'auto.http.koa' : 'auto.http.otel.koa';
 const origin = 'auto.http.koa';

 const EXPECTED_ERROR_EVENT = {
 exception: {
Expand Down

47 changes: 20 additions & 27 deletions
dev-packages/node-integration-tests/suites/tracing/lru-memoizer/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,34 @@
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
import { createCjsTests } from '../../../utils/runner/createEsmAndCjsTests';
import { isOrchestrionEnabled } from '../../../utils';

describe('lru-memoizer', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createTestRunner, test) => {
 test('keeps outer context inside the memoized inner functions', async () => {
 await createTestRunner()
 .expect({
 transaction: {
 transaction: 'test-name',
 contexts: {
 trace: expect.objectContaining({
 op: 'run',
 data: expect.objectContaining({
 'sentry.op': 'run',
 'sentry.origin': 'manual',
 'memoized.context_preserved': true,
 }),
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createTestRunner, test) => {
 test('keeps outer context inside the memoized inner functions', async () => {
 await createTestRunner()
 .expect({
 transaction: {
 transaction: 'test-name',
 contexts: {
 trace: expect.objectContaining({
 op: 'run',
 data: expect.objectContaining({
 'sentry.op': 'run',
 'sentry.origin': 'manual',
 'memoized.context_preserved': true,
 }),
 },
 }),
 },
 })
 .start()
 .completed();
 });
 },
 { failsOnEsm: !isOrchestrionEnabled() },
 );
 },
 })
 .start()
 .completed();
 });
 });

 // CJS-only: the parallel scenario is flaky in ESM (see #21729).
 createCjsTests(__dirname, 'scenario-parallel.mjs', 'instrument.mjs', (createTestRunner, test) => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v4/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 4 so the = 4.0 <6.4 callback-based command band and the
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v4 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 const spanFor = (operation: string): unknown =>
 expect.objectContaining({
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v5/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 5 so the >= 4.0 < 6.4 callback-based command band and the
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v5 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 const spanFor = (operation: string): unknown =>
 expect.objectContaining({
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v6/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 6 so the >= 6.4 promise-based `Connection.prototype.command`
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v6 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 // `db.statement` (scrubbed full command doc) and `db.connection_string` vary
 // by driver version, so assert their presence rather than exact content;
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v7/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 7 so the >= 6.4 promise-based `Connection.prototype.command`
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v7 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 // `db.statement` (scrubbed full command doc) and `db.connection_string` vary
 // by driver version, so assert their presence rather than exact content;
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,10 @@ import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { assertSentryTransaction } from '../../../utils/assertions';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('MongoDB auto-instrumentation', () => {
 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';
 let mongoServer: MongoMemoryServer;

 beforeAll(async () => {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(node-integration): Remove isOrchestrionEnabled helper#23435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicohrubec
merged 2 commits into

from

Aug 20, 2026
 Merged


test(node-integration): Remove isOrchestrionEnabled helper
#23435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
584b3b5

ref(node-integration-tests): Remove tautological isOrchestrionEnabled…


nicohrubec Aug 14, 2026
faf4ecb

Merge branch 'develop' into nh/ref-remove-is-orchestrion-enabled


nicohrubec Aug 20, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 0 additions & 11 deletions
dev-packages/node-integration-tests/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,17 +56,6 @@ export function getPortAppIsRunningOn(app: Express): number | undefined {
 return app.port;
}

/**
 * Whether channel-based (orchestrion diagnostics-channel) instrumentation is active.
 *
 * Channel-based instrumentation is the default in v11, so this is always `true`. Kept as a helper
 * (rather than inlining `true`) so the suites' origin/shape selectors read intentionally; the OTel
 * branches they still contain are dead and get removed alongside the vendored OTel code (JS-3074).
 */
export function isOrchestrionEnabled(): boolean {
 return true;
}

/**
 * Retries `probe` until it resolves, or throws once `timeout` ms elapse.
 *
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration-streamed/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import type { SerializedStreamedSpanContainer } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// See the non-streamed `aws-integration` suite: only the origin differs between the OTel and
// orchestrion diagnostics-channel runs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.aws_sdk' : 'auto.otel.aws';
const ORIGIN = 'auto.aws.aws_sdk';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.aws_sdk' : 'auto.otel.aws';
const ORIGIN = 'auto.aws.aws_sdk';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
Expand Down

13 changes: 3 additions & 10 deletions
dev-packages/node-integration-tests/suites/express/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { afterAll, describe, expect } from 'vitest';
import { assertSentryTransaction } from '../../../utils/assertions';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
import { isOrchestrionEnabled } from '../../../utils';

describe('express tracing', () => {
 afterAll(() => {
Expand DownExpand Up@@ -98,15 +97,9 @@ describe('express tracing', () => {
 // The handler delays its response by ~100ms (see scenario).
 const routerDurationMs = ((routerSpan?.timestamp ?? 0) - (routerSpan?.start_timestamp ?? 0)) * 1000;

 if (isOrchestrionEnabled()) {
 // The orchestrion router span stays open until the response finishes, so
 // it spans the whole sub-stack it dispatched (~the 100ms handler delay).
 expect(routerDurationMs).toBeGreaterThan(50);
 } else {
 // The OTel integration ends router spans immediately, so the router span
 // is a ~0ms marker regardless of how long its sub-stack runs.
 expect(routerDurationMs).toBeLessThan(50);
 }
 // The router span stays open until the response finishes, so it spans the
 // whole sub-stack it dispatched (~the 100ms handler delay).
 expect(routerDurationMs).toBeGreaterThan(50);
 },
 })
 .start();
Expand Down

30 changes: 0 additions & 30 deletions
dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,25 +19,13 @@ import {
 GEN_AI_USAGE_TOTAL_TOKENS,
} from '@sentry/conventions/attributes';
import { GEN_AI_REQUEST_STREAM_ATTRIBUTE } from '../../../../../packages/server-utils/src/ai/core/gen-ai-attributes';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('Anthropic integration', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 const EXPECTED_MODEL_ERROR = {
 exception: {
 values: [
 {
 type: 'Error',
 value: '404 Model not found',
 },
 ],
 },
 };

 const EXPECTED_STREAM_EVENT_HANDLER_MESSAGE = {
 message: 'stream event from user-added event listener captured',
 };
Expand DownExpand Up@@ -83,12 +71,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with genAI recording disabled', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand DownExpand Up@@ -124,12 +106,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with genAI recording enabled', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand DownExpand Up@@ -194,12 +170,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with custom options', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand Down

9 changes: 2 additions & 7 deletions
dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Server start transaction (Apollo Server v5 no longer runs introspection query on start)
const EXPECTED_START_SERVER_TRANSACTION = {
 transaction: 'Test Server Start',
};

// apollo uses graphql v16, so the default run instruments it via the vendored OTel patcher and the
// orchestrion run (auto-injected on CI) via the diagnostics-channel path. Both emit the same span
// name/status; the origin and the document attribute (`graphql.source` vs `graphql.document`) differ.
const orchestrion = isOrchestrionEnabled();
const ORIGIN = orchestrion ? 'auto.graphql.diagnostic_channel' : 'auto.graphql.otel.graphql';
const ORIGIN = 'auto.graphql.diagnostic_channel';

function graphqlExecuteSpan(opts: {
 description: string;
Expand All@@ -28,7 +23,7 @@ function graphqlExecuteSpan(opts: {
 data: expect.objectContaining({
 'graphql.operation.type': operationType,
 ...(operationName ? { 'graphql.operation.name': operationName } : {}),
[orchestrion ? 'graphql.document' : 'graphql.source']: document,
 'graphql.document': document,
 'sentry.origin': ORIGIN,
 }),
 });
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/dataloader/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The span origin depends on which instrumentation is active. When the generic orchestrion run is
// enabled (via INJECT_ORCHESTRION) the OTel `Dataloader` integration is swapped for the
// diagnostics-channel one, which stamps a different origin.
const ORIGIN = isOrchestrionEnabled() ? 'auto.db.dataloader' : 'auto.db.otel.dataloader';
const ORIGIN = 'auto.db.dataloader';
const CACHE_GET_OP = 'cache.get';
const CACHE_MUTATION_OPS = { prime: 'cache.put', clear: 'cache.remove', clearAll: 'cache.remove' } as const;

Expand Down

7 changes: 1 addition & 6 deletions
dev-packages/node-integration-tests/suites/tracing/hapi/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('hapi auto-instrumentation', () => {
 afterAll(async () => {
 cleanupChildProcesses();
 });

 // `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The
 // orchestrion path keeps span ops/attributes identical to the OTel path; only
 // the origin differs to signal the injection mechanism, so we branch on
 // `isOrchestrionEnabled()`.
 const origin = isOrchestrionEnabled() ? 'auto.http.hapi' : 'auto.http.otel.hapi';
 const origin = 'auto.http.hapi';

 const EXPECTED_TRANSACTION = {
 transaction: 'GET /',
Expand Down

5 changes: 2 additions & 3 deletions
dev-packages/node-integration-tests/suites/tracing/kafkajs/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests, describeWithDockerCompose } from '../../../utils/runner';

const producerOrigin = isOrchestrionEnabled() ? 'auto.kafkajs.producer' : 'auto.kafkajs.otel.producer';
const consumerOrigin = isOrchestrionEnabled() ? 'auto.kafkajs.consumer' : 'auto.kafkajs.otel.consumer';
const producerOrigin = 'auto.kafkajs.producer';
const consumerOrigin = 'auto.kafkajs.consumer';

describeWithDockerCompose('kafkajs', { workingDirectory: [__dirname] }, () => {
 afterAll(() => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/knex/mysql2/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../../utils';
import { createEsmAndCjsTests, describeWithDockerCompose } from '../../../../utils/runner';

describeWithDockerCompose('knex auto instrumentation', { workingDirectory: [__dirname] }, () => {
 // Update this if another knex version is installed
 const KNEX_VERSION = '2.5.1';
 const ORIGIN = isOrchestrionEnabled() ? 'auto.db.knex' : 'auto.db.otel.knex';
 const ORIGIN = 'auto.db.knex';

 describe('with `mysql2` client', () => {
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/knex/pg/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../../utils';
import { createEsmAndCjsTests, describeWithDockerCompose } from '../../../../utils/runner';

describe('knex auto instrumentation', () => {
 // Update this if another knex version is installed
 const KNEX_VERSION = '2.5.1';
 const ORIGIN = isOrchestrionEnabled() ? 'auto.db.knex' : 'auto.db.otel.knex';
 const ORIGIN = 'auto.db.knex';

 describeWithDockerCompose('with `pg` client', { workingDirectory: [__dirname] }, () => {
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
Expand Down

7 changes: 1 addition & 6 deletions
dev-packages/node-integration-tests/suites/tracing/koa/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('koa auto-instrumentation', () => {
 afterAll(async () => {
 cleanupChildProcesses();
 });

 // `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The
 // orchestrion path keeps span ops/attributes identical to the OTel path; only
 // the origin differs to signal the injection mechanism, so we branch on
 // `isOrchestrionEnabled()`.
 const origin = isOrchestrionEnabled() ? 'auto.http.koa' : 'auto.http.otel.koa';
 const origin = 'auto.http.koa';

 const EXPECTED_ERROR_EVENT = {
 exception: {
Expand Down

47 changes: 20 additions & 27 deletions
dev-packages/node-integration-tests/suites/tracing/lru-memoizer/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,34 @@
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
import { createCjsTests } from '../../../utils/runner/createEsmAndCjsTests';
import { isOrchestrionEnabled } from '../../../utils';

describe('lru-memoizer', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createTestRunner, test) => {
 test('keeps outer context inside the memoized inner functions', async () => {
 await createTestRunner()
 .expect({
 transaction: {
 transaction: 'test-name',
 contexts: {
 trace: expect.objectContaining({
 op: 'run',
 data: expect.objectContaining({
 'sentry.op': 'run',
 'sentry.origin': 'manual',
 'memoized.context_preserved': true,
 }),
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createTestRunner, test) => {
 test('keeps outer context inside the memoized inner functions', async () => {
 await createTestRunner()
 .expect({
 transaction: {
 transaction: 'test-name',
 contexts: {
 trace: expect.objectContaining({
 op: 'run',
 data: expect.objectContaining({
 'sentry.op': 'run',
 'sentry.origin': 'manual',
 'memoized.context_preserved': true,
 }),
 },
 }),
 },
 })
 .start()
 .completed();
 });
 },
 { failsOnEsm: !isOrchestrionEnabled() },
 );
 },
 })
 .start()
 .completed();
 });
 });

 // CJS-only: the parallel scenario is flaky in ESM (see #21729).
 createCjsTests(__dirname, 'scenario-parallel.mjs', 'instrument.mjs', (createTestRunner, test) => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v4/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 4 so the = 4.0 <6.4 callback-based command band and the
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v4 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 const spanFor = (operation: string): unknown =>
 expect.objectContaining({
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v5/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 5 so the >= 4.0 < 6.4 callback-based command band and the
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v5 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 const spanFor = (operation: string): unknown =>
 expect.objectContaining({
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v6/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 6 so the >= 6.4 promise-based `Connection.prototype.command`
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v6 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 // `db.statement` (scrubbed full command doc) and `db.connection_string` vary
 // by driver version, so assert their presence rather than exact content;
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v7/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 7 so the >= 6.4 promise-based `Connection.prototype.command`
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v7 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 // `db.statement` (scrubbed full command doc) and `db.connection_string` vary
 // by driver version, so assert their presence rather than exact content;
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,10 @@ import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { assertSentryTransaction } from '../../../utils/assertions';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('MongoDB auto-instrumentation', () => {
 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';
 let mongoServer: MongoMemoryServer;

 beforeAll(async () => {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
test(node-integration): Remove isOrchestrionEnabled helper#23435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicohrubec
merged 2 commits into

from

Aug 20, 2026
 Merged


test(node-integration): Remove isOrchestrionEnabled helper
#23435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
584b3b5

ref(node-integration-tests): Remove tautological isOrchestrionEnabled…


nicohrubec Aug 14, 2026
faf4ecb

Merge branch 'develop' into nh/ref-remove-is-orchestrion-enabled


nicohrubec Aug 20, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 0 additions & 11 deletions
dev-packages/node-integration-tests/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,17 +56,6 @@ export function getPortAppIsRunningOn(app: Express): number | undefined {
 return app.port;
}

/**
 * Whether channel-based (orchestrion diagnostics-channel) instrumentation is active.
 *
 * Channel-based instrumentation is the default in v11, so this is always `true`. Kept as a helper
 * (rather than inlining `true`) so the suites' origin/shape selectors read intentionally; the OTel
 * branches they still contain are dead and get removed alongside the vendored OTel code (JS-3074).
 */
export function isOrchestrionEnabled(): boolean {
 return true;
}

/**
 * Retries `probe` until it resolves, or throws once `timeout` ms elapse.
 *
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration-streamed/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import type { SerializedStreamedSpanContainer } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// See the non-streamed `aws-integration` suite: only the origin differs between the OTel and
// orchestrion diagnostics-channel runs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.aws_sdk' : 'auto.otel.aws';
const ORIGIN = 'auto.aws.aws_sdk';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.aws_sdk' : 'auto.otel.aws';
const ORIGIN = 'auto.aws.aws_sdk';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
Expand Down

13 changes: 3 additions & 10 deletions
dev-packages/node-integration-tests/suites/express/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { afterAll, describe, expect } from 'vitest';
import { assertSentryTransaction } from '../../../utils/assertions';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
import { isOrchestrionEnabled } from '../../../utils';

describe('express tracing', () => {
 afterAll(() => {
Expand DownExpand Up@@ -98,15 +97,9 @@ describe('express tracing', () => {
 // The handler delays its response by ~100ms (see scenario).
 const routerDurationMs = ((routerSpan?.timestamp ?? 0) - (routerSpan?.start_timestamp ?? 0)) * 1000;

 if (isOrchestrionEnabled()) {
 // The orchestrion router span stays open until the response finishes, so
 // it spans the whole sub-stack it dispatched (~the 100ms handler delay).
 expect(routerDurationMs).toBeGreaterThan(50);
 } else {
 // The OTel integration ends router spans immediately, so the router span
 // is a ~0ms marker regardless of how long its sub-stack runs.
 expect(routerDurationMs).toBeLessThan(50);
 }
 // The router span stays open until the response finishes, so it spans the
 // whole sub-stack it dispatched (~the 100ms handler delay).
 expect(routerDurationMs).toBeGreaterThan(50);
 },
 })
 .start();
Expand Down

30 changes: 0 additions & 30 deletions
dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,25 +19,13 @@ import {
 GEN_AI_USAGE_TOTAL_TOKENS,
} from '@sentry/conventions/attributes';
import { GEN_AI_REQUEST_STREAM_ATTRIBUTE } from '../../../../../packages/server-utils/src/ai/core/gen-ai-attributes';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('Anthropic integration', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 const EXPECTED_MODEL_ERROR = {
 exception: {
 values: [
 {
 type: 'Error',
 value: '404 Model not found',
 },
 ],
 },
 };

 const EXPECTED_STREAM_EVENT_HANDLER_MESSAGE = {
 message: 'stream event from user-added event listener captured',
 };
Expand DownExpand Up@@ -83,12 +71,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with genAI recording disabled', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand DownExpand Up@@ -124,12 +106,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with genAI recording enabled', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand DownExpand Up@@ -194,12 +170,6 @@ describe('Anthropic integration', () => {
 test('creates anthropic related spans with custom options', async () => {
 const runner = createRunner();

 // The orchestrion path only marks the errored span; unlike the OTel path it does not
 // capture the handled `error-model` rejection as an event.
 if (!isOrchestrionEnabled()) {
 runner.expect({ event: EXPECTED_MODEL_ERROR });
 }

 await runner
 .expect({ transaction: { transaction: 'main' } })
 .expect({
Expand Down

9 changes: 2 additions & 7 deletions
dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Server start transaction (Apollo Server v5 no longer runs introspection query on start)
const EXPECTED_START_SERVER_TRANSACTION = {
 transaction: 'Test Server Start',
};

// apollo uses graphql v16, so the default run instruments it via the vendored OTel patcher and the
// orchestrion run (auto-injected on CI) via the diagnostics-channel path. Both emit the same span
// name/status; the origin and the document attribute (`graphql.source` vs `graphql.document`) differ.
const orchestrion = isOrchestrionEnabled();
const ORIGIN = orchestrion ? 'auto.graphql.diagnostic_channel' : 'auto.graphql.otel.graphql';
const ORIGIN = 'auto.graphql.diagnostic_channel';

function graphqlExecuteSpan(opts: {
 description: string;
Expand All@@ -28,7 +23,7 @@ function graphqlExecuteSpan(opts: {
 data: expect.objectContaining({
 'graphql.operation.type': operationType,
 ...(operationName ? { 'graphql.operation.name': operationName } : {}),
[orchestrion ? 'graphql.document' : 'graphql.source']: document,
 'graphql.document': document,
 'sentry.origin': ORIGIN,
 }),
 });
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/dataloader/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The span origin depends on which instrumentation is active. When the generic orchestrion run is
// enabled (via INJECT_ORCHESTRION) the OTel `Dataloader` integration is swapped for the
// diagnostics-channel one, which stamps a different origin.
const ORIGIN = isOrchestrionEnabled() ? 'auto.db.dataloader' : 'auto.db.otel.dataloader';
const ORIGIN = 'auto.db.dataloader';
const CACHE_GET_OP = 'cache.get';
const CACHE_MUTATION_OPS = { prime: 'cache.put', clear: 'cache.remove', clearAll: 'cache.remove' } as const;

Expand Down

7 changes: 1 addition & 6 deletions
dev-packages/node-integration-tests/suites/tracing/hapi/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('hapi auto-instrumentation', () => {
 afterAll(async () => {
 cleanupChildProcesses();
 });

 // `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The
 // orchestrion path keeps span ops/attributes identical to the OTel path; only
 // the origin differs to signal the injection mechanism, so we branch on
 // `isOrchestrionEnabled()`.
 const origin = isOrchestrionEnabled() ? 'auto.http.hapi' : 'auto.http.otel.hapi';
 const origin = 'auto.http.hapi';

 const EXPECTED_TRANSACTION = {
 transaction: 'GET /',
Expand Down

5 changes: 2 additions & 3 deletions
dev-packages/node-integration-tests/suites/tracing/kafkajs/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests, describeWithDockerCompose } from '../../../utils/runner';

const producerOrigin = isOrchestrionEnabled() ? 'auto.kafkajs.producer' : 'auto.kafkajs.otel.producer';
const consumerOrigin = isOrchestrionEnabled() ? 'auto.kafkajs.consumer' : 'auto.kafkajs.otel.consumer';
const producerOrigin = 'auto.kafkajs.producer';
const consumerOrigin = 'auto.kafkajs.consumer';

describeWithDockerCompose('kafkajs', { workingDirectory: [__dirname] }, () => {
 afterAll(() => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/knex/mysql2/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../../utils';
import { createEsmAndCjsTests, describeWithDockerCompose } from '../../../../utils/runner';

describeWithDockerCompose('knex auto instrumentation', { workingDirectory: [__dirname] }, () => {
 // Update this if another knex version is installed
 const KNEX_VERSION = '2.5.1';
 const ORIGIN = isOrchestrionEnabled() ? 'auto.db.knex' : 'auto.db.otel.knex';
 const ORIGIN = 'auto.db.knex';

 describe('with `mysql2` client', () => {
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/knex/pg/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../../utils';
import { createEsmAndCjsTests, describeWithDockerCompose } from '../../../../utils/runner';

describe('knex auto instrumentation', () => {
 // Update this if another knex version is installed
 const KNEX_VERSION = '2.5.1';
 const ORIGIN = isOrchestrionEnabled() ? 'auto.db.knex' : 'auto.db.otel.knex';
 const ORIGIN = 'auto.db.knex';

 describeWithDockerCompose('with `pg` client', { workingDirectory: [__dirname] }, () => {
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
Expand Down

7 changes: 1 addition & 6 deletions
dev-packages/node-integration-tests/suites/tracing/koa/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('koa auto-instrumentation', () => {
 afterAll(async () => {
 cleanupChildProcesses();
 });

 // `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The
 // orchestrion path keeps span ops/attributes identical to the OTel path; only
 // the origin differs to signal the injection mechanism, so we branch on
 // `isOrchestrionEnabled()`.
 const origin = isOrchestrionEnabled() ? 'auto.http.koa' : 'auto.http.otel.koa';
 const origin = 'auto.http.koa';

 const EXPECTED_ERROR_EVENT = {
 exception: {
Expand Down

47 changes: 20 additions & 27 deletions
dev-packages/node-integration-tests/suites/tracing/lru-memoizer/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,34 @@
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
import { createCjsTests } from '../../../utils/runner/createEsmAndCjsTests';
import { isOrchestrionEnabled } from '../../../utils';

describe('lru-memoizer', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createTestRunner, test) => {
 test('keeps outer context inside the memoized inner functions', async () => {
 await createTestRunner()
 .expect({
 transaction: {
 transaction: 'test-name',
 contexts: {
 trace: expect.objectContaining({
 op: 'run',
 data: expect.objectContaining({
 'sentry.op': 'run',
 'sentry.origin': 'manual',
 'memoized.context_preserved': true,
 }),
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createTestRunner, test) => {
 test('keeps outer context inside the memoized inner functions', async () => {
 await createTestRunner()
 .expect({
 transaction: {
 transaction: 'test-name',
 contexts: {
 trace: expect.objectContaining({
 op: 'run',
 data: expect.objectContaining({
 'sentry.op': 'run',
 'sentry.origin': 'manual',
 'memoized.context_preserved': true,
 }),
 },
 }),
 },
 })
 .start()
 .completed();
 });
 },
 { failsOnEsm: !isOrchestrionEnabled() },
 );
 },
 })
 .start()
 .completed();
 });
 });

 // CJS-only: the parallel scenario is flaky in ESM (see #21729).
 createCjsTests(__dirname, 'scenario-parallel.mjs', 'instrument.mjs', (createTestRunner, test) => {
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v4/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 4 so the = 4.0 <6.4 callback-based command band and the
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v4 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 const spanFor = (operation: string): unknown =>
 expect.objectContaining({
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v5/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 5 so the >= 4.0 < 6.4 callback-based command band and the
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v5 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 const spanFor = (operation: string): unknown =>
 expect.objectContaining({
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v6/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 6 so the >= 6.4 promise-based `Connection.prototype.command`
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v6 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 // `db.statement` (scrubbed full command doc) and `db.connection_string` vary
 // by driver version, so assert their presence rather than exact content;
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb-v7/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongodb 7 so the >= 6.4 promise-based `Connection.prototype.command`
Expand All@@ -21,7 +20,7 @@ describe('MongoDB v7 auto-instrumentation', () => {
 cleanupChildProcesses();
 });

 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';

 // `db.statement` (scrubbed full command doc) and `db.connection_string` vary
 // by driver version, so assert their presence rather than exact content;
Expand Down

3 changes: 1 addition & 2 deletions
dev-packages/node-integration-tests/suites/tracing/mongodb/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,10 @@ import type { TransactionEvent } from '@sentry/core';
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { assertSentryTransaction } from '../../../utils/assertions';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('MongoDB auto-instrumentation', () => {
 const origin = isOrchestrionEnabled() ? 'auto.db.mongo' : 'auto.db.otel.mongo';
 const origin = 'auto.db.mongo';
 let mongoServer: MongoMemoryServer;

 beforeAll(async () => {
Expand Down
Loading
Loading