Skip to content

Commit 6ebfe85

Browse files
committed
revert
1 parent fc68134 commit 6ebfe85

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/CapturedMessageHeadersUtil.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,31 @@
55

66
package io.opentelemetry.instrumentation.api.incubator.semconv.messaging;
77

8+
import static java.util.Collections.unmodifiableList;
9+
810
import io.opentelemetry.api.common.AttributeKey;
911
import java.util.List;
12+
import java.util.Locale;
1013
import java.util.concurrent.ConcurrentHashMap;
1114
import java.util.concurrent.ConcurrentMap;
15+
import java.util.stream.Collectors;
1216

1317
final class CapturedMessageHeadersUtil {
1418

1519
private static final ConcurrentMap<String, AttributeKey<List<String>>> attributeKeysCache =
1620
new ConcurrentHashMap<>();
1721

22+
static List<String> lowercase(List<String> names) {
23+
return unmodifiableList(
24+
names.stream().map(s -> s.toLowerCase(Locale.ROOT)).collect(Collectors.toList()));
25+
}
26+
1827
static AttributeKey<List<String>> attributeKey(String headerName) {
1928
return attributeKeysCache.computeIfAbsent(headerName, n -> createKey(n));
2029
}
2130

2231
private static AttributeKey<List<String>> createKey(String headerName) {
32+
// headerName is always lowercase, see MessagingAttributesExtractor
2333
String key = "messaging.header." + headerName.replace('-', '_');
2434
return AttributeKey.stringArrayKey(key);
2535
}

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
1414
import io.opentelemetry.instrumentation.api.internal.SpanKey;
1515
import io.opentelemetry.instrumentation.api.internal.SpanKeyProvider;
16-
import java.util.ArrayList;
1716
import java.util.List;
1817
import javax.annotation.Nullable;
1918

@@ -86,7 +85,7 @@ public static <REQUEST, RESPONSE> MessagingAttributesExtractorBuilder<REQUEST, R
8685
List<String> capturedHeaders) {
8786
this.getter = getter;
8887
this.operation = operation;
89-
this.capturedHeaders = new ArrayList<>(capturedHeaders);
88+
this.capturedHeaders = CapturedMessageHeadersUtil.lowercase(capturedHeaders);
9089
}
9190

9291
@Override

0 commit comments

Comments
 (0)