Fix and add tests

Author: Luca Forstner

packages/core/test/lib/prepareEvent.test.ts

@@ -228,12 +228,13 @@ describe('prepareEvent', () => {
       event_id: expect.any(String),
       environment: 'production',
       message: 'foo',
-      sdkProcessingMetadata: {
-        propagationContext: {
-          spanId: expect.any(String),
-          traceId: expect.any(String),
+      contexts: {
+        trace: {
+          span_id: expect.any(String),
+          trace_id: expect.any(String),
         },
       },
+      sdkProcessingMetadata: {},
     });
   });
 
@@ -309,16 +310,19 @@ describe('prepareEvent', () => {
       user: { id: '1', email: '[email protected]' },
       tags: { tag1: 'aa', tag2: 'aa' },
       extra: { extra1: 'aa', extra2: 'aa' },
-      contexts: { os: { name: 'os1' }, culture: { display_name: 'name1' } },
+      contexts: {
+        os: { name: 'os1' },
+        culture: { display_name: 'name1' },
+        trace: {
+          span_id: '1',
+          trace_id: '1',
+        },
+      },
       fingerprint: ['dd', 'aa'],
       breadcrumbs: [breadcrumb4, breadcrumb2, breadcrumb3, breadcrumb1],
       sdkProcessingMetadata: {
         aa: 'aa',
         bb: 'bb',
-        propagationContext: {
-          spanId: '1',
-          traceId: '1',
-        },
       },
     });
   });
@@ -379,10 +383,15 @@ describe('prepareEvent', () => {
       message: 'foo',
       fingerprint: ['dd'],
       breadcrumbs: [breadcrumb3, breadcrumb1, breadcrumb2],
+      contexts: {
+        trace: {
+          trace_id: isolationScope.getPropagationContext().traceId,
+          span_id: isolationScope.getPropagationContext().spanId,
+        },
+      },
       sdkProcessingMetadata: {
         aa: 'aa',
         bb: 'bb',
-        propagationContext: isolationScope.getPropagationContext(),
       },
     });
   });

packages/core/test/lib/scope.test.ts

@@ -132,12 +132,13 @@ describe('Scope', () => {
 
       expect(event).toEqual({
         message: 'foo',
-        sdkProcessingMetadata: {
-          propagationContext: {
-            spanId: expect.any(String),
-            traceId: expect.any(String),
+        contexts: {
+          trace: {
+            span_id: expect.any(String),
+            trace_id: expect.any(String),
           },
         },
+        sdkProcessingMetadata: {},
       });
     });
 
@@ -166,15 +167,18 @@ describe('Scope', () => {
         user: { id: '1', email: '[email protected]' },
         tags: { tag1: 'aa', tag2: 'aa' },
         extra: { extra1: 'aa', extra2: 'aa' },
-        contexts: { os: { name: 'os1' }, culture: { display_name: 'name1' } },
+        contexts: {
+          os: { name: 'os1' },
+          culture: { display_name: 'name1' },
+          trace: {
+            span_id: '1',
+            trace_id: '1',
+          },
+        },
         fingerprint: ['dd', 'aa'],
         breadcrumbs: [breadcrumb2, breadcrumb1],
         sdkProcessingMetadata: {
           aa: 'aa',
-          propagationContext: {
-            spanId: '1',
-            traceId: '1',
-          },
         },
       });
     });

packages/core/test/lib/tracing/trace.test.ts

@@ -1,3 +1,4 @@
+import { tracingContextFromHeaders } from '@sentry/utils';
 import {
   Hub,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
@@ -455,6 +456,7 @@ describe('continueTrace', () => {
     const scope = getCurrentScope();
 
     expect(scope.getPropagationContext()).toEqual({
+      dsc: {}, // DSC should be an empty object (frozen), because there was an incoming trace
       sampled: false,
       parentSpanId: '1121201211212012',
       spanId: expect.any(String),

packages/utils/src/tracing.ts

@@ -78,7 +78,7 @@ export function tracingContextFromHeaders(
 
   return {
     traceparentData,
-    dynamicSamplingContext,
+    dynamicSamplingContext: dynamicSamplingContext || {}, // If we have traceparent data but no DSC it means we are not head of trace and we must freeze it,
     propagationContext,
   };
 }

packages/utils/test/tracing.test.ts

@@ -0,0 +1,9 @@
+import { tracingContextFromHeaders } from '../src/tracing';
+
+describe('tracingContextFromHeaders()', () => {
+  it('should produce a frozen baggage (empty object) when there is an incoming trace but no baggage header', () => {
+    const tracingContext = tracingContextFromHeaders('12312012123120121231201212312012-1121201211212012-1', undefined);
+    expect(tracingContext.dynamicSamplingContext).toEqual({});
+    expect(tracingContext.propagationContext.dsc).toEqual({});
+  });
+});