tests, lint

Author: Lms24

packages/browser/src/tracing/browserTracingIntegration.ts

@@ -553,6 +553,9 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
         const scope = getCurrentScope();
         scope.setPropagationContext(propagationContext);
         if (!hasSpansEnabled()) {
+          // for browser, we wanna keep the spanIds consistent during the entire lifetime of the trace
+          // this works by setting the propagationSpanId to a random spanId so that we have a consistent
+          // span id to propagate in TwP mode (!hasSpansEnabled())
           scope.getPropagationContext().propagationSpanId = generateSpanId();
         }
 

packages/core/src/utils/traceData.ts

@@ -10,12 +10,7 @@ import type { SerializedTraceData } from '../types-hoist/tracing';
 import { dynamicSamplingContextToSentryBaggageHeader } from './baggage';
 import { debug } from './debug-logger';
 import { getActiveSpan, spanToTraceHeader, spanToTraceparentHeader } from './spanUtils';
-import {
-  extractTraceparentData,
-  generateSentryTraceHeader,
-  generateTraceparentHeader,
-  TRACEPARENT_REGEXP,
-} from './tracing';
+import { generateSentryTraceHeader, generateTraceparentHeader, TRACEPARENT_REGEXP } from './tracing';
 
 /**
  * Extracts trace propagation data from the current span or from the client's scope (via transaction or propagation

packages/core/test/lib/utils/traceData.test.ts

@@ -15,7 +15,6 @@ import {
 import { getAsyncContextStrategy } from '../../../src/asyncContext';
 import { freezeDscOnSpan } from '../../../src/tracing/dynamicSamplingContext';
 import type { Span } from '../../../src/types-hoist/span';
-import { _sentryTraceToTraceParentHeader } from '../../../src/utils/traceData';
 import type { TestClientOptions } from '../../mocks/client';
 import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
 
@@ -349,20 +348,3 @@ describe('getTraceData', () => {
     expect(traceData.traceparent).toMatch(/00-12345678901234567890123456789099-[0-9a-f]{16}-00/);
   });
 });
-
-describe('_sentryTraceToTraceParentHeader', () => {
-  it('returns positively sampled traceparent header for sentry-trace with positive sampling decision', () => {
-    const traceparent = _sentryTraceToTraceParentHeader('12345678901234567890123456789012-1234567890123456-1');
-    expect(traceparent).toBe('00-12345678901234567890123456789012-1234567890123456-01');
-  });
-
-  it('returns negatively sampled traceparent header for sentry-trace with negative sampling decision', () => {
-    const traceparent = _sentryTraceToTraceParentHeader('12345678901234567890123456789012-1234567890123456-0');
-    expect(traceparent).toBe('00-12345678901234567890123456789012-1234567890123456-00');
-  });
-
-  it('returns negatively sampled traceparent header for sentry-trace with no/deferred sampling decision', () => {
-    const traceparent = _sentryTraceToTraceParentHeader('12345678901234567890123456789012-1234567890123456');
-    expect(traceparent).toBe('00-12345678901234567890123456789012-1234567890123456-00');
-  });
-});

packages/core/test/lib/utils/tracing.test.ts

@@ -1,5 +1,10 @@
 import { describe, expect, it, test } from 'vitest';
-import { extractTraceparentData, propagationContextFromHeaders, shouldContinueTrace } from '../../../src/utils/tracing';
+import {
+  extractTraceparentData,
+  generateTraceparentHeader,
+  propagationContextFromHeaders,
+  shouldContinueTrace,
+} from '../../../src/utils/tracing';
 import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
 
 const EXAMPLE_SENTRY_TRACE = '12312012123120121231201212312012-1121201211212012-1';
@@ -177,3 +182,20 @@ describe('shouldContinueTrace', () => {
     expect(result).toBe(false);
   });
 });
+
+describe('generateTraceparentHeader', () => {
+  test('returns a traceparent header with the given ids and positive sampling decision', () => {
+    const traceparent = generateTraceparentHeader('12345678901234567890123456789012', '1234567890123456', true);
+    expect(traceparent).toBe('00-12345678901234567890123456789012-1234567890123456-01');
+  });
+
+  test('returns a traceparent header with the given ids and negative sampling decision', () => {
+    const traceparent = generateTraceparentHeader('12345678901234567890123456789012', '1234567890123456', false);
+    expect(traceparent).toBe('00-12345678901234567890123456789012-1234567890123456-00');
+  });
+
+  test('no sampling decision passed, creates a negatively sampled traceparent header', () => {
+    const traceparent = generateTraceparentHeader('12345678901234567890123456789012', '1234567890123456');
+    expect(traceparent).toBe('00-12345678901234567890123456789012-1234567890123456-00');
+  });
+});