sidekiq-cronitor 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebea71b4352db386aa8712eb8462b88b4f2a91ed0e7921face88453eb56981e7
-  data.tar.gz: 74fd0296d97a9480d55442d777937c6ae21f6a0821b6c690c8f9d366432ad998
+  metadata.gz: b5acee28d3accfbc11ede0358abfd812ccded70317fc9f9993429837cee38502
+  data.tar.gz: 5fe4bdb322d84c3af94512cb9d09145a1f5409ac5fc99b0e4a97d8f3a81b0112
 SHA512:
-  metadata.gz: 699883656bff1c2adc7e08fcbae41006e4be244a256ffebe30b54b891b51dde4367f412ca4616b6a35571b0c2c892ee4f207696fa42575eb276e203295869260
-  data.tar.gz: 1edd11e88318b33b950626aae9b7615e0e5bf007ae74bc0e5a68582979f9d6741c5120b9ea4551fd1a3a675890a43d56ca69fa857be3a54b7dd9c9a5b0836677
+  metadata.gz: 22056ed9ca15d9a6de93da23e751f88d2ce41dfbb360d1ff02f473017d52a6c9ddfc3fd10a4ed5aa2e043bc197ccd340c652caf5d3144e201557456191515643
+  data.tar.gz: dd3218fa9a210969306bf3fa2f9dc0fe621b0625e7579cfa5a61855f4dc5c86de0a30bac88d11b5dd52298e8b4eba1356221789cfc2eb01df523573df6ce1820

data/lib/sidekiq/cronitor/periodic_jobs.rb

@@ -6,15 +6,28 @@ module Sidekiq::Cronitor
       monitors_payload = []
       loops = Sidekiq::Periodic::LoopSet.new
       loops.each do |lop|
-        job_key = lop.klass.sidekiq_options.fetch('cronitor_key', lop.klass.to_s)
-        next if lop.klass.sidekiq_options.fetch('cronitor_disabled', false)
+        next if fetch_option(lop, 'cronitor_disabled')
 
-        monitors_payload << { key: job_key, schedule: lop.schedule, metadata: lop.options, platform: 'sidekiq', type: 'job' }
+        monitors_payload << {
+          key: fetch_option(lop, 'cronitor_key') || lop.klass.to_s,
+          group: fetch_option(lop, 'cronitor_group'),
+          grace_seconds: fetch_option(lop, 'cronitor_grace_seconds')&.to_i,
+          schedule: lop.schedule,
+          timezone: lop.tz_name || Time.respond_to?(:zone) && Time.zone.tzinfo.name || nil,
+          metadata: lop.options.to_s,
+          platform: 'sidekiq',
+          type: 'job'
+        }.compact
       end
 
       Cronitor::Monitor.put(monitors: monitors_payload)
     rescue Cronitor::Error => e
       Sidekiq.logger.error("[cronitor] error during #{name}.#{__method__}: #{e}")
     end
+
+    def self.fetch_option(lop, key)
+      lop.options.fetch(key, nil) ||
+        lop.klass.constantize.sidekiq_options.fetch(key, nil)
+    end
   end
 end

data/lib/sidekiq/cronitor/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Cronitor
-    VERSION = '3.4.0'
+    VERSION = '3.5.0'
   end
 end

data/lib/sidekiq/cronitor.rb

@@ -41,8 +41,18 @@ module Sidekiq::Cronitor
     end
 
     def job_key(worker)
-      worker.class.sidekiq_options.fetch("cronitor_key", nil) ||
-      options(worker).fetch(:key, worker.class.name)
+      periodic_job_key(worker) || worker.class.sidekiq_options.fetch('cronitor_key', nil) ||
+        options(worker).fetch(:key, worker.class.name)
+    end
+
+    def periodic_job_key(worker)
+      return unless defined?(Sidekiq::Periodic)
+
+      periodic_job = Sidekiq::Periodic::LoopSet.new.find do |lop|
+        lop.history.find { |j| j[0] == worker.jid }
+      end
+
+      periodic_job.present? && periodic_job.options.fetch('cronitor_key', nil)
     end
 
     def options(worker)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cronitor
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Zeke Gabrielse
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-20 00:00:00.000000000 Z
+date: 2022-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq