fixes...

Author: mydea

packages/core/src/currentScopes.ts

@@ -128,11 +128,11 @@ export function getClient<C extends Client>(): C | undefined {
 export function getTraceContextFromScope(scope: Scope): TraceContext {
   const propagationContext = scope.getPropagationContext();
 
-  const { traceId, parentSpanId } = propagationContext;
+  const { traceId, parentSpanId, propagationSpanId } = propagationContext;
 
   const traceContext: TraceContext = dropUndefinedKeys({
     trace_id: traceId,
-    span_id: generateSpanId(),
+    span_id: propagationSpanId || generateSpanId(),
     parent_span_id: parentSpanId,
   });
 

packages/core/src/types-hoist/tracing.ts

@@ -15,19 +15,29 @@ export interface PropagationContext {
    * Either represents the incoming `traceId` or the `traceId` generated by the current SDK, if there was no incoming trace.
    */
   traceId: string;
+
   /**
    * Represents the sampling decision of the incoming trace.
    *
    * The current SDK should not modify this value!
    */
   sampled?: boolean;
+
   /**
    * The `parentSpanId` denotes the ID of the incoming client span. If there is no `parentSpanId` on the propagation
    * context, it means that the the incoming trace didn't come from a span.
    *
    * The current SDK should not modify this value!
    */
   parentSpanId?: string;
+
+  /**
+   * A span ID to be used when using tracing without performance (without an active span).
+   * This is only set/used when the SDK wants to ensure to use the same span ID for propagation.
+   * If this is empty, a random span ID will be generated.
+   */
+  propagationSpanId?: string;
+
   /**
    * An undefined dsc in the propagation context means that the current SDK invocation is the head of trace and still free to modify and set the DSC for outgoing requests.
    *

packages/core/src/utils-hoist/tracing.ts

@@ -72,8 +72,8 @@ export function propagationContextFromHeaders(
  * Create sentry-trace header from span context values.
  */
 export function generateSentryTraceHeader(
-  traceId: string = generateTraceId(),
-  spanId: string = generateSpanId(),
+  traceId: string | undefined = generateTraceId(),
+  spanId: string | undefined = generateSpanId(),
   sampled?: boolean,
 ): string {
   let sampledString = '';

packages/core/src/utils/spanUtils.ts

@@ -7,6 +7,7 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
 } from '../semanticAttributes';
+import { getCapturedScopesOnSpan } from '../tracing';
 import type { SentrySpan } from '../tracing/sentrySpan';
 import { SPAN_STATUS_OK, SPAN_STATUS_UNSET } from '../tracing/spanstatus';
 import type {
@@ -61,7 +62,9 @@ export function spanToTraceContext(span: Span): TraceContext {
   // If the span is remote, we use a random/virtual span as span_id to the trace context,
   // and the remote span as parent_span_id
   const parent_span_id = isRemote ? spanId : spanToJSON(span).parent_span_id;
-  const span_id = isRemote ? generateSpanId() : spanId;
+  const scope = getCapturedScopesOnSpan(span).scope;
+
+  const span_id = isRemote ? scope?.getPropagationContext().propagationSpanId || generateSpanId() : spanId;
 
   return dropUndefinedKeys({
     parent_span_id,

packages/core/src/utils/traceData.ts

@@ -5,7 +5,6 @@ import { isEnabled } from '../exports';
 import type { Scope } from '../scope';
 import { getDynamicSamplingContextFromScope, getDynamicSamplingContextFromSpan } from '../tracing';
 import type { SerializedTraceData, Span } from '../types-hoist';
-import { generateSpanId } from '../utils-hoist';
 import { dynamicSamplingContextToSentryBaggageHeader } from '../utils-hoist/baggage';
 import { logger } from '../utils-hoist/logger';
 import { TRACEPARENT_REGEXP, generateSentryTraceHeader } from '../utils-hoist/tracing';
@@ -56,6 +55,6 @@ export function getTraceData(options: { span?: Span } = {}): SerializedTraceData
  * Get a sentry-trace header value for the given scope.
  */
 function scopeToTraceHeader(scope: Scope): string {
-  const { traceId, sampled } = scope.getPropagationContext();
-  return generateSentryTraceHeader(traceId, generateSpanId(), sampled);
+  const { traceId, sampled, propagationSpanId } = scope.getPropagationContext();
+  return generateSentryTraceHeader(traceId, propagationSpanId, sampled);
 }

packages/node/src/integrations/anr/worker.ts

@@ -127,11 +127,11 @@ function applyScopeToEvent(event: Event, scope: ScopeData): void {
   applyScopeDataToEvent(event, scope);
 
   if (!event.contexts?.trace) {
-    const { traceId, parentSpanId } = scope.propagationContext;
+    const { traceId, parentSpanId, propagationSpanId } = scope.propagationContext;
     event.contexts = {
       trace: {
         trace_id: traceId,
-        span_id: generateSpanId(),
+        span_id: propagationSpanId || generateSpanId(),
         parent_span_id: parentSpanId,
       },
       ...event.contexts,

packages/node/src/integrations/http/SentryHttpInstrumentation.ts

@@ -9,6 +9,7 @@ import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opent
 import type { AggregationCounts, Client, RequestEventData, SanitizedRequestData, Scope } from '@sentry/core';
 import {
   addBreadcrumb,
+  generateSpanId,
   getBreadcrumbLogLevelFromHttpStatusCode,
   getClient,
   getIsolationScope,
@@ -18,6 +19,7 @@ import {
   parseUrl,
   stripUrlQueryAndFragment,
   withIsolationScope,
+  withScope,
 } from '@sentry/core';
 import { DEBUG_BUILD } from '../../debug-build';
 import { getRequestUrl } from '../../utils/getRequestUrl';
@@ -187,7 +189,11 @@ export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpIns
         }
 
         return withIsolationScope(isolationScope, () => {
-          return original.apply(this, [event, ...args]);
+          return withScope(scope => {
+            // Set a new propagationSpanId for this request
+            scope.getPropagationContext().propagationSpanId = generateSpanId();
+            return original.apply(this, [event, ...args]);
+          });
         });
       };
     };

packages/opentelemetry/src/propagator.ts

@@ -233,7 +233,7 @@ export function getInjectionData(context: Context): {
   return {
     dynamicSamplingContext,
     traceId: propagationContext.traceId,
-    spanId: undefined,
+    spanId: propagationContext.propagationSpanId,
     sampled: propagationContext.sampled,
   };
 }