fix

Author: trask

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

@@ -24,9 +24,8 @@ tasks {
 
   test {
     filter {
-      excludeTestsMatching("*DeprecatedInterceptorsTest")
+      excludeTestsMatching("*Deprecated*")
     }
-    systemProperty("otel.instrumentation.messaging.experimental.capture-headers", "Test-Message-Header")
   }
 
   val testDeprecated by registering(Test::class) {
@@ -39,8 +38,16 @@ tasks {
     systemProperty("otel.instrumentation.messaging.experimental.capture-headers", "Test-Message-Header")
   }
 
+  val testDeprecatedSuppressReceiveSpans by registering(Test::class) {
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+    filter {
+      includeTestsMatching("*DeprecatedInterceptorsSuppressReceiveSpansTest")
+    }
+  }
+
   check {
-    dependsOn(testDeprecated)
+    dependsOn(testDeprecated, testDeprecatedSuppressReceiveSpans)
   }
 }
 

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

@@ -26,22 +26,19 @@ abstract class AbstractInterceptorsTest extends KafkaClientBaseTest {
 
   static final String greeting = "Hello Kafka!";
 
-  private static final KafkaTelemetry kafkaTelemetry =
-      KafkaTelemetry.builder(testing.getOpenTelemetry())
-          .setMessagingReceiveInstrumentationEnabled(true)
-          .build();
+  protected abstract KafkaTelemetry kafkaTelemetry();
 
   @Override
   public Map<String, Object> producerProps() {
     Map<String, Object> props = super.producerProps();
-    props.putAll(kafkaTelemetry.producerInterceptorConfigProperties());
+    props.putAll(kafkaTelemetry().producerInterceptorConfigProperties());
     return props;
   }
 
   @Override
   public Map<String, Object> consumerProps() {
     Map<String, Object> props = super.consumerProps();
-    props.putAll(kafkaTelemetry.consumerInterceptorConfigProperties());
+    props.putAll(kafkaTelemetry().consumerInterceptorConfigProperties());
     return props;
   }
 

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

@@ -23,6 +23,14 @@
 
 class InterceptorsSuppressReceiveSpansTest extends AbstractInterceptorsTest {
 
+  private static final KafkaTelemetry kafkaTelemetry =
+      KafkaTelemetry.create(testing.getOpenTelemetry());
+
+  @Override
+  protected KafkaTelemetry kafkaTelemetry() {
+    return kafkaTelemetry;
+  }
+
   @SuppressWarnings("deprecation") // using deprecated semconv
   @Override
   void assertTraces() {

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

@@ -30,6 +30,17 @@
 
 class InterceptorsTest extends AbstractInterceptorsTest {
 
+  private static final KafkaTelemetry kafkaTelemetry =
+      KafkaTelemetry.builder(testing.getOpenTelemetry())
+          .setMessagingReceiveInstrumentationEnabled(true)
+          .setCapturedHeaders(singletonList("Test-Message-Header"))
+          .build();
+
+  @Override
+  protected KafkaTelemetry kafkaTelemetry() {
+    return kafkaTelemetry;
+  }
+
   @SuppressWarnings("deprecation") // using deprecated semconv
   @Override
   void assertTraces() {