remove one more usage and ref rollup mangle

Author: AbhiPrasad

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

@@ -126,12 +126,6 @@ export function makeTerserPlugin() {
           '_sentryId',
           // Keeps the frozen DSC on a Sentry Span
           '_frozenDsc',
-          // These are used to keep span & scope relationships
-          '_sentryRootSpan',
-          '_sentryChildSpans',
-          '_sentrySpan',
-          '_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/utils/spanOnScope.ts

@@ -1,30 +1,24 @@
 import type { Scope } from '../scope';
 import type { Span } from '../types-hoist';
-import { addNonEnumerableProperty } from '../utils-hoist/object';
 
-const SCOPE_SPAN_FIELD = '_sentrySpan';
-
-type ScopeWithMaybeSpan = Scope & {
-  [SCOPE_SPAN_FIELD]?: Span;
-};
+const SCOPE_TO_SPAN_MAP = new WeakMap<Scope, Span>();
 
 /**
  * Set the active span for a given scope.
  * NOTE: This should NOT be used directly, but is only used internally by the trace methods.
  */
 export function _setSpanForScope(scope: Scope, span: Span | undefined): void {
   if (span) {
-    addNonEnumerableProperty(scope as ScopeWithMaybeSpan, SCOPE_SPAN_FIELD, span);
+    SCOPE_TO_SPAN_MAP.set(scope, span);
   } else {
-    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-    delete (scope as ScopeWithMaybeSpan)[SCOPE_SPAN_FIELD];
+    SCOPE_TO_SPAN_MAP.delete(scope);
   }
 }
 
 /**
  * Get the active span for a given scope.
  * NOTE: This should NOT be used directly, but is only used internally by the trace methods.
  */
-export function _getSpanForScope(scope: ScopeWithMaybeSpan): Span | undefined {
-  return scope[SCOPE_SPAN_FIELD];
+export function _getSpanForScope(scope: Scope): Span | undefined {
+  return SCOPE_TO_SPAN_MAP.get(scope);
 }