sidekiq-datadog-monitor 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd2a166674a1910905fed2a8d7bfa629b22db4b806fd6f5eb863f2de58266699
-  data.tar.gz: 74748cd3954362be082a37ac3a82e87b4f1f23f60cadb289b6883b27543627a3
+  metadata.gz: 39eecbfdc5c7bb09b4b328637a5875f7036a840271930dbd63adfadd7648521f
+  data.tar.gz: da573bd3f5cf7547fae79a3eae670c70be017e96360f670abb796771289b5a69
 SHA512:
-  metadata.gz: 70297fb9b7019dd0467d6008c98e77c24442be0ad18791dbcc497b3ed8f9921a0a44c900c1cc0d9800723ade6c139142a89c0e7763fe4aae233c92d53c494571
-  data.tar.gz: 9223c4732bdf197e555d11f6a719d5ae2f8e3c452cab3e11ffeffeecaabea595871c737af828dbcce047327445fd952c544e83ccb28c9d3ebfebdbb70fc7655e
+  metadata.gz: 0fae015feff2028c2ebba9f681d70a5583dfed841650fbe0655987bc60322b7f707b7f0190cef1b7ab2391c1c752b8a532c4f644ae93f11626e1cf0c141c4032
+  data.tar.gz: b4250d36f93d1dd43b84df0e182a8d9ed34bdec094a85ecce29fdb821a94a3beb933693b2068aea62f900ee91fd30e9028a4d934b8f25f0b3f014da51af40dbf

data/lib/sidekiq/datadog/monitor/heartbeat_patch.rb

@@ -16,16 +16,17 @@ module Sidekiq
         end
 
         class << self
-          def apply_heartbeat_patch
+          def apply_heartbeat_patch(sidekiq_config)
             require 'sidekiq/launcher'
 
+            sidekiq_config.options[:lifecycle_events][:beat] ||= []
             Sidekiq::Launcher.prepend(Sidekiq::Datadog::Monitor::HeartbeatPatch)
-            Sidekiq[:lifecycle_events][:beat] ||= []
           end
 
-          def needs_patching?
-            return false unless Sidekiq[:lifecycle_events] # No events exist, Sidekiq is too old
-            return false if Sidekiq[:lifecycle_events][:beat] # beat event exist - no need to patch
+          def needs_patching?(sidekiq_config)
+            return false unless sidekiq_config.respond_to?(:options) # Unsupported config version
+            return false unless sidekiq_config.options[:lifecycle_events] # No events exist, Sidekiq is too old
+            return false if sidekiq_config.options[:lifecycle_events][:beat] # beat event exist - no need to patch
 
             true
           end

data/lib/sidekiq/datadog/monitor/version.rb

@@ -1,7 +1,7 @@
 module Sidekiq
   module Datadog
     module Monitor
-      VERSION = '1.0.3'.freeze
+      VERSION = '1.0.5'.freeze
     end
   end
 end

data/lib/sidekiq/datadog/monitor.rb

@@ -33,10 +33,11 @@ module Sidekiq
         end
 
         def send_metrics
-          sender.send_metrics
+          sender&.send_metrics
         end
 
         def shutdown!
+          @sender = nil # Remove sender first so beat event after shutdown does not raising error
           statsd.close
         end
 
@@ -51,7 +52,7 @@ module Sidekiq
 
         def add_sidekiq_listeners
           Sidekiq.configure_server do |config|
-            patch_sidekiq_heartbeat
+            patch_sidekiq_heartbeat(config)
 
             config.on(:startup) do
               Sidekiq::Datadog::Monitor.initialize!
@@ -65,10 +66,10 @@ module Sidekiq
           end
         end
 
-        def patch_sidekiq_heartbeat
-          return unless Sidekiq::Datadog::Monitor::HeartbeatPatch.needs_patching?
+        def patch_sidekiq_heartbeat(sidekiq_config)
+          return unless Sidekiq::Datadog::Monitor::HeartbeatPatch.needs_patching?(sidekiq_config)
 
-          Sidekiq::Datadog::Monitor::HeartbeatPatch.apply_heartbeat_patch
+          Sidekiq::Datadog::Monitor::HeartbeatPatch.apply_heartbeat_patch(sidekiq_config)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-datadog-monitor
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - aleksa_castle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-16 00:00:00.000000000 Z
+date: 2023-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement