Fix handling of cron with tz in Cron::Job (#2530)

* Fix handling of cron with tz in Cron::Job
* Update CHANGELOG

Author: solnic

CHANGELOG.md

@@ -1,3 +1,9 @@
+## Unreleased
+
+### Bug Fixes
+
+- Fix handling of cron with tz in Cron::Job ([#2530](https://github.com/getsentry/sentry-ruby/pull/2530))
+
 ## 5.22.3
 
 ### Bug Fixes

sentry-sidekiq/lib/sentry-sidekiq.rb

@@ -43,5 +43,6 @@ class Railtie < ::Rails::Railtie
 end
 
 # patches
+require "sentry/sidekiq/cron/helpers"
 require "sentry/sidekiq/cron/job"
 require "sentry/sidekiq-scheduler/scheduler"

sentry-sidekiq/lib/sentry/sidekiq-scheduler/scheduler.rb

@@ -38,17 +38,7 @@ def new_job(name, interval_type, config, schedule, options)
         monitor_config =
           case interval_type
           when "cron"
-            # Split schedule into cron and timezone parts (if timezone exists)
-            cron_parts = schedule.strip.split(" ")
-
-            if cron_parts.length > 5
-              timezone = cron_parts.pop
-              cron_without_timezone = cron_parts.join(" ")
-
-              Sentry::Cron::MonitorConfig.from_crontab(cron_without_timezone, timezone: timezone)
-            else
-              Sentry::Cron::MonitorConfig.from_crontab(schedule)
-            end
+            Sentry::Sidekiq::Cron::Helpers.monitor_config(schedule)
           when "every", "interval"
             Sentry::Cron::MonitorConfig.from_interval(rufus_job.frequency.to_i / 60, :minute)
           end

sentry-sidekiq/lib/sentry/sidekiq/cron/helpers.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Sentry
+  module Sidekiq
+    module Cron
+      module Helpers
+        # This is used by Cron::Job and Scheduler
+        def self.monitor_config(cron)
+          cron_parts = cron.strip.split(" ")
+
+          if cron_parts.length > 5
+            timezone = cron_parts.pop
+            cron_without_timezone = cron_parts.join(" ")
+
+            Sentry::Cron::MonitorConfig.from_crontab(cron_without_timezone, timezone: timezone)
+          else
+            Sentry::Cron::MonitorConfig.from_crontab(cron)
+          end
+        end
+      end
+    end
+  end
+end

sentry-sidekiq/lib/sentry/sidekiq/cron/job.rb

@@ -55,7 +55,7 @@ def save
             klass_const.send(:include, Sentry::Cron::MonitorCheckIns)
             klass_const.send(:sentry_monitor_check_ins,
                              slug: name.to_s,
-                             monitor_config: Sentry::Cron::MonitorConfig.from_crontab(parsed_cron.original))
+                             monitor_config: Sentry::Sidekiq::Cron::Helpers.monitor_config(parsed_cron.original))
           end
 
           true

sentry-sidekiq/spec/fixtures/sidekiq-cron-schedule.yml

@@ -2,6 +2,10 @@ happy:
   cron: "* * * * *"
   class: "HappyWorkerForCron"
 
+happy_with_timezone:
+  cron: "* * * * * America/Los_Angeles"
+  class: "HappyWorkerForCronWithTimezone"
+
 manual:
   cron: "* * * * *"
   class: "SadWorkerWithCron"

sentry-sidekiq/spec/sentry/sidekiq/cron/job_spec.rb

@@ -64,6 +64,15 @@
     expect(HappyWorkerForCron.sentry_monitor_config.schedule.value).to eq('* * * * *')
   end
 
+  it 'patches HappyWorkerForCronWithTimezone' do
+    expect(HappyWorkerForCronWithTimezone.ancestors).to include(Sentry::Cron::MonitorCheckIns)
+    expect(HappyWorkerForCronWithTimezone.sentry_monitor_slug).to eq('happy_with_timezone')
+    expect(HappyWorkerForCronWithTimezone.sentry_monitor_config).to be_a(Sentry::Cron::MonitorConfig)
+    expect(HappyWorkerForCronWithTimezone.sentry_monitor_config.timezone).to eq('America/Los_Angeles')
+    expect(HappyWorkerForCronWithTimezone.sentry_monitor_config.schedule).to be_a(Sentry::Cron::MonitorSchedule::Crontab)
+    expect(HappyWorkerForCronWithTimezone.sentry_monitor_config.schedule.value).to eq('* * * * *')
+  end
+
   it 'patches HappyWorkerWithHumanReadableCron' do
     expect(HappyWorkerWithHumanReadableCron.ancestors).to include(Sentry::Cron::MonitorCheckIns)
     expect(HappyWorkerWithHumanReadableCron.sentry_monitor_slug).to eq('human_readable_cron')

sentry-sidekiq/spec/spec_helper.rb

@@ -143,6 +143,7 @@ def perform
 end
 
 class HappyWorkerForCron < HappyWorker; end
+class HappyWorkerForCronWithTimezone < HappyWorker; end
 class HappyWorkerForScheduler < HappyWorker; end
 class HappyWorkerForSchedulerWithTimezone < HappyWorker; end
 class EveryHappyWorker < HappyWorker; end