add test for experimental kafka span attributes

open-telemetry · May 15, 2024 · 8271414 · 8271414
1 parent 54cddcc
commit 8271414
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/...io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java b/...io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java
@@ -138,7 +138,6 @@ public ConfigProperties configProperties() {
   @ConditionalOnBean(OpenTelemetry.class)
   @ConditionalOnMissingBean({ConfigProperties.class})
   public static class FallbackConfigProperties {
-
     @Bean("configProperties")
     public ConfigProperties configProperties() {
       return DefaultConfigProperties.create(Collections.emptyMap());

diff --git a/...ion/spring/autoconfigure/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java b/...ion/spring/autoconfigure/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java
@@ -10,7 +10,6 @@
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.kafka.DefaultKafkaProducerFactoryCustomizer;
 import org.springframework.context.annotation.Bean;

diff --git a/...c/main/java/io/opentelemetry/spring/smoketest/AbstractJvmKafkaSpringStarterSmokeTest.java b/...c/main/java/io/opentelemetry/spring/smoketest/AbstractJvmKafkaSpringStarterSmokeTest.java
@@ -55,6 +55,7 @@ void setUpContext() {
                     KafkaInstrumentationAutoConfiguration.class,
                     KafkaConfig.class))
             .withPropertyValues(
+                "otel.instrumentation.kafka.experimental-span-attributes=true",
                 "spring.kafka.bootstrap-servers=" + kafka.getBootstrapServers(),
                 "spring.kafka.consumer.auto-offset-reset=earliest",
                 "spring.kafka.consumer.linger-ms=10",

diff --git a/.../src/main/java/io/opentelemetry/spring/smoketest/AbstractKafkaSpringStarterSmokeTest.java b/.../src/main/java/io/opentelemetry/spring/smoketest/AbstractKafkaSpringStarterSmokeTest.java
@@ -9,6 +9,7 @@
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
 
 import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes;
 import org.apache.kafka.clients.admin.NewTopic;
@@ -97,6 +98,9 @@ void shouldInstrumentProducerAndConsumer() {
                             equalTo(
                                 MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP,
                                 "testListener"),
+                            satisfies(
+                                AttributeKey.longKey("kafka.record.queue_time_ms"),
+                                AbstractLongAssert::isNotNegative),
                             satisfies(
                                 MessagingIncubatingAttributes.MESSAGING_CLIENT_ID,
                                 stringAssert -> stringAssert.startsWith("consumer"))),

diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/resources/application.yaml b/smoke-tests-otel-starter/spring-boot-common/src/main/resources/application.yaml
@@ -1,5 +1,7 @@
 otel:
   instrumentation:
+    kafka:
+      experimental-span-attributes: true
     logback-appender:
       experimental:
         capture-code-attributes: true