ref(tracing): Sync baggage data in Http and envelope headers

Author: Lms24

packages/core/src/envelope.ts

@@ -128,19 +128,12 @@ function createEventEnvelopeHeaders(
     ...(event.type === 'transaction' &&
       event.contexts &&
       event.contexts.trace && {
-        // TODO: Grab this from baggage
         trace: dropUndefinedKeys({
           // Trace context must be defined for transactions
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          trace_id: event.contexts!.trace.trace_id as string,
-          environment: event.environment,
-          release: event.release,
-          transaction: event.transaction,
-          user: event.user && {
-            id: event.user.id,
-            segment: event.user.segment,
-          },
+          trace_id: (event.contexts!.trace as Record<string, unknown>).trace_id as string,
           public_key: dsn.publicKey,
+          ...event.contexts.baggage,
         }),
       }),
   };

packages/tracing/src/span.ts

@@ -4,7 +4,6 @@ import { Baggage, Hub, Primitive, Span as SpanInterface, SpanContext, Transactio
 import {
   createBaggage,
   dropUndefinedKeys,
-  isBaggageEmpty,
   isBaggageMutable,
   isSentryBaggageEmpty,
   setBaggageImmutable,
@@ -312,7 +311,7 @@ export class Span implements SpanInterface {
   /**
    * @inheritdoc
    */
-  public getBaggage(): Baggage | undefined {
+  public getBaggage(): Baggage {
     const existingBaggage = this.transaction && this.transaction.metadata.baggage;
 
     // Only add Sentry baggage items to baggage, if baggage does not exist yet or it is still
@@ -322,7 +321,7 @@ export class Span implements SpanInterface {
         ? this._getBaggageWithSentryValues(existingBaggage)
         : existingBaggage;
 
-    return isBaggageEmpty(finalBaggage) ? undefined : finalBaggage;
+    return finalBaggage;
   }
 
   /**

packages/tracing/src/transaction.ts

@@ -6,7 +6,7 @@ import {
   TransactionContext,
   TransactionMetadata,
 } from '@sentry/types';
-import { dropUndefinedKeys, logger } from '@sentry/utils';
+import { dropUndefinedKeys, getSentryBaggageItems, logger } from '@sentry/utils';
 
 import { Span as SpanClass, SpanRecorder } from './span';
 
@@ -122,6 +122,7 @@ export class Transaction extends SpanClass implements TransactionInterface {
     const transaction: Event = {
       contexts: {
         trace: this.getTraceContext(),
+        baggage: getSentryBaggageItems(this.getBaggage()),
       },
       spans: finishedSpans,
       start_timestamp: this.startTimestamp,