fix tests?

Author: mydea

dev-packages/browser-integration-tests/suites/public-api/startSpan/basic/test.ts

@@ -2,15 +2,20 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
+import {
+  envelopeRequestParser,
+  shouldSkipTracingTest,
+  waitForTransactionRequestOnUrl,
+} from '../../../../utils/helpers';
 
 sentryTest('should send a transaction in an envelope', async ({ getLocalTestPath, page }) => {
   if (shouldSkipTracingTest()) {
     sentryTest.skip();
   }
 
   const url = await getLocalTestPath({ testDir: __dirname });
-  const transaction = await getFirstSentryEnvelopeRequest<Event>(page, url);
+  const req = await waitForTransactionRequestOnUrl(page, url);
+  const transaction = envelopeRequestParser(req);
 
   expect(transaction.transaction).toBe('parent_span');
   expect(transaction.spans).toBeDefined();
@@ -22,7 +27,8 @@ sentryTest('should report finished spans as children of the root transaction', a
   }
 
   const url = await getLocalTestPath({ testDir: __dirname });
-  const transaction = await getFirstSentryEnvelopeRequest<Event>(page, url);
+  const req = await waitForTransactionRequestOnUrl(page, url);
+  const transaction = envelopeRequestParser(req);
 
   expect(transaction.spans).toHaveLength(1);
 

packages/core/src/utils/applyScopeDataToEvent.ts

@@ -171,12 +171,13 @@ function applySdkMetadataToEvent(event: Event, sdkProcessingMetadata: ScopeData[
 
 function applySpanToEvent(event: Event, span: Span): void {
   event.contexts = { trace: spanToTraceContext(span), ...event.contexts };
-  const rootSpan = getRootSpan(span);
+
   event.sdkProcessingMetadata = {
     dynamicSamplingContext: getDynamicSamplingContextFromSpan(span),
     ...event.sdkProcessingMetadata,
   };
 
+  const rootSpan = getRootSpan(span);
   const transactionName = spanToJSON(rootSpan).description;
   if (transactionName && !event.transaction) {
     event.transaction = transactionName;