sidekiq-logstash 2.0.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d03d5f447dd18e3fc0989f94b3b79f74cd73a7ec671bafa8655660e90b8ad11b
-  data.tar.gz: c413e9d405d115d5731190e96dc35eaa853f32a19bf28f32c6556c301333d5d6
+  metadata.gz: de10e32b59ccde04045df621855e1257e4290003c08686be06ac2691ff3eadce
+  data.tar.gz: 2ae07b48658b5f72bef3fa621eef3f57eac826fbd976dcadd3ec2df6e4c74549
 SHA512:
-  metadata.gz: 2e793efdad13027f544ca878392232c26db9f599f32f1d2aaf7c59ba60e94db318923bd6b754d35b0ff098ab748bba9a0a33a8e28c02895d849a76804bed047c
-  data.tar.gz: 93a5f3dc665067f09615d3958dfd69c192ca743d07fe444aec389859f72eae6229f60f60ced92799962bfdbabba917d8c2c63d5c8f8bec5dcbc9ce583d40b172
+  metadata.gz: 85183e59824a52c5f8394ba5d45e0ca7a8df48dc6b1f668c2c0e880102713a3f7678e19f141172a78909bf030186210d644101b93684edf2f513ef31dceee3e0
+  data.tar.gz: a56567d1a6715345e11bc5292188bf20a7c3db4b11f433071def26f9a39e95a366e14ffbceaf537f56021211c0dc2607fc275b6bcf0a46da5fdef2a6154449ae

data/.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
-          bundler-cache: true 
+          bundler-cache: true
       - name: Run rubocop
         run: bundle exec rubocop --format progress
   build:
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0', '3.1']
+        ruby: ['2.7', '3.0', '3.1']
 
     steps:
       - uses: actions/checkout@v2

data/.rubocop.yml

@@ -7,7 +7,7 @@ AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
   NewCops: enable
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
 
 Metrics/BlockLength:
   Exclude:

data/Gemfile

@@ -3,6 +3,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-gem 'rubocop-rake'
-gem 'rubocop-rspec'

data/README.md

@@ -78,6 +78,10 @@ Sidekiq::Logstash.configure do |config|
   config.custom_options = lambda do |payload|
     payload['my_custom_field'] = 'my_custom_value'
   end
+  
+  # by default, sidekiq-logstash removes the default error handler
+  # to keep it, simply set this to true
+  config.keep_default_error_handler = true
 end
 ```
 

data/lib/sidekiq/logging/shared.rb

@@ -130,7 +130,7 @@ module Sidekiq
       def deep_stringify!(args)
         case args
         when Hash
-          args.map { |key, value| [deep_stringify!(key), deep_stringify!(value)] }.to_h
+          args.to_h { |key, value| [deep_stringify!(key), deep_stringify!(value)] }
         when Array
           args.map! { |val| deep_stringify!(val) }
         else

data/lib/sidekiq/logstash/configuration.rb

@@ -4,7 +4,7 @@ module Sidekiq
   module Logstash
     # Class that allows to configure the gem behaviour.
     class Configuration
-      attr_accessor :custom_options, :filter_args, :job_start_log
+      attr_accessor :custom_options, :filter_args, :job_start_log, :keep_default_error_handler
 
       def initialize
         @filter_args = []

data/lib/sidekiq/logstash/version.rb

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

data/lib/sidekiq/logstash.rb

@@ -22,21 +22,18 @@ module Sidekiq
     def self.setup(_opts = {})
       # Calls Sidekiq.configure_server to inject logics
       Sidekiq.configure_server do |config|
-        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) }
+        # Remove default, noisy error handler,
+        # unless LogStash.configuration.keep_default_error_handler is set to true
+        unless configuration.keep_default_error_handler
+          config.error_handlers.delete(Sidekiq::Config::ERROR_HANDLER)
+          # Insert a no-op error handler to prevent Sidekiq from logging to STDOUT
+          # because of empty error_handlers (see link).
+          # https://github.com/mperham/sidekiq/blob/02153c17360e712d9a94c08406fe7c057c4d7635/lib/sidekiq/config.rb#L258
+          config.error_handlers << proc {}
         end
 
         # Add logstash support
-        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
-
+        config[:job_logger] = Sidekiq::LogstashJobLogger
         # Set custom formatter for Sidekiq logger
         config.logger.formatter = Sidekiq::Logging::LogstashFormatter.new
       end

data/sidekiq-logstash.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
 
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.add_dependency 'logstash-event', '~> 1.2'
-  spec.add_runtime_dependency 'sidekiq', '>= 6.0', '<7'
+  spec.add_dependency 'sidekiq', '~> 7.0'
 
   spec.add_development_dependency 'factory_bot', '~> 6.1'
   spec.add_development_dependency 'rake', '>= 10'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-logstash
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Mattia Giuffrida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-12 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -28,22 +28,16 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="