Add generic Baggage propagator which can be used in the same situation where PropagatorBasedSpanLinksExtractor is used

Author: cbos

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/PropagatorBasedBaggageExtractor.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.api.internal;
+
+import io.opentelemetry.api.baggage.Baggage;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.propagation.TextMapGetter;
+import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.instrumentation.api.instrumenter.ContextCustomizer;
+
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
+public class PropagatorBasedBaggageExtractor<REQUEST> implements ContextCustomizer<REQUEST> {
+
+  private final TextMapPropagator propagator;
+  private final TextMapGetter<REQUEST> getter;
+
+  public PropagatorBasedBaggageExtractor(
+      TextMapPropagator propagator, TextMapGetter<REQUEST> getter) {
+    this.propagator = propagator;
+    this.getter = getter;
+  }
+
+  @Override
+  public Context onStart(Context parentContext, REQUEST request, Attributes startAttributes) {
+    Context extracted = propagator.extract(parentContext, request, getter);
+    Baggage baggage = Baggage.fromContext(extracted);
+    return baggage.storeInContext(parentContext);
+  }
+}

instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsInstrumenterFactory.java

@@ -18,6 +18,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
+import io.opentelemetry.instrumentation.api.internal.PropagatorBasedBaggageExtractor;
 import io.opentelemetry.instrumentation.api.internal.PropagatorBasedSpanLinksExtractor;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -79,6 +80,10 @@ public Instrumenter<MessageWithDestination, Void> createConsumerReceiveInstrumen
           new PropagatorBasedSpanLinksExtractor<>(
               openTelemetry.getPropagators().getTextMapPropagator(),
               MessagePropertyGetter.INSTANCE));
+      builder.addContextCustomizer(
+          new PropagatorBasedBaggageExtractor<>(
+              openTelemetry.getPropagators().getTextMapPropagator(),
+              MessagePropertyGetter.INSTANCE));
     }
     return builder.buildInstrumenter(SpanKindExtractor.alwaysConsumer());
   }
@@ -101,6 +106,10 @@ public Instrumenter<MessageWithDestination, Void> createConsumerProcessInstrumen
           new PropagatorBasedSpanLinksExtractor<>(
               openTelemetry.getPropagators().getTextMapPropagator(),
               MessagePropertyGetter.INSTANCE));
+      builder.addContextCustomizer(
+          new PropagatorBasedBaggageExtractor<>(
+              openTelemetry.getPropagators().getTextMapPropagator(),
+              MessagePropertyGetter.INSTANCE));
       return builder.buildInstrumenter(SpanKindExtractor.alwaysConsumer());
     } else {
       return builder.buildConsumerInstrumenter(MessagePropertyGetter.INSTANCE);