@@ -7,19 +7,15 @@
 import io.sentry.IScopes;
 import io.sentry.ISentryLifecycleToken;
 import io.sentry.MonitorConfig;
-import io.sentry.MonitorSchedule;
-import io.sentry.MonitorScheduleUnit;
 import io.sentry.ScopesAdapter;
 import io.sentry.SentryLevel;
 import io.sentry.protocol.SentryId;
 import io.sentry.time.Stopwatch;
+import io.sentry.util.MonitorConfigUtils;
 import io.sentry.util.Objects;
 import io.sentry.util.TracingUtils;
 import java.lang.reflect.Method;
 import java.time.Duration;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import org.aopalliance.intercept.MethodInterceptor;
@@ -33,7 +29,6 @@
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 import org.springframework.util.StringValueResolver;
 
 /**
@@ -43,18 +38,6 @@
 @ApiStatus.Internal
 @Open
 public class SentryCheckInAdvice implements MethodInterceptor, EmbeddedValueResolverAware {
-  private static final @NotNull Map<String, String> CRON_MACROS = new HashMap<>();
-
-  static {
-    CRON_MACROS.put("@yearly", "0 0 1 1 *");
-    CRON_MACROS.put("@annually", "0 0 1 1 *");
-    CRON_MACROS.put("@monthly", "0 0 1 * *");
-    CRON_MACROS.put("@weekly", "0 0 * * 0");
-    CRON_MACROS.put("@daily", "0 0 * * *");
-    CRON_MACROS.put("@midnight", "0 0 * * *");
-    CRON_MACROS.put("@hourly", "0 * * * *");
-  }
-
   private final @NotNull IScopes scopes;
 
   private @Nullable StringValueResolver resolver;
@@ -149,40 +132,21 @@ public Object invoke(final @NotNull MethodInvocation invocation) throws Throwabl
         return null;
       }
       final @NotNull Scheduled scheduled = schedules.iterator().next();
+      // timeUnit only exists from Spring 5.3.10, so read it as an attribute
+      final @Nullable Object timeUnitAttribute =
+          AnnotationUtils.getAnnotationAttributes(scheduled).get("timeUnit");
+      final @NotNull TimeUnit timeUnit =
+          timeUnitAttribute instanceof TimeUnit
+              ? (TimeUnit) timeUnitAttribute
+              : TimeUnit.MILLISECONDS;
       final @Nullable String cron = resolve(scheduled.cron());
-      final @Nullable Long fixedRate =
-          periodMillis(scheduled, scheduled.fixedRate(), scheduled.fixedRateString());
-      final @Nullable Long fixedDelay =
-          periodMillis(scheduled, scheduled.fixedDelay(), scheduled.fixedDelayString());
-      final boolean hasCron = cron != null && !cron.isEmpty();
-
-      if (hasCron && cron != null && fixedRate == null && fixedDelay == null) {
-        final @Nullable String crontab = toCrontab(cron);
-        if (crontab == null) {
-          return null;
-        }
-        final @NotNull MonitorConfig config = new MonitorConfig(MonitorSchedule.crontab(crontab));
-        final @Nullable String zone = resolve(scheduled.zone());
-        if (zone != null && !zone.isEmpty()) {
-          config.setTimezone(zone);
-        }
-        return config;
-      }
-      final @Nullable Long period = fixedRate != null ? fixedRate : fixedDelay;
-      if (!hasCron && period != null && (fixedRate == null || fixedDelay == null)) {
-        final long millis = period;
-        final long minuteMillis = TimeUnit.MINUTES.toMillis(1);
-        if (millis < minuteMillis || millis % minuteMillis != 0) {
-          return null;
-        }
-        final long minutes = millis / minuteMillis;
-        if (minutes > Integer.MAX_VALUE) {
-          return null;
-        }
-        return new MonitorConfig(
-            MonitorSchedule.interval((int) minutes, MonitorScheduleUnit.MINUTE));
-      }
-      return null;
+      final @Nullable String zone =
+          cron != null && !cron.isEmpty() ? resolve(scheduled.zone()) : null;
+      return MonitorConfigUtils.fromSchedule(
+          cron,
+          zone,
+          periodMillis(scheduled.fixedRate(), scheduled.fixedRateString(), timeUnit),
+          periodMillis(scheduled.fixedDelay(), scheduled.fixedDelayString(), timeUnit));
     } catch (RuntimeException e) {
       scopes
           .getOptions()
@@ -196,14 +160,7 @@ public Object invoke(final @NotNull MethodInvocation invocation) throws Throwabl
   }
 
   private @Nullable Long periodMillis(
-      final @NotNull Scheduled scheduled, final long value, final @NotNull String valueString) {
-    // timeUnit only exists from Spring 5.3.10, so read it as an attribute
-    final @Nullable Object timeUnitAttribute =
-        AnnotationUtils.getAnnotationAttributes(scheduled).get("timeUnit");
-    final @NotNull TimeUnit timeUnit =
-        timeUnitAttribute instanceof TimeUnit
-            ? (TimeUnit) timeUnitAttribute
-            : TimeUnit.MILLISECONDS;
+      final long value, final @NotNull String valueString, final @NotNull TimeUnit timeUnit) {
     if (value >= 0) {
       return timeUnit.toMillis(value);
     }
@@ -218,34 +175,6 @@ public Object invoke(final @NotNull MethodInvocation invocation) throws Throwabl
     return timeUnit.toMillis(Long.parseLong(trimmed));
   }
 
-  /**
-   * Converts a Spring cron expression (6 fields, seconds first) to a 5 field crontab. Returns null
-   * unless the seconds field is a single fixed number, since crontab cannot express sub-minute
-   * schedules.
-   */
-  private static @Nullable String toCrontab(final @NotNull String cron) {
-    final @NotNull String trimmed = cron.trim();
-    if (Scheduled.CRON_DISABLED.equals(trimmed)) {
-      return null;
-    }
-    if (trimmed.startsWith("@")) {
-      return CRON_MACROS.get(trimmed.toLowerCase(Locale.ROOT));
-    }
-    final @NotNull String[] fields = StringUtils.tokenizeToStringArray(trimmed, " \t");
-    if (fields.length != 6 || !fields[0].matches("\\d{1,2}")) {
-      return null;
-    }
-    final @NotNull StringBuilder crontab = new StringBuilder();
-    for (int i = 1; i < fields.length; i++) {
-      if (i > 1) {
-        crontab.append(' ');
-      }
-      // Spring treats '?' like '*'
-      crontab.append("?".equals(fields[i]) ? "*" : fields[i]);
-    }
-    return crontab.toString();
-  }
-
   private @Nullable String resolve(final @NotNull String value) {
     if (resolver == null || value.isEmpty()) {
       return value;
 
@@ -253,35 +253,6 @@ class SentryCheckInAdviceTest {
     assertNull(config.timezone)
   }
 
-  @Test
-  fun `cron question mark is converted to asterisk`() {
-    val config = inProgressMonitorConfig { sampleServiceScheduled.cronQuestionMark() }
-    assertEquals("0 9 * * *", config?.schedule?.value)
-  }
-
-  @Test
-  fun `cron macro is converted to crontab`() {
-    val config = inProgressMonitorConfig { sampleServiceScheduled.cronMacro() }
-    assertEquals("0 * * * *", config?.schedule?.value)
-  }
-
-  @Test
-  fun `cron with variable seconds sends no monitor config`() {
-    assertNull(inProgressMonitorConfig { sampleServiceScheduled.cronEverySeconds() })
-  }
-
-  @Test
-  fun `disabled cron sends no monitor config`() {
-    assertNull(inProgressMonitorConfig { sampleServiceScheduled.cronDisabled() })
-  }
-
-  @Test
-  fun `cron zone is sent as timezone`() {
-    val config = inProgressMonitorConfig { sampleServiceScheduled.cronWithZone() }
-    assertEquals("0 2 * * *", config?.schedule?.value)
-    assertEquals("Europe/Vienna", config?.timezone)
-  }
-
   @Test
   fun `cron and zone placeholders are resolved`() {
     val config = inProgressMonitorConfig { sampleServiceScheduled.cronFromProperties() }
@@ -312,16 +283,6 @@ class SentryCheckInAdviceTest {
     assertEquals("minute", config?.schedule?.unit)
   }
 
-  @Test
-  fun `sub-minute fixed rate sends no monitor config`() {
-    assertNull(inProgressMonitorConfig { sampleServiceScheduled.fixedRateSeconds() })
-  }
-
-  @Test
-  fun `fixed rate not in whole minutes sends no monitor config`() {
-    assertNull(inProgressMonitorConfig { sampleServiceScheduled.fixedRateNotWholeMinutes() })
-  }
-
   @Test
   fun `multiple schedules send no monitor config`() {
     assertNull(inProgressMonitorConfig { sampleServiceScheduled.multipleSchedules() })
@@ -421,24 +382,6 @@ class SentryCheckInAdviceTest {
 
     @SentryCheckIn("cron") @Scheduled(cron = "0 15 10 * * MON-FRI") open fun cron() {}
 
-    @SentryCheckIn("cron_question_mark")
-    @Scheduled(cron = "0 0 9 ? * *")
-    open fun cronQuestionMark() {}
-
-    @SentryCheckIn("cron_macro") @Scheduled(cron = "@hourly") open fun cronMacro() {}
-
-    @SentryCheckIn("cron_every_seconds")
-    @Scheduled(cron = "*/30 * * * * *")
-    open fun cronEverySeconds() {}
-
-    @SentryCheckIn("cron_disabled")
-    @Scheduled(cron = Scheduled.CRON_DISABLED)
-    open fun cronDisabled() {}
-
-    @SentryCheckIn("cron_zone")
-    @Scheduled(cron = "0 0 2 * * *", zone = "Europe/Vienna")
-    open fun cronWithZone() {}
-
     @SentryCheckIn("cron_properties")
     @Scheduled(cron = "\${my.cron.schedule}", zone = "\${my.cron.zone}")
     open fun cronFromProperties() {}
@@ -453,14 +396,6 @@ class SentryCheckInAdviceTest {
     @Scheduled(fixedDelayString = "\${my.cron.delay}")
     open fun fixedDelayFromProperties() {}
 
-    @SentryCheckIn("fixed_rate_seconds")
-    @Scheduled(fixedRate = 30_000)
-    open fun fixedRateSeconds() {}
-
-    @SentryCheckIn("fixed_rate_odd")
-    @Scheduled(fixedRate = 90_000)
-    open fun fixedRateNotWholeMinutes() {}
-
     @SentryCheckIn("multiple")
     @Scheduled(cron = "0 0 1 * * *")
     @Scheduled(cron = "0 0 13 * * *")