inst-jobs-statsd 2.1.0 → 3.0.2

metadata

@@ -1,57 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs-statsd
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Jeremy Slade
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-08 00:00:00.000000000 Z
+date: 2023-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: inst_statsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: bump
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -65,21 +59,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -93,21 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -177,19 +157,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.24'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.24'
+- !ruby/object:Gem::Dependency
+  name: rubocop-inst
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.21'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.0
+        version: '2.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.0
+        version: '2.24'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -232,7 +268,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
-description: 
+description:
 email:
 - jslade@instructure.com
 executables: []
@@ -241,10 +277,12 @@ 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/complete.rb
+- lib/inst_jobs_statsd/stats/counters/create.rb
 - lib/inst_jobs_statsd/stats/counters/run.rb
 - lib/inst_jobs_statsd/stats/periodic.rb
 - lib/inst_jobs_statsd/stats/periodic/failed.rb
@@ -255,32 +293,12 @@ files:
 - lib/inst_jobs_statsd/stats/timing/perform.rb
 - lib/inst_jobs_statsd/stats/timing/pop.rb
 - 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/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
-- spec/inst_jobs_statsd/stats/periodic/run_spec.rb
-- spec/inst_jobs_statsd/stats/periodic_spec.rb
-- spec/inst_jobs_statsd/stats/timing/failed_spec.rb
-- spec/inst_jobs_statsd/stats/timing/perform_spec.rb
-- spec/inst_jobs_statsd/stats/timing/pop_spec.rb
-- spec/inst_jobs_statsd/stats/timing_spec.rb
-- spec/inst_statsd/default_tracking_spec.rb
-- spec/matchers.rb
-- spec/setup_test_db.rb
-- spec/spec_helper.rb
 homepage: https://github.com/instructure/inst-jobs-statsd
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -288,36 +306,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Stats reporting for inst-jobs
-test_files:
-- 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
-- spec/inst_jobs_statsd/stats/periodic/queue_spec.rb
-- spec/inst_jobs_statsd/stats/timing/failed_spec.rb
-- 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
-- spec/spec_helper.rb
-- 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
+test_files: []

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/factories/jobs.rb

@@ -1,9 +0,0 @@
-FactoryGirl.define do
-  class JobFixture
-    attr_accessor :tag, :run_at, :strand
-  end
-
-  factory :job_fixture, aliases: [:job] do
-    tag 'Test::Job.perform'
-  end
-end

data/spec/factories/workers.rb

@@ -1,9 +0,0 @@
-FactoryGirl.define do
-  class WorkerFixture
-    attr_accessor :name
-  end
-
-  factory :worker_fixture, aliases: [:worker] do
-    sequence(:name) { |n| "worker-#{n}" }
-  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/gemfiles/60.gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../../"
-
-gem "rails", "~> 6.0"
-gem "sinatra", "~> 2.0.8"
-gem "sinatra-contrib", "~> 2.0.8"

data/spec/inst_jobs_statsd/jobs_tracker_spec.rb

@@ -1,29 +0,0 @@
-RSpec.describe InstJobsStatsd::JobsTracker do
-  describe '.track' do
-    it 'calls the block' do
-      @done_in_block = false
-      expect do
-        InstJobsStatsd::JobsTracker.track do
-          @done_in_block = true
-        end
-      end.to(change { @done_in_block })
-    end
-  end
-
-  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)
-      expect(InstJobsStatsd::Stats::Periodic::Queue).to receive(:enable)
-      expect(InstJobsStatsd::Stats::Periodic::Run).to receive(:enable)
-
-      expect(InstJobsStatsd::Stats::Timing::Failed).to receive(:enable)
-      expect(InstJobsStatsd::Stats::Timing::Perform).to receive(:enable)
-      expect(InstJobsStatsd::Stats::Timing::Pop).to receive(:enable)
-
-      InstJobsStatsd::JobsTracker.new
-    end
-  end
-end

data/spec/inst_jobs_statsd/naming_spec.rb

@@ -1,56 +0,0 @@
-RSpec.describe InstJobsStatsd::Naming do
-  describe '.qualified_names' do
-    subject { InstJobsStatsd::Naming.qualified_names(stat_name, job) }
-    let(:stat_name) { :wut }
-
-    context 'when no job is given' do
-      let(:job) { nil }
-      it { should eq ['delayedjob.wut'] }
-    end
-
-    context 'when job is given' do
-      let(:job) { build :job }
-      it { should include 'delayedjob.wut.tag.Test-Job.perform' }
-
-      context 'job tag is unusual' do
-        let(:job) { build :job, tag: 'periodic__Something_on_a_schedule' }
-        it { should include 'delayedjob.wut.tag.periodic__Something_on_a_schedule' }
-      end
-
-      context 'job tag is dynamic' do
-        let(:job) { build :job, tag: '<Class:0x00000004f575b8>#perform' }
-        it { should eq ['delayedjob.wut'] }
-      end
-    end
-
-    context 'with region tags' do
-      before do
-        @jobs_namespace = ENV['INST_JOBS_STATSD_NAMESPACE']
-        ENV['INST_JOBS_STATSD_NAMESPACE'] = 'region_name'
-      end
-
-      after do
-        ENV['INST_JOBS_STATSD_NAMESPACE'] = @jobs_namespace
-      end
-
-      let(:job) { build :job, tag: 'a_tag_name' }
-
-      it { should include 'delayedjob.wut' }
-      it { should include 'delayedjob.wut.tag.a_tag_name' }
-      it { should include 'delayedjob.wut.region_name' }
-      it { should include 'delayedjob.wut.region_name.tag.a_tag_name' }
-    end
-
-    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})
-      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'})
-      end
-    end
-  end
-end

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.delay.perform
-      Delayed::Job.first.fail!
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-RSpec.describe InstJobsStatsd::Stats::Counters::Run do
-  describe '.enable' do
-    it 'enables all the things' do
-      expect(InstJobsStatsd::Stats::Counters::Run).to receive(:enable_run_count)
-      InstJobsStatsd::Stats::Counters::Run.enable
-    end
-  end
-
-  describe '.report_run_count' do
-    let(:x) { Struct.new(:perform).new(true) }
-
-    before do
-      Delayed::Worker.lifecycle.reset!
-      InstJobsStatsd::Stats::Counters::Run.enable
-
-      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: {} })
-      Delayed::Job.all.each do |job|
-        Delayed::Worker.lifecycle.run_callbacks(:perform, {}, job) {}
-      end
-    end
-  end
-end

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

@@ -1,31 +0,0 @@
-RSpec.describe InstJobsStatsd::Stats::Periodic::Failed do
-  before do
-    InstJobsStatsd::Stats::Periodic.instance_variable_set(:@instance, nil)
-  end
-
-  describe '.enable' do
-    it 'enables all the things' do
-      expect(InstJobsStatsd::Stats::Periodic::Failed).to receive(:enable_failed_depth)
-      InstJobsStatsd::Stats::Periodic::Failed.enable
-    end
-  end
-
-  describe '.report_failed_depth' do
-    let(:x) { Struct.new(:perform).new(true) }
-    let(:now) { Delayed::Job.db_time_now }
-
-    before do
-      InstJobsStatsd::Stats::Periodic.enable_callbacks
-      InstJobsStatsd::Stats::Periodic::Failed.enable_failed_depth
-
-      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: {} })
-      InstJobsStatsd::Stats::Periodic::Failed.report_failed_depth
-    end
-  end
-end

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

@@ -1,95 +0,0 @@
-RSpec.describe InstJobsStatsd::Stats::Periodic::Queue do
-  before do
-    InstJobsStatsd::Stats::Periodic.instance_variable_set(:@instance, nil)
-  end
-
-  describe '.enable' do
-    it 'enables all the things' do
-      expect(InstJobsStatsd::Stats::Periodic::Queue).to receive(:enable_queue_depth)
-      expect(InstJobsStatsd::Stats::Periodic::Queue).to receive(:enable_queue_age)
-      InstJobsStatsd::Stats::Periodic::Queue.enable
-    end
-  end
-
-  describe '.report_queue_depth' do
-    let(:x) { Struct.new(:perform).new(true) }
-    let(:now) { Delayed::Job.db_time_now }
-
-    before do
-      InstJobsStatsd::Stats::Periodic::Queue.enable_queue_depth
-
-      x.delay.perform
-      Delayed::Job.first.update(locked_at: Delayed::Job.db_time_now, locked_by: 'test')
-
-      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: {} })
-      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: {} })
-      Timecop.freeze(2.minutes.from_now) do
-        InstJobsStatsd::Stats::Periodic::Queue.report_queue_depth
-      end
-    end
-
-    it do
-      expect(InstStatsd::Statsd).to receive(:gauge)
-        .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
-    end
-  end
-
-  describe '.report_queue_age' do
-    let(:x) { Struct.new(:perform).new(true) }
-    let(:now) { Delayed::Job.db_time_now }
-
-    before do
-      InstJobsStatsd::Stats::Periodic::Queue.enable_queue_age
-
-      x.delay.perform
-      Delayed::Job.first.update(locked_at: Delayed::Job.db_time_now, locked_by: 'test')
-
-      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: {} })
-      expect(InstStatsd::Statsd).to receive(:gauge)
-        .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: {} })
-      expect(InstStatsd::Statsd).to receive(:gauge)
-        .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
-    end
-
-    it do
-      expect(InstStatsd::Statsd).to receive(:gauge)
-        .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: {} })
-      Timecop.freeze(20.minutes.from_now) do
-        InstJobsStatsd::Stats::Periodic::Queue.report_queue_age
-      end
-    end
-  end
-end