ref: Rename & streamline

Author: mydea

packages/core/src/baseclient.ts

@@ -50,15 +50,15 @@ import {
 } from '@sentry/utils';
 
 import { getEnvelopeEndpointWithUrlEncodedAuth } from './api';
-import { getIsolationScope, getTraceContextFromScopes } from './currentScopes';
+import { getCurrentScope, getIsolationScope, getTraceContextFromScope } from './currentScopes';
 import { DEBUG_BUILD } from './debug-build';
 import { createEventEnvelope, createSessionEnvelope } from './envelope';
 import type { IntegrationIndex } from './integration';
 import { afterSetupIntegrations } from './integration';
 import { setupIntegration, setupIntegrations } from './integration';
 import type { Scope } from './scope';
 import { updateSession } from './session';
-import { getDynamicSamplingContextFromScopes } from './tracing/dynamicSamplingContext';
+import { getDynamicSamplingContextFromScope } from './tracing/dynamicSamplingContext';
 import { parseSampleRate } from './utils/parseSampleRate';
 import { prepareEvent } from './utils/prepareEvent';
 
@@ -668,7 +668,7 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
   protected _prepareEvent(
     event: Event,
     hint: EventHint,
-    currentScope?: Scope,
+    currentScope = getCurrentScope(),
     isolationScope = getIsolationScope(),
   ): PromiseLike<Event | null> {
     const options = this.getOptions();
@@ -689,11 +689,11 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
       }
 
       evt.contexts = {
-        trace: getTraceContextFromScopes(currentScope, isolationScope),
+        trace: getTraceContextFromScope(currentScope),
         ...evt.contexts,
       };
 
-      const dynamicSamplingContext = getDynamicSamplingContextFromScopes(this, currentScope, isolationScope);
+      const dynamicSamplingContext = getDynamicSamplingContextFromScope(this, currentScope);
 
       evt.sdkProcessingMetadata = {
         dynamicSamplingContext,

packages/core/src/currentScopes.ts

@@ -1,4 +1,4 @@
-import type { PropagationContext, Scope, TraceContext } from '@sentry/types';
+import type { Scope, TraceContext } from '@sentry/types';
 import type { Client } from '@sentry/types';
 import { dropUndefinedKeys, generateSentryTraceHeader, getGlobalSingleton } from '@sentry/utils';
 import { getAsyncContextStrategy } from './asyncContext';
@@ -124,12 +124,8 @@ export function getClient<C extends Client>(): C | undefined {
 /**
  * Get a trace context for the currently active scopes.
  */
-export function getTraceContextFromScopes(
-  scope = getCurrentScope(),
-  isolationScope = getIsolationScope(),
-  globalScope = getGlobalScope(),
-): TraceContext {
-  const propagationContext = mergePropagationContexts(scope, isolationScope, globalScope);
+export function getTraceContextFromScope(scope: Scope): TraceContext {
+  const propagationContext = scope.getPropagationContext();
 
   const { traceId, spanId, parentSpanId } = propagationContext;
 
@@ -145,24 +141,7 @@ export function getTraceContextFromScopes(
 /**
  * Get a sentry-trace header value for the currently active scopes.
  */
-export function scopesToTraceHeader(
-  scope = getCurrentScope(),
-  isolationScope = getIsolationScope(),
-  globalScope = getGlobalScope(),
-): string {
-  const { traceId, sampled, spanId } = mergePropagationContexts(scope, isolationScope, globalScope);
+export function scopesToTraceHeader(scope: Scope): string {
+  const { traceId, sampled, spanId } = scope.getPropagationContext();
   return generateSentryTraceHeader(traceId, spanId, sampled);
 }
-
-/** Get a merged propagationContext for the current scopes. */
-export function mergePropagationContexts(
-  scope = getCurrentScope(),
-  isolationScope = getIsolationScope(),
-  globalScope = getGlobalScope(),
-): PropagationContext {
-  return {
-    ...globalScope.getPropagationContext(),
-    ...isolationScope.getPropagationContext(),
-    ...scope.getPropagationContext(),
-  };
-}

packages/core/src/index.ts

@@ -38,7 +38,7 @@ export {
   withScope,
   withIsolationScope,
   getClient,
-  getTraceContextFromScopes,
+  getTraceContextFromScope,
 } from './currentScopes';
 export {
   getDefaultCurrentScope,

packages/core/src/server-runtime-client.ts

@@ -15,12 +15,12 @@ import { eventFromMessage, eventFromUnknownInput, logger, resolvedSyncPromise, u
 
 import { BaseClient } from './baseclient';
 import { createCheckInEnvelope } from './checkin';
-import { getIsolationScope, getTraceContextFromScopes } from './currentScopes';
+import { getIsolationScope, getTraceContextFromScope } from './currentScopes';
 import { DEBUG_BUILD } from './debug-build';
 import type { Scope } from './scope';
 import { SessionFlusher } from './sessionflusher';
 import {
-  getDynamicSamplingContextFromScopes,
+  getDynamicSamplingContextFromScope,
   getDynamicSamplingContextFromSpan,
   registerSpanErrorInstrumentation,
 } from './tracing';
@@ -257,10 +257,10 @@ export class ServerRuntimeClient<
 
     const span = _getSpanForScope(scope);
 
-    const traceContext = span ? spanToTraceContext(span) : getTraceContextFromScopes(scope);
+    const traceContext = span ? spanToTraceContext(span) : getTraceContextFromScope(scope);
     const dynamicSamplingContext = span
       ? getDynamicSamplingContextFromSpan(span)
-      : getDynamicSamplingContextFromScopes(this, scope);
+      : getDynamicSamplingContextFromScope(this, scope);
     return [dynamicSamplingContext, traceContext];
   }
 }

packages/core/src/tracing/dynamicSamplingContext.ts

@@ -1,4 +1,4 @@
-import type { Client, DynamicSamplingContext, Span } from '@sentry/types';
+import type { Client, DynamicSamplingContext, Scope, Span } from '@sentry/types';
 import {
   addNonEnumerableProperty,
   baggageHeaderToDynamicSamplingContext,
@@ -7,13 +7,7 @@ import {
 } from '@sentry/utils';
 
 import { DEFAULT_ENVIRONMENT } from '../constants';
-import {
-  getClient,
-  getCurrentScope,
-  getGlobalScope,
-  getIsolationScope,
-  mergePropagationContexts,
-} from '../currentScopes';
+import { getClient } from '../currentScopes';
 import { SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '../semanticAttributes';
 import { hasTracingEnabled } from '../utils/hasTracingEnabled';
 import { getRootSpan, spanIsSampled, spanToJSON } from '../utils/spanUtils';
@@ -61,13 +55,8 @@ export function getDynamicSamplingContextFromClient(trace_id: string, client: Cl
 /**
  * Get the dynamic sampling context for the currently active scopes.
  */
-export function getDynamicSamplingContextFromScopes(
-  client: Client,
-  scope = getCurrentScope(),
-  isolationScope = getIsolationScope(),
-  globalScope = getGlobalScope(),
-): Partial<DynamicSamplingContext> {
-  const propagationContext = mergePropagationContexts(scope, isolationScope, globalScope);
+export function getDynamicSamplingContextFromScope(client: Client, scope: Scope): Partial<DynamicSamplingContext> {
+  const propagationContext = scope.getPropagationContext();
   return propagationContext.dsc || getDynamicSamplingContextFromClient(propagationContext.traceId, client);
 }
 

packages/core/src/tracing/index.ts

@@ -22,7 +22,7 @@ export {
 export {
   getDynamicSamplingContextFromClient,
   getDynamicSamplingContextFromSpan,
-  getDynamicSamplingContextFromScopes,
+  getDynamicSamplingContextFromScope,
   spanToBaggageHeader,
 } from './dynamicSamplingContext';
 export { setMeasurement, timedEventsToMeasurements } from './measurement';

packages/core/src/tracing/sentryHeaders.ts

@@ -1,19 +1,23 @@
 import type { Client, Scope, Span } from '@sentry/types';
 import { dynamicSamplingContextToSentryBaggageHeader } from '@sentry/utils';
-import { scopesToTraceHeader } from '../currentScopes';
+import { getCurrentScope, scopesToTraceHeader } from '../currentScopes';
 import { spanToTraceHeader } from '../utils/spanUtils';
-import { getDynamicSamplingContextFromScopes, getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
+import { getDynamicSamplingContextFromScope, getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
 
 /**
  * Get the sentry-trace and baggage headers for a given span or scope.
  * If no scope is defined, it will use the current scope.
  */
-export function getSentryHeaders({ span, client, scope }: { span?: Span; client: Client; scope?: Scope }): {
+export function getSentryHeaders({
+  span,
+  client,
+  scope = getCurrentScope(),
+}: { span?: Span; client: Client; scope?: Scope }): {
   sentryTrace: string;
   baggage: string | undefined;
 } {
   const sentryTrace = span ? spanToTraceHeader(span) : scopesToTraceHeader(scope);
-  const dsc = span ? getDynamicSamplingContextFromSpan(span) : getDynamicSamplingContextFromScopes(client, scope);
+  const dsc = span ? getDynamicSamplingContextFromSpan(span) : getDynamicSamplingContextFromScope(client, scope);
   const baggage = dynamicSamplingContextToSentryBaggageHeader(dsc);
 
   return {

packages/opentelemetry/src/propagator.ts

@@ -4,8 +4,8 @@ import { context } from '@opentelemetry/api';
 import { propagation, trace } from '@opentelemetry/api';
 import { W3CBaggagePropagator, isTracingSuppressed } from '@opentelemetry/core';
 import { ATTR_URL_FULL, SEMATTRS_HTTP_URL } from '@opentelemetry/semantic-conventions';
-import type { continueTrace} from '@sentry/core';
-import { getDynamicSamplingContextFromScopes } from '@sentry/core';
+import type { continueTrace } from '@sentry/core';
+import { getDynamicSamplingContextFromScope } from '@sentry/core';
 import { getRootSpan } from '@sentry/core';
 import { spanToJSON } from '@sentry/core';
 import { getClient, getCurrentScope, getDynamicSamplingContextFromSpan, getIsolationScope } from '@sentry/core';
@@ -213,7 +213,7 @@ function getInjectionData(context: Context): {
   const client = getClient();
 
   const propagationContext = scope.getPropagationContext();
-  const dynamicSamplingContext = client ? getDynamicSamplingContextFromScopes(client, scope) : undefined;
+  const dynamicSamplingContext = client ? getDynamicSamplingContextFromScope(client, scope) : undefined;
   return {
     dynamicSamplingContext,
     traceId: propagationContext.traceId,

packages/opentelemetry/src/trace.ts

@@ -7,10 +7,10 @@ import {
   continueTrace as baseContinueTrace,
   getClient,
   getCurrentScope,
-  getDynamicSamplingContextFromScopes,
+  getDynamicSamplingContextFromScope,
   getDynamicSamplingContextFromSpan,
   getRootSpan,
-  getTraceContextFromScopes,
+  getTraceContextFromScope,
   handleCallbackErrors,
   spanToJSON,
   spanToTraceContext,
@@ -292,11 +292,11 @@ export function getTraceContextForScope(
   const ctx = getContextFromScope(scope);
   const span = ctx && trace.getSpan(ctx);
 
-  const traceContext = span ? spanToTraceContext(span) : getTraceContextFromScopes(scope);
+  const traceContext = span ? spanToTraceContext(span) : getTraceContextFromScope(scope);
 
   const dynamicSamplingContext = span
     ? getDynamicSamplingContextFromSpan(span)
-    : getDynamicSamplingContextFromScopes(client, scope);
+    : getDynamicSamplingContextFromScope(client, scope);
   return [dynamicSamplingContext, traceContext];
 }