fix tests

Author: jaydeluca

instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsBaseTest.java

@@ -60,6 +60,9 @@ abstract class KafkaStreamsBaseTest {
   static Consumer<Integer, String> consumer;
   static CountDownLatch consumerReady = new CountDownLatch(1);
 
+  protected static final boolean isExperimental =
+      Boolean.getBoolean("otel.instrumentation.kafka.experimental-span-attributes");
+
   @BeforeAll
   static void setup() throws ExecutionException, InterruptedException, TimeoutException {
     kafka =

instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsDefaultTest.java

@@ -48,9 +48,6 @@
 
 class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest {
 
-  private static final boolean isExperimental =
-      Boolean.getBoolean("otel.instrumentation.kafka.experimental-span-attributes");
-
   @SuppressWarnings("deprecation") // using deprecated semconv
   @DisplayName("test kafka produce and consume with streams in-between")
   @Test

instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSuppressReceiveSpansTest.java

@@ -124,10 +124,13 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
                                   k -> k.isInstanceOf(String.class)),
                               equalTo(MESSAGING_KAFKA_MESSAGE_OFFSET, 0),
                               equalTo(MESSAGING_KAFKA_MESSAGE_KEY, "10"),
-                              satisfies(
-                                  longKey("kafka.record.queue_time_ms"),
-                                  k -> k.isGreaterThanOrEqualTo(0)),
                               equalTo(stringKey("asdf"), "testing")));
+                  if (isExperimental) {
+                    assertions.add(
+                        satisfies(
+                            longKey("kafka.record.queue_time_ms"),
+                            k -> k.isGreaterThanOrEqualTo(0)));
+                  }
                   if (Boolean.getBoolean("testLatestDeps")) {
                     assertions.add(equalTo(MESSAGING_KAFKA_CONSUMER_GROUP, "test-application"));
                   }
@@ -170,10 +173,13 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
                                   k -> k.isInstanceOf(String.class)),
                               equalTo(MESSAGING_KAFKA_MESSAGE_OFFSET, 0),
                               equalTo(MESSAGING_KAFKA_MESSAGE_KEY, "10"),
-                              satisfies(
-                                  longKey("kafka.record.queue_time_ms"),
-                                  k -> k.isGreaterThanOrEqualTo(0)),
                               equalTo(longKey("testing"), 123)));
+                  if (isExperimental) {
+                    assertions.add(
+                        satisfies(
+                            longKey("kafka.record.queue_time_ms"),
+                            k -> k.isGreaterThanOrEqualTo(0)));
+                  }
                   if (Boolean.getBoolean("testLatestDeps")) {
                     assertions.add(equalTo(MESSAGING_KAFKA_CONSUMER_GROUP, "test"));
                   }