hmm

Author: Luca Forstner

dev-packages/browser-integration-tests/suites/replay/captureReplay/test.ts

@@ -41,7 +41,6 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
     replay_type: 'session',
     event_id: expect.stringMatching(/\w{32}/),
     environment: 'production',
-    contexts: expect.any(Object),
     sdk: {
       integrations: [
         'InboundFilters',
@@ -79,7 +78,6 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
     replay_type: 'session',
     event_id: expect.stringMatching(/\w{32}/),
     environment: 'production',
-    contexts: expect.any(Object),
     sdk: {
       integrations: [
         'InboundFilters',

dev-packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/test.ts

@@ -41,7 +41,6 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe
     replay_type: 'session',
     event_id: expect.stringMatching(/\w{32}/),
     environment: 'production',
-    contexts: expect.any(Object),
     sdk: {
       integrations: [
         'InboundFilters',

dev-packages/browser-integration-tests/utils/replayEventTemplates.ts

@@ -15,7 +15,6 @@ const DEFAULT_REPLAY_EVENT = {
   replay_type: 'session',
   event_id: expect.stringMatching(/\w{32}/),
   environment: 'production',
-  contexts: expect.any(Object),
   sdk: {
     integrations: [
       'InboundFilters',

dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/propagation.test.ts

@@ -67,7 +67,6 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
             'sentry.origin': 'auto.http.otel.http',
           },
           op: 'http.server',
-          parent_span_id: expect.any(String),
           span_id: expect.any(String),
           status: 'ok',
           tags: {

dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/transactions.test.ts

@@ -32,7 +32,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
             'sentry.origin': 'auto.http.otel.http',
           },
           op: 'http.server',
-          parent_span_id: expect.any(String),
           span_id: expect.any(String),
           status: 'ok',
           tags: {

packages/node/src/integrations/http.ts

@@ -2,7 +2,6 @@ import type * as http from 'http';
 import type * as https from 'https';
 import type { Hub } from '@sentry/core';
 import { getIsolationScope } from '@sentry/core';
-import { getRootSpan } from '@sentry/core';
 import {
   addBreadcrumb,
   getActiveSpan,
@@ -270,21 +269,19 @@ function _createWrappedRequestMethodFactory(
         : undefined;
 
       if (client && shouldAttachTraceData(rawRequestUrl)) {
-        const transaction = requestSpan && getRootSpan(requestSpan);
-
         const { traceId, spanId, sampled, dsc } = {
           ...isolationScope.getPropagationContext(),
           ...scope.getPropagationContext(),
         };
 
-        const sentryTraceHeader = transaction
-          ? spanToTraceHeader(transaction)
+        const sentryTraceHeader = requestSpan
+          ? spanToTraceHeader(requestSpan)
           : generateSentryTraceHeader(traceId, spanId, sampled);
 
         const sentryBaggageHeader = dynamicSamplingContextToSentryBaggageHeader(
           dsc ||
-            (transaction
-              ? getDynamicSamplingContextFromSpan(transaction)
+            (requestSpan
+              ? getDynamicSamplingContextFromSpan(requestSpan)
               : getDynamicSamplingContextFromClient(traceId, client, scope)),
         );
 

packages/node/src/integrations/undici/index.ts

@@ -6,7 +6,6 @@ import {
   getDynamicSamplingContextFromClient,
   getDynamicSamplingContextFromSpan,
   getIsolationScope,
-  getRootSpan,
   isSentryRequestUrl,
   spanToTraceHeader,
 } from '@sentry/core';
@@ -183,8 +182,6 @@ export class Undici implements Integration {
     };
 
     if (shouldAttachTraceData(stringUrl)) {
-      const transaction = span && getRootSpan(span);
-
       const { traceId, spanId, sampled, dsc } = {
         ...isolationScope.getPropagationContext(),
         ...scope.getPropagationContext(),
@@ -194,8 +191,8 @@ export class Undici implements Integration {
 
       const sentryBaggageHeader = dynamicSamplingContextToSentryBaggageHeader(
         dsc ||
-          (transaction
-            ? getDynamicSamplingContextFromSpan(transaction)
+          (span
+            ? getDynamicSamplingContextFromSpan(span)
             : getDynamicSamplingContextFromClient(traceId, client, scope)),
       );
 

packages/opentelemetry-node/src/spanprocessor.ts

@@ -40,17 +40,12 @@ export class SentrySpanProcessor implements OtelSpanProcessor {
 
       // If event has already set `trace` context, use that one.
       event.contexts = {
-        ...event.contexts,
         trace: {
-          ...event.contexts?.trace,
-          // We are overriding values here. In theory this is bad and we definitely need to change that in the future.
-          // The reason we need to override here is because in the core sdk we apply span data to the trace context at the time of capturing, and apply the propagation context if there is no span on the scope.
-          // In the OTEL SDK we never have a span on the scope, meaning that the propagation context is applied.
-          // If we now didn't overwrite the trace context here we would end up with the values of the propagation context instead but we want the data from the span.
           trace_id: otelSpanContext.traceId,
           span_id: otelSpanContext.spanId,
           parent_span_id: otelSpan.parentSpanId,
         },
+        ...event.contexts,
       };
 
       return event;

packages/opentelemetry/src/setupEventContextTrace.ts

@@ -19,17 +19,12 @@ export function setupEventContextTrace(client: Client): void {
 
     // If event has already set `trace` context, use that one.
     event.contexts = {
-      ...event.contexts,
       trace: {
-        ...event.contexts?.trace,
-        // We are overriding values here. In theory this is bad and we definitely need to change that in the future.
-        // The reason we need to override here is because in the core sdk we apply span data to the trace context at the time of capturing, and apply the propagation context if there is no span on the scope.
-        // In the OTEL SDK we never have a span on the scope, meaning that the propagation context is applied.
-        // If we now didn't overwrite the trace context here we would end up with the values of the propagation context instead but we want the data from the span.
         trace_id: spanContext.traceId,
         span_id: spanContext.spanId,
         parent_span_id: spanHasParentId(span) ? span.parentSpanId : undefined,
       },
+      ...event.contexts,
     };
 
     return event;

packages/opentelemetry/test/integration/scope.test.ts

@@ -151,7 +151,7 @@ describe('Integration | Scope', () => {
         withScope(scope2 => {
           scope2.setTag('tag3', 'val3a');
 
-          startSpan({ name: 'first' }, span => {
+          startSpan({ name: 'outer' }, span => {
             spanId1 = span.spanContext().spanId;
             traceId1 = span.spanContext().traceId;
 
@@ -168,7 +168,7 @@ describe('Integration | Scope', () => {
         withScope(scope2 => {
           scope2.setTag('tag3', 'val3b');
 
-          startSpan({ name: 'second' }, span => {
+          startSpan({ name: 'outer' }, span => {
             spanId2 = span.spanContext().spanId;
             traceId2 = span.spanContext().traceId;
 

packages/tracing-internal/src/browser/request.ts

@@ -5,7 +5,6 @@ import {
   getDynamicSamplingContextFromClient,
   getDynamicSamplingContextFromSpan,
   getIsolationScope,
-  getRootSpan,
   hasTracingEnabled,
   spanToJSON,
   spanToTraceHeader,
@@ -299,8 +298,6 @@ export function xhrCallback(
   const client = getClient();
 
   if (xhr.setRequestHeader && shouldAttachHeaders(sentryXhrData.url) && client) {
-    const transaction = span && getRootSpan(span);
-
     const { traceId, spanId, sampled, dsc } = {
       ...isolationScope.getPropagationContext(),
       ...scope.getPropagationContext(),
@@ -310,9 +307,7 @@ export function xhrCallback(
 
     const sentryBaggageHeader = dynamicSamplingContextToSentryBaggageHeader(
       dsc ||
-        (transaction
-          ? getDynamicSamplingContextFromSpan(transaction)
-          : getDynamicSamplingContextFromClient(traceId, client, scope)),
+        (span ? getDynamicSamplingContextFromSpan(span) : getDynamicSamplingContextFromClient(traceId, client, scope)),
     );
 
     setHeaderOnXhr(xhr, sentryTraceHeader, sentryBaggageHeader);

packages/tracing-internal/src/common/fetch.ts

@@ -4,7 +4,6 @@ import {
   getDynamicSamplingContextFromClient,
   getDynamicSamplingContextFromSpan,
   getIsolationScope,
-  getRootSpan,
   hasTracingEnabled,
   spanToTraceHeader,
   startInactiveSpan,
@@ -133,8 +132,6 @@ export function addTracingHeadersToFetchRequest(
   // eslint-disable-next-line deprecation/deprecation
   const span = requestSpan || scope.getSpan();
 
-  const transaction = span && getRootSpan(span);
-
   const isolationScope = getIsolationScope();
 
   const { traceId, spanId, sampled, dsc } = {
@@ -146,9 +143,7 @@ export function addTracingHeadersToFetchRequest(
 
   const sentryBaggageHeader = dynamicSamplingContextToSentryBaggageHeader(
     dsc ||
-      (transaction
-        ? getDynamicSamplingContextFromSpan(transaction)
-        : getDynamicSamplingContextFromClient(traceId, client, scope)),
+      (span ? getDynamicSamplingContextFromSpan(span) : getDynamicSamplingContextFromClient(traceId, client, scope)),
   );
 
   const headers =