sidekiq-logstash 1.2.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a99b4b463ed0d2801d2a32447a29767572a979675d6fca72781fbf0c1971fd9
-  data.tar.gz: dfbfffd67d75c8e0aff617ff8da1a219b264e72e84431632131ec346d4d0dcbb
+  metadata.gz: bda6970e2b9e7d059cd81dd78764a9d99957a4e0b54b6e678fee631be419ffab
+  data.tar.gz: 8a03e0bb6409da9d0664a10cb24f9d215b419e917bf5fdb4054f2d1df153d492
 SHA512:
-  metadata.gz: 38a2a810c8af2eb4afda4f2a340ee39680c4c768d6a9714d897950d23630c189063bf84001f60c97a57ca94c5f0ab03a2464fd9ea8d50803321ac3cfdae86d8d
-  data.tar.gz: 7c4338444e79978f20322d8491e8f4b1b04ff95c643f89fd8d51b92b8379e5b39265190f0b0b0c201ccc6081e89317eec8cedbc9f9fdbe72f505a23e8d705433
+  metadata.gz: 2eadcfac4c1e2c7cadaaf831435d827c52f97bd05d06369d69d31b8ff07afb0e416116964ae0c7aa73e7393f9af38212e10f7c2ff45c22524bec51e8369cf5b0
+  data.tar.gz: 3b7cd2319c92b287757475d78dcdbc1785a8b15572b56b2a85ce5c4ce16874a7108db24150221c04d06bd9c144b610c6b6e5c2ea952e6bcd0ac70605836d331a

data/.github/workflows/{ci.yaml → ci.yml}

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

data/.github/workflows/publish.yml

@@ -10,12 +10,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@master
 
       - name: Set up Ruby 2.7
-        uses: ruby/setup-ruby@v1
+        uses: actions/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 2.7.x
 
       - name: Publish to RubyGems
         run: |
@@ -26,4 +26,4 @@ jobs:
           gem build sidekiq-logstash.gemspec
           gem push sidekiq-logstash-*.gem
         env:
-          GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_AUTH_TOKEN }}
+          GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_AUTH_TOKEN }}

data/.rubocop.yml

@@ -6,17 +6,18 @@ require:
 AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
-  TargetRubyVersion: 2.3
+  NewCops: enable
+  TargetRubyVersion: 2.5
 
 Metrics/BlockLength:
   Exclude:
     - spec/**/*.rb
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
   Exclude:
     - spec/**/*.rb
 
 Style/Documentation:
   Exclude:
-    - 'spec/**/*'
+    - 'spec/**/*'

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-04-20 13:23:53 +0200 using RuboCop version 0.67.2.
+# on 2020-08-16 16:36:05 UTC using RuboCop version 0.89.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,31 +11,27 @@ Lint/DuplicateMethods:
   Exclude:
     - 'lib/sidekiq/logstash/configuration.rb'
 
-# Offense count: 4
+# Offense count: 3
+# Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
-  Max: 31
+  Max: 36
 
-# Offense count: 1
+# Offense count: 2
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 13
+  Max: 18
 
 # Offense count: 6
-# Configuration parameters: CountComments, ExcludedMethods.
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
 Metrics/MethodLength:
   Max: 28
 
 # Offense count: 1
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 14
+  Max: 19
 
-# Offense count: 7
-Style/Documentation:
+# Offense count: 1
+Style/OptionalBooleanParameter:
   Exclude:
-    - 'spec/**/*'
-    - 'lib/sidekiq/logging/argument_filter.rb'
-    - 'lib/sidekiq/logging/logstash_formatter.rb'
-    - 'lib/sidekiq/logging/shared.rb'
-    - 'lib/sidekiq/logstash.rb'
-    - 'lib/sidekiq/logstash/configuration.rb'
-    - 'lib/sidekiq/logstash_job_logger.rb'
-    - 'lib/sidekiq/middleware/server/logstash_logging.rb'
+    - 'spec/workers/spec_worker.rb'

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/README.md

@@ -1,7 +1,7 @@
 # Sidekiq::Logstash
 
-[![Gem Version](https://badge.fury.io/rb/sidekiq-logstash.svg)](https://badge.fury.io/rb/sidekiq-logstash) [<img src="https://travis-ci.org/iMacTia/sidekiq-logstash.svg?branch=master" alt="version" />](https://travis-ci.org/iMacTia/sidekiq-logstash)
-
+[![Gem Version](https://badge.fury.io/rb/sidekiq-logstash.svg)](https://badge.fury.io/rb/sidekiq-logstash)
+[![GitHub Actions CI](https://github.com/iMacTia/sidekiq-logstash/workflows/CI/badge.svg)](https://github.com/iMacTia/sidekiq-logstash/actions?query=workflow%3ACI)
 
 Sidekiq::Logstash turns your [Sidekiq](https://github.com/mperham/sidekiq) log into an organised, aggregated, JSON-syntax log ready to be sent to a logstash server.
 
@@ -30,10 +30,11 @@ Sidekiq::Logstash turns your [Sidekiq](https://github.com/mperham/sidekiq) log i
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add one of the following lines to your application's Gemfile:
 
 ```ruby
-gem 'sidekiq-logstash'
+gem 'sidekiq-logstash', '~> 2.0' # Sidekiq 6
+gem 'sidekiq-logstash', '< 2' # Sidekiq 5 or older
 ```
 
 And then execute:

data/bin/test_console

@@ -4,7 +4,7 @@
 require 'bundler/setup'
 require 'sidekiq/logstash'
 require_relative '../spec/spec_helper'
-FactoryGirl.find_definitions
+FactoryBot.find_definitions
 
 require 'irb'
 IRB.start

data/lib/sidekiq/logging/argument_filter.rb

@@ -14,7 +14,7 @@ module Sidekiq
       end
 
       # Filters argument by using the filters provided upon initialization.
-      # @param args [Array] the list of arguments.
+      # @param args [Hash] the list of arguments in a hash with key :args.
       def filter(args)
         compiled_filter.call(args)
       end
@@ -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

@@ -15,8 +15,8 @@ module Sidekiq
       rescue StandardError => e
         begin
           Sidekiq.logger.warn log_job_exception(job, started_at, e)
-        rescue StandardError => ex
-          log_standard_error(job, e, ex)
+        rescue StandardError => e
+          log_standard_error(job, e, e)
         end
         raise
       end
@@ -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 = '1.2.1'
+    VERSION = '2.0.2'
   end
 end

data/lib/sidekiq/logstash.rb

@@ -2,7 +2,6 @@
 
 require 'sidekiq/logstash/configuration'
 require 'sidekiq/logstash/version'
-require 'sidekiq/middleware/server/logstash_logging'
 require 'sidekiq/logging/logstash_formatter'
 require 'sidekiq/logging/argument_filter'
 require 'sidekiq/logstash_job_logger'
@@ -23,19 +22,14 @@ 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
-        # The logging server middleware was removed in Sidekiq 5.0.0, see: https://github.com/mperham/sidekiq/blob/master/Changes.md
-        if Sidekiq::Middleware::Server.const_defined?(:Logging)
-          config.server_middleware do |chain|
-            chain.add Sidekiq::Middleware::Server::LogstashLogging
-            chain.remove Sidekiq::Middleware::Server::Logging
-          end
-        else
-          Sidekiq.options[:job_logger] = Sidekiq::LogstashJobLogger
-        end
+        config.options[:job_logger] = Sidekiq::LogstashJobLogger
 
         # Set custom formatter for Sidekiq logger
         config.logger.formatter = Sidekiq::Logging::LogstashFormatter.new

data/lib/sidekiq/logstash_job_logger.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
+require 'sidekiq/job_logger'
 require 'sidekiq/logging/shared'
 
 module Sidekiq
-  # Class used to replace Sidekiq 5 job logger.
-  class LogstashJobLogger
+  # Class used to replace Sidekiq default job logger.
+  class LogstashJobLogger < ::Sidekiq::JobLogger
     include Sidekiq::Logging::Shared
 
     def call(job, _queue, &block)

data/sidekiq-logstash.gemspec

@@ -18,18 +18,16 @@ 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'
 
   spec.add_dependency 'logstash-event', '~> 1.2'
-  spec.add_runtime_dependency 'sidekiq', '>= 3.0', '<6'
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.add_runtime_dependency 'sidekiq', '>= 6.0', '<7'
 
-  spec.add_development_dependency 'factory_girl', '~> 4.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'factory_bot', '~> 6.1'
+  spec.add_development_dependency 'rake', '>= 10'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-json_expectations', '~> 2.1.0'
-  spec.add_development_dependency 'rubocop', '~> 0.67.2'
-  spec.add_development_dependency 'rubocop-performance'
+  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: 1.2.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Mattia Giuffrida
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -30,48 +30,48 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -101,33 +101,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.2
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  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'
+        version: '1.5'
 description: 'Sidekiq::Logstash turns your Sidekiq log into an organised, aggregated,
   JSON-syntax log ready to be sent to a logstash server.
 
@@ -138,23 +124,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ci.yaml"
+- ".github/workflows/ci.yml"
 - ".github/workflows/publish.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".ruby-gemset"
-- ".ruby-version"
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - bin/test_console
-- gemfiles/sidekiq3.gemfile
-- gemfiles/sidekiq4.gemfile
-- gemfiles/sidekiq5.gemfile
 - lib/sidekiq/logging/argument_filter.rb
 - lib/sidekiq/logging/logstash_formatter.rb
 - lib/sidekiq/logging/shared.rb
@@ -162,12 +143,12 @@ files:
 - lib/sidekiq/logstash/configuration.rb
 - lib/sidekiq/logstash/version.rb
 - lib/sidekiq/logstash_job_logger.rb
-- lib/sidekiq/middleware/server/logstash_logging.rb
 - sidekiq-logstash.gemspec
 homepage: https://github.com/iMacTia/sidekiq-logstash
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -176,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.ruby-gemset

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

data/.ruby-version

@@ -1 +0,0 @@
-2.6.6

data/gemfiles/sidekiq3.gemfile

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gem 'sidekiq', '~> 3.0'
-
-gemspec path: '../'

data/gemfiles/sidekiq4.gemfile

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gem 'sidekiq', '~> 4.0'
-
-gemspec path: '../'

data/gemfiles/sidekiq5.gemfile

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gem 'sidekiq', '~> 5.0'
-
-gemspec path: '../'

data/lib/sidekiq/middleware/server/logstash_logging.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'sidekiq/logging/shared'
-
-module Sidekiq
-  module Middleware
-    module Server
-      # Class used to replace Sidekiq 4 job logger.
-      class LogstashLogging
-        include Sidekiq::Logging::Shared
-
-        def call(_, job, _, &block)
-          log_job(job, &block)
-        end
-      end
-    end
-  end
-end