Remove messaging header normalization

AlchemyDing · AlchemyDing · commit a838f9e5a71d · 2025-09-02T00:23:34.000+08:00
diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsTest.java
@@ -115,7 +115,7 @@ void assertTraces() {
                     span.hasName("producer callback").hasKind(SpanKind.INTERNAL).hasNoParent()));
   }
 
-  private AttributeKey<List<String>> headerAttributeKey() {
+  private static AttributeKey<List<String>> headerAttributeKey() {
     if (SemconvStability.isEmitOldMessageSemconv()) {
       return AttributeKey.stringArrayKey("messaging.header.Test_Message_Header");
     } else {
diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/AbstractRocketMqClientTest.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/AbstractRocketMqClientTest.java
@@ -458,7 +458,7 @@ private static Consumer<List<? extends LinkData>> links(SpanContext... spanConte
     };
   }
 
-  private AttributeKey<List<String>> headerAttributeKey() {
+  private static AttributeKey<List<String>> headerAttributeKey() {
     if (SemconvStability.isEmitOldMessageSemconv()) {
       return AttributeKey.stringArrayKey("messaging.header.Test_Message_Header");
     } else {
diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java
@@ -601,7 +601,7 @@ private static SpanDataAssert assertProcessSpanWithDelayMessage(
         .hasAttributesSatisfyingExactly(attributeAssertions);
   }
 
-  private AttributeKey<List<String>> headerAttributeKey() {
+  private static AttributeKey<List<String>> headerAttributeKey() {
     if (SemconvStability.isEmitOldMessageSemconv()) {
       return AttributeKey.stringArrayKey("messaging.header.Test_Message_Header");
     } else {

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ void assertTraces() {`
`115`	`115`	`span.hasName("producer callback").hasKind(SpanKind.INTERNAL).hasNoParent()));`
`116`	`116`	`}`
`117`	`117`
`118`		`- private AttributeKey<List<String>> headerAttributeKey() {`
	`118`	`+ private static AttributeKey<List<String>> headerAttributeKey() {`
`119`	`119`	`if (SemconvStability.isEmitOldMessageSemconv()) {`
`120`	`120`	`return AttributeKey.stringArrayKey("messaging.header.Test_Message_Header");`
`121`	`121`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ private static Consumer<List<? extends LinkData>> links(SpanContext... spanConte`
`458`	`458`	`};`
`459`	`459`	`}`
`460`	`460`
`461`		`- private AttributeKey<List<String>> headerAttributeKey() {`
	`461`	`+ private static AttributeKey<List<String>> headerAttributeKey() {`
`462`	`462`	`if (SemconvStability.isEmitOldMessageSemconv()) {`
`463`	`463`	`return AttributeKey.stringArrayKey("messaging.header.Test_Message_Header");`
`464`	`464`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ private static SpanDataAssert assertProcessSpanWithDelayMessage(`
`601`	`601`	`.hasAttributesSatisfyingExactly(attributeAssertions);`
`602`	`602`	`}`
`603`	`603`
`604`		`- private AttributeKey<List<String>> headerAttributeKey() {`
	`604`	`+ private static AttributeKey<List<String>> headerAttributeKey() {`
`605`	`605`	`if (SemconvStability.isEmitOldMessageSemconv()) {`
`606`	`606`	`return AttributeKey.stringArrayKey("messaging.header.Test_Message_Header");`
`607`	`607`	`} else {`