Minor cleanups to messaging header capture tests (#18433)

Co-authored-by: SylvainJuge <763082+SylvainJuge@users.noreply.github.com>

Author: anuraaga

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

@@ -107,13 +107,16 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
       sendMessageRequest.addMessageAttributesEntry(
           "Test-Message-Header",
           new MessageAttributeValue().withDataType("String").withStringValue("test"));
+      sendMessageRequest.addMessageAttributesEntry(
+          "Uncaptured-Header",
+          new MessageAttributeValue().withDataType("String").withStringValue("password"));
     }
     sqsClient.sendMessage(sendMessageRequest);
 
     ReceiveMessageRequest receiveMessageRequest =
         new ReceiveMessageRequest("http://localhost:" + sqsPort + "/000000000000/testSdkSqs");
     if (testCaptureHeaders) {
-      receiveMessageRequest.withMessageAttributeNames("Test-Message-Header");
+      receiveMessageRequest.withMessageAttributeNames("Test-Message-Header", "Uncaptured-Header");
     }
     ReceiveMessageResult receiveMessageResult = sqsClient.receiveMessage(receiveMessageRequest);
 

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

@@ -27,7 +27,6 @@
 import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SYSTEM;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.trace.SpanKind;
@@ -36,7 +35,9 @@
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.testing.internal.armeria.internal.shaded.guava.collect.ImmutableList;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import org.junit.jupiter.api.Test;
@@ -239,13 +240,15 @@ void testCaptureMessageHeaderAsAttributeSpan() {
 
     client.createQueue(createQueueRequest);
 
+    Map<String, MessageAttributeValue> attributes = new HashMap<>();
+    attributes.put(
+        "Test-Message-Header",
+        MessageAttributeValue.builder().dataType("String").stringValue("test").build());
+    attributes.put(
+        "Uncaptured-Header",
+        MessageAttributeValue.builder().dataType("String").stringValue("password").build());
     SendMessageRequest newSendMessageRequest =
-        sendMessageRequest.toBuilder()
-            .messageAttributes(
-                singletonMap(
-                    "Test-Message-Header",
-                    MessageAttributeValue.builder().dataType("String").stringValue("test").build()))
-            .build();
+        sendMessageRequest.toBuilder().messageAttributes(attributes).build();
     client.sendMessage(newSendMessageRequest);
 
     ReceiveMessageRequest newReceiveMessageRequest =

instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/AbstractJms1Test.java

@@ -167,6 +167,7 @@ void shouldCaptureMessageHeaders(
     Destination destination = destinationFactory.create(session);
     TextMessage sentMessage = session.createTextMessage("a message");
     sentMessage.setStringProperty("Test_Message_Header", "test");
+    sentMessage.setStringProperty("Uncaptured_Header", "password");
     sentMessage.setIntProperty("Test_Message_Int_Header", 1234);
 
     MessageProducer producer = session.createProducer(destination);

instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/AbstractJms3Test.java

@@ -179,6 +179,7 @@ void shouldCaptureMessageHeaders(DestinationFactory destinationFactory, boolean
     Destination destination = destinationFactory.create(session);
     TextMessage sentMessage = session.createTextMessage("hello there");
     sentMessage.setStringProperty("Test_Message_Header", "test");
+    sentMessage.setStringProperty("Uncaptured_Header", "password");
     sentMessage.setIntProperty("Test_Message_Int_Header", 1234);
 
     MessageProducer producer = session.createProducer(destination);

instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/KafkaClientDefaultTest.java

@@ -47,6 +47,7 @@ void testKafkaProducerAndConsumerSpan(boolean testHeaders) throws Exception {
               new ProducerRecord<>(SHARED_TOPIC, 10, greeting);
           if (testHeaders) {
             producerRecord.headers().add("Test-Message-Header", "test".getBytes(UTF_8));
+            producerRecord.headers().add("Uncaptured-Header", "password".getBytes(UTF_8));
           }
           producer
               .send(

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

@@ -81,6 +81,7 @@ void testInterceptors() throws InterruptedException {
               .headers()
               // add header to test capturing header value as span attribute
               .add("Test-Message-Header", "test".getBytes(UTF_8))
+              .add("Uncaptured-Header", "password".getBytes(UTF_8))
               // adding baggage header in w3c baggage format
               .add("baggage", "test-baggage-key-1=test-baggage-value-1".getBytes(UTF_8))
               .add("baggage", "test-baggage-key-2=test-baggage-value-2".getBytes(UTF_8));

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

@@ -51,6 +51,7 @@ void testWrappers(boolean testHeaders, boolean testExperimental) throws Interrup
               new ProducerRecord<>(SHARED_TOPIC, greeting);
           if (testHeaders) {
             producerRecord.headers().add("Test-Message-Header", "test".getBytes(UTF_8));
+            producerRecord.headers().add("Uncaptured-Header", "password".getBytes(UTF_8));
           }
           wrappedProducer.send(
               producerRecord,

instrumentation/nats/nats-2.17/javaagent/build.gradle.kts

@@ -24,27 +24,4 @@ tasks {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
     systemProperty("collectMetadata", otelProps.collectMetadata)
   }
-
-  val testExperimental by registering(Test::class) {
-    testClassesDirs = sourceSets.test.get().output.classesDirs
-    classpath = sourceSets.test.get().runtimeClasspath
-    filter {
-      includeTestsMatching("NatsExperimentalTest")
-    }
-    jvmArgs("-Dotel.instrumentation.messaging.experimental.capture-headers=captured-header")
-    systemProperty(
-      "metadataConfig",
-      "otel.instrumentation.messaging.experimental.capture-headers=captured-header"
-    )
-  }
-
-  test {
-    filter {
-      excludeTestsMatching("NatsExperimentalTest")
-    }
-  }
-
-  check {
-    dependsOn(testExperimental)
-  }
 }

instrumentation/nats/nats-2.17/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/NatsExperimentalTest.java

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.instrumentation.nats.v2_17;
 
+import static java.util.Collections.singletonList;
+
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
 import org.junit.jupiter.api.BeforeAll;
@@ -22,6 +24,10 @@ protected InstrumentationExtension testing() {
 
   @BeforeAll
   static void beforeAll() {
-    connection = NatsTelemetry.create(testing.getOpenTelemetry()).wrap(connection);
+    connection =
+        NatsTelemetry.builder(testing.getOpenTelemetry())
+            .setCapturedHeaders(singletonList("Test-Message-Header"))
+            .build()
+            .wrap(connection);
   }
 }