inst-jobs-statsd 2.1.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd7dc1bb11dbc52f03746c3003067ab3583c2941bbde910a5afebe56a3b67db8
-  data.tar.gz: 7fda921fe197a011e611d5b9a6840c670064970cf62e536caa1b8600c78e7e02
+  metadata.gz: efc6027a4283d4fbe37e336710c974dfd2ddd1ab273613fbd9936fb0cfca37e5
+  data.tar.gz: eef10d80500c432b596436e28422c5b1243c1ec48de44fd73ec1a208ccc58734
 SHA512:
-  metadata.gz: 7a3cf26ef4330f4cb30ffa49b00d4bb9926c4b8098c62946539fdac755afb7e58cf009c21231ff046eab196eb0cf5b9aaca2a3653ac0156705207f10ad35b715
-  data.tar.gz: 945d7bdb0a403f99a75baabaa70985d1094c6cbe069e244f872d835082dfcf178ca9280a8688c697ce9ee4f1af95a9341051a9437e6a1ade65d92b84ea9fff47
+  metadata.gz: c4c9cad4da6c5d3897239e390445c852230655cb47fc5d5ca97c045d8d6923e1b33a8a6b7f8c8a66dda12e2636a204b4df6b8b1ca3f5912ece8a8ec991e7470f
+  data.tar.gz: f94e0bf3044911fbfc165f2320a2a08bbd744746e98771c3aded317e210ab2884294bf093b31ff386d2c7d0a22751d2dd48085b7e5785fe15a2191df2621cd65

data/lib/inst-jobs-statsd.rb

@@ -9,7 +9,9 @@ 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/create'
 require_relative 'inst_jobs_statsd/stats/counters/run'
+require_relative 'inst_jobs_statsd/stats/counters/complete'
 
 require_relative 'inst_jobs_statsd/stats/periodic'
 require_relative 'inst_jobs_statsd/stats/periodic/failed'

data/lib/inst_jobs_statsd/jobs_tracker.rb

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

data/lib/inst_jobs_statsd/naming.rb

@@ -8,10 +8,6 @@ module InstJobsStatsd
       BASENAME
     end
 
-    def self.configure(strand_filter: nil)
-      @strand_filter = strand_filter
-    end
-
     def self.qualified_names(stat_name, job)
       names = ["#{basename}.#{stat_name}"]
       tagged = tagged_stat(names[0], job)
@@ -36,9 +32,7 @@ module InstJobsStatsd
 
     def self.dd_job_tags(job)
       tags = dd_region_tags
-      return tags unless job
-      tags = custom_tags(job, tags)
-      return tags unless job.tag
+      return tags unless job&.tag
       return tags if job.tag =~ /Class:0x/
 
       method_tag, obj_tag = split_to_tag(job)
@@ -48,12 +42,6 @@ module InstJobsStatsd
       tags
     end
 
-    def self.custom_tags(job, tags)
-      tags[:jobshard] = job.shard.id if job.respond_to?(:shard)
-      tags[:strand] = job.strand if job&.strand && @strand_filter&.call(job)
-      tags
-    end
-
     # this converts Foo#bar" or "Foo.bar" into "Foo and "bar",
     # and makes sure the values are valid to be used for statsd names
     def self.job_tags(job)

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

@@ -0,0 +1,21 @@
+module InstJobsStatsd
+  module Stats
+    module Counters
+      module Complete
+        def self.enable
+          enable_complete_count
+        end
+
+        def self.enable_complete_count
+          Delayed::Worker.lifecycle.after(:perform) do |_worker, job|
+            report_complete_count(job)
+          end
+        end
+
+        def self.report_complete_count(job)
+          Counters.report_count(:complete, 1, job: job)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module InstJobsStatsd
+  module Stats
+    module Counters
+      module Create
+        def self.enable
+          enable_create_count
+        end
+
+        def self.enable_create_count
+          Delayed::Worker.lifecycle.after(:create) do |_, result:|
+            report_create_count(result)
+          end
+        end
+
+        def self.report_create_count(job)
+          Counters.report_count(:create, 1, job: job)
+        end
+      end
+    end
+  end
+end

data/lib/inst_jobs_statsd/version.rb

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

data/spec/factories/jobs.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   class JobFixture
-    attr_accessor :tag, :run_at, :strand
+    attr_accessor :tag, :run_at
   end
 
   factory :job_fixture, aliases: [:job] do

data/spec/inst_jobs_statsd/ext/job_spec.rb

@@ -5,11 +5,13 @@ RSpec.describe 'InstJobsStatsd::Ext::Job' do
     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: {})
+      allow(InstStatsd::Statsd).to receive(:count)
 
       x.delay.perform
       Delayed::Job.first.fail!
+
+      expect(InstStatsd::Statsd).to have_received(:count)
+        .with(array_including(/\.failed$/), 1, 1, short_stat: :failed, tags: {})
     end
   end
 end

data/spec/inst_jobs_statsd/jobs_tracker_spec.rb

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

data/spec/inst_jobs_statsd/naming_spec.rb

@@ -43,12 +43,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)
+        job = double(tag: 'Account.run_reports_later')
+        expect(InstJobsStatsd::Naming.dd_job_tags(job)).to eq(tag: 'Account.run_reports_later')
       end
 
       it 'properly munges job tags' do
-        job = double(tag: 'Quizzes::Quiz#do_something', strand: nil)
+        job = double(tag: 'Quizzes::Quiz#do_something')
         expect(InstJobsStatsd::Naming.dd_job_tags(job)).to eq(tag: 'Quizzes-Quiz.do_something')
       end
     end

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

@@ -0,0 +1,27 @@
+RSpec.describe InstJobsStatsd::Stats::Counters::Complete do
+  describe '.enable' do
+    it 'enables all the things' do
+      expect(InstJobsStatsd::Stats::Counters::Complete).to receive(:enable_complete_count)
+      InstJobsStatsd::Stats::Counters::Complete.enable
+    end
+  end
+
+  describe '.report_complete_count' do
+    let(:x) { Struct.new(:perform).new(true) }
+
+    before do
+      Delayed::Worker.lifecycle.reset!
+      InstJobsStatsd::Stats::Counters::Complete.enable
+
+      2.times { x.delay.perform }
+    end
+
+    it "increments the counter" do
+      expect(InstStatsd::Statsd).to receive(:count)
+        .twice.with(array_including(/\.complete$/), 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/counters/create_spec.rb

@@ -0,0 +1,27 @@
+RSpec.describe InstJobsStatsd::Stats::Counters::Create do
+  describe '.enable' do
+    it 'enables all the things' do
+      expect(InstJobsStatsd::Stats::Counters::Create).to receive(:enable_create_count)
+      InstJobsStatsd::Stats::Counters::Create.enable
+    end
+  end
+
+  describe '.report_create_count' do
+    let(:x) { Struct.new(:perform).new(true) }
+
+    before do
+      Delayed::Worker.lifecycle.reset!
+      InstJobsStatsd::Stats::Counters::Create.enable
+
+      2.times { x.delay.perform }
+    end
+
+    it "increments the counter" do
+      expect(InstStatsd::Statsd).to receive(:count)
+        .twice.with(array_including(/\.create$/), 1, 1, short_stat: anything, tags: {})
+      Delayed::Job.all.each do |job|
+        Delayed::Worker.lifecycle.run_callbacks(:create, job) {}
+      end
+    end
+  end
+end

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs-statsd
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Jeremy Slade
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2023-07-14 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: '4.0'
@@ -24,9 +24,9 @@ dependencies:
   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: '4.0'
@@ -34,20 +34,14 @@ dependencies:
   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
@@ -245,6 +239,8 @@ files:
 - 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/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
@@ -261,6 +257,8 @@ files:
 - 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/complete_spec.rb
+- spec/inst_jobs_statsd/stats/counters/create_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
@@ -286,14 +284,14 @@ 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.2.24
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Stats reporting for inst-jobs
@@ -308,6 +306,8 @@ test_files:
 - spec/inst_jobs_statsd/stats/timing/perform_spec.rb
 - spec/inst_jobs_statsd/stats/periodic_spec.rb
 - spec/inst_jobs_statsd/stats/counters/run_spec.rb
+- spec/inst_jobs_statsd/stats/counters/create_spec.rb
+- spec/inst_jobs_statsd/stats/counters/complete_spec.rb
 - spec/inst_jobs_statsd/stats/timing_spec.rb
 - spec/inst_jobs_statsd/jobs_tracker_spec.rb
 - spec/spec_helper.rb