sidekiq-datadog 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e55b57e1e98640d8573d18c6b178ecfebf50096e452e2575a96830377515ff2b
-  data.tar.gz: 915d6d656853099ce4a4c01c1acdfbb46bd66efd618702bc7c899177b30a3c35
+  metadata.gz: 02d15ba4b6e7d71e6f38be19ecaf8101c3360af31f59c6e11553c5c93d37f508
+  data.tar.gz: 61a1c4b3c26d636eb145548b1f7e795db2416df53aef320ab5ee57ac87f4395b
 SHA512:
-  metadata.gz: ccd417b410a1d7a4bd54806f970f46ed726fde5fbc9a9c81337beffd63e32f55b857a10ffb66a2ab8676b38d17380578aa8fe37b2d09fe7f845562317678e76d
-  data.tar.gz: 7836809f20864571790e501869c311012beb6b752d9550844d10b358c5d5ca6a734100101fced797b4de12d72363b7027fee036c0854b3b51360e473232210f9
+  metadata.gz: d41323865474c21cf476fe2a2d26745fe15154334f3486e9ca2ed01ba98193711b31d4822e5328dc810a0594eb8228aff4e35fd2d4c711ae3f5651886ba1ef89
+  data.tar.gz: 745c5c73bf6b82d7bedf500529ed9758a7f1f21628fd1f7af0a271ce4d6cc475f5e19e35bff6e61afee5b08c5b74597ddd49e6013fa8ebcd45087b223632136c

data/.rubocop.yml

@@ -1,9 +1,8 @@
+require: rubocop-performance
 inherit_from:
   - https://gitlab.com/bsm/misc/raw/master/rubocop/default.yml
-
 AllCops:
   TargetRubyVersion: "2.3"
-
 Naming/FileName:
   Exclude:
     - "lib/sidekiq-datadog.rb"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sidekiq-datadog (0.5.0)
+    sidekiq-datadog (0.5.1)
       dogstatsd-ruby (>= 4.2.0)
       sidekiq
 
@@ -35,20 +35,23 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.68.1)
+    rubocop (0.69.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-performance (1.3.0)
+      rubocop (>= 0.68.0)
     ruby-progressbar (1.10.0)
     sidekiq (5.2.7)
       connection_pool (~> 2.2, >= 2.2.2)
       rack (>= 1.5.0)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
-    unicode-display_width (1.5.0)
+    timecop (0.9.1)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
@@ -58,7 +61,9 @@ DEPENDENCIES
   rake
   rspec
   rubocop
+  rubocop-performance
   sidekiq-datadog!
+  timecop
 
 BUNDLED WITH
    2.0.1

data/lib/sidekiq/datadog/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Datadog
-    VERSION = '0.5.0'.freeze
+    VERSION = '0.5.1'.freeze
   end
 end

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

@@ -42,19 +42,21 @@ module Sidekiq
 
         def call(worker, job, queue, *)
           start = Time.now
+          clock = Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
+
           begin
             yield
-            record(worker, job, queue, start)
+            record(worker, job, queue, start, clock)
           rescue StandardError => e
-            record(worker, job, queue, start, e)
+            record(worker, job, queue, start, clock, e)
             raise
           end
         end
 
         private
 
-        def record(worker, job, queue, start, error=nil)
-          msec = ((Time.now - start) * 1000).round
+        def record(worker, job, queue, start, clock, error=nil) # rubocop:disable Metrics/ParameterLists
+          msec = Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond) - clock
           tags = build_tags(worker, job, queue, error)
 
           @statsd.increment @metric_name, tags: tags

data/sidekiq-datadog.gemspec

@@ -24,4 +24,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec')
   s.add_development_dependency('rubocop')
+  s.add_development_dependency('rubocop-performance')
+  s.add_development_dependency('timecop')
 end

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

@@ -8,25 +8,42 @@ describe Sidekiq::Middleware::Server::Datadog do
     ['custom:tag', ->(w, *) { "worker:#{w.class.name[1..2]}" }]
   end
   let(:options) { {} }
+  let(:enqueued_at) { 1461881794.9312189 }
+  let(:expected_queued_time_ms) { 444 }
+
+  before do
+    statsd.messages.clear
+
+    clock_gettime_call_count = 0
+    expect(Process).to receive(:clock_gettime).twice do
+      clock_gettime_call_count += 1
+      clock_gettime_call_count == 1 ? 0 : 333
+    end
+
+    Timecop.freeze(Time.at(enqueued_at + expected_queued_time_ms.to_f / 1000))
+  end
 
-  before  { statsd.messages.clear }
   subject { described_class.new(hostname: 'test.host', statsd: statsd, tags: tags, **options) }
 
   it 'should send an increment and timing event for each job run' do
-    subject.call(worker, { 'enqueued_at' => 1461881794.9312189 }, 'default') { 'ok' }
+    subject.call(worker, { 'enqueued_at' => enqueued_at }, 'default') { 'ok' }
     expect(statsd.messages).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',
+      '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:#{expected_queued_time_ms}|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, { 'enqueued_at' => 1461881794.9312189, 'wrapped' => 'wrap' }, nil) { 'ok' }
+    subject.call(worker, { 'enqueued_at' => enqueued_at, 'wrapped' => 'wrap' }, nil) { 'ok' }
     expect(statsd.messages).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',
+      "sidekiq.job.queued_time:#{expected_queued_time_ms}|ms|#custom:tag,worker:oc,host:test.host,"\
+        'env:test,name:wrap,status:ok',
     ])
   end
 
@@ -36,8 +53,10 @@ describe Sidekiq::Middleware::Server::Datadog do
     }).to raise_error('doh!')
 
     expect(statsd.messages).to eq([
-      'sidekiq.job:1|c|#custom:tag,worker:oc,host:test.host,env:test,name:mock/worker,status:error,error:runtime',
-      'sidekiq.job.time:333|ms|#custom:tag,worker:oc,host:test.host,env:test,name:mock/worker,status:error,error:runtime',
+      'sidekiq.job:1|c|#custom:tag,worker:oc,host:test.host,env:test,name:mock/worker,'\
+        'status:error,error:runtime',
+      'sidekiq.job.time:333|ms|#custom:tag,worker:oc,host:test.host,env:test,name:mock/worker,'\
+        'status:error,error:runtime',
     ])
   end
 
@@ -47,12 +66,15 @@ describe Sidekiq::Middleware::Server::Datadog do
     end
 
     it 'should generate the correct tags' do
-      subject.call(worker, { 'enqueued_at' => 1461881794.9312189, 'args' => [1, 2] }, 'default') { 'ok' }
+      subject.call(worker, { 'enqueued_at' => enqueued_at, 'args' => [1, 2] }, 'default') { 'ok' }
 
       expect(statsd.messages).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',
+        '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:#{expected_queued_time_ms}|ms|#custom:tag,arg:1,arg:2,"\
+          'host:test.host,env:test,name:mock/worker,queue:default,status:ok',
       ])
     end
   end
@@ -67,7 +89,7 @@ describe Sidekiq::Middleware::Server::Datadog do
       expect(statsd.messages).to eq([
         'sidekiq.job:1|c|#queue:default,status:ok',
         'sidekiq.job.time:333|ms|#queue:default,status:ok',
-        'sidekiq.job.queued_time:333|ms|#queue:default,status:ok',
+        "sidekiq.job.queued_time:#{expected_queued_time_ms}|ms|#queue:default,status:ok",
       ])
     end
   end

data/spec/spec_helper.rb

@@ -1,15 +1,11 @@
 ENV['RACK_ENV'] ||= 'test'
 require 'sidekiq-datadog'
+require 'timecop'
 
 module Mock
-  class Worker
-  end
+  class Worker; end
 
   class Statsd < ::Datadog::Statsd
-    def timing(stat, _millis, opts={})
-      super(stat, 333, opts)
-    end
-
     def send_stat(message)
       messages.push message
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-datadog
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dogstatsd-ruby
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Datadog metrics for sidekiq
 email:
 - dimitrij@blacksquaremedia.com