revert

Author: Luca Forstner

packages/core/src/baseclient.ts

@@ -642,8 +642,17 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
         ...(scope ? scope.getPropagationContext() : undefined),
       };
 
-      if (propagationContext && (!evt.sdkProcessingMetadata || !evt.sdkProcessingMetadata.dynamicSamplingContext)) {
-        const { traceId: trace_id, dsc } = propagationContext;
+      const trace = evt.contexts && evt.contexts.trace;
+      if (!trace && propagationContext) {
+        const { traceId: trace_id, spanId, parentSpanId, dsc } = propagationContext;
+        evt.contexts = {
+          trace: {
+            trace_id,
+            span_id: spanId,
+            parent_span_id: parentSpanId,
+          },
+          ...evt.contexts,
+        };
 
         const dynamicSamplingContext = dsc ? dsc : getDynamicSamplingContextFromClient(trace_id, this, scope);
 

packages/core/src/utils/applyScopeDataToEvent.ts

@@ -1,4 +1,4 @@
-import type { Breadcrumb, Event, PropagationContext, ScopeData, Span } from '@sentry/types';
+import type { Breadcrumb, Event, ScopeData, Span } from '@sentry/types';
 import { arrayify, dropUndefinedKeys } from '@sentry/utils';
 import { getDynamicSamplingContextFromSpan } from '../tracing/dynamicSamplingContext';
 import { getRootSpan } from './getRootSpan';
@@ -8,19 +8,16 @@ import { spanToJSON, spanToTraceContext } from './spanUtils';
  * Applies data from the scope to the event and runs all event processors on it.
  */
 export function applyScopeDataToEvent(event: Event, data: ScopeData): void {
-  const { fingerprint, span, breadcrumbs, sdkProcessingMetadata, propagationContext } = data;
+  const { fingerprint, span, breadcrumbs, sdkProcessingMetadata } = data;
 
   // Apply general data
   applyDataToEvent(event, data);
 
   // We want to set the trace context for normal events only if there isn't already
   // a trace context on the event. There is a product feature in place where we link
   // errors with transaction and it relies on that.
-  // If there is a span, we use that to apply the trace data, if not, we use the propagation context as a fallback.
   if (span) {
     applySpanToEvent(event, span);
-  } else {
-    applyPropagationContextToEvent(event, propagationContext);
   }
 
   applyFingerprintToEvent(event, fingerprint);
@@ -188,16 +185,6 @@ function applySpanToEvent(event: Event, span: Span): void {
   }
 }
 
-function applyPropagationContextToEvent(event: Event, propagationContext: PropagationContext): void {
-  event.contexts = {
-    trace: {
-      trace_id: propagationContext.traceId,
-      span_id: propagationContext.spanId,
-    },
-    ...event.contexts,
-  };
-}
-
 /**
  * Applies fingerprint from the scope to the event if there's one,
  * uses message if there's one instead or get rid of empty fingerprint