sidekiq-ichnite 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9412bf26b8bf65ec558adf38a48911c197ea0ddc
-  data.tar.gz: b536e2998c5eb7af6c0d042578018382c1d6e614
+  metadata.gz: 68591c277ba356fbc271dd1d9b041665fce8cf80
+  data.tar.gz: ebbab5a28c9649a1da3c893bd639d8b5e9ee9968
 SHA512:
-  metadata.gz: b6d6159242ba2618d28a1ca5bca3fefd37a96d64b2d16981a4b6ce4397671223a69c5777881f6264e7cb7879dc8cafa05ce177767b981f36a02feae99b3426d5
-  data.tar.gz: 9d0778ff5f01c04ce6f1eb8115f7fa2edfce25fb154623287812f00b6708e6de023f537c0d6887d8ecd9dcb0c58a8d437171b20f6cccd9c65d0268460a85aa10
+  metadata.gz: 9a22c12c4d0f144ad9bb7b237b98484a178dc0fd45c8e4648e1dbeb92716550f6a96d28a625f4aa99bcf500eb43b211798c3b0af07cdc167cccfbb79692a87bb
+  data.tar.gz: 04d1c3577ae37fe5f125593e6cb3cc644cfd710ea3bdb5500f0b62be7d13e8b6c5474436c8fbf44839fd566fddb7a153e78e25d82169ebbd722992df1cf87e53

data/lib/sidekiq-ichnite/middleware.rb

@@ -65,7 +65,7 @@ module Sidekiq
             yield
             stop context, msg, ts
           rescue => ex
-            error context, ex, ts
+            error context, msg, ex, ts
             raise ex
           end
         end
@@ -75,25 +75,30 @@ module Sidekiq
         ::Ichnite.log('job_start', context)
       end
 
-      def error(context, error, start)
-        data = context.merge(
+      def error(context, msg, error, start)
+        data = context.merge(job_timing(msg, start))
+        data.merge!(
           at: :error,
-          duration: duration_ms(start),
           error: error.class.name,
           message: error.message[/\A.+$/].inspect)
         ::Ichnite.log('job_error', data)
       end
 
-      def stop(context, _msg, start)
-        data = context.merge(
-          # It looks like this number is subject to clock drift.
-                             # TODO: Figure out a way to make this accurate.
-          # queued_duration: duration_ms(msg['enqueued_at'], start),
-                             duration: duration_ms(start))
-
+      def stop(context, msg, start)
+        data = context.merge(job_timing(msg, start))
         ::Ichnite.log('job_stop', data)
       end
 
+      def job_timing(msg, start)
+        # with clock drift this number can become negative.
+        # Let's take 0 in this case.
+        queued_duration = [0, duration_ms(msg['enqueued_at'], start)].max
+        {
+          queued_for: queued_duration / 1000,
+          duration: duration_ms(start)
+        }
+      end
+
       def duration_ms(from, to = Time.now.to_f)
         ((to - from) * 1000).round
       end

data/lib/sidekiq-ichnite/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Ichnite
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/sidekiq-ichnite.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "ichnite", '>= 0.0.4'
+  spec.add_dependency "ichnite", '>= 0.0.5'
   spec.add_dependency "sidekiq"
 
   spec.add_development_dependency "bundler", "~> 1.13"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-ichnite
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Yves Senn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ichnite
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement