fix tests

Author: mydea

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithHeartbeatTimeout/init.js renamed to dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithChildSpanTimeout/init.js

@@ -5,7 +5,13 @@ window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
-  integrations: [Sentry.browserTracingIntegration()],
+  integrations: [
+    Sentry.browserTracingIntegration({
+      // To avoid having this test run for 15s
+      childSpanTimeout: 2000,
+    }),
+  ],
+  defaultIntegrations: false,
   tracesSampleRate: 1,
 });
 

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithChildSpanTimeout/test.ts

@@ -0,0 +1,24 @@
+import { expect } from '@playwright/test';
+import type { Event } from '@sentry/types';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
+
+// This tests asserts that the pageload span will finish itself after the child span timeout if it
+// has a child span without adding any additional ones or finishing any of them finishing. All of the child spans that
+// are still running should have the status "cancelled".
+sentryTest('should send a pageload span terminated via child span timeout', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
+  const url = await getLocalTestPath({ testDir: __dirname });
+
+  const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
+
+  expect(eventData.contexts?.trace?.op).toBe('pageload');
+  expect(eventData.spans?.length).toBeGreaterThanOrEqual(1);
+  const testSpan = eventData.spans?.find(span => span.description === 'pageload-child-span');
+  expect(testSpan).toBeDefined();
+  expect(testSpan?.status).toBe('cancelled');
+});

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithHeartbeatTimeout/test.ts

@@ -619,10 +619,9 @@ describe('browserTracingIntegration', () => {
       expect(dynamicSamplingContext).toBeDefined();
       expect(dynamicSamplingContext).toStrictEqual({ release: '2.1.14' });
 
-      // Propagation context is correct
-      expect(propagationContext.sampled).toBe(false);
-      expect(propagationContext.traceId).toEqual('12312012123120121231201212312012');
-      expect(propagationContext.parentSpanId).toEqual('1121201211212012');
+      // Propagation context is reset and does not contain the meta tag data
+      expect(propagationContext.traceId).not.toEqual('12312012123120121231201212312012');
+      expect(propagationContext.parentSpanId).not.toEqual('1121201211212012');
     });
 
     it('puts frozen Dynamic Sampling Context on pageload span if sentry-trace data and only 3rd party baggage is present', () => {
@@ -657,10 +656,9 @@ describe('browserTracingIntegration', () => {
       expect(dynamicSamplingContext).toBeDefined();
       expect(dynamicSamplingContext).toStrictEqual({});
 
-      // Propagation context is correct
-      expect(propagationContext.sampled).toBe(false);
-      expect(propagationContext.traceId).toEqual('12312012123120121231201212312012');
-      expect(propagationContext.parentSpanId).toEqual('1121201211212012');
+      // Propagation context is reset and does not contain the meta tag data
+      expect(propagationContext.traceId).not.toEqual('12312012123120121231201212312012');
+      expect(propagationContext.parentSpanId).not.toEqual('1121201211212012');
     });
 
     it('ignores the meta tag data for navigation spans', () => {