use the same test header as other tests

Author: laurit

instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/build.gradle.kts

@@ -36,7 +36,7 @@ tasks {
       excludeTestsMatching("WrapperSuppressReceiveSpansTest")
     }
     jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
-    jvmArgs("-Dotel.instrumentation.messaging.experimental.capture-headers=baggage")
+    systemProperty("otel.instrumentation.messaging.experimental.capture-headers", "test-message-header")
   }
 
   check {

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

@@ -53,6 +53,8 @@ void testInterceptors() throws InterruptedException {
               new ProducerRecord<>(SHARED_TOPIC, greeting);
           producerRecord
               .headers()
+              // add header to test capturing header value as span attribute
+              .add("test-message-header", "test".getBytes(StandardCharsets.UTF_8))
               // adding baggage header in w3c baggage format
               .add(
                   "baggage",

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

@@ -17,15 +17,13 @@
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE;
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
-import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.sdk.trace.data.LinkData;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicReference;
 import org.assertj.core.api.AbstractLongAssert;
 import org.assertj.core.api.AbstractStringAssert;
@@ -47,10 +45,8 @@ void assertTraces() {
                       .hasParent(trace.getSpan(0))
                       .hasAttributesSatisfyingExactly(
                           equalTo(
-                              stringArrayKey("messaging.header.baggage"),
-                              asList(
-                                  "test-baggage-key-1=test-baggage-value-1",
-                                  "test-baggage-key-2=test-baggage-value-2")),
+                              stringArrayKey("messaging.header.test_message_header"),
+                              singletonList("test")),
                           equalTo(MESSAGING_SYSTEM, "kafka"),
                           equalTo(MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
                           equalTo(MESSAGING_OPERATION, "publish"),
@@ -74,10 +70,8 @@ void assertTraces() {
                         .hasLinksSatisfying(links -> assertThat(links).isEmpty())
                         .hasAttributesSatisfyingExactly(
                             equalTo(
-                                AttributeKey.stringArrayKey("messaging.header.baggage"),
-                                Arrays.asList(
-                                    "test-baggage-key-1=test-baggage-value-1",
-                                    "test-baggage-key-2=test-baggage-value-2")),
+                                stringArrayKey("messaging.header.test_message_header"),
+                                singletonList("test")),
                             equalTo(MESSAGING_SYSTEM, "kafka"),
                             equalTo(MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
                             equalTo(MESSAGING_OPERATION, "receive"),
@@ -93,10 +87,8 @@ void assertTraces() {
                         .hasLinks(LinkData.create(producerSpanContext.get()))
                         .hasAttributesSatisfyingExactly(
                             equalTo(
-                                AttributeKey.stringArrayKey("messaging.header.baggage"),
-                                Arrays.asList(
-                                    "test-baggage-key-1=test-baggage-value-1",
-                                    "test-baggage-key-2=test-baggage-value-2")),
+                                stringArrayKey("messaging.header.test_message_header"),
+                                singletonList("test")),
                             equalTo(MESSAGING_SYSTEM, "kafka"),
                             equalTo(MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
                             equalTo(MESSAGING_OPERATION, "process"),