add condition on JavaContinuousProfiler to be on the classpath to invoke ProfilerAutoConfig

Author: lbloder

sentry-spring-boot-4/src/main/java/io/sentry/spring/boot4/SentryProfilerAutoConfiguration.java

@@ -7,7 +7,11 @@
 import org.springframework.context.annotation.Import;
 
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(name = {"io.sentry.opentelemetry.agent.AgentMarker"})
+@ConditionalOnClass(
+    name = {
+      "io.sentry.opentelemetry.agent.AgentMarker",
+      "io.sentry.asyncprofiler.profiling.JavaContinuousProfiler"
+    })
 @Open
 @Import(SentryProfilerConfiguration.class)
 public class SentryProfilerAutoConfiguration {}

sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentryAutoConfigurationTest.kt

@@ -1133,6 +1133,22 @@ class SentryAutoConfigurationTest {
       }
   }
 
+  @Test
+  fun `when JavaContinuousProfiler is not on the classpath and ContinuousProfiling is enabled IProfileConverter beans are not created`() {
+    SentryIntegrationPackageStorage.getInstance().clearStorage()
+    contextRunner
+      .withPropertyValues(
+        "sentry.dsn=http://key@localhost/proj",
+        "sentry.profile-session-sample-rate=1.0",
+        "debug=true",
+      )
+      .withClassLoader(FilteredClassLoader(JavaContinuousProfiler::class.java))
+      .run {
+        assertThat(it).doesNotHaveBean(IContinuousProfiler::class.java)
+        assertThat(it).doesNotHaveBean(IProfileConverter::class.java)
+      }
+  }
+
   @Configuration(proxyBeanMethods = false)
   open class CustomSchedulerFactoryBeanCustomizerConfiguration {
     class MyJobListener : JobListener {

sentry-spring-boot-jakarta/src/main/java/io/sentry/spring/boot/jakarta/SentryProfilerAutoConfiguration.java

@@ -7,7 +7,11 @@
 import org.springframework.context.annotation.Import;
 
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(name = {"io.sentry.opentelemetry.agent.AgentMarker"})
+@ConditionalOnClass(
+    name = {
+      "io.sentry.opentelemetry.agent.AgentMarker",
+      "io.sentry.asyncprofiler.profiling.JavaContinuousProfiler"
+    })
 @Open
 @Import(SentryProfilerConfiguration.class)
 public class SentryProfilerAutoConfiguration {}

sentry-spring-boot-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentryAutoConfigurationTest.kt

@@ -1155,6 +1155,22 @@ class SentryAutoConfigurationTest {
       }
   }
 
+  @Test
+  fun `when JavaContinuousProfiler is not on the classpath and ContinuousProfiling is enabled IProfileConverter beans are not created`() {
+    SentryIntegrationPackageStorage.getInstance().clearStorage()
+    contextRunner
+      .withPropertyValues(
+        "sentry.dsn=http://key@localhost/proj",
+        "sentry.profile-session-sample-rate=1.0",
+        "debug=true",
+      )
+      .withClassLoader(FilteredClassLoader(JavaContinuousProfiler::class.java))
+      .run {
+        assertThat(it).doesNotHaveBean(IContinuousProfiler::class.java)
+        assertThat(it).doesNotHaveBean(IProfileConverter::class.java)
+      }
+  }
+
   @Configuration(proxyBeanMethods = false)
   open class CustomSchedulerFactoryBeanCustomizerConfiguration {
     class MyJobListener : JobListener {

sentry-spring-boot/src/main/java/io/sentry/spring/boot/SentryProfilerAutoConfiguration.java

@@ -7,7 +7,11 @@
 import org.springframework.context.annotation.Import;
 
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(name = {"io.sentry.opentelemetry.agent.AgentMarker"})
+@ConditionalOnClass(
+    name = {
+      "io.sentry.opentelemetry.agent.AgentMarker",
+      "io.sentry.asyncprofiler.profiling.JavaContinuousProfiler"
+    })
 @Open
 @Import(SentryProfilerConfiguration.class)
 public class SentryProfilerAutoConfiguration {}

sentry-spring-boot/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt

@@ -1006,6 +1006,22 @@ class SentryAutoConfigurationTest {
       }
   }
 
+  @Test
+  fun `when JavaContinuousProfiler is not on the classpath and ContinuousProfiling is enabled IProfileConverter beans are not created`() {
+    SentryIntegrationPackageStorage.getInstance().clearStorage()
+    contextRunner
+      .withPropertyValues(
+        "sentry.dsn=http://key@localhost/proj",
+        "sentry.profile-session-sample-rate=1.0",
+        "debug=true",
+      )
+      .withClassLoader(FilteredClassLoader(JavaContinuousProfiler::class.java))
+      .run {
+        assertThat(it).doesNotHaveBean(IContinuousProfiler::class.java)
+        assertThat(it).doesNotHaveBean(IProfileConverter::class.java)
+      }
+  }
+
   @Test
   fun `creates quartz config`() {
     contextRunner.withPropertyValues("sentry.dsn=http://key@localhost/proj").run {