inst-jobs-statsd 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10d4bb1c1c2d71c7a93df1ccd59657c96f871dd65b4e90ea7430fdf7b6da4991
-  data.tar.gz: f8af74f6d0e5abd4ec7f490ad592ee75c2909126574d889d275d7e8a2227df8d
+  metadata.gz: efc6027a4283d4fbe37e336710c974dfd2ddd1ab273613fbd9936fb0cfca37e5
+  data.tar.gz: eef10d80500c432b596436e28422c5b1243c1ec48de44fd73ec1a208ccc58734
 SHA512:
-  metadata.gz: 26f9240b397a8012fd8173c1a4658c53b7106eeecb4c2c833c82e2dc7963b4b73bb38bd442b469fcd551636f49c998daea5c8f7d7d929e5f7b3c0e1ac5361172
-  data.tar.gz: 8704615a3f54eed9d808930932ebb293818ab7af537bfc8e3a88cff6de685e3e6b3153342f643d1547f84f8a4c34b1181cc2d830cc3a91520b5e5e398d093d1c
+  metadata.gz: c4c9cad4da6c5d3897239e390445c852230655cb47fc5d5ca97c045d8d6923e1b33a8a6b7f8c8a66dda12e2636a204b4df6b8b1ca3f5912ece8a8ec991e7470f
+  data.tar.gz: f94e0bf3044911fbfc165f2320a2a08bbd744746e98771c3aded317e210ab2884294bf093b31ff386d2c7d0a22751d2dd48085b7e5785fe15a2191df2621cd65

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/version.rb

@@ -1,3 +1,3 @@
 module InstJobsStatsd
-  VERSION = '2.2.0'.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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs-statsd
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jeremy Slade
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
@@ -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
@@ -232,7 +226,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
-description: 
+description:
 email:
 - jslade@instructure.com
 executables: []
@@ -282,7 +276,7 @@ homepage: https://github.com/instructure/inst-jobs-statsd
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -290,36 +284,36 @@ 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.1.4
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Stats reporting for inst-jobs
 test_files:
-- spec/factories/jobs.rb
-- spec/factories/workers.rb
-- 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/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
 - spec/inst_jobs_statsd/stats/periodic/run_spec.rb
-- spec/inst_jobs_statsd/stats/periodic_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/perform_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/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_statsd/default_tracking_spec.rb
-- spec/matchers.rb
-- spec/setup_test_db.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/factories/workers.rb
+- spec/factories/jobs.rb
+- spec/inst_statsd/default_tracking_spec.rb