From 72b97421b5e7eff0bcdf3407c972e4c890dd62af Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Mon, 25 Mar 2024 20:29:09 -0400
Subject: [PATCH] feat(core/v8): Remove _frozenDynamicSamplingContext

---
 .../rollup-utils/plugins/bundlePlugins.mjs    |  3 --
 .../src/tracing/dynamicSamplingContext.ts     | 32 ++++---------------
 packages/core/src/tracing/transaction.ts      | 11 -------
 3 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/dev-packages/rollup-utils/plugins/bundlePlugins.mjs b/dev-packages/rollup-utils/plugins/bundlePlugins.mjs
index 80dbc4422ea4..bb0b371fd515 100644
--- a/dev-packages/rollup-utils/plugins/bundlePlugins.mjs
+++ b/dev-packages/rollup-utils/plugins/bundlePlugins.mjs
@@ -121,9 +121,6 @@ export function makeTerserPlugin() {
           // These are used by instrument.ts in utils for identifying HTML elements & events
           '_sentryCaptured',
           '_sentryId',
-          // For v7 backwards-compatibility we need to access txn._frozenDynamicSamplingContext
-          // TODO (v8): Remove this reserved word
-          '_frozenDynamicSamplingContext',
           // These are used to keep span relationships
           '_sentryRootSpan',
           '_sentryChildSpans',
diff --git a/packages/core/src/tracing/dynamicSamplingContext.ts b/packages/core/src/tracing/dynamicSamplingContext.ts
index 04510683a1b9..12b27d964135 100644
--- a/packages/core/src/tracing/dynamicSamplingContext.ts
+++ b/packages/core/src/tracing/dynamicSamplingContext.ts
@@ -1,9 +1,9 @@
-import type { Client, DynamicSamplingContext, Span, Transaction } from '@sentry/types';
+import type { Client, DynamicSamplingContext, Span } from '@sentry/types';
 import { dropUndefinedKeys } from '@sentry/utils';
 
 import { DEFAULT_ENVIRONMENT } from '../constants';
 import { getClient } from '../currentScopes';
-import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '../semanticAttributes';
+import { SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '../semanticAttributes';
 import { getRootSpan, spanIsSampled, spanToJSON } from '../utils/spanUtils';
 
 /**
@@ -28,11 +28,6 @@ export function getDynamicSamplingContextFromClient(trace_id: string, client: Cl
   return dsc;
 }
 
-/**
- * A Span with a frozen dynamic sampling context.
- */
-type TransactionWithV7FrozenDsc = Transaction & { _frozenDynamicSamplingContext?: DynamicSamplingContext };
-
 /**
  * Creates a dynamic sampling context from a span (and client and scope)
  *
@@ -47,34 +42,21 @@ export function getDynamicSamplingContextFromSpan(span: Span): Readonly<Partial<
   }
 
   const dsc = getDynamicSamplingContextFromClient(spanToJSON(span).trace_id || '', client);
-
-  // TODO (v8): Remove v7FrozenDsc as a Transaction will no longer have _frozenDynamicSamplingContext
   const rootSpan = getRootSpan(span);
   if (!rootSpan) {
     return dsc;
   }
 
-  // TODO (v8): Remove v7FrozenDsc as a Transaction will no longer have _frozenDynamicSamplingContext
-  // For now we need to avoid breaking users who directly created a txn with a DSC, where this field is still set.
-  // @see Transaction class constructor
-  const v7FrozenDsc = rootSpan && (rootSpan as TransactionWithV7FrozenDsc)._frozenDynamicSamplingContext;
-  if (v7FrozenDsc) {
-    return v7FrozenDsc;
-  }
+  // We don't want to have a transaction name in the DSC if the source is "url" because URLs might contain PII
+  const jsonSpan = spanToJSON(rootSpan);
+  const data = jsonSpan.data || {};
 
-  // TODO (v8): Replace txn.metadata with txn.attributes[]
-  // We can't do this yet because attributes aren't always set yet.
-  // eslint-disable-next-line deprecation/deprecation
-  const { sampleRate: maybeSampleRate } = (rootSpan as TransactionWithV7FrozenDsc).metadata || {};
+  const source = data[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE];
+  const maybeSampleRate = data[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE];
   if (maybeSampleRate != null) {
     dsc.sample_rate = `${maybeSampleRate}`;
   }
 
-  // We don't want to have a transaction name in the DSC if the source is "url" because URLs might contain PII
-  const jsonSpan = spanToJSON(rootSpan);
-
-  const source = (jsonSpan.data || {})[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE];
-
   // after JSON conversion, txn.name becomes jsonSpan.description
   if (source && source !== 'url') {
     dsc.transaction = jsonSpan.description;
diff --git a/packages/core/src/tracing/transaction.ts b/packages/core/src/tracing/transaction.ts
index 2469594ad687..69010dfe9f19 100644
--- a/packages/core/src/tracing/transaction.ts
+++ b/packages/core/src/tracing/transaction.ts
@@ -39,9 +39,6 @@ export class Transaction extends SentrySpan implements TransactionInterface {
 
   private _trimEnd?: boolean | undefined;
 
-  // DO NOT yet remove this property, it is used in a hack for v7 backwards compatibility.
-  private _frozenDynamicSamplingContext: Readonly<Partial<DynamicSamplingContext>> | undefined;
-
   private _metadata: Partial<TransactionMetadata>;
 
   /**
@@ -78,14 +75,6 @@ export class Transaction extends SentrySpan implements TransactionInterface {
     // TODO (v8): Replace this with another way to set the root span
     // eslint-disable-next-line deprecation/deprecation
     this.transaction = this;
-
-    // If Dynamic Sampling Context is provided during the creation of the transaction, we freeze it as it usually means
-    // there is incoming Dynamic Sampling Context. (Either through an incoming request, a baggage meta-tag, or other means)
-    const incomingDynamicSamplingContext = this._metadata.dynamicSamplingContext;
-    if (incomingDynamicSamplingContext) {
-      // We shallow copy this in case anything writes to the original reference of the passed in `dynamicSamplingContext`
-      this._frozenDynamicSamplingContext = { ...incomingDynamicSamplingContext };
-    }
   }
 
   // This sadly conflicts with the getter/setter ordering :(