adjustments and fixes

Author: mydea

dev-packages/browser-integration-tests/suites/tracing/continueTrace/full-tracing/test.ts

@@ -5,6 +5,7 @@ import {
   eventAndTraceHeaderRequestParser,
   getFirstSentryEnvelopeRequest,
   shouldSkipTracingTest,
+  waitForErrorRequest,
   waitForTransactionRequest,
 } from '../../../../utils/helpers';
 
@@ -73,15 +74,11 @@ sentryTest(
     await getFirstSentryEnvelopeRequest<EventAndTraceHeader>(page, url, eventAndTraceHeaderRequestParser);
 
     // The captured error carries the continued (unsampled) trace even though no transaction is sent.
-    const errorPromise = getFirstSentryEnvelopeRequest<EventAndTraceHeader>(
-      page,
-      undefined,
-      eventAndTraceHeaderRequestParser,
-    );
+    const errorPromise = waitForErrorRequest(page);
 
     await page.locator('#unsampled').click();
 
-    const [errorEvent] = await errorPromise;
+    const [errorEvent] = eventAndTraceHeaderRequestParser(await errorPromise);
     expect(errorEvent.contexts?.trace?.trace_id).toBe(UNSAMPLED_TRACE_ID);
 
     // Outgoing request carries the continued trace with the negative sampling decision.

dev-packages/browser-integration-tests/suites/tracing/continueTrace/subject.js

@@ -22,8 +22,11 @@ const TRACES = {
 function continueAndRun(variant) {
   const { sentryTrace, baggage } = TRACES[variant];
   Sentry.continueTrace({ sentryTrace, baggage }, () => {
-    Sentry.startSpan({ op: 'ui.interaction.click', name: `continued-${variant}` }, async () => {
-      await fetch('http://sentry-test-site.example');
+    // Keep the span callback synchronous: the browser ACS is stack-based, so an `await` here would pop
+    // the continued span/scope before `fetch` and `captureException` run. Firing `fetch` without
+    // awaiting still attaches the propagation headers (they are read synchronously at call time).
+    Sentry.startSpan({ op: 'ui.interaction.click', name: `continued-${variant}` }, () => {
+      fetch('http://sentry-test-site.example');
       Sentry.captureException(new Error(`continued-${variant}-error`));
     });
   });

dev-packages/browser-integration-tests/suites/tracing/continueTrace/tracesSampleRate-zero/test.ts

@@ -1,10 +1,9 @@
 import { expect } from '@playwright/test';
 import { sentryTest } from '../../../../utils/fixtures';
-import type { EventAndTraceHeader } from '../../../../utils/helpers';
 import {
   eventAndTraceHeaderRequestParser,
-  getFirstSentryEnvelopeRequest,
   shouldSkipTracingTest,
+  waitForErrorRequest,
   waitForTransactionRequest,
 } from '../../../../utils/helpers';
 
@@ -63,20 +62,17 @@ sentryTest(
     await page.goto(url);
 
     // The captured error carries the continued trace even though no transaction is sent.
-    const errorPromise = getFirstSentryEnvelopeRequest<EventAndTraceHeader>(
-      page,
-      undefined,
-      eventAndTraceHeaderRequestParser,
-    );
+    const errorPromise = waitForErrorRequest(page);
 
     await page.locator('#deferred').click();
 
-    const [errorEvent] = await errorPromise;
+    const [errorEvent] = eventAndTraceHeaderRequestParser(await errorPromise);
     expect(errorEvent.contexts?.trace?.trace_id).toBe(DEFERRED_TRACE_ID);
 
+    // The deferred decision resolves negatively against the local tracesSampleRate=0.
     const outgoingRequest = await outgoingRequestPromise;
     const headers = await outgoingRequest.allHeaders();
-    expect(headers['sentry-trace']).toMatch(new RegExp(`^${DEFERRED_TRACE_ID}-[a-f0-9]{16}`));
+    expect(headers['sentry-trace']).toMatch(new RegExp(`^${DEFERRED_TRACE_ID}-[a-f0-9]{16}-0$`));
   },
 );
 
@@ -96,15 +92,11 @@ sentryTest(
 
     await page.goto(url);
 
-    const errorPromise = getFirstSentryEnvelopeRequest<EventAndTraceHeader>(
-      page,
-      undefined,
-      eventAndTraceHeaderRequestParser,
-    );
+    const errorPromise = waitForErrorRequest(page);
 
     await page.locator('#unsampled').click();
 
-    const [errorEvent] = await errorPromise;
+    const [errorEvent] = eventAndTraceHeaderRequestParser(await errorPromise);
     expect(errorEvent.contexts?.trace?.trace_id).toBe(UNSAMPLED_TRACE_ID);
 
     const outgoingRequest = await outgoingRequestPromise;

dev-packages/browser-integration-tests/suites/tracing/continueTrace/tracing-without-performance/test.ts

@@ -1,10 +1,9 @@
 import { expect } from '@playwright/test';
 import { sentryTest } from '../../../../utils/fixtures';
-import type { EventAndTraceHeader } from '../../../../utils/helpers';
 import {
   eventAndTraceHeaderRequestParser,
-  getFirstSentryEnvelopeRequest,
   shouldSkipTracingTest,
+  waitForErrorRequest,
 } from '../../../../utils/helpers';
 
 const SAMPLED_TRACE_ID = '12345678901234567890123456789012';
@@ -36,15 +35,11 @@ for (const variant of VARIANTS) {
 
       await page.goto(url);
 
-      const errorPromise = getFirstSentryEnvelopeRequest<EventAndTraceHeader>(
-        page,
-        undefined,
-        eventAndTraceHeaderRequestParser,
-      );
+      const errorPromise = waitForErrorRequest(page);
 
       await page.locator(`#${variant.button}`).click();
 
-      const [errorEvent] = await errorPromise;
+      const [errorEvent] = eventAndTraceHeaderRequestParser(await errorPromise);
       expect(errorEvent.contexts?.trace?.trace_id).toBe(variant.traceId);
 
       const outgoingRequest = await outgoingRequestPromise;