test(node): Port baggage and metadata tests to span streaming

dev-packages/node-integration-tests/suites/tracing/double-baggage/no-spans/instrument.mjs

@@ -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',
   // explicitly not setting tracesSampleRate,

dev-packages/node-integration-tests/suites/tracing/double-baggage/no-spans/test.ts

@@ -31,7 +31,6 @@ describe('double baggage prevention', () => {
 
       await createRunner()
         .withEnv({ SERVER_URL })
-        .ignore('transaction')
         .expect({
           event: {
             exception: {

dev-packages/node-integration-tests/suites/tracing/double-baggage/spans-no-parent/instrument.mjs

@@ -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',
   tracesSampleRate: 1.0,

dev-packages/node-integration-tests/suites/tracing/double-baggage/spans-no-parent/test.ts

@@ -1,3 +1,5 @@
+import { SENTRY_OP, URL_FULL } from '@sentry/conventions/attributes';
+import { HTTP_CLIENT } from '@sentry/conventions/op';
 import { createTestServer } from '@sentry-internal/test-utils';
 import { describe, expect } from 'vitest';
 import { createEsmAndCjsTests } from '../../../../utils/runner';
@@ -31,13 +33,28 @@ describe('double baggage prevention', () => {
 
       await createRunner()
         .withEnv({ SERVER_URL })
+        .unordered()
         .expect({
           event: {
             exception: {
               values: [{ type: 'Error', value: 'done' }],
             },
           },
         })
+        .expect({
+          span: container => {
+            const spans = container.items;
+            expect(spans.map(span => span.attributes[URL_FULL]?.value).sort()).toEqual([
+              `${SERVER_URL}/api/fetch`,
+              `${SERVER_URL}/api/fetch-custom-headers`,
+            ]);
+            for (const span of spans) {
+              expect(span.attributes[SENTRY_OP]?.value).toBe(HTTP_CLIENT);
+              expect(span.is_segment).toBe(true);
+              expect(span.parent_span_id).toBeUndefined();
+            }
+          },
+        })
         .start()
         .completed();
       closeTestServer();

dev-packages/node-integration-tests/suites/tracing/double-baggage/spans-parent/instrument.mjs

@@ -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',
   tracesSampleRate: 1.0,

dev-packages/node-integration-tests/suites/tracing/double-baggage/spans-parent/test.ts

@@ -1,3 +1,5 @@
+import { SENTRY_OP, URL_FULL } from '@sentry/conventions/attributes';
+import { HTTP_CLIENT } from '@sentry/conventions/op';
 import { createTestServer } from '@sentry-internal/test-utils';
 import { describe, expect } from 'vitest';
 import { createEsmAndCjsTests } from '../../../../utils/runner';
@@ -6,7 +8,7 @@ import { expectConsistentTraceId, expectNoDuplicateSentryBaggageKeys, expectUser
 
 describe('double baggage prevention - http.client spans with parent span', () => {
   createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
-    let transactionTraceId = '000';
+    let traceId = '000';
     let fetchSpanId = '000';
     let httpCustomHeadersSpanId = '000';
     let fetchCustomHeadersSpanId = '000';
@@ -16,7 +18,7 @@ describe('double baggage prevention - http.client spans with parent span', () =>
         .get('/api/fetch-custom-headers', headers => {
           // fetch with manual getTraceData() headers — core reproduction case
           const sentryTrace = extractTraceparentData(headers['sentry-trace'] as string);
-          transactionTraceId = sentryTrace!.traceId!;
+          traceId = sentryTrace!.traceId!;
           fetchCustomHeadersSpanId = sentryTrace!.parentSpanId!;
           expectNoDuplicateSentryBaggageKeys(headers['baggage']);
           expect(headers['sentry-trace']).not.toContain(',');
@@ -46,42 +48,46 @@ describe('double baggage prevention - http.client spans with parent span', () =>
         .withEnv({ SERVER_URL })
         .ignore('event')
         .expect({
-          transaction: txn => {
-            expect(transactionTraceId).toMatch(/^[a-f0-9]{32}$/);
+          span: container => {
+            expect(traceId).toMatch(/^[a-f0-9]{32}$/);
 
-            expect(txn).toMatchObject({
-              transaction: 'parent_span',
-              spans: [
-                {
-                  op: 'http.client',
-                  description: expect.stringMatching(/^GET .*\/api\/fetch-custom-headers$/),
-                  data: {},
-                  // span id is expected to be different since users call getTraceData() before the
-                  // http.client span is created
-                  span_id: expect.not.stringContaining(fetchCustomHeadersSpanId),
-                  start_timestamp: expect.any(Number),
-                  trace_id: transactionTraceId,
+            expect(container.items.find(span => span.is_segment)?.name).toBe('parent_span');
+            expect(container.items.filter(span => !span.is_segment)).toMatchObject([
+              {
+                name: 'GET localhost',
+                attributes: {
+                  [SENTRY_OP]: { type: 'string', value: HTTP_CLIENT },
+                  [URL_FULL]: { type: 'string', value: expect.stringMatching(/^.*\/api\/fetch-custom-headers$/) },
                 },
-                {
-                  op: 'http.client',
-                  description: expect.stringMatching(/^GET .*\/api\/fetch$/),
-                  data: {},
-                  span_id: fetchSpanId,
-                  start_timestamp: expect.any(Number),
-                  trace_id: transactionTraceId,
+                // span id is expected to be different since users call getTraceData() before the
+                // http.client span is created
+                span_id: expect.not.stringContaining(fetchCustomHeadersSpanId),
+                start_timestamp: expect.any(Number),
+                trace_id: traceId,
+              },
+              {
+                name: 'GET localhost',
+                attributes: {
+                  [SENTRY_OP]: { type: 'string', value: HTTP_CLIENT },
+                  [URL_FULL]: { type: 'string', value: expect.stringMatching(/^.*\/api\/fetch$/) },
                 },
-                {
-                  op: 'http.client',
-                  description: expect.stringMatching(/^GET .*\/api\/http-custom-headers$/),
-                  data: {},
-                  // span id is expected to be different since users call getTraceData() before the
-                  // http.client span is created
-                  span_id: expect.not.stringContaining(httpCustomHeadersSpanId),
-                  start_timestamp: expect.any(Number),
-                  trace_id: transactionTraceId,
+                span_id: fetchSpanId,
+                start_timestamp: expect.any(Number),
+                trace_id: traceId,
+              },
+              {
+                name: 'GET localhost',
+                attributes: {
+                  [SENTRY_OP]: { type: 'string', value: HTTP_CLIENT },
+                  [URL_FULL]: { type: 'string', value: expect.stringMatching(/^.*\/api\/http-custom-headers$/) },
                 },
-              ],
-            });
+                // span id is expected to be different since users call getTraceData() before the
+                // http.client span is created
+                span_id: expect.not.stringContaining(httpCustomHeadersSpanId),
+                start_timestamp: expect.any(Number),
+                trace_id: traceId,
+              },
+            ]);
           },
         })
         .start()

dev-packages/node-integration-tests/suites/tracing/dsc-txn-name-update/scenario-events.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',
   tracesSampleRate: 1.0,

dev-packages/node-integration-tests/suites/tracing/dsc-txn-name-update/scenario-headers.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',
   tracesSampleRate: 1.0,

dev-packages/node-integration-tests/suites/tracing/dsc-txn-name-update/test.ts

@@ -53,7 +53,7 @@ test('adds current transaction name to baggage when the txn name is high-quality
   await createRunner(__dirname, 'scenario-headers.ts')
     .withEnv({ SERVER_URL })
     .expect({
-      transaction: {},
+      span: {},
     })
     .start()
     .completed();
@@ -106,7 +106,7 @@ test('adds current transaction name to trace envelope header when the txn name i
       },
     })
     .expectHeader({
-      transaction: {
+      span: {
         trace: {
           environment: 'production',
           public_key: 'public',

dev-packages/node-integration-tests/suites/tracing/meta-tags-twp-errors/no-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',
   transport: loggingTransport,

dev-packages/node-integration-tests/suites/tracing/meta-tags-twp-errors/server.js

@@ -2,7 +2,6 @@ const { loggingTransport, startExpressServerAndSendPortToRunner } = require('@se
 const Sentry = require('@sentry/node');
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   transport: loggingTransport,
 });

dev-packages/node-integration-tests/suites/tracing/meta-tags-twp/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',
   transport: loggingTransport,
 });

dev-packages/node-integration-tests/suites/tracing/meta-tags/server-sdk-disabled.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',
   tracesSampleRate: 1.0,
   transport: loggingTransport,

dev-packages/node-integration-tests/suites/tracing/meta-tags/server-tracesSampleRate-zero.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',
   tracesSampleRate: 0,
   transport: loggingTransport,

dev-packages/node-integration-tests/suites/tracing/meta-tags/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',
   tracesSampleRate: 1.0,
   transport: loggingTransport,