sidekiq-datadog 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aea86eaa87d26b2fa592d8ca714c4fffec52f3a
-  data.tar.gz: 34498e1f66cc33ac85f6056a803c625ddc7a5524
+  metadata.gz: a8043891b229caf308e08b902fade3f2ae4bf959
+  data.tar.gz: 0f12bab2a9ab38efc1d77742b74dfb700ffad439
 SHA512:
-  metadata.gz: 84c2b8fa2b0504fd69b67314b4f55b6ae32678fb07c29db9ba0526bb33bd8302293efe78961e77c7ff67d6587d61c4ec01834a88ea952b5603997328f91225f1
-  data.tar.gz: 8bc0124d01c54c5a76428ec09099e092cc504c964501b65254ad14ede5c7aa74e02d460454e6da08503e526f7c6d8ff9edbae3af7217564342925ebc88be00b9
+  metadata.gz: 19c3f2ee20b3a66ef3eab88abddbfe32709c594a72db5d87b79e3096ddbdcb6540cfe76a606fbf97c06cf3b56ad0bc8925779553905847b09aa320aa3b1610c2
+  data.tar.gz: be99a4d3b34abed38c26e0f7745bd8919b0faa050091368e23bb60890b21f6d9b38e7d3d0aff7c13c5766c5cc67d23a810369426c89bb0f985ed3312370c7eb8

data/.gitignore

@@ -3,15 +3,4 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
 pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
+sudo: false
+cache: bundler
 rvm:
   - 2.2.2
   - 2.1.1
   - 2.0.0
-  - 1.9.3

data/Gemfile.lock

@@ -0,0 +1,45 @@
+PATH
+  remote: .
+  specs:
+    sidekiq-datadog (0.3.1)
+      dogstatsd-ruby
+      sidekiq
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    concurrent-ruby (1.0.1)
+    connection_pool (2.2.0)
+    diff-lcs (1.2.5)
+    dogstatsd-ruby (1.6.0)
+    rake (11.1.2)
+    redis (3.3.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    sidekiq (4.1.1)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      redis (~> 3.2, >= 3.2.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  rake
+  rspec (~> 3.0)
+  sidekiq-datadog!
+
+BUNDLED WITH
+   1.11.2

data/README.md

@@ -21,7 +21,7 @@ Configure it in an initializer:
       end
     end
 
-For full configuration options, please see the [Documentation][http://www.rubydoc.info/gems/sidekiq-datadog].
+For full configuration options, please see the [Documentation](http://www.rubydoc.info/gems/sidekiq-datadog).
 
 ## Contributing
 

data/lib/sidekiq/datadog/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Datadog
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

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

@@ -57,6 +57,9 @@ module Sidekiq
 
           def record(worker, job, queue, start, error = nil)
             ms   = ((Time.now - start) * 1000).round
+            if job["created_at"]
+              queued_ms = start - Time.at(job["created_at"])
+            end
             name = underscore(job['wrapped'] || worker.class.to_s)
             tags = @tags.map do |tag|
               case tag when String then tag when Proc then tag.call(worker, job, queue, error) end
@@ -74,6 +77,9 @@ module Sidekiq
 
             @statsd.increment @metric_name, :tags => tags
             @statsd.timing "#{@metric_name}.time", ms, :tags => tags
+            if queued_ms
+              @statsd.timing "#{@metric_name}.queued_time", queued_ms, :tags => tags
+            end
           end
 
           def underscore(word)

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

@@ -9,18 +9,20 @@ describe Sidekiq::Middleware::Server::Datadog do
   subject { described_class.new hostname: "test.host", statsd: statsd, tags: ["custom:tag", lambda{|w, *| "worker:#{w.class.name[1..2]}" }] }
 
   it 'should send an increment and timing event for each job run' do
-    subject.call(worker, {}, 'default') { "ok" }
+    subject.call(worker, { "created_at" => 1461881794.9312189 }, 'default') { "ok" }
     expect(statsd.buffer).to eq([
       "sidekiq.job:1|c|#custom:tag,worker:oc,host:test.host,env:test,name:mock/worker,queue:default,status:ok",
       "sidekiq.job.time:333|ms|#custom:tag,worker:oc,host:test.host,env:test,name:mock/worker,queue:default,status:ok",
+      "sidekiq.job.queued_time:333|ms|#custom:tag,worker:oc,host:test.host,env:test,name:mock/worker,queue:default,status:ok",
     ])
   end
 
   it 'should support wrappers' do
-    subject.call(worker, {'wrapped' => 'wrap'}, nil) { "ok" }
+    subject.call(worker, { 'created_at' => 1461881794.9312189, 'wrapped' => 'wrap'}, nil) { "ok" }
     expect(statsd.buffer).to eq([
       "sidekiq.job:1|c|#custom:tag,worker:oc,host:test.host,env:test,name:wrap,status:ok",
       "sidekiq.job.time:333|ms|#custom:tag,worker:oc,host:test.host,env:test,name:wrap,status:ok",
+      "sidekiq.job.queued_time:333|ms|#custom:tag,worker:oc,host:test.host,env:test,name:wrap,status:ok",
     ])
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-datadog
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -90,6 +90,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -119,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Datadog metrics for sidekiq
@@ -127,4 +128,3 @@ test_files:
 - spec/sidekiq/datadog/version_spec.rb
 - spec/sidekiq/middleware/server/datadog_spec.rb
 - spec/spec_helper.rb
-has_rdoc: