Fix opentracing header name issue (#5840)

open-telemetry · Oct 31, 2023 · ccb2e04 · ccb2e04
1 parent 33d3a92
commit ccb2e04
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/...agators/src/main/java/io/opentelemetry/extension/trace/propagation/OtTracePropagator.java b/...agators/src/main/java/io/opentelemetry/extension/trace/propagation/OtTracePropagator.java
@@ -20,6 +20,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Locale;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
@@ -108,14 +109,17 @@ public <C> Context extract(Context context, @Nullable C carrier, TextMapGetter<C
     if (carrier != null) {
       BaggageBuilder baggageBuilder = Baggage.builder();
       for (String key : getter.keys(carrier)) {
-        if (!key.startsWith(PREFIX_BAGGAGE_HEADER)) {
+        String lowercaseKey = key.toLowerCase(Locale.ROOT);
+        if (!lowercaseKey.startsWith(PREFIX_BAGGAGE_HEADER)) {
           continue;
         }
         String value = getter.get(carrier, key);
         if (value == null) {
           continue;
         }
-        baggageBuilder.put(key.replace(OtTracePropagator.PREFIX_BAGGAGE_HEADER, ""), value);
+        String baggageKey =
+            lowercaseKey.substring(OtTracePropagator.PREFIX_BAGGAGE_HEADER.length());
+        baggageBuilder.put(baggageKey, value);
       }
       Baggage baggage = baggageBuilder.build();
       if (!baggage.isEmpty()) {

diff --git a/...ors/src/test/java/io/opentelemetry/extension/trace/propagation/OtTracePropagatorTest.java b/...ors/src/test/java/io/opentelemetry/extension/trace/propagation/OtTracePropagatorTest.java
@@ -20,6 +20,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.Locale;
 import java.util.Map;
 import javax.annotation.Nullable;
 import org.junit.jupiter.api.Test;
@@ -55,6 +56,18 @@ private static Context withSpanContext(SpanContext spanContext, Context context)
     return context.with(Span.wrap(spanContext));
   }
 
+  private static String capitalizeFirstLetter(String input, String delimiter) {
+    String[] words = input.split(delimiter);
+
+    for (int i = 0; i < words.length; i++) {
+      String firstLetter = words[i].substring(0, 1).toUpperCase(Locale.ROOT);
+      String restOfWord = words[i].substring(1).toLowerCase(Locale.ROOT);
+      words[i] = firstLetter + restOfWord;
+    }
+
+    return String.join(delimiter, words);
+  }
+
   @Test
   void inject_invalidContext() {
     Map<String, String> carrier = new LinkedHashMap<>();
@@ -313,6 +326,22 @@ void extract_Baggage() {
     assertThat(Baggage.fromContext(context)).isEqualTo(expectedBaggage);
   }
 
+  @Test
+  void extract_Baggage_CapitalizedHeaders() {
+    String capitalizedBaggageHeader =
+        capitalizeFirstLetter(OtTracePropagator.PREFIX_BAGGAGE_HEADER + "some-key", "-");
+    Map<String, String> carrier = new LinkedHashMap<>();
+    carrier.put(OtTracePropagator.TRACE_ID_HEADER, TRACE_ID);
+    carrier.put(OtTracePropagator.SPAN_ID_HEADER, SPAN_ID);
+    carrier.put(OtTracePropagator.SAMPLED_HEADER, Common.TRUE_INT);
+    carrier.put(capitalizedBaggageHeader, "value");
+
+    Context context = propagator.extract(Context.current(), carrier, getter);
+
+    Baggage expectedBaggage = Baggage.builder().put("some-key", "value").build();
+    assertThat(Baggage.fromContext(context)).isEqualTo(expectedBaggage);
+  }
+
   @Test
   void extract_Baggage_InvalidContext() {
     Map<String, String> carrier = new LinkedHashMap<>();