test(e2e): Update live ingestion verification for span streaming

Co-Authored-By: GPT-6 <codex@openai.com>

Author: msonnb

dev-packages/e2e-tests/test-applications/node-express-send-to-sentry/src/app.ts

@@ -1,23 +1,22 @@
 import * as Sentry from '@sentry/node';
 
-let lastTransactionId: string | undefined;
-let lastTransactionTraceId: string | undefined;
+let lastSpanTraceId: string | undefined;
 let lastErrorTraceId: string | undefined;
 
 Sentry.init({
-  traceLifecycle: 'static',
-  environment: 'qa', // dynamic sampling bias to keep transactions
+  environment: 'qa', // dynamic sampling bias to keep traces
   dsn: process.env.E2E_TEST_DSN,
   includeLocalVariables: true,
   tracesSampleRate: 1,
   beforeSend(event) {
     lastErrorTraceId = event.contexts?.trace?.trace_id;
     return event;
   },
-  beforeSendTransaction(event) {
-    lastTransactionId = event.event_id;
-    lastTransactionTraceId = event.contexts?.trace?.trace_id;
-    return event;
+  beforeSendSpan(span) {
+    if (span.name === 'test-span') {
+      lastSpanTraceId = span.trace_id;
+    }
+    return span;
   },
 });
 
@@ -34,17 +33,16 @@ app.get('/test-param/:param', function (req, res) {
   res.send({ paramWas: req.params.param });
 });
 
-app.get('/test-transaction', function (req, res) {
+app.get('/test-span', function (req, res) {
   Sentry.withActiveSpan(null, async () => {
-    Sentry.startSpan({ name: 'test-transaction', op: 'e2e-test' }, () => {
-      Sentry.startSpan({ name: 'test-span' }, () => undefined);
+    Sentry.startSpan({ name: 'test-span', op: 'e2e-test' }, () => {
+      Sentry.startSpan({ name: 'test-child-span' }, () => undefined);
     });
 
     await Sentry.flush();
 
     res.send({
-      transactionId: lastTransactionId,
-      traceId: lastTransactionTraceId,
+      traceId: lastSpanTraceId,
     });
   });
 });

dev-packages/e2e-tests/test-applications/node-express-send-to-sentry/tests/send-to-sentry.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from '@playwright/test';
-import { EVENT_POLLING_OPTIONS, findErrorInTrace, findTransactionInTrace } from './utils/sentry-api';
+import { EVENT_POLLING_OPTIONS, findErrorInTrace, findSpanInTrace } from './utils/sentry-api';
 
 test('Sends exception to Sentry', async ({ baseURL }) => {
   const response = await fetch(`${baseURL}/test-error`);
@@ -10,13 +10,13 @@ test('Sends exception to Sentry', async ({ baseURL }) => {
   await expect.poll(() => findErrorInTrace(traceId, exceptionId), EVENT_POLLING_OPTIONS).toBeDefined();
 });
 
-test('Sends transaction to Sentry', async ({ baseURL }) => {
-  const response = await fetch(`${baseURL}/test-transaction`);
-  const { transactionId, traceId } = await response.json();
+test('Sends streamed span to Sentry', async ({ baseURL }) => {
+  const response = await fetch(`${baseURL}/test-span`);
+  const { traceId } = await response.json();
 
-  console.log(`Polling for transaction eventId: ${transactionId} in trace: ${traceId}`);
+  console.log(`Polling for streamed span in trace: ${traceId}`);
 
   await expect
-    .poll(() => findTransactionInTrace(traceId, transactionId), EVENT_POLLING_OPTIONS)
+    .poll(() => findSpanInTrace(traceId, 'e2e-test'), EVENT_POLLING_OPTIONS)
     .toMatchObject({ op: 'e2e-test' });
 });

dev-packages/e2e-tests/test-applications/node-express-send-to-sentry/tests/utils/sentry-api.ts

@@ -13,11 +13,8 @@ export const EVENT_POLLING_OPTIONS = { timeout: 180_000, intervals: [5_000] };
  */
 export interface TraceItem {
   event_id?: string;
-  /** On spans this is the event id of the transaction the span belongs to. */
-  transaction_id?: string;
   event_type?: 'span' | 'error' | 'occurrence' | 'uptime_check';
   op?: string;
-  is_transaction?: boolean;
   children?: TraceItem[];
   errors?: TraceItem[];
   occurrences?: TraceItem[];
@@ -67,6 +64,6 @@ export async function findErrorInTrace(traceId: string, eventId: string): Promis
   return flattenTrace(await fetchTrace(traceId)).find(item => item.event_type === 'error' && item.event_id === eventId);
 }
 
-export async function findTransactionInTrace(traceId: string, eventId: string): Promise<TraceItem | undefined> {
-  return flattenTrace(await fetchTrace(traceId)).find(item => item.is_transaction && item.transaction_id === eventId);
+export async function findSpanInTrace(traceId: string, op: string): Promise<TraceItem | undefined> {
+  return flattenTrace(await fetchTrace(traceId)).find(item => item.op === op);
 }