move files around

Author: mydea

packages/core/src/baseclient.ts

@@ -50,15 +50,15 @@ import {
 } from '@sentry/utils';
 
 import { getEnvelopeEndpointWithUrlEncodedAuth } from './api';
-import { getIsolationScope } from './currentScopes';
+import { getIsolationScope, getTraceContextFromScopes } 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 { getDynamicSamplingContextFromScopes, getTraceContextFromScopes } from './propagationContext';
 import type { Scope } from './scope';
 import { updateSession } from './session';
+import { getDynamicSamplingContextFromScopes } from './tracing/dynamicSamplingContext';
 import { parseSampleRate } from './utils/parseSampleRate';
 import { prepareEvent } from './utils/prepareEvent';
 

packages/core/src/currentScopes.ts

@@ -1,6 +1,6 @@
-import type { Scope } from '@sentry/types';
+import type { PropagationContext, Scope, TraceContext } from '@sentry/types';
 import type { Client } from '@sentry/types';
-import { getGlobalSingleton } from '@sentry/utils';
+import { dropUndefinedKeys, generateSentryTraceHeader, getGlobalSingleton } from '@sentry/utils';
 import { getAsyncContextStrategy } from './asyncContext';
 import { getMainCarrier } from './carrier';
 import { Scope as ScopeClass } from './scope';
@@ -120,3 +120,49 @@ export function withIsolationScope<T>(
 export function getClient<C extends Client>(): C | undefined {
   return getCurrentScope().getClient<C>();
 }
+
+/**
+ * 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);
+
+  const { traceId, spanId, parentSpanId } = propagationContext;
+
+  const traceContext: TraceContext = dropUndefinedKeys({
+    trace_id: traceId,
+    span_id: spanId,
+    parent_span_id: parentSpanId,
+  });
+
+  return traceContext;
+}
+
+/**
+ * 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);
+  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,15 +38,12 @@ export {
   withScope,
   withIsolationScope,
   getClient,
+  getTraceContextFromScopes,
 } from './currentScopes';
 export {
   getDefaultCurrentScope,
   getDefaultIsolationScope,
 } from './defaultScopes';
-export {
-  getDynamicSamplingContextFromScopes,
-  getTraceContextFromScopes,
-} from './propagationContext';
 export { setAsyncContextStrategy } from './asyncContext';
 export { getMainCarrier } from './carrier';
 export { makeSession, closeSession, updateSession } from './session';

packages/core/src/propagationContext.ts

@@ -15,12 +15,15 @@ import { eventFromMessage, eventFromUnknownInput, logger, resolvedSyncPromise, u
 
 import { BaseClient } from './baseclient';
 import { createCheckInEnvelope } from './checkin';
-import { getIsolationScope } from './currentScopes';
+import { getIsolationScope, getTraceContextFromScopes } from './currentScopes';
 import { DEBUG_BUILD } from './debug-build';
-import { getDynamicSamplingContextFromScopes, getTraceContextFromScopes } from './propagationContext';
 import type { Scope } from './scope';
 import { SessionFlusher } from './sessionflusher';
-import { getDynamicSamplingContextFromSpan, registerSpanErrorInstrumentation } from './tracing';
+import {
+  getDynamicSamplingContextFromScopes,
+  getDynamicSamplingContextFromSpan,
+  registerSpanErrorInstrumentation,
+} from './tracing';
 import { _getSpanForScope } from './utils/spanOnScope';
 import { spanToTraceContext } from './utils/spanUtils';
 

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

@@ -7,7 +7,13 @@ import {
 } from '@sentry/utils';
 
 import { DEFAULT_ENVIRONMENT } from '../constants';
-import { getClient } from '../currentScopes';
+import {
+  getClient,
+  getCurrentScope,
+  getGlobalScope,
+  getIsolationScope,
+  mergePropagationContexts,
+} 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';
@@ -52,6 +58,19 @@ export function getDynamicSamplingContextFromClient(trace_id: string, client: Cl
   return dsc;
 }
 
+/**
+ * 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);
+  return propagationContext.dsc || getDynamicSamplingContextFromClient(propagationContext.traceId, client);
+}
+
 /**
  * Creates a dynamic sampling context from a span (and client and scope)
  *

packages/core/src/tracing/dynamicSamplingContext.ts

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

packages/core/src/tracing/index.ts

@@ -1,8 +1,8 @@
 import type { Client, Scope, Span } from '@sentry/types';
 import { dynamicSamplingContextToSentryBaggageHeader } from '@sentry/utils';
-import { getDynamicSamplingContextFromScopes, scopesToTraceHeader } from '../propagationContext';
+import { scopesToTraceHeader } from '../currentScopes';
 import { spanToTraceHeader } from '../utils/spanUtils';
-import { getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
+import { getDynamicSamplingContextFromScopes, getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
 
 /**
  * Get the sentry-trace and baggage headers for a given span or scope.