wip

Author: Lms24

packages/browser/src/tracing/browserTracingIntegration.ts

@@ -24,6 +24,7 @@ import {
   getDynamicSamplingContextFromSpan,
   getIsolationScope,
   getLocationHref,
+  getRootSpan,
   logger,
   propagationContextFromHeaders,
   registerSpanErrorInstrumentation,
@@ -35,7 +36,6 @@ import { DEBUG_BUILD } from '../debug-build';
 import { WINDOW } from '../helpers';
 import { registerBackgroundTabDetection } from './backgroundtab';
 import { defaultRequestInstrumentationOptions, instrumentOutgoingRequests } from './request';
-import type { PreviousTraceInfo } from './previousTrace';
 import {
   addPreviousTraceSpanLink,
   getPreviousTraceFromSessionStorage,
@@ -274,19 +274,10 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
     source: undefined,
   };
 
-  let previousTraceInfo: PreviousTraceInfo | undefined;
-  if (enablePreviousTrace && persistPreviousTrace) {
-    previousTraceInfo = getPreviousTraceFromSessionStorage();
-  }
-
   /** Create routing idle transaction. */
   function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions): void {
     const isPageloadTransaction = startSpanOptions.op === 'pageload';
 
-    if (enablePreviousTrace && previousTraceInfo) {
-      previousTraceInfo = addPreviousTraceSpanLink(previousTraceInfo, startSpanOptions);
-    }
-
     const finalStartSpanOptions: StartSpanOptions = beforeStartSpan
       ? beforeStartSpan(startSpanOptions)
       : startSpanOptions;
@@ -330,16 +321,6 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
     });
     setActiveIdleSpan(client, idleSpan);
 
-    if (enablePreviousTrace) {
-      previousTraceInfo = {
-        spanContext: idleSpan.spanContext(),
-        startTimestamp: spanToJSON(idleSpan).start_timestamp,
-      };
-      if (persistPreviousTrace) {
-        storePreviousTraceInSessionStorage(previousTraceInfo);
-      }
-    }
-
     function emitFinish(): void {
       if (optionalWindowDocument && ['interactive', 'complete'].includes(optionalWindowDocument.readyState)) {
         client.emit('idleSpanEnableAutoFinish', idleSpan);
@@ -468,6 +449,22 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
         shouldCreateSpanForRequest,
         enableHTTPTimings,
       });
+
+      if (enablePreviousTrace) {
+        let previousTraceInfo = persistPreviousTrace ? getPreviousTraceFromSessionStorage() : undefined;
+
+        client.on('spanStart', span => {
+          if (getRootSpan(span) !== span) {
+            return;
+          }
+
+          previousTraceInfo = addPreviousTraceSpanLink(previousTraceInfo, span);
+
+          if (persistPreviousTrace) {
+            storePreviousTraceInSessionStorage(previousTraceInfo);
+          }
+        });
+      }
     },
   };
 }) satisfies IntegrationFn;

packages/browser/src/tracing/previousTrace.ts

@@ -1,4 +1,5 @@
-import { logger, SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE, type SpanContextData, type StartSpanOptions } from '@sentry/core';
+import type { Span } from '@sentry/core';
+import { logger, SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE, spanToJSON, type SpanContextData } from '@sentry/core';
 import { WINDOW } from '../exports';
 import { DEBUG_BUILD } from '../debug-build';
 
@@ -25,23 +26,22 @@ const PREVIOUS_TRACE_KEY = 'sentry_previous_trace';
  * Returns @param previousTraceInfo if the previous trace is still valid, otherwise returns undefined.
  */
 export function addPreviousTraceSpanLink(
-  previousTraceInfo: PreviousTraceInfo,
-  startSpanOptions: StartSpanOptions,
-): PreviousTraceInfo | undefined {
-  if (Date.now() / 1000 - previousTraceInfo.startTimestamp <= PREVIOUS_TRACE_MAX_DURATION) {
-    startSpanOptions.links = [
-      ...(startSpanOptions.links || []),
-      {
-        context: previousTraceInfo.spanContext,
-        attributes: {
-          [SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: 'previous_trace',
-        },
+  previousTraceInfo: PreviousTraceInfo | undefined,
+  span: Span,
+): PreviousTraceInfo {
+  if (previousTraceInfo && Date.now() / 1000 - previousTraceInfo.startTimestamp <= PREVIOUS_TRACE_MAX_DURATION) {
+    span.addLink({
+      context: previousTraceInfo.spanContext,
+      attributes: {
+        [SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: 'previous_trace',
       },
-    ];
-  } else if (previousTraceInfo) {
-    return undefined;
+    });
   }
-  return previousTraceInfo;
+
+  return {
+    spanContext: span.spanContext(),
+    startTimestamp: spanToJSON(span).start_timestamp,
+  };
 }
 
 /**