inst-jobs-statsd 1.4.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5903c772d523ffc042f3c178230cfb16973ca1d233c3b00c2e1c7b15ce05889
-  data.tar.gz: a6b313b2539a309361b8d40c0d30b9f7e4de617aa014abe6499503e7cbec147f
+  metadata.gz: fd7dc1bb11dbc52f03746c3003067ab3583c2941bbde910a5afebe56a3b67db8
+  data.tar.gz: 7fda921fe197a011e611d5b9a6840c670064970cf62e536caa1b8600c78e7e02
 SHA512:
-  metadata.gz: 02c42027da50b1ab69fdfc8a4045ce106efd6b9d1b17d6df122c443136fd4541f70e1632f79855db0e6e19a2b4bf1d09db7aa33747f27d99f2960d1ca57f0f52
-  data.tar.gz: 7a873df94b01d909e262ca4d53b6a632d77c606771da12cebb83e905e251f32c6627cce1da50c7a630ddbcc05372b24ff72432d6aeef804dd56ff867d24837b9
+  metadata.gz: 7a3cf26ef4330f4cb30ffa49b00d4bb9926c4b8098c62946539fdac755afb7e58cf009c21231ff046eab196eb0cf5b9aaca2a3653ac0156705207f10ad35b715
+  data.tar.gz: 945d7bdb0a403f99a75baabaa70985d1094c6cbe069e244f872d835082dfcf178ca9280a8688c697ce9ee4f1af95a9341051a9437e6a1ade65d92b84ea9fff47

data/lib/inst-jobs-statsd.rb

@@ -9,7 +9,6 @@ require_relative 'inst_jobs_statsd/jobs_tracker'
 require_relative 'inst_jobs_statsd/naming'
 
 require_relative 'inst_jobs_statsd/stats/counters'
-require_relative 'inst_jobs_statsd/stats/counters/failed'
 require_relative 'inst_jobs_statsd/stats/counters/run'
 
 require_relative 'inst_jobs_statsd/stats/periodic'
@@ -21,5 +20,6 @@ require_relative 'inst_jobs_statsd/stats/timing'
 require_relative 'inst_jobs_statsd/stats/timing/failed'
 require_relative 'inst_jobs_statsd/stats/timing/perform'
 require_relative 'inst_jobs_statsd/stats/timing/pop'
+require_relative 'inst_jobs_statsd/ext/job'
 
 ::InstStatsd::DefaultTracking.include InstJobsStatsd::DefaultTracking

data/lib/inst_jobs_statsd/ext/job.rb

@@ -0,0 +1,11 @@
+module InstJobsStatsd
+  module Ext
+    module Job
+      def fail!
+        failed_job = super
+        InstJobsStatsd::Stats::Counters.report_count(:failed, 1, job: failed_job)
+        failed_job
+      end
+    end
+  end
+end

data/lib/inst_jobs_statsd/jobs_tracker.rb

@@ -9,8 +9,8 @@ module InstJobsStatsd
     end
 
     def initialize(enable_periodic_queries: true)
-      Stats::Counters::Failed.enable
       Stats::Counters::Run.enable
+      ::Delayed::Job.prepend InstJobsStatsd::Ext::Job
 
       if enable_periodic_queries
         Stats::Periodic::Failed.enable

data/lib/inst_jobs_statsd/naming.rb

@@ -82,7 +82,7 @@ module InstJobsStatsd
 
     def self.dd_region_tags
       return {} unless ENV['INST_JOBS_STATSD_NAMESPACE']
-      {namespace: ENV['INST_JOBS_STATSD_NAMESPACE']}
+      { namespace: ENV['INST_JOBS_STATSD_NAMESPACE'] }
     end
 
     private
@@ -91,7 +91,7 @@ module InstJobsStatsd
       obj_tag, method_tag = job.tag.split(/[\.#]/, 2).map do |v|
         InstStatsd::Statsd.escape(v).gsub('::', '-')
       end
-      return method_tag, obj_tag
+      [method_tag, obj_tag]
     end
   end
 end

data/lib/inst_jobs_statsd/version.rb

@@ -1,3 +1,3 @@
 module InstJobsStatsd
-  VERSION = '1.4.1'.freeze
+  VERSION = '2.1.2'.freeze
 end

data/spec/inst_jobs_statsd/ext/job_spec.rb

@@ -0,0 +1,15 @@
+RSpec.describe 'InstJobsStatsd::Ext::Job' do
+  describe 'sends count on job failure' do
+    before do
+      InstJobsStatsd::JobsTracker.new
+    end
+    let(:x) { Struct.new(:perform).new(true) }
+    it 'sends a stat' do
+      expect(InstStatsd::Statsd).to receive(:count)
+        .with(array_including(/\.failed$/), 1, 1, short_stat: :failed, tags: {})
+
+      x.delay.perform
+      Delayed::Job.first.fail!
+    end
+  end
+end

data/spec/inst_jobs_statsd/jobs_tracker_spec.rb

@@ -12,7 +12,6 @@ RSpec.describe InstJobsStatsd::JobsTracker do
 
   describe '.initialize' do
     it 'enables everything' do
-      expect(InstJobsStatsd::Stats::Counters::Failed).to receive(:enable)
       expect(InstJobsStatsd::Stats::Counters::Run).to receive(:enable)
 
       expect(InstJobsStatsd::Stats::Periodic::Failed).to receive(:enable)

data/spec/inst_jobs_statsd/naming_spec.rb

@@ -44,12 +44,12 @@ RSpec.describe InstJobsStatsd::Naming do
     describe '.dd_job_tags' do
       it 'works' do
         job = double(tag: 'Account.run_reports_later', shard: double(id: 101), strand: 'special')
-        expect(InstJobsStatsd::Naming.dd_job_tags(job)).to eq({ tag: 'Account.run_reports_later', jobshard: 101})
+        expect(InstJobsStatsd::Naming.dd_job_tags(job)).to eq(tag: 'Account.run_reports_later', jobshard: 101)
       end
 
       it 'properly munges job tags' do
         job = double(tag: 'Quizzes::Quiz#do_something', strand: nil)
-        expect(InstJobsStatsd::Naming.dd_job_tags(job)).to eq({ tag: 'Quizzes-Quiz.do_something'})
+        expect(InstJobsStatsd::Naming.dd_job_tags(job)).to eq(tag: 'Quizzes-Quiz.do_something')
       end
     end
   end

data/spec/inst_jobs_statsd/stats/counters/run_spec.rb

@@ -13,12 +13,12 @@ RSpec.describe InstJobsStatsd::Stats::Counters::Run do
       Delayed::Worker.lifecycle.reset!
       InstJobsStatsd::Stats::Counters::Run.enable
 
-      2.times { x.send_later(:perform) }
+      2.times { x.delay.perform }
     end
 
     it do
       expect(InstStatsd::Statsd).to receive(:count)
-        .twice.with(array_including(/\.run$/), 1, 1, { short_stat: anything, tags: {} })
+        .twice.with(array_including(/\.run$/), 1, 1, short_stat: anything, tags: {})
       Delayed::Job.all.each do |job|
         Delayed::Worker.lifecycle.run_callbacks(:perform, {}, job) {}
       end

data/spec/inst_jobs_statsd/stats/periodic/failed_spec.rb

@@ -18,13 +18,13 @@ RSpec.describe InstJobsStatsd::Stats::Periodic::Failed do
       InstJobsStatsd::Stats::Periodic.enable_callbacks
       InstJobsStatsd::Stats::Periodic::Failed.enable_failed_depth
 
-      x.send_later(:perform)
+      x.delay.perform
       Delayed::Job.first.fail!
     end
 
     it do
       expect(InstStatsd::Statsd).to receive(:gauge)
-        .with(array_including(/\.failed_depth$/), 1, 1, { short_stat: anything, tags: {} })
+        .with(array_including(/\.failed_depth$/), 1, 1, short_stat: anything, tags: {})
       InstJobsStatsd::Stats::Periodic::Failed.report_failed_depth
     end
   end

data/spec/inst_jobs_statsd/stats/periodic/queue_spec.rb

@@ -18,23 +18,23 @@ RSpec.describe InstJobsStatsd::Stats::Periodic::Queue do
     before do
       InstJobsStatsd::Stats::Periodic::Queue.enable_queue_depth
 
-      x.send_later(:perform)
+      x.delay.perform
       Delayed::Job.first.update(locked_at: Delayed::Job.db_time_now, locked_by: 'test')
 
-      x.send_later(:perform)
-      x.send_later_enqueue_args(:perform, run_at: now + 1.minute)
-      x.send_later_enqueue_args(:perform, run_at: now + 10.minutes)
+      x.delay.perform
+      x.delay(run_at: now + 1.minute).perform
+      x.delay(run_at: now + 10.minutes).perform
     end
 
     it do
       expect(InstStatsd::Statsd).to receive(:gauge)
-        .with(array_including(/\.queue_depth$/), 1, 1, { short_stat: anything, tags: {} })
+        .with(array_including(/\.queue_depth$/), 1, 1, short_stat: anything, tags: {})
       InstJobsStatsd::Stats::Periodic::Queue.report_queue_depth
     end
 
     it do
       expect(InstStatsd::Statsd).to receive(:gauge)
-        .with(array_including(/\.queue_depth$/), 2, 1, { short_stat: anything, tags: {} })
+        .with(array_including(/\.queue_depth$/), 2, 1, short_stat: anything, tags: {})
       Timecop.freeze(2.minutes.from_now) do
         InstJobsStatsd::Stats::Periodic::Queue.report_queue_depth
       end
@@ -42,7 +42,7 @@ RSpec.describe InstJobsStatsd::Stats::Periodic::Queue do
 
     it do
       expect(InstStatsd::Statsd).to receive(:gauge)
-        .with(array_including(/\.queue_depth$/), 3, 1, { short_stat: anything, tags: {} })
+        .with(array_including(/\.queue_depth$/), 3, 1, short_stat: anything, tags: {})
       Timecop.freeze(20.minutes.from_now) do
         InstJobsStatsd::Stats::Periodic::Queue.report_queue_depth
       end
@@ -56,27 +56,27 @@ RSpec.describe InstJobsStatsd::Stats::Periodic::Queue do
     before do
       InstJobsStatsd::Stats::Periodic::Queue.enable_queue_age
 
-      x.send_later(:perform)
+      x.delay.perform
       Delayed::Job.first.update(locked_at: Delayed::Job.db_time_now, locked_by: 'test')
 
-      x.send_later(:perform)
-      x.send_later_enqueue_args(:perform, run_at: now + 1.minute)
-      x.send_later_enqueue_args(:perform, run_at: now + 10.minutes)
+      x.delay.perform
+      x.delay(run_at: now + 1.minute).perform
+      x.delay(run_at: now + 10.minutes).perform
     end
 
     it do
       expect(InstStatsd::Statsd).to receive(:gauge)
-        .ordered.with(array_including(/\.queue_age_total$/), number_near(0), 1, { short_stat: anything, tags: {} })
+        .ordered.with(array_including(/\.queue_age_total$/), number_near(0), 1, short_stat: anything, tags: {})
       expect(InstStatsd::Statsd).to receive(:gauge)
-        .ordered.with(array_including(/\.queue_age_max$/), number_near(0), 1, { short_stat: anything, tags: {} })
+        .ordered.with(array_including(/\.queue_age_max$/), number_near(0), 1, short_stat: anything, tags: {})
       InstJobsStatsd::Stats::Periodic::Queue.report_queue_age
     end
 
     it do
       expect(InstStatsd::Statsd).to receive(:gauge)
-        .ordered.with(array_including(/\.queue_age_total$/), number_near(180), 1, { short_stat: anything, tags: {} })
+        .ordered.with(array_including(/\.queue_age_total$/), number_near(180), 1, short_stat: anything, tags: {})
       expect(InstStatsd::Statsd).to receive(:gauge)
-        .ordered.with(array_including(/\.queue_age_max$/), number_near(120), 1, { short_stat: anything, tags: {} })
+        .ordered.with(array_including(/\.queue_age_max$/), number_near(120), 1, short_stat: anything, tags: {})
       Timecop.freeze(2.minutes.from_now) do
         InstJobsStatsd::Stats::Periodic::Queue.report_queue_age
       end
@@ -84,9 +84,9 @@ RSpec.describe InstJobsStatsd::Stats::Periodic::Queue do
 
     it do
       expect(InstStatsd::Statsd).to receive(:gauge)
-        .ordered.with(array_including(/\.queue_age_total$/), number_near(2940), 1, { short_stat: anything, tags: {} })
+        .ordered.with(array_including(/\.queue_age_total$/), number_near(2940), 1, short_stat: anything, tags: {})
       expect(InstStatsd::Statsd).to receive(:gauge)
-        .ordered.with(array_including(/\.queue_age_max$/), number_near(1200), 1, { short_stat: anything, tags: {} })
+        .ordered.with(array_including(/\.queue_age_max$/), number_near(1200), 1, short_stat: anything, tags: {})
       Timecop.freeze(20.minutes.from_now) do
         InstJobsStatsd::Stats::Periodic::Queue.report_queue_age
       end

data/spec/inst_jobs_statsd/stats/periodic/run_spec.rb

@@ -18,14 +18,14 @@ RSpec.describe InstJobsStatsd::Stats::Periodic::Run do
     before do
       InstJobsStatsd::Stats::Periodic::Run.enable_run_depth
 
-      x.send_later(:perform)
-      x.send_later(:perform)
+      x.delay.perform
+      x.delay.perform
       Delayed::Job.first.update(locked_at: Delayed::Job.db_time_now, locked_by: 'test')
     end
 
     it do
       expect(InstStatsd::Statsd).to receive(:gauge)
-        .with(array_including(/\.run_depth$/), 1, 1, { short_stat: anything, tags: {} })
+        .with(array_including(/\.run_depth$/), 1, 1, short_stat: anything, tags: {})
       InstJobsStatsd::Stats::Periodic::Run.report_run_depth
     end
   end
@@ -37,16 +37,16 @@ RSpec.describe InstJobsStatsd::Stats::Periodic::Run do
     before do
       InstJobsStatsd::Stats::Periodic::Run.enable_run_age
 
-      x.send_later(:perform)
-      x.send_later(:perform)
+      x.delay.perform
+      x.delay.perform
       Delayed::Job.first.update(locked_at: now, locked_by: 'test')
     end
 
     it do
       expect(InstStatsd::Statsd).to receive(:gauge)
-        .ordered.with(array_including(/\.run_age_total$/), number_near(0), 1, { short_stat: anything, tags: {} })
+        .ordered.with(array_including(/\.run_age_total$/), number_near(0), 1, short_stat: anything, tags: {})
       expect(InstStatsd::Statsd).to receive(:gauge)
-        .ordered.with(array_including(/\.run_age_max$/), number_near(0), 1, { short_stat: anything, tags: {} })
+        .ordered.with(array_including(/\.run_age_max$/), number_near(0), 1, short_stat: anything, tags: {})
       InstJobsStatsd::Stats::Periodic::Run.report_run_age
     end
   end

data/spec/setup_test_db.rb

@@ -3,10 +3,6 @@
 ENV['TEST_ENV_NUMBER'] ||= '1'
 ENV['TEST_DB_HOST'] ||= 'localhost'
 ENV['TEST_DB_DATABASE'] ||= "inst-jobs-test-#{ENV['TEST_ENV_NUMBER']}"
-ENV['TEST_REDIS_CONNECTION'] ||= 'redis://localhost:6379/'
-
-Delayed::Backend::Redis::Job.redis = Redis.new(url: ENV['TEST_REDIS_CONNECTION'])
-Delayed::Backend::Redis::Job.redis.select ENV['TEST_ENV_NUMBER']
 
 connection_config = {
   adapter: :postgresql,

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-if /^2\.5/ =~ RUBY_VERSION && /51\./ =~ ENV['BUNDLE_GEMFILE'] # Limit coverage to one build
+if /^2\.7/ =~ RUBY_VERSION && /60\./ =~ ENV['BUNDLE_GEMFILE'] # Limit coverage to one build
   require 'simplecov'
 
   SimpleCov.start do

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs-statsd
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Jeremy Slade
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: inst_statsd
   requirement: !ruby/object:Gem::Requirement
@@ -232,7 +232,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
-description: 
+description:
 email:
 - jslade@instructure.com
 executables: []
@@ -241,10 +241,10 @@ extra_rdoc_files: []
 files:
 - lib/inst-jobs-statsd.rb
 - lib/inst_jobs_statsd/default_tracking.rb
+- lib/inst_jobs_statsd/ext/job.rb
 - lib/inst_jobs_statsd/jobs_tracker.rb
 - lib/inst_jobs_statsd/naming.rb
 - lib/inst_jobs_statsd/stats/counters.rb
-- lib/inst_jobs_statsd/stats/counters/failed.rb
 - lib/inst_jobs_statsd/stats/counters/run.rb
 - lib/inst_jobs_statsd/stats/periodic.rb
 - lib/inst_jobs_statsd/stats/periodic/failed.rb
@@ -257,12 +257,10 @@ files:
 - lib/inst_jobs_statsd/version.rb
 - spec/factories/jobs.rb
 - spec/factories/workers.rb
-- spec/gemfiles/42.gemfile
-- spec/gemfiles/51.gemfile
 - spec/gemfiles/60.gemfile
+- spec/inst_jobs_statsd/ext/job_spec.rb
 - spec/inst_jobs_statsd/jobs_tracker_spec.rb
 - spec/inst_jobs_statsd/naming_spec.rb
-- spec/inst_jobs_statsd/stats/counters/failed_spec.rb
 - spec/inst_jobs_statsd/stats/counters/run_spec.rb
 - spec/inst_jobs_statsd/stats/periodic/failed_spec.rb
 - spec/inst_jobs_statsd/stats/periodic/queue_spec.rb
@@ -280,7 +278,7 @@ homepage: https://github.com/instructure/inst-jobs-statsd
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -295,11 +293,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.24
+signing_key:
 specification_version: 4
 summary: Stats reporting for inst-jobs
 test_files:
+- spec/inst_jobs_statsd/ext/job_spec.rb
 - spec/inst_jobs_statsd/naming_spec.rb
 - spec/inst_jobs_statsd/stats/periodic/failed_spec.rb
 - spec/inst_jobs_statsd/stats/periodic/run_spec.rb
@@ -308,7 +307,6 @@ test_files:
 - spec/inst_jobs_statsd/stats/timing/pop_spec.rb
 - spec/inst_jobs_statsd/stats/timing/perform_spec.rb
 - spec/inst_jobs_statsd/stats/periodic_spec.rb
-- spec/inst_jobs_statsd/stats/counters/failed_spec.rb
 - spec/inst_jobs_statsd/stats/counters/run_spec.rb
 - spec/inst_jobs_statsd/stats/timing_spec.rb
 - spec/inst_jobs_statsd/jobs_tracker_spec.rb
@@ -316,8 +314,6 @@ test_files:
 - spec/setup_test_db.rb
 - spec/matchers.rb
 - spec/gemfiles/60.gemfile
-- spec/gemfiles/42.gemfile
-- spec/gemfiles/51.gemfile
 - spec/factories/workers.rb
 - spec/factories/jobs.rb
 - spec/inst_statsd/default_tracking_spec.rb

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

@@ -1,28 +0,0 @@
-module InstJobsStatsd
-  module Stats
-    module Counters
-      module Failed
-        def self.enable
-          enable_failed_count
-        end
-
-        def self.enable_failed_count
-          return if Delayed::Job::Failed < AfterCreateHook
-          Delayed::Job::Failed.include AfterCreateHook
-        end
-
-        module AfterCreateHook
-          def self.included(base)
-            base.after_create do
-              InstJobsStatsd::Stats::Counters::Failed.report_failed_count(self)
-            end
-          end
-        end
-
-        def self.report_failed_count(job)
-          Counters.report_count(:failed, 1, job: job)
-        end
-      end
-    end
-  end
-end

data/spec/gemfiles/42.gemfile

@@ -1,8 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../../"
-
-gem "rails", "~> 4.2.11"
-gem "pg", "~> 0.21.0"
-gem "after_transaction_commit", "< 2"
-gem "test_after_commit", "1.1.0"

data/spec/gemfiles/51.gemfile

@@ -1,8 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../../"
-
-gem "rails", "~> 5.1.7"
-gem "sinatra", "~> 2.0.8"
-gem "sinatra-contrib", "~> 2.0.8"
-gem "sprockets", "~> 3.7" # 4.0+ requires Ruby 2.5

data/spec/inst_jobs_statsd/stats/counters/failed_spec.rb

@@ -1,20 +0,0 @@
-RSpec.describe InstJobsStatsd::Stats::Counters::Failed do
-  describe '.enable' do
-    it 'enables all the things' do
-      expect(InstJobsStatsd::Stats::Counters::Failed).to receive(:enable_failed_count)
-      InstJobsStatsd::Stats::Counters::Failed.enable
-    end
-  end
-
-  describe '.report_failed_count' do
-    let(:x) { Struct.new(:perform).new(true) }
-    it do
-      expect(InstStatsd::Statsd).to receive(:count)
-        .with(array_including(/\.failed$/), 1, 1, { short_stat: :failed, tags: {} })
-
-      InstJobsStatsd::Stats::Counters::Failed.enable_failed_count
-      x.send_later(:perform)
-      Delayed::Job.first.fail!
-    end
-  end
-end