sidekiq-datadog 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f4d345b0e6b984519eca3a6e088f387649fc5bbc46d414fc3ed0165f8ca9db7
-  data.tar.gz: 0d9b85a785bea3e9ca60d2a62604c90eef649754a0f6377e32aa115eb0a0eb95
+  metadata.gz: 587cd9c94eb2d0018ddc31e367990f2f0121c40061e8437e6ed0d1491f16a499
+  data.tar.gz: b9e3cf7e254ecb3f26c1df1969f5d40cd20113fed85d69de13792001ec02be87
 SHA512:
-  metadata.gz: 5da1867bec33ef19c61ac30efe3f37aef687f77c509a1859d69028fbeade3f49ae4543604bbf21a6c16a2ed980f0f025dbc31f7f09f37119b8a39f554e1b4cfa
-  data.tar.gz: 62cff0b0830b3a3caba520257827524fc49f59f307abfb5476d67b96911bb96db3db21d6fbdeccef2586b7f10c7e2bd1925f76601ae85cf872ac1af197cb18c8
+  metadata.gz: 3abe152091c7c6cce17d943b830f37cf1954a0151c9662fd562d5d4f64fc5d7df87118bcdd8d4e211e1398a2fa9b9af24f0f9f7644c3f20135c93a7825778c54
+  data.tar.gz: f0eb0e04d485c4d915d7c9a1198946725ed9e99be82b2130f4fb39fa19fb04a205a64576f5353f0a907f5ddc608f1baeb643dd21046554ce192e5ebe76b76936

data/Gemfile.lock

@@ -1,38 +1,36 @@
 PATH
   remote: .
   specs:
-    sidekiq-datadog (0.4.0)
+    sidekiq-datadog (0.4.1)
       dogstatsd-ruby (>= 3.3.0)
       sidekiq
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.0.5)
     connection_pool (2.2.2)
     diff-lcs (1.3)
-    dogstatsd-ruby (3.3.0)
+    dogstatsd-ruby (4.0.0)
     rack (2.0.5)
     rack-protection (2.0.3)
       rack
     rake (12.3.1)
-    redis (4.0.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    redis (4.0.2)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    sidekiq (5.1.3)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    sidekiq (5.2.1)
+      connection_pool (~> 2.2, >= 2.2.2)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
 
@@ -46,4 +44,4 @@ DEPENDENCIES
   sidekiq-datadog!
 
 BUNDLED WITH
-   1.16.2
+   1.16.4

data/lib/sidekiq/datadog/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Datadog
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/lib/sidekiq/middleware/server/datadog.rb

@@ -61,7 +61,7 @@ module Sidekiq
               queued_ms = ((start - Time.at(job["enqueued_at"])) * 1000).round
             end
             name = underscore(job['wrapped'] || worker.class.to_s)
-            tags = @tags.map do |tag|
+            tags = @tags.flat_map do |tag|
               case tag when String then tag when Proc then tag.call(worker, job, queue, error) end
             end
 

data/spec/sidekiq/middleware/server/datadog_spec.rb

@@ -2,11 +2,14 @@ require 'spec_helper'
 
 describe Sidekiq::Middleware::Server::Datadog do
 
-  let(:statsd) { Mock::Statsd.new(nil, nil, {}, 10000) }
+  let(:statsd) { Mock::Statsd.new('localhost', 55555) }
   let(:worker) { Mock::Worker.new }
+  let(:tags) {
+    ["custom:tag", lambda{|w, *| "worker:#{w.class.name[1..2]}" }]
+  }
 
   before  { statsd.written.clear }
-  subject { described_class.new hostname: "test.host", statsd: statsd, tags: ["custom:tag", lambda{|w, *| "worker:#{w.class.name[1..2]}" }] }
+  subject { described_class.new hostname: "test.host", statsd: statsd, tags: tags }
 
   it 'should send an increment and timing event for each job run' do
     subject.call(worker, { 'enqueued_at' => 1461881794.9312189 }, 'default') { "ok" }
@@ -37,4 +40,20 @@ describe Sidekiq::Middleware::Server::Datadog do
     ])
   end
 
+  context 'with a dynamic tag list' do
+    let(:tags) {
+      ["custom:tag", lambda {|w, j, *| j['args'].map { |n| "arg:#{n}"} }]
+    }
+
+    it 'should generate the correct tags' do
+      subject.call(worker, { 'enqueued_at' => 1461881794.9312189, 'args' => [1, 2] }, 'default') { "ok" }
+
+      expect(statsd.written).to eq([
+        "sidekiq.job:1|c|#custom:tag,arg:1,arg:2,host:test.host,env:test,name:mock/worker,queue:default,status:ok",
+        "sidekiq.job.time:333|ms|#custom:tag,arg:1,arg:2,host:test.host,env:test,name:mock/worker,queue:default,status:ok",
+        "sidekiq.job.queued_time:333|ms|#custom:tag,arg:1,arg:2,host:test.host,env:test,name:mock/worker,queue:default,status:ok"
+      ])
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ module Mock
 
   class Statsd < ::Datadog::Statsd
     def timing(stat, ms, opts={}); super(stat, 333, opts); end
-    def send_to_socket(message); written.push(message); end
+    def send_stat(message); written.push(message); end
     def written; @written ||= []; end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-datadog
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Datadog metrics for sidekiq