Merge remote-tracking branch 'origin/develop' into lforst-sample-rand

Author: Luca Forstner

docs/migration/v8-to-v9.md

@@ -270,6 +270,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`.
 - `Client` now always expects the `BaseClient` class - there is no more abstract `Client` that can be implemented! Any `Client` class has to extend from `BaseClient`.
 - `ReportDialogOptions` now extends `Record<string, unknown>` instead of `Record<string, any>` - this should not affect most users.
 - The `RequestDataIntegrationOptions` type has been removed. There is no replacement.

packages/core/src/tracing/trace.ts

@@ -414,10 +414,6 @@ function _startRootSpan(spanArguments: SentrySpanArguments, scope: Scope, parent
           name,
           parentSampled,
           attributes,
-          transactionContext: {
-            name,
-            parentSampled,
-          },
           // parentSampleRate: 'TODO',
         },
         sampleRand,

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.
    */

packages/core/test/lib/tracing/trace.test.ts

@@ -606,7 +606,6 @@ describe('startSpan', () => {
         test2: 'aa',
         test3: 'bb',
       },
-      transactionContext: expect.objectContaining({ name: 'outer', parentSampled: undefined }),
     });
   });
 

packages/opentelemetry/src/sampler.ts

@@ -110,10 +110,6 @@ export class SentrySampler implements Sampler {
         {
           name: inferredSpanName,
           attributes: mergedAttributes,
-          transactionContext: {
-            name: inferredSpanName,
-            parentSampled,
-          },
           // parentSampleRate: 'TODO',
           normalizedRequest: isolationScope?.getScopeData().sdkProcessingMetadata.normalizedRequest,
           parentSampled,

packages/opentelemetry/test/trace.test.ts

@@ -1344,7 +1344,6 @@ describe('trace (sampling)', () => {
       parentSampled: undefined,
       name: 'outer',
       attributes: {},
-      transactionContext: { name: 'outer', parentSampled: undefined },
     });
 
     // Now return `false`, it should not sample
@@ -1364,15 +1363,13 @@ describe('trace (sampling)', () => {
         parentSampled: undefined,
         name: 'outer',
         attributes: {},
-        transactionContext: { name: 'outer', parentSampled: undefined },
       }),
     );
     expect(tracesSampler).toHaveBeenCalledWith(
       expect.objectContaining({
         parentSampled: undefined,
         name: 'outer2',
         attributes: {},
-        transactionContext: { name: 'outer2', parentSampled: undefined },
       }),
     );
 
@@ -1413,7 +1410,6 @@ describe('trace (sampling)', () => {
         attr2: 1,
         'sentry.op': 'test.op',
       },
-      transactionContext: { name: 'outer', parentSampled: undefined },
     });
 
     // Now return `0`, it should not sample
@@ -1433,7 +1429,6 @@ describe('trace (sampling)', () => {
         parentSampled: undefined,
         name: 'outer2',
         attributes: {},
-        transactionContext: { name: 'outer2', parentSampled: undefined },
       }),
     );
 
@@ -1456,7 +1451,6 @@ describe('trace (sampling)', () => {
       parentSampled: undefined,
       name: 'outer3',
       attributes: {},
-      transactionContext: { name: 'outer3', parentSampled: undefined },
     });
   });
 
@@ -1490,10 +1484,6 @@ describe('trace (sampling)', () => {
       parentSampled: true,
       name: 'outer',
       attributes: {},
-      transactionContext: {
-        name: 'outer',
-        parentSampled: true,
-      },
     });
   });
 

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,
     });