feat(core): Add DSC to all outgoing envelopes (#7820)

getsentry · Apr 12, 2023 · 943df92 · 943df92
1 parent 3efb556
commit 943df92
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 17 deletions.
diff --git a/packages/core/src/scope.ts b/packages/core/src/scope.ts
@@ -482,9 +482,16 @@ export class Scope implements ScopeInterface {
     // errors with transaction and it relies on that.
     if (this._span) {
       event.contexts = { trace: this._span.getTraceContext(), ...event.contexts };
-      const transactionName = this._span.transaction && this._span.transaction.name;
-      if (transactionName) {
-        event.tags = { transaction: transactionName, ...event.tags };
+      const transaction = this._span.transaction;
+      if (transaction) {
+        event.sdkProcessingMetadata = {
+          dynamicSamplingContext: transaction.getDynamicSamplingContext(),
+          ...event.sdkProcessingMetadata,
+        };
+        const transactionName = transaction.name;
+        if (transactionName) {
+          event.tags = { transaction: transactionName, ...event.tags };
+        }
       }
     }
 

diff --git a/packages/core/test/lib/envelope.test.ts b/packages/core/test/lib/envelope.test.ts
@@ -6,14 +6,6 @@ const testDsn: DsnComponents = { protocol: 'https', projectId: 'abc', host: 'tes
 
 describe('createEventEnvelope', () => {
   describe('trace header', () => {
-    it("doesn't add trace header if event is not a transaction", () => {
-      const event: Event = {};
-      const envelopeHeaders = createEventEnvelope(event, testDsn)[0];
-
-      expect(envelopeHeaders).toBeDefined();
-      expect(envelopeHeaders.trace).toBeUndefined();
-    });
-
     const testTable: Array<[string, Event, DynamicSamplingContext]> = [
       [
         'adds minimal baggage items',
@@ -66,6 +58,15 @@ describe('createEventEnvelope', () => {
           trace_id: '1234',
         },
       ],
+      [
+        'with error event',
+        {
+          sdkProcessingMetadata: {
+            dynamicSamplingContext: { trace_id: '1234', public_key: 'pubKey123' },
+          },
+        },
+        { trace_id: '1234', public_key: 'pubKey123' },
+      ],
     ];
     it.each(testTable)('%s', (_: string, event, trace) => {
       const envelopeHeaders = createEventEnvelope(event, testDsn)[0];

diff --git a/packages/hub/test/scope.test.ts b/packages/hub/test/scope.test.ts
@@ -354,6 +354,7 @@ describe('Scope', () => {
         fake: 'span',
         getTraceContext: () => ({ a: 'b' }),
         name: 'fake transaction',
+        getDynamicSamplingContext: () => ({}),
       } as any;
       transaction.transaction = transaction; // because this is a transaction, its `transaction` pointer points to itself
       scope.setSpan(transaction);
@@ -366,7 +367,7 @@ describe('Scope', () => {
     test('adds `transaction` tag when span on scope', async () => {
       expect.assertions(1);
       const scope = new Scope();
-      const transaction = { name: 'fake transaction' };
+      const transaction = { name: 'fake transaction', getDynamicSamplingContext: () => ({}) };
       const span = {
         fake: 'span',
         getTraceContext: () => ({ a: 'b' }),

diff --git a/packages/utils/src/envelope.ts b/packages/utils/src/envelope.ts
@@ -237,15 +237,13 @@ export function createEventEnvelopeHeaders(
   dsn: DsnComponents,
 ): EventEnvelopeHeaders {
   const dynamicSamplingContext = event.sdkProcessingMetadata && event.sdkProcessingMetadata.dynamicSamplingContext;
-
   return {
     event_id: event.event_id as string,
     sent_at: new Date().toISOString(),
     ...(sdkInfo && { sdk: sdkInfo }),
     ...(!!tunnel && { dsn: dsnToString(dsn) }),
-    ...(event.type === 'transaction' &&
-      dynamicSamplingContext && {
-        trace: dropUndefinedKeys({ ...dynamicSamplingContext }),
-      }),
+    ...(dynamicSamplingContext && {
+      trace: dropUndefinedKeys({ ...dynamicSamplingContext }),
+    }),
   };
 }