sidekiq-datadog-monitor 1.0.5 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39eecbfdc5c7bb09b4b328637a5875f7036a840271930dbd63adfadd7648521f
-  data.tar.gz: da573bd3f5cf7547fae79a3eae670c70be017e96360f670abb796771289b5a69
+  metadata.gz: 709613ebbfff56801af234ef64b3250ef6203a01e4f04a799fa63da34f808694
+  data.tar.gz: 3abe47720b64d535b0e194b7711deb33edf1050d293707a3fe73ed524e5e4ccc
 SHA512:
-  metadata.gz: 0fae015feff2028c2ebba9f681d70a5583dfed841650fbe0655987bc60322b7f707b7f0190cef1b7ab2391c1c752b8a532c4f644ae93f11626e1cf0c141c4032
-  data.tar.gz: b4250d36f93d1dd43b84df0e182a8d9ed34bdec094a85ecce29fdb821a94a3beb933693b2068aea62f900ee91fd30e9028a4d934b8f25f0b3f014da51af40dbf
+  metadata.gz: 5ddff6ed74a41711c72276727628313f9fe524ebc5de6672a13410edb3d683eccbfe84958c25b873cc27c250c540e0421e8fd692a7ee487dd7e37522ccba63fd
+  data.tar.gz: ba1963c7642218ccc7ba32f53899e8cf786f41a76f4caf716346439d3a65cebda6db0a70582fba2254f7bdfd73f82fb228429eadeea1180db831a7545183b61c

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "sidekiq/datadog/monitor"
+require 'bundler/setup'
+require 'sidekiq/datadog/monitor'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "sidekiq/datadog/monitor"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

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

@@ -34,4 +34,4 @@ module Sidekiq
       end
     end
   end
-end
+end

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/tag_builder.rb

@@ -2,7 +2,7 @@ module Sidekiq
   module Datadog
     module Monitor
       class TagBuilder
-        SPECIAL_SYMBOLS = /[\/\.:]/i.freeze
+        SPECIAL_SYMBOLS = %r{[/.:]}i.freeze
         def initialize(common_tags)
           @common_tags = common_tags
         end

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

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

data/lib/sidekiq/datadog/monitor.rb

@@ -34,6 +34,11 @@ module Sidekiq
 
         def send_metrics
           sender&.send_metrics
+        rescue ArgumentError => e
+          # Ignore this error. Sometimes sender hasn't yet started when we send metrics for the first time on boot
+          return if sender && e.message == 'Start sender first'
+
+          raise
         end
 
         def shutdown!
@@ -54,15 +59,9 @@ module Sidekiq
           Sidekiq.configure_server do |config|
             patch_sidekiq_heartbeat(config)
 
-            config.on(:startup) do
-              Sidekiq::Datadog::Monitor.initialize!
-            end
-            config.on(:beat) do
-              Sidekiq::Datadog::Monitor.send_metrics
-            end
-            config.on(:shutdown) do
-              Sidekiq::Datadog::Monitor.shutdown!
-            end
+            config.on(:startup) { Sidekiq::Datadog::Monitor.initialize! }
+            config.on(:beat) { Sidekiq::Datadog::Monitor.send_metrics }
+            config.on(:shutdown) { Sidekiq::Datadog::Monitor.shutdown! }
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-datadog-monitor
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.1
 platform: ruby
 authors:
 - aleksa_castle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,33 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.38.1
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: dogstatsd-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: dogstatsd-ruby
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
 description: 
 email:
 - oleksandra.k@matic.com