revert tests

Author: mydea

packages/browser/test/tracing/browserTracingIntegration.test.ts

@@ -20,18 +20,15 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-  SentryNonRecordingSpan,
   TRACING_DEFAULTS,
   getActiveSpan,
   getCurrentScope,
   getDynamicSamplingContextFromSpan,
   getIsolationScope,
-  getTraceData,
   setCurrentClient,
   spanIsSampled,
   spanToJSON,
   startInactiveSpan,
-  updateSpanName,
 } from '@sentry/core';
 import type { Span, StartSpanOptions } from '@sentry/core';
 import { JSDOM } from 'jsdom';
@@ -268,10 +265,6 @@ describe('browserTracingIntegration', () => {
 
       expect(span).toBeDefined();
       expect(spanIsSampled(span!)).toBe(false);
-
-      // Ensure getTraceData is correct in this case
-      const traceData = getTraceData();
-      expect(traceData['sentry-trace']).toEqual(`${span?.spanContext().traceId}-${span?.spanContext().spanId}-0`);
     });
 
     it('works with integration setup', () => {
@@ -372,7 +365,7 @@ describe('browserTracingIntegration', () => {
 
       const client = new BrowserClient(
         getDefaultBrowserClientOptions({
-          tracesSampleRate: 1,
+          tracesSampleRate: 0,
           integrations: [
             browserTracingIntegration({
               instrumentPageLoad: false,
@@ -385,7 +378,9 @@ describe('browserTracingIntegration', () => {
       setCurrentClient(client);
       client.init();
 
-      const pageloadSpan = startBrowserTracingPageLoadSpan(client, { name: 'test span' });
+      startBrowserTracingPageLoadSpan(client, { name: 'test span' });
+
+      const pageloadSpan = getActiveSpan();
 
       expect(spanToJSON(pageloadSpan!).op).toBe('test op');
     });
@@ -413,7 +408,7 @@ describe('browserTracingIntegration', () => {
 
     const client = new BrowserClient(
       getDefaultBrowserClientOptions({
-        tracesSampleRate: 1,
+        tracesSampleRate: 0,
         integrations: [
           browserTracingIntegration({
             instrumentPageLoad: false,
@@ -463,10 +458,6 @@ describe('browserTracingIntegration', () => {
 
       expect(span).toBeDefined();
       expect(spanIsSampled(span!)).toBe(false);
-
-      // Ensure getTraceData is correct in this case
-      const traceData = getTraceData();
-      expect(traceData['sentry-trace']).toEqual(`${span?.spanContext().traceId}-${span?.spanContext().spanId}-0`);
     });
 
     it('works with integration setup', () => {
@@ -571,7 +562,7 @@ describe('browserTracingIntegration', () => {
 
       const client = new BrowserClient(
         getDefaultBrowserClientOptions({
-          tracesSampleRate: 1,
+          tracesSampleRate: 0,
           integrations: [
             browserTracingIntegration({
               instrumentPageLoad: false,
@@ -584,7 +575,9 @@ describe('browserTracingIntegration', () => {
       setCurrentClient(client);
       client.init();
 
-      const navigationSpan = startBrowserTracingNavigationSpan(client, { name: 'test span' });
+      startBrowserTracingNavigationSpan(client, { name: 'test span' });
+
+      const navigationSpan = getActiveSpan();
 
       expect(spanToJSON(navigationSpan!).op).toBe('test op');
     });
@@ -597,7 +590,7 @@ describe('browserTracingIntegration', () => {
 
       const client = new BrowserClient(
         getDefaultBrowserClientOptions({
-          tracesSampleRate: 1,
+          tracesSampleRate: 0,
           integrations: [
             browserTracingIntegration({
               instrumentPageLoad: false,
@@ -635,7 +628,7 @@ describe('browserTracingIntegration', () => {
     it("updates the scopes' propagationContexts on a navigation", () => {
       const client = new BrowserClient(
         getDefaultBrowserClientOptions({
-          integrations: [browserTracingIntegration({ instrumentPageLoad: false })],
+          integrations: [browserTracingIntegration()],
         }),
       );
       setCurrentClient(client);
@@ -644,8 +637,7 @@ describe('browserTracingIntegration', () => {
       const oldIsolationScopePropCtx = getIsolationScope().getPropagationContext();
       const oldCurrentScopePropCtx = getCurrentScope().getPropagationContext();
 
-      const span = startBrowserTracingNavigationSpan(client, { name: 'test navigation span' });
-      const traceId = span!.spanContext().traceId;
+      startBrowserTracingNavigationSpan(client, { name: 'test navigation span' });
 
       const newIsolationScopePropCtx = getIsolationScope().getPropagationContext();
       const newCurrentScopePropCtx = getCurrentScope().getPropagationContext();
@@ -657,37 +649,14 @@ describe('browserTracingIntegration', () => {
         traceId: expect.stringMatching(/[a-f0-9]{32}/),
       });
       expect(newCurrentScopePropCtx).toEqual({
-        traceId,
-        sampled: false,
-        dsc: {
-          environment: 'production',
-          public_key: 'examplePublicKey',
-          sample_rate: '0',
-          trace_id: traceId,
-        },
+        traceId: expect.stringMatching(/[a-f0-9]{32}/),
       });
       expect(newIsolationScopePropCtx).toEqual({
         traceId: expect.stringMatching(/[a-f0-9]{32}/),
       });
 
       expect(newIsolationScopePropCtx.traceId).not.toEqual(oldIsolationScopePropCtx.traceId);
       expect(newCurrentScopePropCtx.traceId).not.toEqual(oldCurrentScopePropCtx.traceId);
-
-      const span2 = startBrowserTracingNavigationSpan(client, { name: 'test navigation span 2' });
-      const traceId2 = span2!.spanContext().traceId;
-      expect(traceId2).not.toEqual(traceId);
-
-      const newCurrentScopePropCtx2 = getCurrentScope().getPropagationContext();
-      expect(newCurrentScopePropCtx2).toEqual({
-        traceId: traceId2,
-        sampled: false,
-        dsc: {
-          environment: 'production',
-          public_key: 'examplePublicKey',
-          sample_rate: '0',
-          trace_id: traceId2,
-        },
-      });
     });
 
     it("saves the span's positive sampling decision and its DSC on the propagationContext when the span finishes", () => {
@@ -708,18 +677,8 @@ describe('browserTracingIntegration', () => {
       const propCtxBeforeEnd = getCurrentScope().getPropagationContext();
       expect(propCtxBeforeEnd).toStrictEqual({
         traceId: expect.stringMatching(/[a-f0-9]{32}/),
-        sampled: true,
-        dsc: {
-          environment: 'production',
-          public_key: 'examplePublicKey',
-          sample_rate: '1',
-          sampled: 'true',
-          transaction: 'mySpan',
-          trace_id: propCtxBeforeEnd.traceId,
-        },
       });
 
-      updateSpanName(navigationSpan!, 'mySpan2');
       navigationSpan!.end();
 
       const propCtxAfterEnd = getCurrentScope().getPropagationContext();
@@ -731,7 +690,7 @@ describe('browserTracingIntegration', () => {
           public_key: 'examplePublicKey',
           sample_rate: '1',
           sampled: 'true',
-          transaction: 'mySpan2',
+          transaction: 'mySpan',
           trace_id: propCtxBeforeEnd.traceId,
         },
       });
@@ -755,15 +714,6 @@ describe('browserTracingIntegration', () => {
       const propCtxBeforeEnd = getCurrentScope().getPropagationContext();
       expect(propCtxBeforeEnd).toStrictEqual({
         traceId: expect.stringMatching(/[a-f0-9]{32}/),
-        sampled: false,
-        dsc: {
-          environment: 'production',
-          public_key: 'examplePublicKey',
-          sample_rate: '0',
-          sampled: 'false',
-          transaction: 'mySpan',
-          trace_id: propCtxBeforeEnd.traceId,
-        },
       });
 
       navigationSpan!.end();
@@ -808,19 +758,18 @@ describe('browserTracingIntegration', () => {
       const dynamicSamplingContext = getDynamicSamplingContextFromSpan(idleSpan!);
       const propagationContext = getCurrentScope().getPropagationContext();
 
-      // Span is non-recording
-      expect(idleSpan instanceof SentryNonRecordingSpan).toBe(true);
+      // Span is correct
+      expect(spanToJSON(idleSpan).op).toBe('pageload');
+      expect(spanToJSON(idleSpan).trace_id).toEqual('12312012123120121231201212312012');
+      expect(spanToJSON(idleSpan).parent_span_id).toEqual('1121201211212012');
+      expect(spanIsSampled(idleSpan)).toBe(false);
 
       expect(dynamicSamplingContext).toBeDefined();
       expect(dynamicSamplingContext).toStrictEqual({ release: '2.1.14' });
 
       // Propagation context keeps the meta tag trace data for later events on the same route to add them to the trace
       expect(propagationContext.traceId).toEqual('12312012123120121231201212312012');
       expect(propagationContext.parentSpanId).toEqual('1121201211212012');
-
-      // Ensure getTraceData is correct in this case
-      const traceData = getTraceData();
-      expect(traceData['sentry-trace']).toMatch(/12312012123120121231201212312012-[a-f0-9]{16}-0/);
     });
 
     it('puts frozen Dynamic Sampling Context on pageload span if sentry-trace data and only 3rd party baggage is present', () => {
@@ -846,19 +795,18 @@ describe('browserTracingIntegration', () => {
       const dynamicSamplingContext = getDynamicSamplingContextFromSpan(idleSpan);
       const propagationContext = getCurrentScope().getPropagationContext();
 
-      // Span is NonRecordingSpan
-      expect(idleSpan instanceof SentryNonRecordingSpan).toBe(true);
+      // Span is correct
+      expect(spanToJSON(idleSpan).op).toBe('pageload');
+      expect(spanToJSON(idleSpan).trace_id).toEqual('12312012123120121231201212312012');
+      expect(spanToJSON(idleSpan).parent_span_id).toEqual('1121201211212012');
+      expect(spanIsSampled(idleSpan)).toBe(false);
 
       expect(dynamicSamplingContext).toBeDefined();
       expect(dynamicSamplingContext).toStrictEqual({});
 
       // Propagation context keeps the meta tag trace data for later events on the same route to add them to the trace
       expect(propagationContext.traceId).toEqual('12312012123120121231201212312012');
       expect(propagationContext.parentSpanId).toEqual('1121201211212012');
-
-      // Ensure getTraceData is correct in this case
-      const traceData = getTraceData();
-      expect(traceData['sentry-trace']).toMatch(/12312012123120121231201212312012-[a-f0-9]{16}-0/);
     });
 
     it('ignores the meta tag data for navigation spans', () => {