add integration test for pageload span

Author: Lms24

dev-packages/browser-integration-tests/utils/helpers.ts

@@ -9,6 +9,7 @@ import type {
   EventEnvelope,
   EventEnvelopeHeaders,
   SessionContext,
+  SpanV2Envelope,
   TransactionEvent,
 } from '@sentry/core';
 import { parseEnvelope } from '@sentry/core';
@@ -258,6 +259,44 @@ export function waitForTransactionRequest(
   });
 }
 
+/**
+ * Wait for a span v2 envelope
+ */
+export async function waitForSpanV2Envelope(
+  page: Page,
+  callback?: (spanEnvelope: SpanV2Envelope) => boolean,
+): Promise<SpanV2Envelope> {
+  const req = await page.waitForRequest(req => {
+    const postData = req.postData();
+    if (!postData) {
+      return false;
+    }
+
+    try {
+      const spanEnvelope = properFullEnvelopeParser<SpanV2Envelope>(req);
+
+      const envelopeItemHeader = spanEnvelope[1][0][0];
+
+      if (
+        envelopeItemHeader?.type !== 'span' ||
+        envelopeItemHeader?.content_type !== 'application/vnd.sentry.items.span.v2+json'
+      ) {
+        return false;
+      }
+
+      if (callback) {
+        return callback(spanEnvelope);
+      }
+
+      return true;
+    } catch {
+      return false;
+    }
+  });
+
+  return properFullEnvelopeParser<SpanV2Envelope>(req);
+}
+
 export function waitForClientReportRequest(page: Page, callback?: (report: ClientReport) => boolean): Promise<Request> {
   return page.waitForRequest(req => {
     const postData = req.postData();

dev-packages/node-integration-tests/suites/tracing/meta-tags-twp-errors/test.ts

@@ -1,5 +1,6 @@
 import { afterAll, describe, expect, test } from 'vitest';
 import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
+import { run } from 'node:test';
 
 describe('errors in TwP mode have same trace in trace context and getTraceData()', () => {
   afterAll(() => {
@@ -8,11 +9,16 @@ describe('errors in TwP mode have same trace in trace context and getTraceData()
 
   // In a request handler, the spanId is consistent inside of the request
   test('in incoming request', async () => {
+    let firstTraceId: string | undefined;
+
     const runner = createRunner(__dirname, 'server.js')
       .expect({
         event: event => {
           const { contexts } = event;
           const { trace_id, span_id } = contexts?.trace || {};
+          if (!firstTraceId) {
+            firstTraceId = trace_id;
+          }
           expect(trace_id).toMatch(/^[a-f\d]{32}$/);
           expect(span_id).toMatch(/^[a-f\d]{16}$/);
 
@@ -28,8 +34,15 @@ describe('errors in TwP mode have same trace in trace context and getTraceData()
           expect(traceData.metaTags).not.toContain('sentry-sampled=');
         },
       })
+      .expect({
+        event: event => {
+          expect(event.contexts?.trace?.trace_id).toBeDefined();
+          expect(event.contexts?.trace?.trace_id).toBe(firstTraceId);
+        },
+      })
       .start();
     runner.makeRequest('get', '/test');
+    runner.makeRequest('get', '/test');
     await runner.completed();
   });