sidekiq-datadog-monitor 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b176cbc444ad443cebef16a369d2e14782a875d83f9118448146fb6c18be0f3
-  data.tar.gz: ebaaba9e002ece8575c8a753d8324ad48b4594e892b1863fcd473838fb8f413e
+  metadata.gz: 3a71de3fc86dd6e570fd38bd359dfe756309acbea31e3fcfa0279a7e416c06ef
+  data.tar.gz: 1d0ab44f27575be1054940a3c961303cbba36e178919b56d16f389ce22d063cd
 SHA512:
-  metadata.gz: 7f68121956dab1ca0346db4247e21979baf5338b6d097c9d0202b712c3fe93c9bcf5fa010803c0d2f77fd8ea9d966e3eb9dc86bbcebc830feb12f63b0743a5f2
-  data.tar.gz: 37267daf3457dd9bea4acb41e86e69088221e38ab1cdd6cb65c36d2f1230cfaccdf3e872db70f1f4dee3a2b5a319be8a37add4e83b5847750944bc05fa1dfbe4
+  metadata.gz: 1b14f615ffa636622043efaf6731a604487c91fcefad1d709b67dacdcedea4e529d87b347878da92d0ee058b082b22e0aa077b9adec6390c45768ab0989f5a8d
+  data.tar.gz: 5a796a1382a874b81da0be3e24439767549e8411ea28a442790e89505139edc09b6e0ea281ce0f8373531b311b6415a33141e05b39d6386426e1e37d0f0eda19

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

@@ -0,0 +1,37 @@
+module Sidekiq
+  module Datadog
+    module Monitor
+      # Prior to Sidekiq 6.5.2 - there was no beat event that fired every couple seconds
+      # Following Module wraps original heartbeat method on Sidekiq::Launcher fires :beat lifecycle event
+      module HeartbeatPatch
+        def heartbeat
+          super
+          fire_beat
+        end
+
+        def fire_beat
+          return unless (listeners = Sidekiq.options[:lifecycle_events][:beat])
+
+          listeners.each { |block| block.call }
+        end
+
+        class << self
+          def apply_heartbeat_patch(sidekiq_config)
+            require 'sidekiq/launcher'
+
+            sidekiq_config.options[:lifecycle_events][:beat] ||= []
+            Sidekiq::Launcher.prepend(Sidekiq::Datadog::Monitor::HeartbeatPatch)
+          end
+
+          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
+        end
+      end
+    end
+  end
+end

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

@@ -30,7 +30,7 @@ module Sidekiq
         end
 
         def post_process_stats(process)
-          utilization = process['busy'] / process['concurrency'].to_f
+          utilization = (process['busy'] / process['concurrency'].to_f * 100).round(2)
           tags = tags_builder.build(process_id: process['identity'], process_tag: process['tag'])
 
           statsd.gauge('sidekiq.process.utilization', utilization, tags: tags)

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

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

data/lib/sidekiq/datadog/monitor.rb

@@ -1,6 +1,8 @@
+require 'sidekiq'
 require 'datadog/statsd'
 require 'sidekiq/datadog/monitor/metrics_sender'
 require 'sidekiq/datadog/monitor/tag_builder'
+require 'sidekiq/datadog/monitor/heartbeat_patch'
 
 module Sidekiq
   module Datadog
@@ -49,11 +51,12 @@ module Sidekiq
 
         def add_sidekiq_listeners
           Sidekiq.configure_server do |config|
-            metrics_event = config.options[:lifecycle_events][:beat] ? :beat : :heartbeat
+            patch_sidekiq_heartbeat(config)
+
             config.on(:startup) do
               Sidekiq::Datadog::Monitor.initialize!
             end
-            config.on(metrics_event) do
+            config.on(:beat) do
               Sidekiq::Datadog::Monitor.send_metrics
             end
             config.on(:shutdown) do
@@ -61,6 +64,12 @@ module Sidekiq
             end
           end
         end
+
+        def patch_sidekiq_heartbeat(sidekiq_config)
+          return unless Sidekiq::Datadog::Monitor::HeartbeatPatch.needs_patching?(sidekiq_config)
+
+          Sidekiq::Datadog::Monitor::HeartbeatPatch.apply_heartbeat_patch(sidekiq_config)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-datadog-monitor
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - aleksa_castle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-15 00:00:00.000000000 Z
+date: 2023-02-16 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
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: dogstatsd-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ files:
 - bin/console
 - bin/setup
 - lib/sidekiq/datadog/monitor.rb
+- lib/sidekiq/datadog/monitor/heartbeat_patch.rb
 - lib/sidekiq/datadog/monitor/metrics_sender.rb
 - lib/sidekiq/datadog/monitor/tag_builder.rb
 - lib/sidekiq/datadog/monitor/version.rb