ensure we always have a DSC

Author: mydea

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

@@ -41,9 +41,19 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
 
   // data is passed through from the inbound request, to verify we have the correct headers set
   const inboundHeaderSentryTrace = data.headers?.['sentry-trace'];
+  const inboundHeaderBaggage = data.headers?.['baggage'];
+
   expect(inboundHeaderSentryTrace).toEqual(`${traceId}-${outgoingHttpSpanId}-1`);
-  // Baggage and DSC are not set
-  expect(data.headers?.['baggage']).toEqual(undefined);
+  expect(inboundHeaderBaggage).toBeDefined();
+
+  const baggage = (inboundHeaderBaggage || '').split(',');
+  expect(baggage).toEqual(
+    expect.arrayContaining([
+      'sentry-environment=qa',
+      `sentry-trace_id=${traceId}`,
+      expect.stringMatching(/sentry-public_key=/),
+    ]),
+  );
 
   expect(outboundTransaction).toEqual(
     expect.objectContaining({

packages/node-experimental/src/opentelemetry/propagator.ts

@@ -1,10 +1,13 @@
 import type { Baggage, Context, SpanContext, TextMapGetter, TextMapSetter } from '@opentelemetry/api';
 import { propagation, trace, TraceFlags } from '@opentelemetry/api';
 import { isTracingSuppressed, W3CBaggagePropagator } from '@opentelemetry/core';
-import type { PropagationContext } from '@sentry/types';
+import { getDynamicSamplingContextFromClient } from '@sentry/core';
+import type { DynamicSamplingContext, PropagationContext } from '@sentry/types';
 import { generateSentryTraceHeader, SENTRY_BAGGAGE_KEY_PREFIX, tracingContextFromHeaders } from '@sentry/utils';
 
+import { getCurrentHub } from '../sdk/hub';
 import { SENTRY_BAGGAGE_HEADER, SENTRY_PROPAGATION_CONTEXT_CONTEXT_KEY, SENTRY_TRACE_HEADER } from './../constants';
+import { getSpanScope } from './spanData';
 
 /**
  * Injects and extracts `sentry-trace` and `baggage` headers from carriers.
@@ -23,7 +26,10 @@ export class SentryPropagator extends W3CBaggagePropagator {
     const propagationContext = context.getValue(SENTRY_PROPAGATION_CONTEXT_CONTEXT_KEY) as
       | PropagationContext
       | undefined;
-    const dynamicSamplingContext = propagationContext?.dsc;
+
+    const { spanId, traceId, sampled } = getSentryTraceData(context, propagationContext);
+
+    const dynamicSamplingContext = propagationContext ? getDsc(context, propagationContext, traceId) : undefined;
 
     if (dynamicSamplingContext) {
       baggage = Object.entries(dynamicSamplingContext).reduce<Baggage>((b, [dscKey, dscValue]) => {
@@ -34,8 +40,6 @@ export class SentryPropagator extends W3CBaggagePropagator {
       }, baggage);
     }
 
-    const { spanId, traceId, sampled } = getSentryTraceData(context, propagationContext);
-
     setter.set(carrier, SENTRY_TRACE_HEADER, generateSentryTraceHeader(traceId, spanId, sampled));
 
     super.inject(propagation.setBaggage(context, baggage), carrier, setter);
@@ -78,6 +82,28 @@ export class SentryPropagator extends W3CBaggagePropagator {
   }
 }
 
+function getDsc(
+  context: Context,
+  propagationContext: PropagationContext,
+  traceId: string | undefined,
+): DynamicSamplingContext | undefined {
+  // If we have a DSC on the propagation context, we just use it
+  if (propagationContext.dsc) {
+    return propagationContext.dsc;
+  }
+
+  // Else, we try to generate a new one
+  const client = getCurrentHub().getClient();
+  const activeSpan = trace.getSpan(context);
+  const scope = activeSpan ? getSpanScope(activeSpan) : undefined;
+
+  if (client) {
+    return getDynamicSamplingContextFromClient(traceId || propagationContext.traceId, client, scope);
+  }
+
+  return undefined;
+}
+
 function getSentryTraceData(
   context: Context,
   propagationContext: PropagationContext | undefined,

packages/node-experimental/test/opentelemetry/propagator.test.ts

@@ -113,7 +113,7 @@ describe('SentryPropagator', () => {
           'd4cda95b652f4a1592b449d5929fda1b-6e0c63257de34c92-0',
         ],
         [
-          'works without a dsc',
+          'creates a new DSC if none exists yet',
           {
             traceId: 'd4cda95b652f4a1592b449d5929fda1b',
             spanId: '6e0c63257de34c92',
@@ -126,7 +126,12 @@ describe('SentryPropagator', () => {
             sampled: true,
             dsc: undefined,
           },
-          [],
+          [
+            'sentry-environment=production',
+            'sentry-public_key=abc',
+            'sentry-release=1.0.0',
+            'sentry-trace_id=d4cda95b652f4a1592b449d5929fda1b',
+          ],
           'd4cda95b652f4a1592b449d5929fda1b-6e0c63257de34c92-1',
         ],
         [