sidekiq-gelf 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c46bd62ad753085c579e55a252ef075ad089c117
-  data.tar.gz: 76e6cf687aa141e1e48285e64e6c3c9c2370adf3
+  metadata.gz: fea564d8dedc5a3d9412bacc3e2a617c113b84d7
+  data.tar.gz: 2f99100fb0ac350d41ae7f5acd79609b3a9b9e37
 SHA512:
-  metadata.gz: 863015d151ad1cffed3668825fffc5caebc944428c4faf4f1f605a30181a2758da6b252a834acdeffeded232121fbca85d0f8406d5dbdad1fb7406eafb48142c
-  data.tar.gz: 3d000b16ecfb2130c5c5dc18a2211ff87da87d416ce8d853aee41e36fe0da8ebbcf1d3dfba6e0c3d0a1314a826e24ba3b2d407fd8ee261309def4d47f7f7d2ae
+  metadata.gz: d6a1ea966dd16d201693d31eefff6402dc721900d2b5c1939a2a012e2e37f8ad75bc34a422f56db7b731fdd5851b3f887cefaf6250173a051cf8ae5e2464d4bc
+  data.tar.gz: 4e98eb0f37359afd6f777e67c26315d1215975242e3304ed55fd449bff2483a4053fd843c4c3e20e9cafc4ac27bf72656d9c5d9ea610111939f864968e0564f3

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# Change Log
+
+## 1.0.3
+**WARNING** If you are upgrading sidekiq to >= 3.1.1 you SHOULD also update sidekiq-gelf-rb to at least 1.0.3
+
+* [a25fe81](https://github.com/betterplace/sidekiq-gelf-rb/commit/a25fe81f60fb2e8a04c733be828b762fb03ee5b0): Fixes issue with an incompatibility with sidekiq-gelf-rb 1.0.0 and sidekiq >= 3.1.1

data/lib/sidekiq-gelf/middleware.rb

@@ -9,7 +9,7 @@ module Sidekiq
         def call(worker, item, queue)
           Sidekiq::Logging.with_context("#{worker.class.to_s} JID-#{item['jid']}") do
             begin
-              logger.info({
+              logger.info(filter_fields({
                 short_message: "Start: #{worker.class.to_s} JID-#{item['jid']}",
                 jid: item['jid'],
                 pid: pid,
@@ -18,14 +18,15 @@ module Sidekiq
                 worker: worker.class.to_s,
                 queue: queue,
                 params: item['args'],
-                latency: Sidekiq::Job.new(Sidekiq.dump_json(item)).latency
-              })
+                latency: Sidekiq::Job.new(Sidekiq.dump_json(item)).latency,
+                memory: memory
+              }))
 
               start = Time.now
 
               yield # Pass the torch
 
-              logger.info({
+              logger.info(filter_fields({
                 short_message: "Done: #{worker.class.to_s} JID-#{item['jid']}",
                 jid: item['jid'],
                 pid: pid,
@@ -34,10 +35,11 @@ module Sidekiq
                 worker: worker.class.to_s,
                 queue: queue,
                 params: item['args'],
-                runtime: elapsed(start)
-              })
+                runtime: elapsed(start),
+                memory: memory
+              }))
             rescue Exception => e
-              logger.error({
+              logger.error(filter_fields({
                 short_message: "Fail: #{worker.class.to_s} JID-#{item['jid']}",
                 jid: item['jid'],
                 pid: pid,
@@ -49,8 +51,9 @@ module Sidekiq
                 runtime: elapsed(start),
                 exception_class: e.class.to_s,
                 exception_message: e.message,
-                backtrace: e.backtrace.join("\n")
-              })
+                backtrace: e.backtrace.join("\n"),
+                memory: memory
+              }))
 
               raise e
             end
@@ -75,9 +78,24 @@ module Sidekiq
           ::Thread.current[:sidekiq_context]
         end
 
+        def memory
+          `ps -o rss= -p #{::Process.pid}`.chomp.to_i
+        end
+
         def elapsed(start)
+          return nil if start.nil?
           (Time.now - start).to_f.round(3)
         end
+
+        def filter_fields(data)
+          data.each do |key, val|
+            if val.is_a?(String) && val.length > 32766 # max message length
+              data[key] = "[omitted; length = #{val.length}, max = 32766]"
+            end
+          end
+
+          data
+        end
       end
     end
   end

data/sidekiq-gelf.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-gelf"
-  s.version = "1.0.3"
+  s.version = "1.1.0"
 
   s.author = "Ryan LeFevre"
   s.date = "2014-04-21"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-gelf
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -14,42 +14,42 @@ dependencies:
   name: gelf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: GELF logging for Sidekiq
@@ -60,7 +60,8 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .gitignore
+- ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -78,12 +79,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []