heavylog 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e48d8003501e21ef31c7a1918584f3262ee15ce422cd000487ae9ab129f6f67
-  data.tar.gz: 2b8e7b279148ad6f424846da1699c903415e57c718e081f7162e967815752173
+  metadata.gz: 28311750ff2fdcc2dcb08226faf88a2b655c1b3e61d44e590c47c9bb389037d2
+  data.tar.gz: 1524b0b67c35da8d3d9edec17b0cceb040ffc77752610d919e04f1ee90dca90f
 SHA512:
-  metadata.gz: 79b57e0cbc7ddb381da1ff2e8f075984b03b82d572fc03efd37a27067f665b031f2f1cc99a6d92bea557f3806905ed31ff20804260da43f69a789f574b84e537
-  data.tar.gz: 4afb16d1a35e1980d3c5c753424255610e9212559a1494114e1a6a6fe8b51dd7416a81071dbc5160dc53ed35d499b71c34452ea96db6bfdf0c1cfe4ac671b935
+  metadata.gz: ce3b240f7f9b75ac07d1d3ffccb71f024a1dda45183816b996d99aed4df89557337e564847f25041d2d7ce7b0c819c179b859906165215b3bcfab8ab4093acf5
+  data.tar.gz: 57af42b8052b55fe3e74f6f2cc6cb739c1cf0aaa906b5082c408fd362239f73b4a6b90f0534a4e15c3358f7e6e543e0f0642a52306ce74e678684c2b50668e29

data/lib/heavylog/sidekiq_logger.rb

@@ -2,6 +2,10 @@
 
 module Heavylog
   class SidekiqLogger
+    def initialize(logger=Sidekiq.logger)
+      @logger = logger
+    end
+
     def call(item, _queue)
       # item = {"class"=>"SuspiciousJob", "args"=>[12754545, [3858890], "invoice"], "retry"=>true, "queue"=>"default",
       #   "jid"=>"5ec968571e358497d70a3cf2", "created_at"=>1540484817.3950138, "enqueued_at"=>1540484817.395076}
@@ -10,24 +14,51 @@ module Heavylog
 
       begin
         start = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-        logger.info("start")
+        @logger.info("start")
+
         yield
-        logger.info("done: #{elapsed(start)} sec")
+
+        with_elapsed_time_context(start) do
+          @logger.info("done")
+        end
+
         Heavylog.finish_sidekiq
       rescue StandardError
-        logger.info("fail: #{elapsed(start)} sec")
+        with_elapsed_time_context(start) do
+          @logger.info("fail")
+        end
+
         raise
       end
     end
 
+    def with_job_hash_context(job_hash, &block)
+      @logger.with_context(job_hash_context(job_hash), &block)
+    end
+
+    def job_hash_context(job_hash)
+      # If we're using a wrapper class, like ActiveJob, use the "wrapped"
+      # attribute to expose the underlying thing.
+      h = {
+        class: job_hash["wrapped"] || job_hash["class"],
+        jid:   job_hash["jid"],
+      }
+      h[:bid] = job_hash["bid"] if job_hash["bid"]
+      h
+    end
+
+    def with_elapsed_time_context(start, &block)
+      @logger.with_context(elapsed_time_context(start), &block)
+    end
+
+    def elapsed_time_context(start)
+      { elapsed: elapsed(start).to_s }
+    end
+
     private
 
     def elapsed(start)
       (::Process.clock_gettime(::Process::CLOCK_MONOTONIC) - start).round(3)
     end
-
-    def logger
-      Sidekiq.logger
-    end
   end
 end

data/lib/heavylog/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Heavylog
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heavylog
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Kristjan Rang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -171,8 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Format all Rails logging per request