sidekiq-instrument 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c5ff8d26009611bbdb4c3282c9e6988d2d3bf755c8029095ee6ce9939810db3
-  data.tar.gz: fa29960d6ac51cb3d22f230b8c6275bb893a89366ae8710091aa239e4de2829f
+  metadata.gz: f9a0f783ab0e59fc566b949266b79f362a76d7c99cd15886e5d09b01b26f08f0
+  data.tar.gz: b7d615af7a4884543ef3e7a5a585186fa0f93f1627fe9f5eac0576835b449136
 SHA512:
-  metadata.gz: 926b9162dc1910c198c441faff6b87c036c8a9d87f91d35159af0ea0c09091971d27e40adba8a87732667f88fd4c132284b14400306ce798282460dd2b6c0445
-  data.tar.gz: 662b3f4b9fe31c355831a24cd43f8cd7c98fd5c2f08cc286e38bfbf5747cd40ef8b9775fa26d36069b0f76a175002a1ff17b6f73d9e0922e5e58fa185e58e354
+  metadata.gz: 95343856da7a9cad0f41dbcfe4731a4837782ac13bf9f4b515579f45f4326b7f25e4d7c85c5e1ea7ef519f271cd1b6aa7f16c62c89e9c02acb412b1b321e57f8
+  data.tar.gz: dfd0394b47aba69c43e58feabd778dc38091f8e0e61a4c75086c23bf7504fcb294881f3102bbe4de8dbd85223ecf024bdc27721a615bfa6f46df298153a7c186

data/lib/sidekiq/instrument/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Instrument
-    VERSION = "0.5.3"
+    VERSION = '0.5.5'
   end
 end

data/lib/sidekiq/instrument/worker.rb

@@ -9,10 +9,10 @@ module Sidekiq::Instrument
     # (i.e. the metrics will reported as :processed, :workers, :pending, and :failed).
     # Feel free to override.
     METRIC_NAMES = {
-      processed:    nil,
+      processed: nil,
       workers_size: :workers,
-      enqueued:     :pending,
-      failed:       nil
+      enqueued: :pending,
+      failed: nil
     }
 
     def perform
@@ -25,21 +25,39 @@ module Sidekiq::Instrument
         Statter.dogstatsd&.gauge("sidekiq.#{stat}", info.send(method))
       end
 
-      working = Sidekiq::ProcessSet.new.select { |p| p[:busy] == 1 }.count
+      working = Sidekiq::Workers.new.count
       Statter.statsd.gauge('shared.sidekiq.stats.working', working)
       Statter.dogstatsd&.gauge('sidekiq.working', working)
 
-      info.queues.each do |name, size|
-        Statter.statsd.gauge("shared.sidekiq.#{name}.size", size)
-        Statter.dogstatsd&.gauge('sidekiq.queue.size', size, tags: ["queue:#{name}"])
-      end
-
       Sidekiq::Queue.all.each do |queue|
+        Statter.statsd.gauge("shared.sidekiq.#{queue.name}.size", queue.size)
+        Statter.dogstatsd&.gauge('sidekiq.queue.size', queue.size, tags: dd_tags(queue))
+
         Statter.statsd.gauge("shared.sidekiq.#{queue.name}.latency", queue.latency)
-        Statter.dogstatsd&.gauge('sidekiq.queue.latency', queue.latency, tags: ["queue:#{queue.name}"])
+        Statter.dogstatsd&.gauge('sidekiq.queue.latency', queue.latency, tags: dd_tags(queue))
       end
 
       Statter.dogstatsd&.flush(sync: true)
     end
+
+    private
+
+    # @param [Sidekiq::Queue] queue used for stats emission
+    # @return [Array<String>] an array of tags
+    # @example this method can be override to add more tags
+    #   class MyStatsWorker < Sidekiq::Instrument::Worker
+    #     private
+    #
+    #     def dd_tags(queue)
+    #       custom_tags = []
+    #       queue_type = queue.name.match?(/readonly$/) ? 'read_only'  : 'regular'
+    #       custom_tags << "queue_type:#{queue_type}"
+    #
+    #       super(queue) | custom_tags
+    #     end
+    #   end
+    def dd_tags(queue)
+      ["queue:#{queue.name}"]
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-instrument
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - Loan Application Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2023-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq