Skip to content

Commit a159439

Browse files
AlchemyDingAlchemyDing
committed
Remove messaging header normalization
1 parent 0b0c59c commit a159439

File tree

11 files changed

+26
-26
lines changed

11 files changed

+26
-26
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static AttributeKey<List<String>> attributeKey(String headerName) {
2020
}
2121

2222
private static AttributeKey<List<String>> createKey(String headerName) {
23-
String key = "messaging.header." + headerName.replace('-', '_');
23+
String key = "messaging.header." + headerName;
2424
return AttributeKey.stringArrayKey(key);
2525
}
2626

‎instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
182182
if (testCaptureHeaders) {
183183
attributes.add(
184184
satisfies(
185-
stringArrayKey("messaging.header.Test_Message_Header"),
185+
stringArrayKey("messaging.header.Test-Message-Header"),
186186
val -> val.isEqualTo(singletonList("test"))));
187187
}
188188

@@ -222,7 +222,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
222222
if (testCaptureHeaders) {
223223
attributes.add(
224224
satisfies(
225-
stringArrayKey("messaging.header.Test_Message_Header"),
225+
stringArrayKey("messaging.header.Test-Message-Header"),
226226
val -> val.isEqualTo(singletonList("test"))));
227227
}
228228

@@ -261,7 +261,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
261261
if (testCaptureHeaders) {
262262
attributes.add(
263263
satisfies(
264-
stringArrayKey("messaging.header.Test_Message_Header"),
264+
stringArrayKey("messaging.header.Test-Message-Header"),
265265
val -> val.isEqualTo(singletonList("test"))));
266266
}
267267
span.hasName("testSdkSqs process")

‎instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ protected void assertSqsTraces(boolean withParent, boolean captureHeaders) {
9393
if (captureHeaders) {
9494
attributes.add(
9595
satisfies(
96-
stringArrayKey("messaging.header.Test_Message_Header"),
96+
stringArrayKey("messaging.header.Test-Message-Header"),
9797
v -> v.isEqualTo(ImmutableList.of("test"))));
9898
}
9999
span.hasName("testSdkSqs publish")
@@ -163,7 +163,7 @@ protected void assertSqsTraces(boolean withParent, boolean captureHeaders) {
163163
if (captureHeaders) {
164164
attributes.add(
165165
satisfies(
166-
stringArrayKey("messaging.header.Test_Message_Header"),
166+
stringArrayKey("messaging.header.Test-Message-Header"),
167167
v -> v.isEqualTo(ImmutableList.of("test"))));
168168
}
169169

@@ -201,7 +201,7 @@ protected void assertSqsTraces(boolean withParent, boolean captureHeaders) {
201201
if (captureHeaders) {
202202
attributes.add(
203203
satisfies(
204-
stringArrayKey("messaging.header.Test_Message_Header"),
204+
stringArrayKey("messaging.header.Test-Message-Header"),
205205
v -> v.isEqualTo(singletonList("test"))));
206206
}
207207

‎instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafkaclients/common/v0_11/internal/KafkaClientBaseTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ protected static List<AttributeAssertion> sendAttributes(
188188
if (testHeaders) {
189189
assertions.add(
190190
equalTo(
191-
AttributeKey.stringArrayKey("messaging.header.Test_Message_Header"),
191+
AttributeKey.stringArrayKey("messaging.header.Test-Message-Header"),
192192
Collections.singletonList("test")));
193193
}
194194
return assertions;
@@ -211,7 +211,7 @@ protected static List<AttributeAssertion> receiveAttributes(boolean testHeaders)
211211
if (testHeaders) {
212212
assertions.add(
213213
equalTo(
214-
AttributeKey.stringArrayKey("messaging.header.Test_Message_Header"),
214+
AttributeKey.stringArrayKey("messaging.header.Test-Message-Header"),
215215
Collections.singletonList("test")));
216216
}
217217
return assertions;
@@ -249,7 +249,7 @@ protected static List<AttributeAssertion> processAttributes(
249249
if (testHeaders) {
250250
assertions.add(
251251
equalTo(
252-
AttributeKey.stringArrayKey("messaging.header.Test_Message_Header"),
252+
AttributeKey.stringArrayKey("messaging.header.Test-Message-Header"),
253253
Collections.singletonList("test")));
254254
}
255255

‎instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void assertTraces() {
4545
.hasParent(trace.getSpan(0))
4646
.hasAttributesSatisfyingExactly(
4747
equalTo(
48-
stringArrayKey("messaging.header.Test_Message_Header"),
48+
stringArrayKey("messaging.header.Test-Message-Header"),
4949
singletonList("test")),
5050
equalTo(MESSAGING_SYSTEM, "kafka"),
5151
equalTo(MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
@@ -70,7 +70,7 @@ void assertTraces() {
7070
.hasLinksSatisfying(links -> assertThat(links).isEmpty())
7171
.hasAttributesSatisfyingExactly(
7272
equalTo(
73-
stringArrayKey("messaging.header.Test_Message_Header"),
73+
stringArrayKey("messaging.header.Test-Message-Header"),
7474
singletonList("test")),
7575
equalTo(MESSAGING_SYSTEM, "kafka"),
7676
equalTo(MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
@@ -87,7 +87,7 @@ void assertTraces() {
8787
.hasLinks(LinkData.create(producerSpanContext.get()))
8888
.hasAttributesSatisfyingExactly(
8989
equalTo(
90-
stringArrayKey("messaging.header.Test_Message_Header"),
90+
stringArrayKey("messaging.header.Test-Message-Header"),
9191
singletonList("test")),
9292
equalTo(MESSAGING_SYSTEM, "kafka"),
9393
equalTo(MESSAGING_DESTINATION_NAME, SHARED_TOPIC),

‎instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperSuppressReceiveSpansTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ protected static List<AttributeAssertion> sendAttributes(boolean testHeaders) {
7373
if (testHeaders) {
7474
assertions.add(
7575
equalTo(
76-
AttributeKey.stringArrayKey("messaging.header.Test_Message_Header"),
76+
AttributeKey.stringArrayKey("messaging.header.Test-Message-Header"),
7777
Collections.singletonList("test")));
7878
}
7979
return assertions;
@@ -100,7 +100,7 @@ private static List<AttributeAssertion> processAttributes(String greeting, boole
100100
if (testHeaders) {
101101
assertions.add(
102102
equalTo(
103-
AttributeKey.stringArrayKey("messaging.header.Test_Message_Header"),
103+
AttributeKey.stringArrayKey("messaging.header.Test-Message-Header"),
104104
Collections.singletonList("test")));
105105
}
106106
return assertions;

‎instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ protected static List<AttributeAssertion> sendAttributes(boolean testHeaders) {
9696
if (testHeaders) {
9797
assertions.add(
9898
equalTo(
99-
AttributeKey.stringArrayKey("messaging.header.Test_Message_Header"),
99+
AttributeKey.stringArrayKey("messaging.header.Test-Message-Header"),
100100
Collections.singletonList("test")));
101101
}
102102
return assertions;
@@ -123,7 +123,7 @@ private static List<AttributeAssertion> processAttributes(String greeting, boole
123123
if (testHeaders) {
124124
assertions.add(
125125
equalTo(
126-
AttributeKey.stringArrayKey("messaging.header.Test_Message_Header"),
126+
AttributeKey.stringArrayKey("messaging.header.Test-Message-Header"),
127127
Collections.singletonList("test")));
128128
}
129129
return assertions;
@@ -143,7 +143,7 @@ protected static List<AttributeAssertion> receiveAttributes(boolean testHeaders)
143143
if (testHeaders) {
144144
assertions.add(
145145
equalTo(
146-
AttributeKey.stringArrayKey("messaging.header.Test_Message_Header"),
146+
AttributeKey.stringArrayKey("messaging.header.Test-Message-Header"),
147147
Collections.singletonList("test")));
148148
}
149149
return assertions;

‎instrumentation/pulsar/pulsar-2.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/AbstractPulsarClientTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ static List<AttributeAssertion> sendAttributes(
363363
if (testHeaders) {
364364
assertions.add(
365365
equalTo(
366-
AttributeKey.stringArrayKey("messaging.header.Test_Message_Header"),
366+
AttributeKey.stringArrayKey("messaging.header.Test-Message-Header"),
367367
Collections.singletonList("test")));
368368
}
369369
int partitionIndex = TopicName.getPartitionIndex(destination);
@@ -399,7 +399,7 @@ static List<AttributeAssertion> receiveAttributes(
399399
if (testHeaders) {
400400
assertions.add(
401401
equalTo(
402-
AttributeKey.stringArrayKey("messaging.header.Test_Message_Header"),
402+
AttributeKey.stringArrayKey("messaging.header.Test-Message-Header"),
403403
Collections.singletonList("test")));
404404
}
405405
if (isBatch) {
@@ -426,7 +426,7 @@ static List<AttributeAssertion> processAttributes(
426426
if (testHeaders) {
427427
assertions.add(
428428
equalTo(
429-
AttributeKey.stringArrayKey("messaging.header.Test_Message_Header"),
429+
AttributeKey.stringArrayKey("messaging.header.Test-Message-Header"),
430430
Collections.singletonList("test")));
431431
}
432432
int partitionIndex = TopicName.getPartitionIndex(destination);

‎instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/AbstractRocketMqClientTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ void captureMessageHeaderAsSpanAttributes() throws Exception {
409409
"SEND_OK"),
410410
equalTo(
411411
AttributeKey.stringArrayKey(
412-
"messaging.header.Test_Message_Header"),
412+
"messaging.header.Test-Message-Header"),
413413
singletonList("test"))),
414414
span ->
415415
span.hasName(sharedTopic + " process")
@@ -436,7 +436,7 @@ void captureMessageHeaderAsSpanAttributes() throws Exception {
436436
val -> val.isInstanceOf(Long.class)),
437437
equalTo(
438438
AttributeKey.stringArrayKey(
439-
"messaging.header.Test_Message_Header"),
439+
"messaging.header.Test-Message-Header"),
440440
singletonList("test"))),
441441
span ->
442442
span.hasName("messageListener")

‎instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ public void testCapturedMessageHeaders() throws Throwable {
372372
sendReceipt,
373373
equalTo(
374374
AttributeKey.stringArrayKey(
375-
"messaging.header.Test_Message_Header"),
375+
"messaging.header.Test-Message-Header"),
376376
Collections.singletonList("test")))
377377
.hasParent(trace.getSpan(0)));
378378
sendSpanData.set(trace.getSpan(1));
@@ -392,7 +392,7 @@ public void testCapturedMessageHeaders() throws Throwable {
392392
sendReceipt,
393393
equalTo(
394394
AttributeKey.stringArrayKey(
395-
"messaging.header.Test_Message_Header"),
395+
"messaging.header.Test-Message-Header"),
396396
Collections.singletonList("test")))
397397
// As the child of receive span.
398398
.hasParent(trace.getSpan(0)),

0 commit comments

Comments
 (0)