revert packages/core/src/tracing/utils.ts and amend dsc logic

Author: AbhiPrasad

dev-packages/rollup-utils/plugins/bundlePlugins.mjs

@@ -126,6 +126,9 @@ export function makeTerserPlugin() {
           '_sentryId',
           // Keeps the frozen DSC on a Sentry Span
           '_frozenDsc',
+          // These are used to keep span & scope relationships
+          '_sentryScope',
+          '_sentryIsolationScope',
           // require-in-the-middle calls `Module._resolveFilename`. We cannot mangle this (AWS lambda layer bundle).
           '_resolveFilename',
           // Set on e.g. the shim feedbackIntegration to be able to detect it

packages/core/src/tracing/dynamicSamplingContext.ts

@@ -8,27 +8,18 @@ import {
   baggageHeaderToDynamicSamplingContext,
   dynamicSamplingContextToSentryBaggageHeader,
 } from '../utils-hoist/baggage';
-import { addNonEnumerableProperty, dropUndefinedKeys } from '../utils-hoist/object';
+import { dropUndefinedKeys } from '../utils-hoist/object';
 import { hasSpansEnabled } from '../utils/hasSpansEnabled';
 import { getRootSpan, spanIsSampled, spanToJSON } from '../utils/spanUtils';
 import { getCapturedScopesOnSpan } from './utils';
 
-/**
- * If you change this value, also update the terser plugin config to
- * avoid minification of the object property!
- */
-const FROZEN_DSC_FIELD = '_frozenDsc';
-
-type SpanWithMaybeDsc = Span & {
-  [FROZEN_DSC_FIELD]?: Partial<DynamicSamplingContext> | undefined;
-};
+const SPAN_TO_DSC_MAP = new WeakMap<Span, Partial<DynamicSamplingContext>>();
 
 /**
  * Freeze the given DSC on the given span.
  */
 export function freezeDscOnSpan(span: Span, dsc: Partial<DynamicSamplingContext>): void {
-  const spanWithMaybeDsc = span as SpanWithMaybeDsc;
-  addNonEnumerableProperty(spanWithMaybeDsc, FROZEN_DSC_FIELD, dsc);
+  SPAN_TO_DSC_MAP.set(span, dsc);
 }
 
 /**
@@ -91,7 +82,7 @@ export function getDynamicSamplingContextFromSpan(span: Span): Readonly<Partial<
   }
 
   // For core implementation, we freeze the DSC onto the span as a non-enumerable property
-  const frozenDsc = (rootSpan as SpanWithMaybeDsc)[FROZEN_DSC_FIELD];
+  const frozenDsc = SPAN_TO_DSC_MAP.get(rootSpan);
   if (frozenDsc) {
     return applyLocalSampleRateToDsc(frozenDsc);
   }

packages/core/src/tracing/utils.ts

@@ -1,14 +1,20 @@
 import type { Scope } from '../scope';
 import type { Span } from '../types-hoist';
+import { addNonEnumerableProperty } from '../utils-hoist/object';
 
-const SPAN_TO_SCOPE_MAP = new WeakMap<Span, Scope>();
-const SPAN_TO_ISOLATION_SCOPE_MAP = new WeakMap<Span, Scope>();
+const SCOPE_ON_START_SPAN_FIELD = '_sentryScope';
+const ISOLATION_SCOPE_ON_START_SPAN_FIELD = '_sentryIsolationScope';
+
+type SpanWithScopes = Span & {
+  [SCOPE_ON_START_SPAN_FIELD]?: Scope;
+  [ISOLATION_SCOPE_ON_START_SPAN_FIELD]?: Scope;
+};
 
 /** Store the scope & isolation scope for a span, which can the be used when it is finished. */
 export function setCapturedScopesOnSpan(span: Span | undefined, scope: Scope, isolationScope: Scope): void {
   if (span) {
-    SPAN_TO_SCOPE_MAP.set(span, scope);
-    SPAN_TO_ISOLATION_SCOPE_MAP.set(span, isolationScope);
+    addNonEnumerableProperty(span, ISOLATION_SCOPE_ON_START_SPAN_FIELD, isolationScope);
+    addNonEnumerableProperty(span, SCOPE_ON_START_SPAN_FIELD, scope);
   }
 }
 
@@ -17,7 +23,7 @@ export function setCapturedScopesOnSpan(span: Span | undefined, scope: Scope, is
  */
 export function getCapturedScopesOnSpan(span: Span): { scope?: Scope; isolationScope?: Scope } {
   return {
-    scope: SPAN_TO_SCOPE_MAP.get(span),
-    isolationScope: SPAN_TO_ISOLATION_SCOPE_MAP.get(span),
+    scope: (span as SpanWithScopes)[SCOPE_ON_START_SPAN_FIELD],
+    isolationScope: (span as SpanWithScopes)[ISOLATION_SCOPE_ON_START_SPAN_FIELD],
   };
 }