feat(core): Allow custom tracing implementations

And do this for opentelemetry, instead of relying on extra exports.

Also needed to move things around a bit to avoid circular dependency build issues.

Author: mydea

packages/core/src/asyncContext.ts

@@ -1,6 +1,8 @@
 import type { Hub, Integration } from '@sentry/types';
 import type { Scope } from '@sentry/types';
 import { GLOBAL_OBJ } from '@sentry/utils';
+import type { startInactiveSpan, startSpan, startSpanManual, withActiveSpan } from './tracing/trace';
+import type { getActiveSpan } from './utils/spanUtils';
 
 /**
  * @private Private API with no semver guarantees!
@@ -42,6 +44,24 @@ export interface AsyncContextStrategy {
    * Get the currently active isolation scope.
    */
   getIsolationScope: () => Scope;
+
+  // OPTIONAL: Custom tracing methods
+  // These are used so that we can provide OTEL-based implementations
+
+  /** Start an active span. */
+  startSpan?: typeof startSpan;
+
+  /** Start an inactive span. */
+  startInactiveSpan?: typeof startInactiveSpan;
+
+  /** Start an active manual span. */
+  startSpanManual?: typeof startSpanManual;
+
+  /** Get the currently active span. */
+  getActiveSpan?: typeof getActiveSpan;
+
+  /** Make a span the active span in the context of the callback. */
+  withActiveSpan?: typeof withActiveSpan;
 }
 
 /**

packages/core/src/exports.ts

@@ -10,18 +10,16 @@ import type {
   FinishedCheckIn,
   MonitorConfig,
   Primitive,
-  Scope as ScopeInterface,
   Session,
   SessionContext,
   SeverityLevel,
-  Span,
   TransactionContext,
   User,
 } from '@sentry/types';
 import { GLOBAL_OBJ, isThenable, logger, timestampInSeconds, uuid4 } from '@sentry/utils';
 
 import { DEFAULT_ENVIRONMENT } from './constants';
-import { getClient, getCurrentScope, getIsolationScope, withScope } from './currentScopes';
+import { getClient, getCurrentScope, getIsolationScope } from './currentScopes';
 import { DEBUG_BUILD } from './debug-build';
 import type { Hub } from './hub';
 import { getCurrentHub } from './hub';
@@ -126,23 +124,6 @@ export function setUser(user: User | null): ReturnType<Hub['setUser']> {
   getIsolationScope().setUser(user);
 }
 
-/**
- * Forks the current scope and sets the provided span as active span in the context of the provided callback. Can be
- * passed `null` to start an entirely new span tree.
- *
- * @param span Spans started in the context of the provided callback will be children of this span. If `null` is passed,
- * spans started within the callback will not be attached to a parent span.
- * @param callback Execution context in which the provided span will be active. Is passed the newly forked scope.
- * @returns the value returned from the provided callback function.
- */
-export function withActiveSpan<T>(span: Span | null, callback: (scope: ScopeInterface) => T): T {
-  return withScope(scope => {
-    // eslint-disable-next-line deprecation/deprecation
-    scope.setSpan(span || undefined);
-    return callback(scope);
-  });
-}
-
 /**
  * Starts a new `Transaction` and returns it. This is the entry point to manual tracing instrumentation.
  *

packages/core/src/index.ts

@@ -29,7 +29,6 @@ export {
   startSession,
   endSession,
   captureSession,
-  withActiveSpan,
   addEventProcessor,
 } from './exports';
 export {
@@ -93,6 +92,7 @@ export {
   getSpanDescendants,
   getStatusMessage,
   getRootSpan,
+  getActiveSpan,
 } from './utils/spanUtils';
 export { applySdkMetadata } from './utils/sdkMetadata';
 export { DEFAULT_ENVIRONMENT } from './constants';

packages/core/src/metrics/aggregator.ts

@@ -1,9 +1,9 @@
 import type { Client, MeasurementUnit, MetricsAggregator as MetricsAggregatorBase, Primitive } from '@sentry/types';
 import { timestampInSeconds } from '@sentry/utils';
+import { updateMetricSummaryOnActiveSpan } from '../utils/spanUtils';
 import { DEFAULT_FLUSH_INTERVAL, MAX_WEIGHT, NAME_AND_TAG_KEY_NORMALIZATION_REGEX, SET_METRIC_TYPE } from './constants';
 import { captureAggregateMetrics } from './envelope';
 import { METRIC_MAP } from './instance';
-import { updateMetricSummaryOnActiveSpan } from './metric-summary';
 import type { MetricBucket, MetricType } from './types';
 import { getBucketKey, sanitizeTags } from './utils';
 

packages/core/src/metrics/browser-aggregator.ts

@@ -1,9 +1,9 @@
 import type { Client, MeasurementUnit, MetricsAggregator, Primitive } from '@sentry/types';
 import { timestampInSeconds } from '@sentry/utils';
+import { updateMetricSummaryOnActiveSpan } from '../utils/spanUtils';
 import { DEFAULT_BROWSER_FLUSH_INTERVAL, NAME_AND_TAG_KEY_NORMALIZATION_REGEX, SET_METRIC_TYPE } from './constants';
 import { captureAggregateMetrics } from './envelope';
 import { METRIC_MAP } from './instance';
-import { updateMetricSummaryOnActiveSpan } from './metric-summary';
 import type { MetricBucket, MetricType } from './types';
 import { getBucketKey, sanitizeTags } from './utils';
 

packages/core/src/metrics/metric-summary.ts

@@ -2,7 +2,6 @@ import type { MeasurementUnit, Span } from '@sentry/types';
 import type { MetricSummary } from '@sentry/types';
 import type { Primitive } from '@sentry/types';
 import { dropUndefinedKeys } from '@sentry/utils';
-import { getActiveSpan } from '../tracing/utils';
 import type { MetricType } from './types';
 
 /**
@@ -40,52 +39,50 @@ export function getMetricSummaryJsonForSpan(span: Span): Record<string, Array<Me
 }
 
 /**
- * Updates the metric summary on the currently active span
+ * Updates the metric summary on a span.
  */
-export function updateMetricSummaryOnActiveSpan(
+export function updateMetricSummaryOnSpan(
+  span: Span,
   metricType: MetricType,
   sanitizedName: string,
   value: number,
   unit: MeasurementUnit,
   tags: Record<string, Primitive>,
   bucketKey: string,
 ): void {
-  const span = getActiveSpan();
-  if (span) {
-    const storage = getMetricStorageForSpan(span) || new Map<string, [string, MetricSummary]>();
+  const storage = getMetricStorageForSpan(span) || new Map<string, [string, MetricSummary]>();
 
-    const exportKey = `${metricType}:${sanitizedName}@${unit}`;
-    const bucketItem = storage.get(bucketKey);
+  const exportKey = `${metricType}:${sanitizedName}@${unit}`;
+  const bucketItem = storage.get(bucketKey);
 
-    if (bucketItem) {
-      const [, summary] = bucketItem;
-      storage.set(bucketKey, [
-        exportKey,
-        {
-          min: Math.min(summary.min, value),
-          max: Math.max(summary.max, value),
-          count: (summary.count += 1),
-          sum: (summary.sum += value),
-          tags: summary.tags,
-        },
-      ]);
-    } else {
-      storage.set(bucketKey, [
-        exportKey,
-        {
-          min: value,
-          max: value,
-          count: 1,
-          sum: value,
-          tags,
-        },
-      ]);
-    }
-
-    if (!SPAN_METRIC_SUMMARY) {
-      SPAN_METRIC_SUMMARY = new WeakMap();
-    }
+  if (bucketItem) {
+    const [, summary] = bucketItem;
+    storage.set(bucketKey, [
+      exportKey,
+      {
+        min: Math.min(summary.min, value),
+        max: Math.max(summary.max, value),
+        count: (summary.count += 1),
+        sum: (summary.sum += value),
+        tags: summary.tags,
+      },
+    ]);
+  } else {
+    storage.set(bucketKey, [
+      exportKey,
+      {
+        min: value,
+        max: value,
+        count: 1,
+        sum: value,
+        tags,
+      },
+    ]);
+  }
 
-    SPAN_METRIC_SUMMARY.set(span, storage);
+  if (!SPAN_METRIC_SUMMARY) {
+    SPAN_METRIC_SUMMARY = new WeakMap();
   }
+
+  SPAN_METRIC_SUMMARY.set(span, storage);
 }

packages/core/src/tracing/errors.ts

@@ -5,9 +5,8 @@ import {
 } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../debug-build';
-import { getRootSpan } from '../utils/spanUtils';
+import { getActiveSpan, getRootSpan } from '../utils/spanUtils';
 import { SPAN_STATUS_ERROR } from './spanstatus';
-import { getActiveSpan } from './utils';
 
 let errorsInstrumented = false;
 

packages/core/src/tracing/idleSpan.ts

@@ -5,11 +5,16 @@ import { getClient, getCurrentScope } from '../currentScopes';
 import { DEBUG_BUILD } from '../debug-build';
 import { SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON } from '../semanticAttributes';
 import { hasTracingEnabled } from '../utils/hasTracingEnabled';
-import { getSpanDescendants, removeChildSpanFromSpan, spanTimeInputToSeconds, spanToJSON } from '../utils/spanUtils';
+import {
+  getActiveSpan,
+  getSpanDescendants,
+  removeChildSpanFromSpan,
+  spanTimeInputToSeconds,
+  spanToJSON,
+} from '../utils/spanUtils';
 import { SentryNonRecordingSpan } from './sentryNonRecordingSpan';
 import { SPAN_STATUS_ERROR } from './spanstatus';
 import { startInactiveSpan } from './trace';
-import { getActiveSpan } from './utils';
 
 export const TRACING_DEFAULTS = {
   idleTimeout: 1_000,

packages/core/src/tracing/index.ts

@@ -4,7 +4,7 @@ export { SentrySpan } from './sentrySpan';
 export { SentryNonRecordingSpan } from './sentryNonRecordingSpan';
 export { Transaction } from './transaction';
 // eslint-disable-next-line deprecation/deprecation
-export { getActiveTransaction, getActiveSpan } from './utils';
+export { getActiveTransaction } from './utils';
 export {
   setHttpStatus,
   getSpanStatusFromHttpCode,
@@ -15,6 +15,7 @@ export {
   startInactiveSpan,
   startSpanManual,
   continueTrace,
+  withActiveSpan,
 } from './trace';
 export { getDynamicSamplingContextFromClient, getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
 export { setMeasurement } from './measurement';

packages/core/src/tracing/measurement.ts

@@ -1,7 +1,5 @@
 import type { MeasurementUnit, Span, Transaction } from '@sentry/types';
-import { getRootSpan } from '../utils/spanUtils';
-
-import { getActiveSpan } from './utils';
+import { getActiveSpan, getRootSpan } from '../utils/spanUtils';
 
 /**
  * Adds a measurement to the current active transaction.