inst-jobs-statsd 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f299ba77daf29bef9b9a2f8f52710fd23029d3f122d723ec8c19518389ba10cf
-  data.tar.gz: 38df7c0062ee2c19622e19e24377d853e05c55eb3d59253f470fb40668afb2c1
+  metadata.gz: b3de8c2ebb6a0209eece2b69f072091c760908020c2957334e34303dcf209305
+  data.tar.gz: 5fb37614c812c728b8448f447597d1b4b6d9c7f6856cdb5052ea36ea3d47cb40
 SHA512:
-  metadata.gz: f45e0aea9f8e01b3e592754fd596d03a1123d74958803f3b6250964adbaa132fe1d5467fad6a9ac330b68f9df0225e9a1851662a08f29834d769d5020c3b3c47
-  data.tar.gz: a1376daa61d0e4db5911c707dc2524af23fabca7788ee626cbfa7d0ca06fd6f77003d7ea2cbda9acff13bd4c0283f52f89ba4b3d64d9608a4a921db2eff96811
+  metadata.gz: 912a311942077658bed03600aa01cc2c5fd114ec381a04b38173a1573d1c956f5a76fdebdc2ff5b26707fe1ba4b0039748b225ce4647c7b0291849dbd8d7f980
+  data.tar.gz: e1ee70af317c0a531fb005be42541b5cb4a1813afa5d1d275314eb7bd1873e00edd07989fa546453b86786034952f01cdb5eeeed77272e79d404b34afe007170

data/lib/inst_jobs_statsd/naming.rb

@@ -8,6 +8,10 @@ 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)
@@ -31,14 +35,22 @@ module InstJobsStatsd
     end
 
     def self.dd_job_tags(job)
-      return {} unless job
-      return {} unless job.tag
-      return {} if job.tag =~ /Class:0x/
+      tags = dd_region_tags
+      return tags unless job
+      tags = custom_tags(job, tags)
+      return tags unless job.tag
+      return tags if job.tag =~ /Class:0x/
 
       method_tag, obj_tag = split_to_tag(job)
       tag = obj_tag
       tag = [obj_tag, method_tag].join('.') if method_tag.present?
-      {tag: tag}
+      tags[:tag] = tag
+    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",
@@ -67,6 +79,11 @@ module InstJobsStatsd
       end
     end
 
+    def self.dd_region_tags
+      return {} unless ENV['INST_JOBS_STATSD_NAMESPACE']
+      {namespace: ENV['INST_JOBS_STATSD_NAMESPACE']}
+    end
+
     private
 
     def self.split_to_tag(job)

data/lib/inst_jobs_statsd/version.rb

@@ -1,3 +1,3 @@
 module InstJobsStatsd
-  VERSION = '1.2.2'.freeze
+  VERSION = '1.2.3'.freeze
 end

data/spec/factories/jobs.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs-statsd
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Jeremy Slade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs