only add baggage to context if actually present

Author: adinauer

sentry-opentelemetry/sentry-opentelemetry-otlp/src/main/java/io/sentry/opentelemetry/otlp/OpenTelemetryOtlpPropagator.java

@@ -87,7 +87,6 @@ public <C> Context extract(
       SentryTraceHeader sentryTraceHeader = new SentryTraceHeader(sentryTraceString);
 
       final @Nullable String baggageString = getter.get(carrier, BaggageHeader.BAGGAGE_HEADER);
-      final Baggage baggage = Baggage.fromHeader(baggageString);
       final @NotNull TraceState traceState = TraceState.getDefault();
 
       final @NotNull TraceFlags traceFlags =
@@ -104,8 +103,11 @@ public <C> Context extract(
 
       Span wrappedSpan = Span.wrap(otelSpanContext);
 
-      final @NotNull Context modifiedContext =
-          context.with(wrappedSpan).with(SENTRY_BAGGAGE_KEY, baggage);
+      @NotNull Context modifiedContext = context.with(wrappedSpan);
+      if (baggageString != null) {
+        modifiedContext =
+            modifiedContext.with(SENTRY_BAGGAGE_KEY, Baggage.fromHeader(baggageString));
+      }
 
       scopes
           .getOptions()

sentry-opentelemetry/sentry-opentelemetry-otlp/src/test/kotlin/OtelSentryPropagatorTest.kt

@@ -68,6 +68,37 @@ class OpenTelemetryOtlpPropagatorTest {
     )
   }
 
+  @Test
+  fun `extract does not store baggage in context when baggage header is missing`() {
+    val propagator = OpenTelemetryOtlpPropagator()
+    val carrier: Map<String, String> =
+      mapOf("sentry-trace" to "f9118105af4a2d42b4124532cd1065ff-424cffc8f94feeee-1")
+    val newContext = propagator.extract(Context.root(), carrier, MapGetter())
+
+    assertNull(newContext.get(OpenTelemetryOtlpPropagator.SENTRY_BAGGAGE_KEY))
+  }
+
+  @Test
+  fun `does not inject baggage header when baggage is missing from context`() {
+    val propagator = OpenTelemetryOtlpPropagator()
+    val carrier = mutableMapOf<String, String>()
+
+    val otelSpanContext =
+      SpanContext.create(
+        "f9118105af4a2d42b4124532cd1065ff",
+        "424cffc8f94feeee",
+        TraceFlags.getSampled(),
+        TraceState.getDefault(),
+      )
+    val otelSpan = Span.wrap(otelSpanContext)
+    val context = Context.root().with(otelSpan)
+
+    propagator.inject(context, carrier, MapSetter())
+
+    assertEquals("f9118105af4a2d42b4124532cd1065ff-424cffc8f94feeee-1", carrier["sentry-trace"])
+    assertNull(carrier["baggage"])
+  }
+
   @Test
   fun `extract sets sampled trace flag when sentry-trace has sampled=0`() {
     val propagator = OpenTelemetryOtlpPropagator()