fix(quartz): Skip name steps and calendars, send 7/n as Saturday

Quartz ignores a step after a day or month name, and Sentry can't
express calendar exclusions, so send no config for either. 7/n only
fires on Saturday.

Author: wedamija

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

@@ -18,6 +18,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
+import java.util.regex.Pattern;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -47,6 +48,10 @@ public final class SentryJobListener implements JobListener {
   private static final @NotNull List<String> DAY_NAMES =
       Arrays.asList("SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT");
 
+  // Quartz ignores a step after a name, so SUN/2 is every Sunday
+  private static final @NotNull Pattern NAME_STEP =
+      Pattern.compile("(^|,)[A-Za-z]{3}(-[A-Za-z]{3})?/");
+
   private final @NotNull IScopes scopes;
 
   public SentryJobListener() {
@@ -115,6 +120,10 @@ private boolean shouldUpsertMonitorConfig(final @NotNull JobExecutionContext con
 
   private @Nullable MonitorConfig monitorConfigFromTrigger(final @Nullable Trigger trigger) {
     try {
+      // Sentry can't express calendar exclusions
+      if (trigger == null || trigger.getCalendarName() != null) {
+        return null;
+      }
       if (trigger instanceof CronTrigger) {
         final @NotNull CronTrigger cronTrigger = (CronTrigger) trigger;
         final @Nullable String cron = toSixFieldCron(cronTrigger.getCronExpression());
@@ -123,14 +132,14 @@ private boolean shouldUpsertMonitorConfig(final @NotNull JobExecutionContext con
         }
         final @Nullable TimeZone timeZone = cronTrigger.getTimeZone();
         return MonitorConfigUtils.fromSchedule(
-            cron, timeZone == null ? null : timeZone.getID(), null, null);
+            cron, timeZone == null ? null : timeZone.getID(), null);
       }
       if (trigger instanceof SimpleTrigger) {
         final @NotNull SimpleTrigger simpleTrigger = (SimpleTrigger) trigger;
         if (simpleTrigger.getRepeatCount() != SimpleTrigger.REPEAT_INDEFINITELY) {
           return null;
         }
-        return MonitorConfigUtils.fromSchedule(null, null, simpleTrigger.getRepeatInterval(), null);
+        return MonitorConfigUtils.fromSchedule(null, null, simpleTrigger.getRepeatInterval());
       }
       return null;
     } catch (RuntimeException e) {
@@ -143,7 +152,10 @@ private boolean shouldUpsertMonitorConfig(final @NotNull JobExecutionContext con
     }
   }
 
-  /** Quartz numbers days of week 1-7 from Sunday; crontab uses 0-6. Null if a year is set. */
+  /**
+   * Quartz numbers days of week 1-7 from Sunday; crontab uses 0-6. Null if a year is set or a name
+   * has a step.
+   */
   static @Nullable String toSixFieldCron(final @Nullable String quartzCron) {
     if (quartzCron == null) {
       return null;
@@ -155,6 +167,9 @@ private boolean shouldUpsertMonitorConfig(final @NotNull JobExecutionContext con
     if (fields.length != 6 && fields.length != 7) {
       return null;
     }
+    if (NAME_STEP.matcher(fields[4]).find() || NAME_STEP.matcher(fields[5]).find()) {
+      return null;
+    }
     final @Nullable String dayOfWeek = toZeroBasedDayOfWeek(fields[5]);
     if (dayOfWeek == null) {
       return null;
@@ -210,8 +225,11 @@ private boolean shouldUpsertMonitorConfig(final @NotNull JobExecutionContext con
       final @Nullable Integer end = toZeroBasedDay(range[1]);
       return end == null ? null : start + "-" + end + step;
     }
+    if (slash < 0 || start == 6) {
+      return String.valueOf(start);
+    }
     // a step from a single day ends on Saturday in Quartz, but on Sunday (7) in crontab
-    return slash >= 0 ? start + "-6" + step : String.valueOf(start);
+    return start + "-6" + step;
   }
 
   private static @Nullable Integer toZeroBasedDay(final @NotNull String day) {

sentry-quartz/src/test/kotlin/io/sentry/quartz/SentryJobListenerTest.kt

@@ -165,6 +165,17 @@ class SentryJobListenerTest {
     assertThat(inProgressMonitorConfig(trigger)).isNull()
   }
 
+  @Test
+  fun `trigger with a calendar sends no monitor config`() {
+    val trigger =
+      TriggerBuilder.newTrigger()
+        .withSchedule(CronScheduleBuilder.cronSchedule("0 0 2 * * ?"))
+        .modifiedByCalendar("holidays")
+        .build()
+
+    assertThat(inProgressMonitorConfig(trigger)).isNull()
+  }
+
   @Test
   fun `without upsert monitor config key sends no monitor config`() {
     assertThat(inProgressMonitorConfig(cronTrigger("0 0 2 * * ?"), JobDataMap())).isNull()
@@ -209,7 +220,7 @@ class SentryJobListenerTest {
         "0 0 12 ? * FRIL" to "0 0 12 ? * 5L",
         "0 0 12 ? * 1/2" to "0 0 12 ? * 0-6/2",
         "0 0 12 ? * 2/2" to "0 0 12 ? * 1-6/2",
-        "0 0 12 ? * MON/2" to "0 0 12 ? * 1-6/2",
+        "0 0 12 ? * 7/2" to "0 0 12 ? * 6",
         "0 0 12 ? * 2-6/2" to "0 0 12 ? * 1-5/2",
         "0 0 12 ? * */2" to "0 0 12 ? * */2",
         "0 0 12 L * ?" to "0 0 12 L * ?",
@@ -227,6 +238,10 @@ class SentryJobListenerTest {
         "0 0 12 ? * L",
         "0 0 12 ? * 8",
         "0 0 12 ? * XYZL",
+        "0 0 12 ? * SUN/2",
+        "0 0 12 ? * mon-wed/3",
+        "0 0 12 ? * 1,MON/2",
+        "0 0 12 * JUN/3 ?",
         "0 12 * * *",
       )) {
       assertThat(SentryJobListener.toSixFieldCron(quartz)).isNull()