sidekiq-logstash 2.0.0 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1986944d83eef688f7d35ab06cf9dfdb613c51a41cb8f33143ef85fc972be25
-  data.tar.gz: d6480ae4134cb68185ac9c6334c36e6ed9d92e3c0684b760a7064be6f6cdf909
+  metadata.gz: d03d5f447dd18e3fc0989f94b3b79f74cd73a7ec671bafa8655660e90b8ad11b
+  data.tar.gz: c413e9d405d115d5731190e96dc35eaa853f32a19bf28f32c6556c301333d5d6
 SHA512:
-  metadata.gz: b9f8ade62f6abdb3fda0e2b33d617545b127f8b3f7ffa24501669ba76d05c8c9b3ccf461fd33360896421b9f2becebc914b82bc4681f9382ec2a52b373533844
-  data.tar.gz: 9ecfa6afc056cb0b0281eb971bd3e74ceefc71efc9d493b91fa0f901b1f5d2490429d47155301377e1b0d2fece87765821949f27b617f28805383f1b1111aab8
+  metadata.gz: 2e793efdad13027f544ca878392232c26db9f599f32f1d2aaf7c59ba60e94db318923bd6b754d35b0ff098ab748bba9a0a33a8e28c02895d849a76804bed047c
+  data.tar.gz: 93a5f3dc665067f09615d3958dfd69c192ca743d07fe444aec389859f72eae6229f60f60ced92799962bfdbabba917d8c2c63d5c8f8bec5dcbc9ce583d40b172

data/.github/workflows/ci.yml

@@ -16,11 +16,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.x
-      - name: Install dependencies
-        run: bundle install
+          ruby-version: 2.7
+          bundler-cache: true 
       - name: Run rubocop
         run: bundle exec rubocop --format progress
   build:
@@ -28,14 +27,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.5.x', '2.6.x', '2.7.x']
+        ruby: ['2.6', '2.7', '3.0', '3.1']
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - name: Install dependencies
-        run: bundle install
+          bundler-cache: true
       - name: Run tests
         run: bundle exec rake

data/Gemfile

@@ -2,6 +2,7 @@
 
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in sidekiq-logstash.gemspec
-
 gemspec
+
+gem 'rubocop-rake'
+gem 'rubocop-rspec'

data/lib/sidekiq/logging/argument_filter.rb

@@ -63,7 +63,7 @@ module Sidekiq
             parents.push(key) if deep_regexps
             if regexps.any? { |r| key =~ r }
               value = FILTERED
-            elsif deep_regexps && (joined = parents.join('.')) && deep_regexps.any? { |r| joined =~ r }
+            elsif deep_regexps && (joined = parents.join('.')) && deep_regexps.any? { |r| joined =~ r } # rubocop:disable Lint/DuplicateBranch
               value = FILTERED
             elsif value.is_a?(Hash)
               value = call(value, parents)
@@ -71,15 +71,15 @@ module Sidekiq
               value = value.map { |v| v.is_a?(Hash) ? call(v, parents) : v }
             elsif blocks.any?
               key = begin
-                      key.dup
-                    rescue StandardError
-                      key
-                    end
+                key.dup
+              rescue StandardError
+                key
+              end
               value = begin
-                        value.dup
-                      rescue StandardError
-                        value
-                      end
+                value.dup
+              rescue StandardError
+                value
+              end
               blocks.each { |b| b.call(key, value) }
             end
             parents.pop if deep_regexps

data/lib/sidekiq/logging/shared.rb

@@ -49,6 +49,8 @@ module Sidekiq
 
         payload['message'] += ": fail: #{payload['duration']} sec"
         payload['job_status'] = 'fail'
+
+        exc = exc.cause || exc if exc.is_a? Sidekiq::JobRetry::Handled
         payload['error_message'] = exc.message
         payload['error'] = exc.class
         payload['error_backtrace'] = %('#{exc.backtrace.join("\n")}')
@@ -128,7 +130,7 @@ module Sidekiq
       def deep_stringify!(args)
         case args
         when Hash
-          Hash[args.map { |key, value| [deep_stringify!(key), deep_stringify!(value)] }]
+          args.map { |key, value| [deep_stringify!(key), deep_stringify!(value)] }.to_h
         when Array
           args.map! { |val| deep_stringify!(val) }
         else

data/lib/sidekiq/logstash/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Logstash
-    VERSION = '2.0.0'
+    VERSION = '2.0.3'
   end
 end

data/lib/sidekiq/logstash.rb

@@ -22,11 +22,20 @@ module Sidekiq
     def self.setup(_opts = {})
       # Calls Sidekiq.configure_server to inject logics
       Sidekiq.configure_server do |config|
-        # Remove default Sidekiq error_handler that logs errors
-        config.error_handlers.delete_if { |h| h.is_a?(Sidekiq::ExceptionHandler::Logger) }
+        if defined?(Sidekiq::ExceptionHandler::Logger)
+          # Remove default Sidekiq error_handler that logs errors
+          # NOTE: this only exists up until Sidekiq 6.4.x
+          config.error_handlers.delete_if { |h| h.is_a?(Sidekiq::ExceptionHandler::Logger) }
+        end
 
         # Add logstash support
-        config.options[:job_logger] = Sidekiq::LogstashJobLogger
+        if config.respond_to?(:[]=)
+          # Only available from Sidekiq 6.5
+          config[:job_logger] = Sidekiq::LogstashJobLogger
+        else
+          # This is deprecated and will be removed in Sidekiq 7.0
+          config.options[:job_logger] = Sidekiq::LogstashJobLogger
+        end
 
         # Set custom formatter for Sidekiq logger
         config.logger.formatter = Sidekiq::Logging::LogstashFormatter.new

data/sidekiq-logstash.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
   spec.license = 'MIT'
 
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir = 'exe'
-  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.5.0'
 
@@ -31,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-json_expectations', '~> 2.1.0'
   spec.add_development_dependency 'rubocop-performance', '~> 1.5'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-logstash
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.3
 platform: ruby
 authors:
 - Mattia Giuffrida
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2022-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -117,7 +117,7 @@ dependencies:
 description: 'Sidekiq::Logstash turns your Sidekiq log into an organised, aggregated,
   JSON-syntax log ready to be sent to a logstash server.
 
-'
+  '
 email:
 - giuffrida.mattia@gmail.com
 executables: []
@@ -130,8 +130,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".ruby-gemset"
-- ".ruby-version"
 - Gemfile
 - README.md
 - Rakefile
@@ -149,7 +147,8 @@ files:
 homepage: https://github.com/iMacTia/sidekiq-logstash
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -165,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Logstash plugin for Sidekiq

data/.ruby-gemset

@@ -1 +0,0 @@
-sidekiq-logstash

data/.ruby-version

@@ -1 +0,0 @@
-2.7.1