Merge branch 'feat/crons-options' into feat/crons-experimental

Author: adinauer

sentry-samples/sentry-samples-spring-boot-jakarta/src/main/resources/application.properties

@@ -10,6 +10,8 @@ sentry.logging.minimum-breadcrumb-level=debug
 # Performance configuration
 sentry.traces-sample-rate=1.0
 sentry.enable-tracing=true
+sentry.enable-automatic-checkins=true
+sentry.ignored-checkins=ignored_monitor_slug_1,ignored_monitor_slug_2
 sentry.debug=true
 in-app-includes="io.sentry.samples"
 

sentry-samples/sentry-samples-spring-boot/src/main/resources/application.properties

@@ -10,7 +10,8 @@ sentry.logging.minimum-breadcrumb-level=debug
 # Performance configuration
 sentry.traces-sample-rate=1.0
 sentry.enable-tracing=true
-#sentry.enable-automatic-checkins=true
+sentry.enable-automatic-checkins=true
+sentry.ignored-checkins=ignored_monitor_slug_1,ignored_monitor_slug_2
 sentry.debug=true
 in-app-includes="io.sentry.samples"
 

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

@@ -767,6 +767,22 @@ class SentryAutoConfigurationTest {
             }
     }
 
+    @Test
+    fun `when auto checkins is disabled, does not create quartz config`() {
+        contextRunner.withPropertyValues("sentry.dsn=http://key@localhost/proj", "sentry.enable-automatic-checkins=false")
+            .run {
+                assertThat(it).doesNotHaveBean(SchedulerFactoryBeanCustomizer::class.java)
+            }
+    }
+
+    @Test
+    fun `when auto checkins option is skipped, does not create quartz config`() {
+        contextRunner.withPropertyValues("sentry.dsn=http://key@localhost/proj")
+            .run {
+                assertThat(it).doesNotHaveBean(SchedulerFactoryBeanCustomizer::class.java)
+            }
+    }
+
     @Configuration(proxyBeanMethods = false)
     open class CustomOptionsConfigurationConfiguration {
 

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

@@ -767,6 +767,22 @@ class SentryAutoConfigurationTest {
             }
     }
 
+    @Test
+    fun `when auto checkins is disabled, does not create quartz config`() {
+        contextRunner.withPropertyValues("sentry.dsn=http://key@localhost/proj", "sentry.enable-automatic-checkins=false")
+            .run {
+                assertThat(it).doesNotHaveBean(SchedulerFactoryBeanCustomizer::class.java)
+            }
+    }
+
+    @Test
+    fun `when auto checkins option is skipped, does not create quartz config`() {
+        contextRunner.withPropertyValues("sentry.dsn=http://key@localhost/proj")
+            .run {
+                assertThat(it).doesNotHaveBean(SchedulerFactoryBeanCustomizer::class.java)
+            }
+    }
+
     @Configuration(proxyBeanMethods = false)
     open class CustomOptionsConfigurationConfiguration {
 

sentry/src/main/java/io/sentry/SentryOptions.java

@@ -2460,7 +2460,7 @@ public void merge(final @NotNull ExternalOptions options) {
     }
     if (options.getIgnoredCheckIns() != null) {
       final List<String> ignoredCheckIns = new ArrayList<>(options.getIgnoredCheckIns());
-      setTracePropagationTargets(ignoredCheckIns);
+      setIgnoredCheckIns(ignoredCheckIns);
     }
   }
 

sentry/src/test/java/io/sentry/SentryOptionsTest.kt

@@ -371,6 +371,9 @@ class SentryOptionsTest {
         externalOptions.isEnabled = false
         externalOptions.isEnablePrettySerializationOutput = false
         externalOptions.isSendModules = false
+        externalOptions.isEnableAutomaticCheckIns = true
+        externalOptions.ignoredCheckIns = listOf("slug1", "slug-B")
+
         val options = SentryOptions()
 
         options.merge(externalOptions)
@@ -398,6 +401,8 @@ class SentryOptionsTest {
         assertFalse(options.isEnabled)
         assertFalse(options.isEnablePrettySerializationOutput)
         assertFalse(options.isSendModules)
+        assertTrue(options.isEnableAutomaticCheckIns)
+        assertEquals(listOf("slug1", "slug-B"), options.ignoredCheckIns)
     }
 
     @Test