sidekiq-instrument 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db865235fec8b38f0539955fcea78d64af8bdd18652d5f8ddf9f6e184279d2a8
-  data.tar.gz: 76b9633e492b0831927f8c07d22f8901e396ac11023013c92611652c8d7bfc5c
+  metadata.gz: 7c79cacef1cb058038cfd3c55495349dbbd4b4c023114bb4760e83868647a9b1
+  data.tar.gz: c2c1ad52812042a210fc7549b48520977ec33836b850b17110002d3b23d442d4
 SHA512:
-  metadata.gz: 53adc64be56592453878813e397a618070181df863bfd2f61f6e2b3e239a2e4705a3662c3051acfd5dd72621d71c63cef1c296cbbb82d1dc5a3e11c7f29a41bc
-  data.tar.gz: 5fc9b80770108d223784cac1b16e381764d9b53afb4f1aa6250673cdcf83ea2c143b5a408ad836bd0df712064badf910cdaf00d7e0a27bf247c7df054a621b02
+  metadata.gz: c586597549a8eb0a7002ea2f1b290737a39d5fb08f66565f613c5f77448c32027f961b44a3c2cd743f05f80f0bdaf3e4fcc8297357e8b3f6eb43bd3b25d0c14a
+  data.tar.gz: 88d1aee1549d0189be4c6e71cefdb6dc7d975f932c9e47b20ce7b9245646f2eb01d29e2b079e300197afa028888c9e26c2e5eefbebed4fdf8d20013170667fb4

data/lib/sidekiq/instrument/middleware/client.rb

@@ -20,7 +20,7 @@ module Sidekiq::Instrument
       if Sidekiq::Context.current[:class].present?
         WorkerMetrics.trace_workers_increment_counter(klass.name.underscore)
         Statter.statsd.increment(metric_name(class_instance, 'enqueue'))
-        Statter.dogstatsd&.increment('sidekiq.enqueue', worker_dog_options(class_instance))
+        Statter.dogstatsd&.increment('sidekiq.enqueue', worker_dog_options(class_instance, job))
       end
 
       Statter.dogstatsd&.flush(sync: true)

data/lib/sidekiq/instrument/middleware/server.rb

@@ -9,23 +9,27 @@ module Sidekiq::Instrument
 
     def call(worker, job, _queue, &block)
       dequeue_string = is_retry(job) ? 'dequeue.retry' : 'dequeue'
-      Statter.dogstatsd&.increment("sidekiq.#{dequeue_string}", worker_dog_options(worker))
+      Statter.dogstatsd&.increment("sidekiq.#{dequeue_string}", worker_dog_options(worker, job))
       Statter.statsd.increment(metric_name(worker, dequeue_string))
 
       start_time = Time.now
       yield block
       execution_time_ms = (Time.now - start_time) * 1000
+      Statter.dogstatsd&.timing('sidekiq.runtime', execution_time_ms, worker_dog_options(worker, job))
       Statter.statsd.measure(metric_name(worker, 'runtime'), execution_time_ms)
-      Statter.dogstatsd&.timing('sidekiq.runtime', execution_time_ms, worker_dog_options(worker))
-    rescue StandardError => e
+    rescue Exception => e
+      dd_options = worker_dog_options(worker, job)
+      dd_options[:tags] << "error:#{e.class.name}"
+
       # if we have retries left, increment the enqueue.retry counter to indicate the job is going back on the queue
       if max_retries(worker) > current_retries(job) + 1
         WorkerMetrics.trace_workers_increment_counter(worker.class.to_s.underscore)
-        Statter.dogstatsd&.increment('sidekiq.enqueue.retry', worker_dog_options(worker))
+        Statter.dogstatsd&.increment('sidekiq.enqueue.retry', dd_options)
       end
 
+      Statter.dogstatsd&.increment('sidekiq.error', dd_options)
       Statter.statsd.increment(metric_name(worker, 'error'))
-      Statter.dogstatsd&.increment('sidekiq.error', worker_dog_options(worker))
+
       raise e
     ensure
       WorkerMetrics.trace_workers_decrement_counter(worker.class.to_s.underscore)

data/lib/sidekiq/instrument/mixin.rb

@@ -8,8 +8,13 @@ module Sidekiq::Instrument
       end
     end
 
-    def worker_dog_options(worker)
-      { tags: ["queue:#{queue_name(worker)}", "worker:#{underscore(class_name(worker))}"] }
+    def worker_dog_options(worker, job)
+      {
+        tags: [
+          "queue:#{queue_name(worker)}",
+          "worker:#{underscore(class_name(worker))}"
+        ].concat(job.fetch('tags', []))
+      }
     end
 
     def max_retries(worker)

data/lib/sidekiq/instrument/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Instrument
-    VERSION = '0.7.1'
+    VERSION = '0.7.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-instrument
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Loan Application Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-05 00:00:00.000000000 Z
+date: 2024-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq