Merge branch 'feat/crons-lib-support' into feat/crons-options

Author: adinauer

CHANGELOG.md

@@ -7,7 +7,7 @@
 - Add `sendModules` option for disable sending modules ([#2926](https://github.com/getsentry/sentry-java/pull/2926))
 - Send `db.system` and `db.name` in span data for androidx.sqlite spans ([#2928](https://github.com/getsentry/sentry-java/pull/2928))
 - Add API for sending checkins (CRONS) manually ([#2935](https://github.com/getsentry/sentry-java/pull/2935))
-- Automatic CRON checkins for Quartz ([#2940](https://github.com/getsentry/sentry-java/pull/2940))
+- Support check-ins (CRONS) for Quartz ([#2940](https://github.com/getsentry/sentry-java/pull/2940))
 - Add option for ignoring certain monitor slugs ([#2943](https://github.com/getsentry/sentry-java/pull/2943))
 
 ### Fixes

sentry-quartz/api/sentry-quartz.api

@@ -7,7 +7,6 @@ public final class io/sentry/quartz/SentryJobListener : org/quartz/JobListener {
 	public static final field SENTRY_CHECK_IN_ID_KEY Ljava/lang/String;
 	public static final field SENTRY_CHECK_IN_SLUG_KEY Ljava/lang/String;
 	public fun <init> ()V
-	public fun <init> (Lio/sentry/IHub;)V
 	public fun getName ()Ljava/lang/String;
 	public fun jobExecutionVetoed (Lorg/quartz/JobExecutionContext;)V
 	public fun jobToBeExecuted (Lorg/quartz/JobExecutionContext;)V

sentry-quartz/src/main/java/io/sentry/quartz/SentryJobListener.java

@@ -3,16 +3,13 @@
 import io.sentry.BuildConfig;
 import io.sentry.CheckIn;
 import io.sentry.CheckInStatus;
-import io.sentry.HubAdapter;
-import io.sentry.IHub;
 import io.sentry.MonitorConfig;
 import io.sentry.MonitorSchedule;
 import io.sentry.MonitorScheduleUnit;
 import io.sentry.Sentry;
 import io.sentry.SentryIntegrationPackageStorage;
 import io.sentry.SentryLevel;
 import io.sentry.protocol.SentryId;
-import io.sentry.util.Objects;
 import java.util.List;
 import java.util.TimeZone;
 import org.jetbrains.annotations.NotNull;
@@ -34,14 +31,7 @@ public final class SentryJobListener implements JobListener {
   public static final String SENTRY_CHECK_IN_ID_KEY = "sentry-checkin-id";
   public static final String SENTRY_CHECK_IN_SLUG_KEY = "sentry-checkin-slug";
 
-  private final @NotNull IHub hub;
-
   public SentryJobListener() {
-    this(HubAdapter.getInstance());
-  }
-
-  public SentryJobListener(final @NotNull IHub hub) {
-    this.hub = Objects.requireNonNull(hub, "hub is required");
     SentryIntegrationPackageStorage.getInstance().addIntegration("Quartz");
     SentryIntegrationPackageStorage.getInstance()
         .addPackage("maven:io.sentry:sentry-quartz", BuildConfig.VERSION_NAME);
@@ -55,9 +45,6 @@ public String getName() {
   @Override
   public void jobToBeExecuted(JobExecutionContext context) {
     try {
-      if (isDisabled()) {
-        return;
-      }
       final @NotNull String slug = getSlug(context.getJobDetail());
       final @NotNull CheckIn checkIn = new CheckIn(slug, CheckInStatus.IN_PROGRESS);
 
@@ -196,10 +183,6 @@ public void jobExecutionVetoed(JobExecutionContext context) {
   @Override
   public void jobWasExecuted(JobExecutionContext context, JobExecutionException jobException) {
     try {
-      if (isDisabled()) {
-        return;
-      }
-
       final @Nullable Object checkInIdObjectFromContext = context.get(SENTRY_CHECK_IN_ID_KEY);
       final @Nullable Object slugObjectFromContext = context.get(SENTRY_CHECK_IN_SLUG_KEY);
       final @NotNull SentryId checkInId =
@@ -220,8 +203,4 @@ public void jobWasExecuted(JobExecutionContext context, JobExecutionException jo
           .log(SentryLevel.ERROR, "Unable to capture check-in in jobWasExecuted.", t);
     }
   }
-
-  private boolean isDisabled() {
-    return !hub.getOptions().isEnableAutomaticCheckIns();
-  }
 }

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

@@ -174,7 +174,6 @@ static class GraphqlConfiguration {}
     @Configuration(proxyBeanMethods = false)
     @Import(SentryQuartzConfiguration.class)
     @Open
-    @ConditionalOnProperty(name = "sentry.enable-automatic-checkins")
     @ConditionalOnClass({
       SentryJobListener.class,
       QuartzScheduler.class,

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

@@ -174,7 +174,6 @@ static class GraphqlConfiguration {}
     @Configuration(proxyBeanMethods = false)
     @Import(SentryQuartzConfiguration.class)
     @Open
-    @ConditionalOnProperty(name = "sentry.enable-automatic-checkins")
     @ConditionalOnClass({
       SentryJobListener.class,
       QuartzScheduler.class,