ref: Use getInjectionData for otel-specific getTraceData

Author: mydea

packages/opentelemetry/src/asyncContextStrategy.ts

@@ -12,6 +12,7 @@ import { startInactiveSpan, startSpan, startSpanManual, withActiveSpan } from '.
 import type { CurrentScopes } from './types';
 import { getScopesFromContext } from './utils/contextData';
 import { getActiveSpan } from './utils/getActiveSpan';
+import { getTraceData } from './utils/getTraceData';
 import { suppressTracing } from './utils/suppressTracing';
 
 /**
@@ -103,7 +104,7 @@ export function setOpenTelemetryContextAsyncContextStrategy(): void {
     startInactiveSpan,
     getActiveSpan,
     suppressTracing,
-    // getTraceData,
+    getTraceData,
     // The types here don't fully align, because our own `Span` type is narrower
     // than the OTEL one - but this is OK for here, as we now we'll only have OTEL spans passed around
     withActiveSpan: withActiveSpan as typeof defaultWithActiveSpan,

packages/opentelemetry/src/propagator.ts

@@ -186,7 +186,10 @@ export class SentryPropagator extends W3CBaggagePropagator {
   }
 }
 
-function getInjectionData(context: Context): {
+/**
+ * Get propagation injection data for the given context.
+ */
+export function getInjectionData(context: Context): {
   dynamicSamplingContext: Partial<DynamicSamplingContext> | undefined;
   traceId: string | undefined;
   spanId: string | undefined;

packages/opentelemetry/src/utils/getTraceData.ts

@@ -1,32 +1,27 @@
 import * as api from '@opentelemetry/api';
 import { getCapturedScopesOnSpan } from '@sentry/core';
 import type { SerializedTraceData, Span } from '@sentry/types';
-import { dropUndefinedKeys } from '@sentry/utils';
+import { dynamicSamplingContextToSentryBaggageHeader, generateSentryTraceHeader } from '@sentry/utils';
+import { getInjectionData } from '../propagator';
 import { getContextFromScope } from './contextData';
 
 /**
  * Otel-specific implementation of `getTraceData`.
  * @see `@sentry/core` version of `getTraceData` for more information
  */
 export function getTraceData({ span }: { span?: Span } = {}): SerializedTraceData {
-  const headersObject: Record<string, string> = {};
+  let ctx = api.context.active();
 
   if (span) {
     const { scope } = getCapturedScopesOnSpan(span);
     // fall back to current context if for whatever reason we can't find the one of the span
-    const ctx = (scope && getContextFromScope(scope)) || api.trace.setSpan(api.context.active(), span);
-
-    api.propagation.inject(ctx, headersObject);
-  } else {
-    api.propagation.inject(api.context.active(), headersObject);
+    ctx = (scope && getContextFromScope(scope)) || api.trace.setSpan(api.context.active(), span);
   }
 
-  if (!headersObject['sentry-trace']) {
-    return {};
-  }
+  const { traceId, spanId, sampled, dynamicSamplingContext } = getInjectionData(ctx);
 
-  return dropUndefinedKeys({
-    'sentry-trace': headersObject['sentry-trace'],
-    baggage: headersObject.baggage,
-  });
+  return {
+    'sentry-trace': generateSentryTraceHeader(traceId, spanId, sampled),
+    baggage: dynamicSamplingContextToSentryBaggageHeader(dynamicSamplingContext),
+  };
 }