feat(core): Remove transactionContext from samplingContext

getsentry · Jan 7, 2025 · 29808e1 · 29808e1
1 parent c347dae
commit 29808e1
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 31 deletions.
diff --git a/docs/migration/v8-to-v9.md b/docs/migration/v8-to-v9.md
@@ -221,6 +221,7 @@ Since v9, the types have been merged into `@sentry/core`, which removed some of
 - The `Request` type has been removed. Use `RequestEventData` type instead.
 - The `IntegrationClass` type is no longer exported - it was not used anymore. Instead, use `Integration` or `IntegrationFn`.
 - The `samplingContext.request` attribute in the `tracesSampler` has been removed. Use `samplingContext.normalizedRequest` instead. Note that the type of `normalizedRequest` differs from `request`.
+- The `samplingContext.transactionContext` object in the `tracesSampler` has been removed. All object attributes are available in the top-level of `samplingContext`.
 
 # No Version Support Timeline
 

diff --git a/packages/core/src/tracing/trace.ts b/packages/core/src/tracing/trace.ts
@@ -381,10 +381,6 @@ function _startRootSpan(spanArguments: SentrySpanArguments, scope: Scope, parent
         name,
         parentSampled,
         attributes,
-        transactionContext: {
-          name,
-          parentSampled,
-        },
       });
 
   const rootSpan = new SentrySpan({

diff --git a/packages/core/src/types-hoist/samplingcontext.ts b/packages/core/src/types-hoist/samplingcontext.ts
@@ -15,15 +15,6 @@ export interface CustomSamplingContext {
  * Adds default data to data provided by the user. See {@link Hub.startTransaction}
  */
 export interface SamplingContext extends CustomSamplingContext {
-  /**
-   * Context data with which transaction being sampled was created.
-   * @deprecated This is duplicate data and will be removed eventually.
-   */
-  transactionContext: {
-    name: string;
-    parentSampled?: boolean | undefined;
-  };
-
   /**
    * Sampling decision from the parent transaction, if any.
    */

diff --git a/packages/core/test/lib/tracing/trace.test.ts b/packages/core/test/lib/tracing/trace.test.ts
@@ -496,7 +496,6 @@ describe('startSpan', () => {
         test2: 'aa',
         test3: 'bb',
       },
-      transactionContext: expect.objectContaining({ name: 'outer', parentSampled: undefined }),
     });
   });
 

diff --git a/packages/opentelemetry/src/sampler.ts b/packages/opentelemetry/src/sampler.ts
@@ -99,10 +99,6 @@ export class SentrySampler implements Sampler {
     const [sampled, sampleRate] = sampleSpan(options, {
       name: inferredSpanName,
       attributes: mergedAttributes,
-      transactionContext: {
-        name: inferredSpanName,
-        parentSampled,
-      },
       parentSampled,
     });
 

diff --git a/packages/opentelemetry/test/trace.test.ts b/packages/opentelemetry/test/trace.test.ts
@@ -1322,7 +1322,6 @@ describe('trace (sampling)', () => {
       parentSampled: undefined,
       name: 'outer',
       attributes: {},
-      transactionContext: { name: 'outer', parentSampled: undefined },
     });
 
     // Now return `false`, it should not sample
@@ -1341,7 +1340,6 @@ describe('trace (sampling)', () => {
       parentSampled: false,
       name: 'inner2',
       attributes: {},
-      transactionContext: { name: 'inner2', parentSampled: false },
     });
   });
 
@@ -1376,7 +1374,6 @@ describe('trace (sampling)', () => {
         attr2: 1,
         'sentry.op': 'test.op',
       },
-      transactionContext: { name: 'outer', parentSampled: undefined },
     });
 
     // Now return `0`, it should not sample
@@ -1395,7 +1392,6 @@ describe('trace (sampling)', () => {
       parentSampled: false,
       name: 'inner2',
       attributes: {},
-      transactionContext: { name: 'inner2', parentSampled: false },
     });
 
     // Now return `0.4`, it should not sample
@@ -1410,7 +1406,6 @@ describe('trace (sampling)', () => {
       parentSampled: undefined,
       name: 'outer3',
       attributes: {},
-      transactionContext: { name: 'outer3', parentSampled: undefined },
     });
   });
 
@@ -1444,10 +1439,6 @@ describe('trace (sampling)', () => {
       parentSampled: true,
       name: 'outer',
       attributes: {},
-      transactionContext: {
-        name: 'outer',
-        parentSampled: true,
-      },
     });
   });
 

diff --git a/packages/profiling-node/src/spanProfileUtils.ts b/packages/profiling-node/src/spanProfileUtils.ts
@@ -48,10 +48,6 @@ export function maybeProfileSpan(
     profilesSampleRate = profilesSampler({
       name: spanName,
       attributes: data,
-      transactionContext: {
-        name: spanName,
-        parentSampled,
-      },
       parentSampled,
       ...customSamplingContext,
     });
-Original file line number
+Diff line change
@@ Expand Up / @@ -496,7 +496,6 @@ describe('startSpan', () => { @@
             test2: 'aa',
             test3: 'bb',
           },
-          transactionContext: expect.objectContaining({ name: 'outer', parentSampled: undefined }),
         });
       });
@@ Expand Down @@