inst-jobs-statsd 3.0.2 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5760a670863e6b529a17f1443c45b360ed9762b35ad9fe432a4bd66c5b3e90d
-  data.tar.gz: 0efe20cd91f2dcb8cb55b5f4df13c372aa2f1b60ff2401c5379a453ed16e1bae
+  metadata.gz: 2842be633e3d25b6880b6ff576d9b00a37d56d2a28713ea424aa670181280efe
+  data.tar.gz: 6463453b401639f55f7335cb66a0590a48da0ef545cb81d64652dca7656c47e1
 SHA512:
-  metadata.gz: 1a35e512b5a4b8a1e87205fa97a03922d70b95298635dda6d5778e9bcd110bb02b74dfd36791a963ca169dddbaafcac448c2e33beb1d640b27955f793138d990
-  data.tar.gz: bd8808fa5e79266049f4cc9852df42c8bea046fc19d96c0402831df006e1c2a982a8d0475f12ac603bc0b0baf7224585546f78b79b3a650611f06d67cc1fe283
+  metadata.gz: b4f9cc39873e1c1648922de0335c2d81d62d96c637e1c0e78a25e219965284178f55873185710c2223a4c73e69f81001ec9d21a69f4dbfee4be3698f0b087d42
+  data.tar.gz: 8f30d404ce68bac3b0ca1cfb099f04e48e50b754b5b88cac8f13b03bde7613184bbdd7f2ab6b518a2f03a496f3bb78d29a9e68d97a73f1b8d579e416f931032b

data/lib/inst_jobs_statsd/stats/periodic/failed.rb

@@ -14,8 +14,9 @@ module InstJobsStatsd
         end
 
         def self.report_failed_depth
-          count = Delayed::Job::Failed.count
-          Periodic.report_gauge(:failed_depth, count)
+          count_by_queue = Delayed::Job::Failed.group(:queue).count
+
+          Periodic.report_gauge_by_queue(:failed_depth, count_by_queue)
         end
       end
     end

data/lib/inst_jobs_statsd/stats/periodic/queue.rb

@@ -20,10 +20,7 @@ module InstJobsStatsd
         end
 
         def self.report_queue_depth
-          # count = Delayed::Job.jobs_count(:current)  <-- includes running / locked
-          scope = queued_jobs_scope
-          count = scope.count
-          Periodic.report_gauge(:queue_depth, count)
+          Periodic.report_gauge_by_queue(:queue_depth, queued_jobs_scope.count)
         end
 
         # Limit the jobs included in this gauge to prevent blowing up
@@ -34,16 +31,20 @@ module InstJobsStatsd
         # the count is capped, the metric will continue to grow
         # if the queue is actually stalled
         def self.report_queue_age
-          jobs_run_at = queued_jobs_scope.limit(10_000).pluck(:run_at)
-          age_secs = jobs_run_at.map { |t| Delayed::Job.db_time_now - t }
-          Periodic.report_gauge(:queue_age_total, age_secs.sum)
-          Periodic.report_gauge(:queue_age_max, age_secs.max || 0)
+          jobs_run_at_by_queue = queued_jobs_scope.limit(10_000).pluck(:queue, "ARRAY_AGG(run_at)").to_h
+          age_secs_by_queue = jobs_run_at_by_queue.transform_values { |v| v.map { |t| Delayed::Job.db_time_now - t } }
+          age_max_by_queue = age_secs_by_queue.transform_values(&:max)
+          age_total_by_queue = age_secs_by_queue.transform_values(&:sum)
+
+          Periodic.report_gauge_by_queue(:queue_age_total, age_total_by_queue)
+          Periodic.report_gauge_by_queue(:queue_age_max, age_max_by_queue)
         end
 
         def self.queued_jobs_scope
           Delayed::Job
             .current
-            .where("locked_at IS NULL OR locked_by = 'on_hold'") # not running
+            .where("locked_at IS NULL OR locked_by = ?", Delayed::Backend::Base::ON_HOLD_LOCKED_BY) # not running
+            .group(:queue)
         end
       end
     end

data/lib/inst_jobs_statsd/stats/periodic/run.rb

@@ -20,19 +20,21 @@ module InstJobsStatsd
         end
 
         def self.report_run_depth
-          scope = running_jobs_scope
-          Periodic.report_gauge(:run_depth, scope.count)
+          Periodic.report_gauge_by_queue(:run_depth, running_jobs_scope.count)
         end
 
         def self.report_run_age
-          jobs_run_at = running_jobs_scope.limit(10_000).pluck(:run_at)
-          age_secs = jobs_run_at.map { |t| Delayed::Job.db_time_now - t }
-          Periodic.report_gauge(:run_age_total, age_secs.sum)
-          Periodic.report_gauge(:run_age_max, age_secs.max || 0)
+          jobs_run_at_by_queue = running_jobs_scope.limit(10_000).pluck(:queue, "ARRAY_AGG(run_at)").to_h
+          age_secs_by_queue = jobs_run_at_by_queue.transform_values { |v| v.map { |t| Delayed::Job.db_time_now - t } }
+          age_max_by_queue = age_secs_by_queue.transform_values(&:max)
+          age_total_by_queue = age_secs_by_queue.transform_values(&:sum)
+
+          Periodic.report_gauge_by_queue(:run_age_total, age_total_by_queue)
+          Periodic.report_gauge_by_queue(:run_age_max, age_max_by_queue)
         end
 
         def self.running_jobs_scope
-          Delayed::Job.running
+          Delayed::Job.running.group(:queue)
         end
       end
     end

data/lib/inst_jobs_statsd/stats/periodic.rb

@@ -13,9 +13,21 @@ module InstJobsStatsd
         @instance.add(proc)
       end
 
-      def self.report_gauge(stat, value, job: nil, sample_rate: 1)
+      def self.report_gauge(stat, value, job: nil, sample_rate: 1, additional_tags: {})
         stats = Naming.qualified_names(stat, job)
-        InstStatsd::Statsd.gauge(stats, value, sample_rate, short_stat: stat, tags: Naming.dd_job_tags(job))
+        InstStatsd::Statsd.gauge(stats,
+                                 value,
+                                 sample_rate,
+                                 short_stat: stat,
+                                 tags: Naming.dd_job_tags(job).merge(additional_tags))
+      end
+
+      def self.report_gauge_by_queue(stat, value_by_queue)
+        value_by_queue.each do |queue, count|
+          report_gauge(stat, count, additional_tags: { queue: queue })
+        end
+
+        report_gauge("#{stat}.total", value_by_queue.values.sum)
       end
 
       class Callbacks

data/lib/inst_jobs_statsd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module InstJobsStatsd
-  VERSION = "3.0.2"
+  VERSION = "4.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs-statsd
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 4.0.1
 platform: ruby
 authors:
 - Jeremy Slade
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-02 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
@@ -268,7 +268,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
-description:
+description: 
 email:
 - jslade@instructure.com
 executables: []
@@ -298,7 +298,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -313,8 +313,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Stats reporting for inst-jobs
 test_files: []