Merge 24348b2 into cf9ba0c

adinauer · web-flow · commit a0ce3551b76c · 2026-04-09T12:36:14.000Z
diff --git a/sentry-spring-boot-jakarta/src/main/java/io/sentry/spring/boot/jakarta/SentryAutoConfiguration.java b/sentry-spring-boot-jakarta/src/main/java/io/sentry/spring/boot/jakarta/SentryAutoConfiguration.java
@@ -252,6 +252,7 @@ static class SentryCacheConfiguration {
     @Configuration(proxyBeanMethods = false)
     @ConditionalOnClass(KafkaTemplate.class)
     @ConditionalOnProperty(name = "sentry.enable-queue-tracing", havingValue = "true")
+    @ConditionalOnMissingClass("io.sentry.opentelemetry.SentryAutoConfigurationCustomizerProvider")
     @Open
     static class SentryKafkaQueueConfiguration {
 
diff --git a/sentry-spring-boot-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentryKafkaAutoConfigurationTest.kt b/sentry-spring-boot-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentryKafkaAutoConfigurationTest.kt
@@ -1,10 +1,12 @@
 package io.sentry.spring.boot.jakarta
 
+import io.sentry.opentelemetry.SentryAutoConfigurationCustomizerProvider
 import io.sentry.spring.jakarta.kafka.SentryKafkaConsumerBeanPostProcessor
 import io.sentry.spring.jakarta.kafka.SentryKafkaProducerBeanPostProcessor
 import kotlin.test.Test
 import org.assertj.core.api.Assertions.assertThat
 import org.springframework.boot.autoconfigure.AutoConfigurations
+import org.springframework.boot.test.context.FilteredClassLoader
 import org.springframework.boot.test.context.runner.ApplicationContextRunner
 
 class SentryKafkaAutoConfigurationTest {
@@ -24,25 +26,43 @@ class SentryKafkaAutoConfigurationTest {
         "sentry.debug=false",
       )
 
+  /** Hide the OTel customizer so conditions evaluate as "no OTel present". */
+  private val noOtelClassLoader =
+    FilteredClassLoader(SentryAutoConfigurationCustomizerProvider::class.java)
+
   @Test
   fun `registers Kafka BPPs when queue tracing is enabled`() {
-    contextRunner.withPropertyValues("sentry.enable-queue-tracing=true").run { context ->
-      assertThat(context).hasSingleBean(SentryKafkaProducerBeanPostProcessor::class.java)
-      assertThat(context).hasSingleBean(SentryKafkaConsumerBeanPostProcessor::class.java)
-    }
+    contextRunner
+      .withClassLoader(noOtelClassLoader)
+      .withPropertyValues("sentry.enable-queue-tracing=true")
+      .run { context ->
+        assertThat(context).hasSingleBean(SentryKafkaProducerBeanPostProcessor::class.java)
+        assertThat(context).hasSingleBean(SentryKafkaConsumerBeanPostProcessor::class.java)
+      }
   }
 
   @Test
   fun `does not register Kafka BPPs when queue tracing is disabled`() {
-    contextRunner.run { context ->
+    contextRunner.withClassLoader(noOtelClassLoader).run { context ->
       assertThat(context).doesNotHaveBean(SentryKafkaProducerBeanPostProcessor::class.java)
       assertThat(context).doesNotHaveBean(SentryKafkaConsumerBeanPostProcessor::class.java)
     }
   }
 
   @Test
   fun `does not register Kafka BPPs when queue tracing is explicitly false`() {
-    contextRunner.withPropertyValues("sentry.enable-queue-tracing=false").run { context ->
+    contextRunner
+      .withClassLoader(noOtelClassLoader)
+      .withPropertyValues("sentry.enable-queue-tracing=false")
+      .run { context ->
+        assertThat(context).doesNotHaveBean(SentryKafkaProducerBeanPostProcessor::class.java)
+        assertThat(context).doesNotHaveBean(SentryKafkaConsumerBeanPostProcessor::class.java)
+      }
+  }
+
+  @Test
+  fun `does not register Kafka BPPs when OpenTelemetry integration is present`() {
+    contextRunner.withPropertyValues("sentry.enable-queue-tracing=true").run { context ->
       assertThat(context).doesNotHaveBean(SentryKafkaProducerBeanPostProcessor::class.java)
       assertThat(context).doesNotHaveBean(SentryKafkaConsumerBeanPostProcessor::class.java)
     }
diff --git a/sentry/src/main/java/io/sentry/util/SpanUtils.java b/sentry/src/main/java/io/sentry/util/SpanUtils.java
@@ -40,6 +40,8 @@ public final class SpanUtils {
       origins.add("auto.http.spring7.resttemplate");
       origins.add("auto.http.openfeign");
       origins.add("auto.http.ktor-client");
+      origins.add("auto.queue.spring_jakarta.kafka.producer");
+      origins.add("auto.queue.spring_jakarta.kafka.consumer");
     }
 
     if (SentryOpenTelemetryMode.AGENT == mode) {

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ public final class SpanUtils {`
`40`	`40`	`origins.add("auto.http.spring7.resttemplate");`
`41`	`41`	`origins.add("auto.http.openfeign");`
`42`	`42`	`origins.add("auto.http.ktor-client");`
	`43`	`+ origins.add("auto.queue.spring_jakarta.kafka.producer");`
	`44`	`+ origins.add("auto.queue.spring_jakarta.kafka.consumer");`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`if (SentryOpenTelemetryMode.AGENT == mode) {`