sidekiq-cronitor 3.7.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58670e7c63fcd04abfa27f9e5e0e0ad717e3a630eb8e5d00f8ba8420eec6e5e2
-  data.tar.gz: 859ef82c42ff3053ff10d5a1d20a8f8d35e471326ebcc067a6eed6a02832d856
+  metadata.gz: 73f1021e94b3744466768b9f4f6d3d1378c979207be5ff5001fd3ba569633d34
+  data.tar.gz: 9fad65ced9e8198bef92ecdfdb3cf35021f92b991f8d261ce8a519556aed5611
 SHA512:
-  metadata.gz: a7f3979bea1da06b7e8f30de736485f26867d4c10ebcf456e8c0e376764d689e77d00e7b7672830fa79abfec163fd9f27405d13100601bc0717d2b3bc13f38c1
-  data.tar.gz: e6b23c396b7e27c0ad88bf12125b7da3c813b22c720df44e9c28ea173a89d435c633245f4b40e362b5a3419c521832ba063b65f7688686e59f21a3a9704c31c2
+  metadata.gz: da13ce558bda83799ad8a5d8644bf74f961fdea6f36ee7b17bbaf7450d2c20c7f92262689a2868f2f4ae1a7a02c638c645e0b08c77d98f12e27ba26fe99936d9
+  data.tar.gz: a2b79972087d00cdfe6858399b12e8165918424764130d79170b03befb86fb8d9608fd80fcd093451a6fe3996527686c47e7697d672b99ffe3073a0452638d05

data/lib/sidekiq/cronitor/periodic_jobs.rb

@@ -6,7 +6,7 @@ module Sidekiq::Cronitor
       monitors_payload = []
       loops = Sidekiq::Periodic::LoopSet.new
       loops.each do |lop|
-        if fetch_option(lop, 'cronitor_enabled')
+        if parsed_options(lop).has_key?('cronitor_enabled') || Object.const_get(lop.klass).sidekiq_options.has_key?('cronitor_enabled')
           next unless fetch_option(lop, 'cronitor_enabled', Cronitor.auto_discover_sidekiq)
         else
           next if fetch_option(lop, 'cronitor_disabled', !Cronitor.auto_discover_sidekiq)
@@ -29,9 +29,17 @@ module Sidekiq::Cronitor
       Sidekiq.logger.error("[cronitor] error during #{name}.#{__method__}: #{e}")
     end
 
+    def self.parsed_options(lop)
+      if lop.options.is_a?(String)
+        JSON.parse(lop.options)
+      else
+        lop.options
+      end
+    end
+
     def self.fetch_option(lop, key, default = nil)
-      lop.options.fetch(key, default) ||
-        lop.klass.constantize.sidekiq_options.fetch(key, default)
+      parsed_options(lop).fetch(key, default) ||
+        Object.const_get(lop.klass).sidekiq_options.fetch(key, default)
     end
   end
 end

data/lib/sidekiq/cronitor/sidekiq_scheduler.rb

@@ -13,7 +13,7 @@ module Sidekiq::Cronitor
         job_klass = Object.const_get(v['class'])
         job_key = job_klass.sidekiq_options.fetch('cronitor_key', v['class'])
 
-        if job_klass.sidekiq_options['cronitor_enabled']
+        if job_klass.sidekiq_options.has_key?('cronitor_enabled')
           next unless job_klass.sidekiq_options.fetch('cronitor_enabled', Cronitor.auto_discover_sidekiq)
         else
           next if job_klass.sidekiq_options.fetch('cronitor_disabled', !Cronitor.auto_discover_sidekiq)

data/lib/sidekiq/cronitor/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Cronitor
-    VERSION = '3.7.0'
+    VERSION = '3.8.0'
   end
 end

data/lib/sidekiq/cronitor.rb

@@ -13,72 +13,63 @@ end
 
 module Sidekiq::Cronitor
   class ServerMiddleware
-    def call(worker, message, queue)
-      ping(worker: worker, state: 'run')
+    # @param [Object] worker the instance of the job that was queued
+    # @param [Hash] job_payload the full job payload
+    #   * @see https://github.com/sidekiq/sidekiq/wiki/Job-Format
+    # @param [String] queue the name of the queue the job was pulled from
+    # @yield the next middleware in the chain or worker `perform` method
+    def call(worker, job_payload, queue)
+      ping(job_payload: job_payload, state: 'run')
 
       result = yield
     rescue => e
-      ping(worker: worker, state: 'fail', message: e.to_s)
+      ping(job_payload: job_payload, state: 'fail', message: e.to_s)
 
       raise e
     else
-      ping(worker: worker, state: 'complete')
+      ping(job_payload: job_payload, state: 'complete')
       result # to be consistent with client middleware, return results of yield
     end
 
     private
 
-    def cronitor(worker)
-      Cronitor::Monitor.new(job_key(worker))
+    def cronitor(job_payload)
+      Cronitor::Monitor.new(job_key(job_payload))
     end
 
-    def cronitor_disabled?(worker)
-      if worker.class.sidekiq_options["cronitor_enabled"]
-        !worker.class.sidekiq_options.fetch("cronitor_enabled", Cronitor.auto_discover_sidekiq)
+    def cronitor_disabled?(job_payload)
+      if job_payload.has_key?("cronitor_enabled")
+        !job_payload.fetch("cronitor_enabled", Cronitor.auto_discover_sidekiq)
       else
-        worker.class.sidekiq_options.fetch("cronitor_disabled", options(worker).fetch(:disabled, !Cronitor.auto_discover_sidekiq))
+        job_payload.fetch("cronitor_disabled", options(job_payload).fetch("disabled", !Cronitor.auto_discover_sidekiq))
       end
     end
 
-    def job_key(worker)
-      periodic_job_key(worker) || worker.class.sidekiq_options.fetch('cronitor_key', nil) ||
-        options(worker).fetch(:key, worker.class.name)
+    def job_key(job_payload)
+      job_payload['cronitor_key'] || options(job_payload)['key'] || job_payload['class']
     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)
+    def options(job_payload)
       # eventually we will delete this method of passing options
       # ultimately we want all cronitor options to be top level keys
-      opts = worker.class.sidekiq_options.fetch("cronitor", {})
-      # symbolize_keys is a rails helper, so only use it if it's defined
-      opts = opts.symbolize_keys if opts.respond_to?(:symbolize_keys)
-      opts
+      job_payload.fetch("cronitor", {})
     end
 
-    def ping(worker:, state:, message: nil)
-      return unless should_ping?(worker)
+    def ping(job_payload:, state:, message: nil)
+      return unless should_ping?(job_payload)
 
-      Sidekiq.logger.debug("[cronitor] ping: worker=#{job_key(worker)} state=#{state} message=#{message}")
+      Sidekiq.logger.debug("[cronitor] ping: worker=#{job_key(job_payload)} state=#{state} message=#{message}")
 
-      cronitor(worker).ping(state: state, message: message)
+      cronitor(job_payload).ping(state: state, message: message)
     rescue Cronitor::Error => e
-      Sidekiq.logger.error("[cronitor] error during ping: worker=#{job_key(worker)} error=#{e.message}")
+      Sidekiq.logger.error("[cronitor] error during ping: worker=#{job_key(job_payload)} error=#{e.message}")
     rescue => e
-      Sidekiq.logger.error("[cronitor] unexpected error: worker=#{job_key(worker)} error=#{e.message}")
+      Sidekiq.logger.error("[cronitor] unexpected error: worker=#{job_key(job_payload)} error=#{e.message}")
       Sidekiq.logger.error(e.backtrace.first)
     end
 
-    def should_ping?(worker)
-      !cronitor(worker).api_key.nil? && !cronitor_disabled?(worker)
+    def should_ping?(job_payload)
+      !cronitor(job_payload).api_key.nil? && !cronitor_disabled?(job_payload)
     end
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cronitor
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Zeke Gabrielse
 - Samuel Cochran
 - Kevin Tom
 - August Flanagan
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-14 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -118,7 +118,7 @@ homepage: https://github.com/cronitor/sidekiq-cronitor
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -133,8 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Monitor your Sidekiq jobs with Cronitor
 test_files: []