small cleanup

Author: Lms24

packages/browser/src/tracing/browserTracingIntegration.ts

@@ -22,6 +22,7 @@ import {
   spanIsSampled,
   spanToJSON,
   startIdleSpan,
+  startNewTrace,
 } from '@sentry/core';
 import type { Client, IntegrationFn, StartSpanOptions, TransactionSource } from '@sentry/types';
 import type { Span } from '@sentry/types';
@@ -412,8 +413,7 @@ export function startBrowserTracingPageLoadSpan(
  * This will only do something if a browser tracing integration has been setup.
  */
 export function startBrowserTracingNavigationSpan(client: Client, spanOptions: StartSpanOptions): Span | undefined {
-  getCurrentScope().setPropagationContext(generatePropagationContext());
-  getIsolationScope().setPropagationContext(generatePropagationContext());
+  startNewTrace();
 
   client.emit('startNavigationSpan', spanOptions);
 
@@ -487,10 +487,3 @@ function registerInteractionListener(
     addEventListener('click', registerInteractionTransaction, { once: false, capture: true });
   }
 }
-
-function generatePropagationContext(): { traceId: string; spanId: string } {
-  return {
-    traceId: uuid4(),
-    spanId: uuid4().substring(16),
-  };
-}

packages/core/src/scope.ts

@@ -24,6 +24,7 @@ import type {
 import { dateTimestampInSeconds, isPlainObject, logger, uuid4 } from '@sentry/utils';
 
 import { updateSession } from './session';
+import { generatePropagationContext } from './tracing/propagationContext';
 import { _getSpanForScope, _setSpanForScope } from './utils/spanOnScope';
 
 /**
@@ -600,10 +601,3 @@ export const Scope = ScopeClass;
  * Holds additional event information.
  */
 export type Scope = ScopeInterface;
-
-function generatePropagationContext(): PropagationContext {
-  return {
-    traceId: uuid4(),
-    spanId: uuid4().substring(16),
-  };
-}

packages/core/src/tracing/propagationContext.ts

@@ -0,0 +1,12 @@
+import type { PropagationContext } from '@sentry/types';
+import { uuid4 } from '@sentry/utils';
+
+/**
+ * Generates a new minimal propagation context
+ */
+export function generatePropagationContext(): PropagationContext {
+  return {
+    traceId: uuid4(),
+    spanId: uuid4().substring(16),
+  };
+}

packages/core/src/tracing/trace.ts

@@ -14,6 +14,7 @@ import { _getSpanForScope, _setSpanForScope } from '../utils/spanOnScope';
 import { addChildSpanToSpan, getRootSpan, spanIsSampled, spanTimeInputToSeconds, spanToJSON } from '../utils/spanUtils';
 import { freezeDscOnSpan, getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
 import { logSpanStart } from './logSpans';
+import { generatePropagationContext } from './propagationContext';
 import { sampleSpan } from './sampling';
 import { SentryNonRecordingSpan } from './sentryNonRecordingSpan';
 import { SentrySpan } from './sentrySpan';
@@ -414,10 +415,3 @@ function getParentSpan(scope: Scope): SentrySpan | undefined {
 
   return span;
 }
-
-function generatePropagationContext(): { traceId: string; spanId: string } {
-  return {
-    traceId: uuid4(),
-    spanId: uuid4().substring(16),
-  };
-}

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

@@ -0,0 +1,10 @@
+import { generatePropagationContext } from '../../../src/tracing/propagationContext';
+
+describe('generatePropagationContext', () => {
+  it('generates a new minimal propagation context', () => {
+    expect(generatePropagationContext()).toEqual({
+      traceId: expect.stringMatching(/^[0-9a-f]{32}$/),
+      spanId: expect.stringMatching(/^[0-9a-f]{16}$/),
+    });
+  });
+});