Always use baggage header if sentr-trace is present on incoming request to make sure baggage is frozen

Author: adinauer

sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentryPropagator.java

@@ -75,10 +75,8 @@ public <C> Context extract(
       Context modifiedContext = context.with(SentryOtelKeys.SENTRY_TRACE_KEY, sentryTraceHeader);
 
       final @Nullable String baggageString = getter.get(carrier, BaggageHeader.BAGGAGE_HEADER);
-      if (baggageString != null) {
-        Baggage baggage = Baggage.fromHeader(baggageString);
-        modifiedContext = modifiedContext.with(SentryOtelKeys.SENTRY_BAGGAGE_KEY, baggage);
-      }
+      Baggage baggage = Baggage.fromHeader(baggageString);
+      modifiedContext = modifiedContext.with(SentryOtelKeys.SENTRY_BAGGAGE_KEY, baggage);
 
       Span wrappedSpan = Span.wrap(otelSpanContext);
       modifiedContext = modifiedContext.with(wrappedSpan);

sentry/src/main/java/io/sentry/Baggage.java

@@ -35,7 +35,7 @@ public final class Baggage {
   final @NotNull ILogger logger;
 
   @NotNull
-  public static Baggage fromHeader(final String headerValue) {
+  public static Baggage fromHeader(final @Nullable String headerValue) {
     return Baggage.fromHeader(
         headerValue, false, HubAdapter.getInstance().getOptions().getLogger());
   }