sidekiq-instrument 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3818055d583770879264a519e270abd97900bdadc1fb38bfa341e68d08ea17b7
-  data.tar.gz: 14d508fbe113e65e6093d23ecc6dc3a56ddafb6924200b80af9fe737e42a9914
+  metadata.gz: b4112a344ff91a81260af18c47e66fbd1806b9340f9bf0f632d84b405b308c39
+  data.tar.gz: 8fddd4f0232f9c9a4b41ec29428e1a39a84c85dacdea09d1b60a0d535af4ff92
 SHA512:
-  metadata.gz: 651b65e1354e88685c56a1bdc266efc8b1f8234e0e84ebeb4d989ea490f4ad15ab9e0fb3f4952ce7c864a3c1d3821dc5ea648219815915d668070dfaccd3a195
-  data.tar.gz: 91360c3448d562455fff7aa6ceb3d1198f72c88087bd0872bf00923cecd3ebf8d33079595873cba4c76c637eb32edaae671e8a439211d12bda4bc393cc6601ad
+  metadata.gz: b75d3188a1b15368dc70d3f9fca27844f7a8c89dc52f7d632286c9e05268004c969f48ac37b5d11a9747c64342c74723e38873b0616782c8c19e082ba91531c9
+  data.tar.gz: 5508859e81ef17cda16e7582f718f5e36b56ccc836895267927f96d997366340071e035f106252d6b0a9d336c013e451f82222284166b96ee0d26b170a149b9f

data/README.md

@@ -101,8 +101,8 @@ For each job, the following metrics and tags will be reported:
    job fails.
 
 For each queue, the following metrics and tags will be reported:
-1. **sidekiq.queue_size (tags: {queue: _queue_})**: gauge of how many jobs are in the queue
-1. **sidekiq.queue_latency (tags: {queue: _queue_})**: gauge of how long the oldest job has been in the queue
+1. **sidekiq.queue.size (tags: {queue: _queue_})**: gauge of how many jobs are in the queue
+1. **sidekiq.queue.latency (tags: {queue: _queue_})**: gauge of how long the oldest job has been in the queue
 
 ## Worker
 There is a worker, `Sidekiq::Instrument::Worker`, that submits gauges

data/lib/sidekiq/instrument/mixin.rb

@@ -9,7 +9,7 @@ module Sidekiq::Instrument
     end
 
     def worker_dog_options(worker)
-      { tags: ["queue:#{queue_name(worker)}", "worker:#{class_name(worker)}"] }
+      { tags: ["queue:#{queue_name(worker)}", "worker:#{underscore(class_name(worker))}"] }
     end
 
     private
@@ -21,5 +21,13 @@ module Sidekiq::Instrument
     def class_name(worker)
       worker.class.name.gsub('::', '_')
     end
+
+    def underscore(string)
+      string.gsub(/::/, '/').
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").
+        downcase
+    end
   end
 end

data/lib/sidekiq/instrument/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Instrument
-    VERSION = "0.5.2"
+    VERSION = "0.5.4"
   end
 end

data/lib/sidekiq/instrument/worker.rb

@@ -25,7 +25,7 @@ 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)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-instrument
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Loan Application Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2023-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq