test(browser): drop static pins from non-tracing suites

dev-packages/browser-integration-tests/suites/errors/fetch-enhance-messages-off/init.js

@@ -3,7 +3,6 @@ import * as Sentry from '@sentry/browser';
 window.Sentry = Sentry;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   enhanceFetchErrorMessages: false,
 });

dev-packages/browser-integration-tests/suites/errors/fetch-enhance-messages-report-only/init.js

@@ -3,7 +3,6 @@ import * as Sentry from '@sentry/browser';
 window.Sentry = Sentry;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   enhanceFetchErrorMessages: 'report-only',
 });

dev-packages/browser-integration-tests/suites/errors/fetch/init.js

@@ -3,6 +3,5 @@ import * as Sentry from '@sentry/browser';
 window.Sentry = Sentry;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
 });

dev-packages/browser-integration-tests/suites/feedback/attachTo/init.js

@@ -10,7 +10,6 @@ window.Sentry = Sentry;
 window.feedback = feedback;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   integrations: [feedback],
 });

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/init.js

@@ -5,7 +5,6 @@ import { feedbackIntegration } from '@sentry/browser';
 window.Sentry = Sentry;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   integrations: [
     feedbackIntegration({

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/init.js

@@ -5,7 +5,6 @@ import { feedbackIntegration } from '@sentry/browser';
 window.Sentry = Sentry;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   replaysOnErrorSampleRate: 1.0,
   replaysSessionSampleRate: 1.0,

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackCsp/init.js

@@ -5,7 +5,6 @@ import { feedbackIntegration } from '@sentry/browser';
 window.Sentry = Sentry;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   integrations: [
     feedbackIntegration({ tags: { from: 'integration init' }, styleNonce: 'foo1234', scriptNonce: 'foo1234' }),

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackWithProfiling/init.js

@@ -8,7 +8,6 @@ import { feedbackIntegration } from '@sentry/browser';
 window.Sentry = Sentry;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   integrations: [
     Sentry.browserTracingIntegration(),

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackWithProfiling/test.ts

@@ -1,11 +1,11 @@
 import { expect } from '@playwright/test';
+import { getSpanOp, waitForStreamedSpan } from '../../../utils/spanUtils';
 import { sentryTest } from '../../../utils/fixtures';
 import {
   envelopeRequestParser,
   getEnvelopeType,
   shouldSkipFeedbackTest,
   shouldSkipTracingTest,
-  waitForTransactionRequest,
 } from '../../../utils/helpers';
 
 sentryTest(
@@ -21,8 +21,8 @@ sentryTest(
       responseHeaders: { 'Document-Policy': 'js-profiling' },
     });
 
-    // Wait for the pageload transaction to be sent (idle span ended)
-    const pageloadRequestPromise = waitForTransactionRequest(page, event => event.contexts?.trace?.op === 'pageload');
+    // Wait for the idle pageload span to end.
+    const pageloadSpanPromise = waitForStreamedSpan(page, span => span.is_segment && getSpanOp(span) === 'pageload');
 
     const feedbackRequestPromise = page.waitForResponse(res => {
       const req = res.request();
@@ -40,7 +40,7 @@ sentryTest(
     await page.goto(url);
 
     // Wait for the idle page load span to finish
-    const pageLoadEvent = envelopeRequestParser(await pageloadRequestPromise);
+    const pageloadSpan = await pageloadSpanPromise;
 
     // Submit feedback after idle span ended — no active span
     await page.getByText('Report a Bug').waitFor({ state: 'visible' });
@@ -55,11 +55,10 @@ sentryTest(
     expect(feedbackEvent.contexts?.trace?.trace_id).toMatch(/\w{32}/);
     expect(feedbackEvent.contexts?.trace?.span_id).toMatch(/\w{16}/);
 
-    // contexts.trace.data must include thread.id to identify which thread is associated with the transaction
-    expect(pageLoadEvent.contexts?.trace?.data?.['thread.id']).toBe('0');
-    expect(pageLoadEvent.contexts?.trace?.data?.['thread.name']).toBe('main');
+    expect(pageloadSpan.attributes['thread.id']).toEqual({ type: 'string', value: '0' });
+    expect(pageloadSpan.attributes['thread.name']).toEqual({ type: 'string', value: 'main' });
 
-    const profilerId = pageLoadEvent.contexts?.profile?.profiler_id;
+    const profilerId = pageloadSpan.attributes['sentry.profiler_id']?.value;
     expect(profilerId).toMatch(/^[a-f\d]{32}$/);
     expect(feedbackEvent.contexts?.profile?.profiler_id).toBe(profilerId);
   },

dev-packages/browser-integration-tests/suites/feedback/logger/init.js

@@ -10,7 +10,6 @@ window.Sentry = Sentry;
 window.feedback = feedback;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   debug: true,
   integrations: [feedback],

dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/console/init.js

@@ -3,7 +3,6 @@ import * as Sentry from '@sentry/browser';
 window.Sentry = Sentry;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   defaultIntegrations: false,
   integrations: [Sentry.breadcrumbsIntegration(), Sentry.consoleIntegration()],

dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/init.js

@@ -3,7 +3,6 @@ import * as Sentry from '@sentry/browser';
 window.Sentry = Sentry;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   defaultIntegrations: false,
   integrations: [Sentry.breadcrumbsIntegration()],

dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/init.js

@@ -3,7 +3,6 @@ import * as Sentry from '@sentry/browser';
 window.Sentry = Sentry;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   defaultIntegrations: false,
   integrations: [Sentry.breadcrumbsIntegration()],

dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/history/init.js

@@ -3,7 +3,6 @@ import * as Sentry from '@sentry/browser';
 window.Sentry = Sentry;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   defaultIntegrations: false,
   integrations: [Sentry.breadcrumbsIntegration()],

dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/init.js

@@ -3,7 +3,6 @@ import * as Sentry from '@sentry/browser';
 window.Sentry = Sentry;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   defaultIntegrations: false,
   integrations: [Sentry.breadcrumbsIntegration()],

dev-packages/browser-integration-tests/suites/integrations/ContextLines/init.js

@@ -4,7 +4,6 @@ import { contextLinesIntegration } from '@sentry/browser';
 window.Sentry = Sentry;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   integrations: [contextLinesIntegration()],
 });

dev-packages/browser-integration-tests/suites/integrations/browserApiErrors/init.js

@@ -12,7 +12,6 @@ const myClickListener = () => {
 btn.addEventListener('click', myClickListener);
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
 });
 

dev-packages/browser-integration-tests/suites/integrations/browserApiErrors/unregisterOriginalCallbacks/init.js

@@ -12,7 +12,6 @@ const myClickListener = () => {
 btn.addEventListener('click', myClickListener);
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   integrations: [
     Sentry.browserApiErrorsIntegration({

dev-packages/browser-integration-tests/suites/integrations/captureConsole-attachStackTrace/init.js

@@ -4,7 +4,6 @@ import { captureConsoleIntegration } from '@sentry/browser';
 window.Sentry = Sentry;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   integrations: [captureConsoleIntegration()],
   attachStacktrace: true,

dev-packages/browser-integration-tests/suites/integrations/captureConsole/init.js

@@ -4,7 +4,6 @@ import { captureConsoleIntegration } from '@sentry/browser';
 window.Sentry = Sentry;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   integrations: [captureConsoleIntegration()],
   attachStacktrace: false,

dev-packages/browser-integration-tests/suites/integrations/cultureContext/init.js

@@ -2,19 +2,8 @@ import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
 
-const integrations = Sentry.getDefaultIntegrations({}).filter(
-  defaultIntegration => defaultIntegration.name === 'CultureContext',
-);
-
-const client = new Sentry.BrowserClient({
+Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
-  transport: Sentry.makeFetchTransport,
-  stackParser: Sentry.defaultStackParser,
-  integrations: integrations,
+  integrations: [Sentry.browserTracingIntegration()],
+  tracesSampleRate: 1.0,
 });
-
-const scope = new Sentry.Scope();
-scope.setClient(client);
-client.init();
-
-window._sentryScope = scope;

dev-packages/browser-integration-tests/suites/integrations/cultureContext/subject.js

@@ -1 +1 @@
-window._sentryScope.captureException(new Error('test error'));
+window.Sentry.captureException(new Error('test error'));

dev-packages/browser-integration-tests/suites/integrations/cultureContext/test.ts

@@ -1,12 +1,14 @@
 import { expect } from '@playwright/test';
-import type { Event } from '@sentry/core';
 import { sentryTest } from '../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
+import { envelopeRequestParser, shouldSkipTracingTest, waitForErrorRequest } from '../../../utils/helpers';
+import { getSpanOp, waitForStreamedSpan } from '../../../utils/spanUtils';
 
 sentryTest('cultureContextIntegration captures locale, timezone, and calendar', async ({ getLocalTestUrl, page }) => {
   const url = await getLocalTestUrl({ testDir: __dirname });
 
-  const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
+  const errorRequestPromise = waitForErrorRequest(page);
+  await page.goto(url);
+  const eventData = envelopeRequestParser(await errorRequestPromise);
 
   expect(eventData.exception?.values).toHaveLength(1);
 
@@ -16,3 +18,21 @@ sentryTest('cultureContextIntegration captures locale, timezone, and calendar',
     calendar: expect.any(String),
   });
 });
+
+sentryTest(
+  'cultureContextIntegration adds locale, timezone, and calendar to spans',
+  async ({ getLocalTestUrl, page }) => {
+    sentryTest.skip(shouldSkipTracingTest());
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    const spanPromise = waitForStreamedSpan(page, span => span.is_segment && getSpanOp(span) === 'pageload');
+
+    await page.goto(url);
+
+    const pageloadSpan = await spanPromise;
+
+    expect(pageloadSpan.attributes['culture.locale']).toEqual({ type: 'string', value: expect.any(String) });
+    expect(pageloadSpan.attributes['culture.timezone']).toEqual({ type: 'string', value: expect.any(String) });
+    expect(pageloadSpan.attributes['culture.calendar']).toEqual({ type: 'string', value: expect.any(String) });
+  },
+);

dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/onError/init.js

@@ -6,7 +6,6 @@ window.Sentry = Sentry;
 // window.sentryFeatureFlagsIntegration = Sentry.featureFlagsIntegration();
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   sampleRate: 1.0,
   integrations: [Sentry.featureFlagsIntegration()],

dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/onSpan/init.js

@@ -3,7 +3,6 @@ import * as Sentry from '@sentry/browser';
 window.Sentry = Sentry;
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   sampleRate: 1.0,
   tracesSampleRate: 1.0,

dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/onSpan/test.ts

@@ -1,13 +1,8 @@
 import { expect } from '@playwright/test';
 import { _INTERNAL_MAX_FLAGS_PER_SPAN as MAX_FLAGS_PER_SPAN } from '@sentry/core';
+import { waitForStreamedSpan } from '../../../../../utils/spanUtils';
 import { sentryTest } from '../../../../../utils/fixtures';
-import {
-  type EventAndTraceHeader,
-  eventAndTraceHeaderRequestParser,
-  getMultipleSentryEnvelopeRequests,
-  shouldSkipFeatureFlagsTest,
-  shouldSkipTracingTest,
-} from '../../../../../utils/helpers';
+import { shouldSkipFeatureFlagsTest, shouldSkipTracingTest } from '../../../../../utils/helpers';
 
 sentryTest("Feature flags are added to active span's attributes on span end.", async ({ getLocalTestUrl, page }) => {
   if (shouldSkipFeatureFlagsTest() || shouldSkipTracingTest()) {
@@ -25,14 +20,9 @@ sentryTest("Feature flags are added to active span's attributes on span end.", a
   const url = await getLocalTestUrl({ testDir: __dirname, skipDsnRouteHandler: true });
   await page.goto(url);
 
-  const envelopeRequestPromise = getMultipleSentryEnvelopeRequests<EventAndTraceHeader>(
-    page,
-    1,
-    {},
-    eventAndTraceHeaderRequestParser,
-  );
+  const innerSpanPromise = waitForStreamedSpan(page, span => span.name === 'test-nested-span');
+  const outerSpanPromise = waitForStreamedSpan(page, span => span.name === 'test-span');
 
-  // withNestedSpans is a util used to start 3 nested spans: root-span (not recorded in transaction_event.spans), span, and nested-span.
   await page.evaluate(maxFlags => {
     (window as any).withNestedSpans(() => {
       const flagsIntegration = (window as any).Sentry.getClient().getIntegrationByName('FeatureFlags');
@@ -45,22 +35,20 @@ sentryTest("Feature flags are added to active span's attributes on span end.", a
     return true;
   }, MAX_FLAGS_PER_SPAN);
 
-  const event = (await envelopeRequestPromise)[0][0];
-  const innerSpan = event.spans?.[0];
-  const outerSpan = event.spans?.[1];
-  const outerSpanFlags = Object.entries(outerSpan?.data ?? {}).filter(([key, _val]) =>
+  const [innerSpan, outerSpan] = await Promise.all([innerSpanPromise, outerSpanPromise]);
+  const outerSpanFlags = Object.entries(outerSpan.attributes).filter(([key, _val]) =>
     key.startsWith('flag.evaluation'),
   );
-  const innerSpanFlags = Object.entries(innerSpan?.data ?? {}).filter(([key, _val]) =>
+  const innerSpanFlags = Object.entries(innerSpan.attributes).filter(([key, _val]) =>
     key.startsWith('flag.evaluation'),
   );
 
-  expect(innerSpanFlags).toEqual([]);
+  expect(outerSpanFlags).toEqual([]);
 
-  const expectedOuterSpanFlags = [];
+  const expectedInnerSpanFlags = [];
   for (let i = 1; i <= MAX_FLAGS_PER_SPAN; i++) {
-    expectedOuterSpanFlags.push([`flag.evaluation.feat${i}`, i === 3]);
+    expectedInnerSpanFlags.push([`flag.evaluation.feat${i}`, { type: 'boolean', value: i === 3 }]);
   }
   // Order agnostic (attribute dict is unordered).
-  expect(outerSpanFlags.sort()).toEqual(expectedOuterSpanFlags.sort());
+  expect(innerSpanFlags.sort()).toEqual(expectedInnerSpanFlags.sort());
 });

dev-packages/browser-integration-tests/suites/integrations/featureFlags/growthbook/onError/init.js

@@ -31,7 +31,6 @@ window.Sentry = Sentry;
 window.sentryGrowthBookIntegration = Sentry.growthbookIntegration({ growthbookClass: window.GrowthBook });
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   sampleRate: 1.0,
   integrations: [window.sentryGrowthBookIntegration],

dev-packages/browser-integration-tests/suites/integrations/featureFlags/growthbook/onSpan/init.js

@@ -29,7 +29,6 @@ window.Sentry = Sentry;
 window.sentryGrowthBookIntegration = Sentry.growthbookIntegration({ growthbookClass: window.GrowthBook });
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   sampleRate: 1.0,
   tracesSampleRate: 1.0,