From 7ab96de88b81833b86555149c494583607ca3f3b Mon Sep 17 00:00:00 2001 From: Maharshi Mishra Date: Sun, 20 Sep 2026 15:13:23 +0530 Subject: [PATCH] test(node): Port envelope-header tests to span streaming Co-Authored-By: GPT-6 --- .../error-active-span-unsampled/scenario.ts | 1 - .../envelope-header/error-active-span-unsampled/test.ts | 2 +- .../envelope-header/error-active-span/scenario.ts | 1 - .../tracing/envelope-header/error-active-span/test.ts | 2 +- .../suites/tracing/envelope-header/error/scenario.ts | 1 - .../envelope-header/sampleRate-propagation/server.js | 1 - .../envelope-header/sampleRate-propagation/test.ts | 9 +++++---- .../envelope-header/transaction-route/scenario.ts | 1 - .../tracing/envelope-header/transaction-route/test.ts | 4 ++-- .../tracing/envelope-header/transaction-url/scenario.ts | 1 - .../tracing/envelope-header/transaction-url/test.ts | 4 ++-- .../tracing/envelope-header/transaction/scenario.ts | 1 - .../suites/tracing/envelope-header/transaction/test.ts | 4 ++-- 13 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/scenario.ts index 254aa9adc579..5890e9c365cf 100644 --- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/scenario.ts +++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/scenario.ts @@ -2,7 +2,6 @@ import * as Sentry from '@sentry/node'; import { loggingTransport } from '@sentry-internal/node-integration-tests'; Sentry.init({ - traceLifecycle: 'static', dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', tracePropagationTargets: [/\/v0/, 'v1'], diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts index 131c5b208239..6c568715f905 100644 --- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts @@ -3,7 +3,7 @@ import { createRunner } from '../../../../utils/runner'; test('envelope header for error event during active unsampled span is correct', async () => { await createRunner(__dirname, 'scenario.ts') - .ignore('transaction') + .ignore('span') .expectHeader({ event: { trace: { diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/scenario.ts index 020b687d2e22..b45aed2e5572 100644 --- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/scenario.ts +++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/scenario.ts @@ -2,7 +2,6 @@ import * as Sentry from '@sentry/node'; import { loggingTransport } from '@sentry-internal/node-integration-tests'; Sentry.init({ - traceLifecycle: 'static', dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', tracePropagationTargets: [/\/v0/, 'v1'], diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts index 4b103c7e7d79..cd00e51ea958 100644 --- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts @@ -3,7 +3,7 @@ import { createRunner } from '../../../../utils/runner'; test('envelope header for error event during active span is correct', async () => { await createRunner(__dirname, 'scenario.ts') - .ignore('transaction') + .ignore('span') .expectHeader({ event: { trace: { diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error/scenario.ts index 16d7d686b2f1..e87cf53b8c80 100644 --- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error/scenario.ts +++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error/scenario.ts @@ -2,7 +2,6 @@ import * as Sentry from '@sentry/node'; import { loggingTransport } from '@sentry-internal/node-integration-tests'; Sentry.init({ - traceLifecycle: 'static', dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', tracePropagationTargets: [/\/v0/, 'v1'], diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/server.js b/dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/server.js index 9d1af464ce56..6f7ecfa269f0 100644 --- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/server.js +++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/server.js @@ -2,7 +2,6 @@ const { loggingTransport } = require('@sentry-internal/node-integration-tests'); const Sentry = require('@sentry/node'); Sentry.init({ - traceLifecycle: 'static', dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', // disable attaching headers to /test/* endpoints diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/test.ts index 63db6ff4e820..cdb264095446 100644 --- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/test.ts @@ -8,11 +8,12 @@ describe('tracesSampleRate propagation', () => { const traceId = '12345678123456781234567812345678'; - test('uses sample rate from incoming baggage header in trace envelope item', async () => { + test('uses the incoming sample rate in the streamed span envelope header', async () => { const runner = createRunner(__dirname, 'server.js') .expectHeader({ - transaction: { + span: { trace: { + public_key: 'public', sample_rate: '0.05', sampled: 'true', trace_id: traceId, @@ -22,10 +23,10 @@ describe('tracesSampleRate propagation', () => { }, }) .start(); - runner.makeRequest('get', '/test', { + await runner.makeRequest('get', '/test', { headers: { 'sentry-trace': `${traceId}-1234567812345678-1`, - baggage: `sentry-sample_rate=0.05,sentry-trace_id=${traceId},sentry-sampled=true,sentry-transaction=myTransaction,sentry-sample_rand=0.42`, + baggage: `sentry-public_key=public,sentry-sample_rate=0.05,sentry-trace_id=${traceId},sentry-sampled=true,sentry-transaction=myTransaction,sentry-sample_rand=0.42`, }, }); await runner.completed(); diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/scenario.ts index 87f2a025a57c..4d67fee0a0d2 100644 --- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/scenario.ts +++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/scenario.ts @@ -3,7 +3,6 @@ import * as Sentry from '@sentry/node'; import { loggingTransport } from '@sentry-internal/node-integration-tests'; Sentry.init({ - traceLifecycle: 'static', dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', tracePropagationTargets: [/\/v0/, 'v1'], diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts index 9798194b0c1c..63883ec44577 100644 --- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts @@ -1,10 +1,10 @@ import { expect, test } from 'vitest'; import { createRunner } from '../../../../utils/runner'; -test('envelope header for transaction event of route correct', async () => { +test('includes the route name in the streamed span envelope header', async () => { await createRunner(__dirname, 'scenario.ts') .expectHeader({ - transaction: { + span: { trace: { trace_id: expect.stringMatching(/[a-f\d]{32}/), public_key: 'public', diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/scenario.ts index 093856dd1d12..69b76f248555 100644 --- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/scenario.ts +++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/scenario.ts @@ -3,7 +3,6 @@ import * as Sentry from '@sentry/node'; import { loggingTransport } from '@sentry-internal/node-integration-tests'; Sentry.init({ - traceLifecycle: 'static', dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', tracePropagationTargets: [/\/v0/, 'v1'], diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts index 7b6b07191c44..c448336148a1 100644 --- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts @@ -1,10 +1,10 @@ import { expect, test } from 'vitest'; import { createRunner } from '../../../../utils/runner'; -test('envelope header for transaction event with source=url correct', async () => { +test('omits the URL-sourced name from the streamed span envelope header', async () => { await createRunner(__dirname, 'scenario.ts') .expectHeader({ - transaction: { + span: { trace: { trace_id: expect.stringMatching(/[a-f\d]{32}/), public_key: 'public', diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/scenario.ts index f8e208bd56d7..05b2e5d48de2 100644 --- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/scenario.ts +++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/scenario.ts @@ -2,7 +2,6 @@ import * as Sentry from '@sentry/node'; import { loggingTransport } from '@sentry-internal/node-integration-tests'; Sentry.init({ - traceLifecycle: 'static', dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', tracePropagationTargets: [/\/v0/, 'v1'], diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/test.ts index 24276f57f212..8b7cdfbf8a18 100644 --- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/test.ts @@ -1,10 +1,10 @@ import { expect, test } from 'vitest'; import { createRunner } from '../../../../utils/runner'; -test('envelope header for transaction event is correct', async () => { +test('envelope header for streamed spans is correct', async () => { await createRunner(__dirname, 'scenario.ts') .expectHeader({ - transaction: { + span: { trace: { trace_id: expect.stringMatching(/[a-f\d]{32}/), public_key: 'public',