sidekiq-datadog-monitor 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a71de3fc86dd6e570fd38bd359dfe756309acbea31e3fcfa0279a7e416c06ef
-  data.tar.gz: 1d0ab44f27575be1054940a3c961303cbba36e178919b56d16f389ce22d063cd
+  metadata.gz: cc1c08fcbeb8b6c537ba978f1cefd6fa9bcdd51603033c9dab842454521b3f68
+  data.tar.gz: 882d91a2df184e5ac834e065f7a4cb9c1fa4ce6cb0d78ce458d4127cc9b91cae
 SHA512:
-  metadata.gz: 1b14f615ffa636622043efaf6731a604487c91fcefad1d709b67dacdcedea4e529d87b347878da92d0ee058b082b22e0aa077b9adec6390c45768ab0989f5a8d
-  data.tar.gz: 5a796a1382a874b81da0be3e24439767549e8411ea28a442790e89505139edc09b6e0ea281ce0f8373531b311b6415a33141e05b39d6386426e1e37d0f0eda19
+  metadata.gz: 89840dff563a53de966bf6364b2179a81a5225379ed9aecb0d946f56d226ea846060eb9bec50366824474890b6a2e455c319722ccdd459966867956a72c0fd73
+  data.tar.gz: 9a5487c643e2a9214d4a8b96f477a438a313be3cdbeca3d3bd428c48a1f12fe97ed0c9b94828bd7748c4b30e611fc871983445e8811594b9e122343d77233066

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

@@ -11,22 +11,22 @@ module Sidekiq
         end
 
         def send_metrics
-          Sidekiq::Stats.new.queues.each_pair do |queue_name, size|
-            post_queue_stats(statsd, queue_name, size)
+          Sidekiq::Queue.all.each do |queue|
+            post_queue_stats(queue)
           end
           Sidekiq::ProcessSet.new.each do |process|
             post_process_stats(process)
           end
+          post_scheduled_stats
         end
 
         protected
 
-        def post_queue_stats(statsd, queue_name, size)
-          latency = Sidekiq::Queue.new(queue_name).latency
-          tags = tags_builder.build(queue_name: queue_name)
+        def post_queue_stats(queue)
+          tags = tags_builder.build(queue_name: queue.name)
 
-          statsd.gauge('sidekiq.queue.size', size, tags: tags)
-          statsd.gauge('sidekiq.queue.latency', latency, tags: tags)
+          statsd.gauge('sidekiq.queue.size', queue.size, tags: tags)
+          statsd.gauge('sidekiq.queue.latency', queue.latency, tags: tags)
         end
 
         def post_process_stats(process)
@@ -35,6 +35,11 @@ module Sidekiq
 
           statsd.gauge('sidekiq.process.utilization', utilization, tags: tags)
         end
+
+        def post_scheduled_stats
+          scheduled_size = Sidekiq::Stats.new.scheduled_size
+          statsd.gauge('sidekiq.scheduled.size', scheduled_size, tags: tags_builder.build({}))
+        end
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module Sidekiq
   module Datadog
     module Monitor
-      VERSION = '1.0.4'.freeze
+      VERSION = '1.1.0'.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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-datadog-monitor
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - aleksa_castle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-16 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler