Skip to content

Commit d0b4cca

Browse files
authored
test(node): Port envelope-header tests to span streaming (#24528)
1 parent b7227bb commit d0b4cca

13 files changed

Lines changed: 13 additions & 19 deletions

File tree

‎dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/scenario.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as Sentry from '@sentry/node';
22
import { loggingTransport } from '@sentry-internal/node-integration-tests';
33

44
Sentry.init({
5-
traceLifecycle: 'static',
65
dsn: 'https://public@dsn.ingest.sentry.io/1337',
76
release: '1.0',
87
tracePropagationTargets: [/\/v0/, 'v1'],

‎dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { createRunner } from '../../../../utils/runner';
33

44
test('envelope header for error event during active unsampled span is correct', async () => {
55
await createRunner(__dirname, 'scenario.ts')
6-
.ignore('transaction')
6+
.ignore('span')
77
.expectHeader({
88
event: {
99
trace: {

‎dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/scenario.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as Sentry from '@sentry/node';
22
import { loggingTransport } from '@sentry-internal/node-integration-tests';
33

44
Sentry.init({
5-
traceLifecycle: 'static',
65
dsn: 'https://public@dsn.ingest.sentry.io/1337',
76
release: '1.0',
87
tracePropagationTargets: [/\/v0/, 'v1'],

‎dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { createRunner } from '../../../../utils/runner';
33

44
test('envelope header for error event during active span is correct', async () => {
55
await createRunner(__dirname, 'scenario.ts')
6-
.ignore('transaction')
6+
.ignore('span')
77
.expectHeader({
88
event: {
99
trace: {

‎dev-packages/node-integration-tests/suites/tracing/envelope-header/error/scenario.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as Sentry from '@sentry/node';
22
import { loggingTransport } from '@sentry-internal/node-integration-tests';
33

44
Sentry.init({
5-
traceLifecycle: 'static',
65
dsn: 'https://public@dsn.ingest.sentry.io/1337',
76
release: '1.0',
87
tracePropagationTargets: [/\/v0/, 'v1'],

‎dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/server.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ const { loggingTransport } = require('@sentry-internal/node-integration-tests');
22
const Sentry = require('@sentry/node');
33

44
Sentry.init({
5-
traceLifecycle: 'static',
65
dsn: 'https://public@dsn.ingest.sentry.io/1337',
76
release: '1.0',
87
// disable attaching headers to /test/* endpoints

‎dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/test.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ describe('tracesSampleRate propagation', () => {
88

99
const traceId = '12345678123456781234567812345678';
1010

11-
test('uses sample rate from incoming baggage header in trace envelope item', async () => {
11+
test('uses the incoming sample rate in the streamed span envelope header', async () => {
1212
const runner = createRunner(__dirname, 'server.js')
1313
.expectHeader({
14-
transaction: {
14+
span: {
1515
trace: {
16+
public_key: 'public',
1617
sample_rate: '0.05',
1718
sampled: 'true',
1819
trace_id: traceId,
@@ -22,10 +23,10 @@ describe('tracesSampleRate propagation', () => {
2223
},
2324
})
2425
.start();
25-
runner.makeRequest('get', '/test', {
26+
await runner.makeRequest('get', '/test', {
2627
headers: {
2728
'sentry-trace': `${traceId}-1234567812345678-1`,
28-
baggage: `sentry-sample_rate=0.05,sentry-trace_id=${traceId},sentry-sampled=true,sentry-transaction=myTransaction,sentry-sample_rand=0.42`,
29+
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`,
2930
},
3031
});
3132
await runner.completed();

‎dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/scenario.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import * as Sentry from '@sentry/node';
33
import { loggingTransport } from '@sentry-internal/node-integration-tests';
44

55
Sentry.init({
6-
traceLifecycle: 'static',
76
dsn: 'https://public@dsn.ingest.sentry.io/1337',
87
release: '1.0',
98
tracePropagationTargets: [/\/v0/, 'v1'],

‎dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { expect, test } from 'vitest';
22
import { createRunner } from '../../../../utils/runner';
33

4-
test('envelope header for transaction event of route correct', async () => {
4+
test('includes the route name in the streamed span envelope header', async () => {
55
await createRunner(__dirname, 'scenario.ts')
66
.expectHeader({
7-
transaction: {
7+
span: {
88
trace: {
99
trace_id: expect.stringMatching(/[a-f\d]{32}/),
1010
public_key: 'public',

‎dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/scenario.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import * as Sentry from '@sentry/node';
33
import { loggingTransport } from '@sentry-internal/node-integration-tests';
44

55
Sentry.init({
6-
traceLifecycle: 'static',
76
dsn: 'https://public@dsn.ingest.sentry.io/1337',
87
release: '1.0',
98
tracePropagationTargets: [/\/v0/, 'v1'],

0 commit comments

Comments
 (0)