sidekiq-logstash 0.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 25dbb440e6e8695797cc7857512139580ea799dc
-  data.tar.gz: adc96a196faa34ee2b45822bca2cb6328fe1061c
+SHA256:
+  metadata.gz: f1986944d83eef688f7d35ab06cf9dfdb613c51a41cb8f33143ef85fc972be25
+  data.tar.gz: d6480ae4134cb68185ac9c6334c36e6ed9d92e3c0684b760a7064be6f6cdf909
 SHA512:
-  metadata.gz: f10f38029bd0168fe3306fba03d3d7b6cce126a78333e7ce8e791194332988979a37d07d4bf5ea00c65e606f233e153cfc91af2702b26d2810adbd679e57dd4e
-  data.tar.gz: 52fcd3c3e046e03b7e1c464d1eff487a916f06ebfd51fb435f9539650a2d690241ff8548136385bbac93f1e5f345ff0a260d4ba1072fc04d7515011538bb700c
+  metadata.gz: b9f8ade62f6abdb3fda0e2b33d617545b127f8b3f7ffa24501669ba76d05c8c9b3ccf461fd33360896421b9f2becebc914b82bc4681f9382ec2a52b373533844
+  data.tar.gz: 9ecfa6afc056cb0b0281eb971bd3e74ceefc71efc9d493b91fa0f901b1f5d2490429d47155301377e1b0d2fece87765821949f27b617f28805383f1b1111aab8

data/.github/workflows/ci.yml

@@ -0,0 +1,41 @@
+name: CI
+
+on:
+  pull_request:
+
+  push:
+    branches: [master]
+
+env:
+  GIT_COMMIT_SHA: ${{ github.sha }}
+  GIT_BRANCH: ${{ github.ref }}
+
+jobs:
+  linting:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.7.x
+      - name: Install dependencies
+        run: bundle install
+      - name: Run rubocop
+        run: bundle exec rubocop --format progress
+  build:
+    needs: [linting]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.5.x', '2.6.x', '2.7.x']
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

data/.github/workflows/publish.yml

@@ -0,0 +1,29 @@
+name: Publish
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    name: Publish to Rubygems
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Set up Ruby 2.7
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.7.x
+
+      - name: Publish to RubyGems
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          gem build sidekiq-logstash.gemspec
+          gem push sidekiq-logstash-*.gem
+        env:
+          GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_AUTH_TOKEN }}

data/.rubocop.yml

@@ -0,0 +1,23 @@
+inherit_from: .rubocop_todo.yml
+
+require:
+  - rubocop-performance
+
+AllCops:
+  DisplayCopNames: true
+  DisplayStyleGuide: true
+  NewCops: enable
+  TargetRubyVersion: 2.5
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*.rb
+
+Layout/LineLength:
+  Max: 120
+  Exclude:
+    - spec/**/*.rb
+
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'

data/.rubocop_todo.yml

@@ -0,0 +1,37 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# 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
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+Lint/DuplicateMethods:
+  Exclude:
+    - 'lib/sidekiq/logstash/configuration.rb'
+
+# Offense count: 3
+# Configuration parameters: IgnoredMethods.
+Metrics/AbcSize:
+  Max: 36
+
+# Offense count: 2
+# Configuration parameters: IgnoredMethods.
+Metrics/CyclomaticComplexity:
+  Max: 18
+
+# Offense count: 6
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 28
+
+# Offense count: 1
+# Configuration parameters: IgnoredMethods.
+Metrics/PerceivedComplexity:
+  Max: 19
+
+# Offense count: 1
+Style/OptionalBooleanParameter:
+  Exclude:
+    - 'spec/workers/spec_worker.rb'

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.7.1

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sidekiq-logstash.gemspec

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:
@@ -68,6 +69,11 @@ Sidekiq::Logstash.configure do |config|
   # it works just like rails params filtering (http://guides.rubyonrails.org/action_controller_overview.html#parameters-filtering)
   config.filter_args << 'foo'
   
+  # by default, the "job started" logs are omitted from the logs
+  # to have one-line logs for each log (following Lograge), but you can
+  # enable job start logs by setting the following flag:
+  config.job_start_log = true
+  
   # custom_option is a Proc that will be called before logging the payload, allowing you to add fields to it
   config.custom_options = lambda do |payload|
     payload['my_custom_field'] = 'my_custom_value'

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'sidekiq/logstash'

data/bin/test_console

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 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

@@ -1,15 +1,20 @@
+# frozen_string_literal: true
+
 # This implementation is taken directly from https://github.com/rails/rails/blob/52ce6ece8c8f74064bb64e0a0b1ddd83092718e1/actionpack/lib/action_dispatch/http/parameter_filter.rb
 # Adding actionpack to the gem dependencies would have been too heavy, so here is just what we need.
-
 module Sidekiq
   module Logging
+    # Class that allows to filter-out sensible arguments.
     class ArgumentFilter
-      FILTERED = '[FILTERED]'.freeze
+      # String used to replace sensible arguments.
+      FILTERED = '[FILTERED]'
 
       def initialize(filters = [])
         @filters = filters
       end
 
+      # Filters argument by using the filters provided upon initialization.
+      # @param args [Hash] the list of arguments in a hash with key :args.
       def filter(args)
         compiled_filter.call(args)
       end
@@ -22,8 +27,11 @@ module Sidekiq
 
       class CompiledFilter # :nodoc:
         def self.compile(filters)
-          return lambda { |args| args.dup } if filters.empty?
-          strings, regexps, blocks = [], [], []
+          return ->(args) { args.dup } if filters.empty?
+
+          strings = []
+          regexps = []
+          blocks = []
           filters.each do |item|
             case item
             when Proc
@@ -34,10 +42,10 @@ module Sidekiq
               strings << Regexp.escape(item.to_s)
             end
           end
-          deep_regexps, regexps = regexps.partition { |r| r.to_s.include?("\\.".freeze) }
-          deep_strings, strings = strings.partition { |s| s.include?("\\.".freeze) }
-          regexps << Regexp.new(strings.join('|'.freeze), true) unless strings.empty?
-          deep_regexps << Regexp.new(deep_strings.join('|'.freeze), true) unless deep_strings.empty?
+          deep_regexps, regexps = regexps.partition { |r| r.to_s.include?('\\.') }
+          deep_strings, strings = strings.partition { |s| s.include?('\\.') }
+          regexps << Regexp.new(strings.join('|'), true) unless strings.empty?
+          deep_regexps << Regexp.new(deep_strings.join('|'), true) unless deep_strings.empty?
           new regexps, deep_regexps, blocks
         end
 
@@ -62,8 +70,16 @@ module Sidekiq
             elsif value.is_a?(Array)
               value = value.map { |v| v.is_a?(Hash) ? call(v, parents) : v }
             elsif blocks.any?
-              key = key.dup rescue key
-              value = value.dup rescue value
+              key = begin
+                      key.dup
+                    rescue StandardError
+                      key
+                    end
+              value = begin
+                        value.dup
+                      rescue StandardError
+                        value
+                      end
               blocks.each { |b| b.call(key, value) }
             end
             parents.pop if deep_regexps
@@ -74,4 +90,4 @@ module Sidekiq
       end
     end
   end
-end
+end

data/lib/sidekiq/logging/logstash_formatter.rb

@@ -1,25 +1,33 @@
+# frozen_string_literal: true
+
 require 'logstash-event'
 
 module Sidekiq
   module Logging
+    # Class that takes a log payload and format it to be Logstash-compatible.
     class LogstashFormatter
-      def call(severity, time, progname, data)
+      def call(severity, _time, _progname, data)
+        json_data = { severity: severity }
+
         if data.is_a? Hash
-          json_data = data
+          json_data.merge!(data)
         else
-          json_data = {
-              severity: severity,
-              message:  data
-          }
+          json_data[:message] = data
         end
 
         # Merge custom_options to provide customization
-        custom_options.call(json_data) if custom_options rescue nil
+        begin
+          custom_options&.call(json_data)
+        rescue StandardError
+          nil
+        end
         event = LogStash::Event.new(json_data)
 
         "#{event.to_json}\n"
       end
 
+      private
+
       def custom_options
         Sidekiq::Logstash.configuration.custom_options
       end

data/lib/sidekiq/logging/shared.rb

@@ -1,62 +1,140 @@
+# frozen_string_literal: true
+
 module Sidekiq
   module Logging
+    # Shared module with all the logics used by job loggers.
     module Shared
-      def log_job(payload, started_at, exc = nil)
+      ENCRYPTED = '[ENCRYPTED]'
+
+      def log_job(job)
+        started_at = Time.now.utc
+        log_start = log_job_start(job)
+        Sidekiq.logger.info log_start if log_start
+        yield if block_given?
+        Sidekiq.logger.info log_job_exec(job, started_at)
+      rescue StandardError => e
+        begin
+          Sidekiq.logger.warn log_job_exception(job, started_at, e)
+        rescue StandardError => e
+          log_standard_error(job, e, e)
+        end
+        raise
+      end
+
+      def log_job_start(job)
+        return unless Sidekiq::Logstash.configuration.job_start_log
+        # Skips start logs for retrying jobs
+        return if job['failed_at']
+
+        payload = setup_payload(job)
+        payload['job_status'] = 'started'
+        payload['message'] += ': started'
+        process_payload(payload)
+      end
+
+      def log_job_exec(job, started_at)
+        payload = setup_payload(job)
+        payload['duration'] = elapsed(started_at)
+
+        payload['message'] += ": done: #{payload['duration']} sec"
+        payload['job_status'] = 'done'
+        payload['completed_at'] = Time.now.utc
+
+        process_payload(payload)
+      end
+
+      def log_job_exception(job, started_at, exc)
+        payload = setup_payload(job)
+        payload['duration'] = elapsed(started_at)
+
+        payload['message'] += ": fail: #{payload['duration']} sec"
+        payload['job_status'] = 'fail'
+        payload['error_message'] = exc.message
+        payload['error'] = exc.class
+        payload['error_backtrace'] = %('#{exc.backtrace.join("\n")}')
+
+        process_payload(payload)
+      end
+
+      private
+
+      def setup_payload(job)
         # Create a copy of the payload using JSON
         # This should always be possible since Sidekiq store it in Redis
-        payload = JSON.parse(JSON.unparse(payload))
+        payload = JSON.parse(JSON.unparse(job))
 
         # Convert timestamps into Time instances
-        %w( created_at enqueued_at retried_at failed_at completed_at ).each do |key|
+        %w[created_at enqueued_at retried_at failed_at completed_at].each do |key|
           payload[key] = parse_time(payload[key]) if payload[key]
         end
 
-        # Add process id params
-        payload['pid']      = ::Process.pid
-        payload['duration'] = elapsed(started_at)
+        # Sets the initial message
+        payload['message'] = "#{payload['class']} JID-#{payload['jid']}"
 
-        message = "#{payload['class']} JID-#{payload['jid']}"
+        # Add process id params
+        payload['pid'] = ::Process.pid
 
-        if exc
-          payload['message']         = "#{message}: fail: #{payload['duration']} sec"
-          payload['job_status']      = 'fail'
-          payload['error_message']   = exc.message
-          payload['error']           = exc.class
-          payload['error_backtrace'] = %('#{exc.backtrace.join("\n")}')
-        else
-          payload['message']      = "#{message}: done: #{payload['duration']} sec"
-          payload['job_status']   = 'done'
-          payload['completed_at'] = Time.now.utc
-        end
+        payload
+      end
 
+      def process_payload(payload)
         # Filter sensitive parameters
         unless filter_args.empty?
-          args_filter     = Sidekiq::Logging::ArgumentFilter.new(filter_args)
-          payload['args'] = args_filter.filter({ args: payload['args'] })[:args]
+          args_filter = Sidekiq::Logging::ArgumentFilter.new(filter_args)
+          payload['args'] = args_filter.filter(args: payload['args'])[:args]
         end
 
+        # If encrypt is true, the last arg is encrypted so hide it
+        payload['args'][-1] = ENCRYPTED if payload['encrypt']
+
         # Needs to map all args to strings for ElasticSearch compatibility
-        payload['args'].map!(&:to_s)
+        deep_stringify!(payload['args'])
+
+        # Needs to map all unique_args to strings for ElasticSearch
+        # compatibility in case sidekiq-unique-jobs is used
+        deep_stringify!(payload['unique_args'])
+
+        if payload['retry'].is_a?(Integer)
+          payload['max_retries'] = payload['retry']
+          payload['retry'] = true
+        end
 
         payload
       end
 
+      def log_standard_error(job, job_exc, log_exc)
+        Sidekiq.logger.error 'Error logging the job execution!'
+        Sidekiq.logger.error "Job: #{job}"
+        Sidekiq.logger.error "Job Exception: #{job_exc}"
+        Sidekiq.logger.error "Log Exception: #{log_exc}"
+      end
+
       def elapsed(start)
         (Time.now.utc - start).round(3)
       end
 
       def parse_time(timestamp)
         return timestamp if timestamp.is_a? Time
-        timestamp.is_a?(Float) ?
-            Time.at(timestamp).utc :
-            Time.parse(timestamp)
-      rescue
+
+        timestamp.is_a?(Float) ? Time.at(timestamp).utc : Time.parse(timestamp)
+      rescue StandardError
         timestamp
       end
 
       def filter_args
         Sidekiq::Logstash.configuration.filter_args
       end
+
+      def deep_stringify!(args)
+        case args
+        when Hash
+          Hash[args.map { |key, value| [deep_stringify!(key), deep_stringify!(value)] }]
+        when Array
+          args.map! { |val| deep_stringify!(val) }
+        else
+          args.to_s
+        end
+      end
     end
   end
 end

data/lib/sidekiq/logstash.rb

@@ -1,11 +1,15 @@
+# frozen_string_literal: true
+
 require 'sidekiq/logstash/configuration'
 require 'sidekiq/logstash/version'
-require 'sidekiq/middleware/server/logstah_logging'
 require 'sidekiq/logging/logstash_formatter'
 require 'sidekiq/logging/argument_filter'
 require 'sidekiq/logstash_job_logger'
 
 module Sidekiq
+  # Main level module for Sidekiq::Logstash.
+  # Provides integration between Sidekiq and Logstash by changing the way
+  # Sidekiq jobs are logged.
   module Logstash
     def self.configuration
       @configuration ||= Configuration.new
@@ -15,22 +19,14 @@ module Sidekiq
       yield(configuration)
     end
 
-    def self.setup(opts = {})
+    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) }
 
         # 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/configuration.rb

@@ -1,17 +1,22 @@
+# frozen_string_literal: true
+
 module Sidekiq
   module Logstash
+    # Class that allows to configure the gem behaviour.
     class Configuration
-      attr_accessor :custom_options, :filter_args
+      attr_accessor :custom_options, :filter_args, :job_start_log
 
       def initialize
         @filter_args = []
+        @job_start_log = false
       end
 
       # Added to ensure custom_options is a Proc
       def custom_options=(proc)
         raise ArgumentError, 'Argument must be a Proc.' unless proc.is_a?(Proc)
+
         @custom_options = proc
       end
     end
   end
-end
+end

data/lib/sidekiq/logstash/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Sidekiq
   module Logstash
-    VERSION = '0.3.0'
+    VERSION = '2.0.0'
   end
 end

data/lib/sidekiq/logstash_job_logger.rb

@@ -1,23 +1,15 @@
+# frozen_string_literal: true
+
+require 'sidekiq/job_logger'
 require 'sidekiq/logging/shared'
 
 module Sidekiq
-  class LogstashJobLogger
+  # Class used to replace Sidekiq default job logger.
+  class LogstashJobLogger < ::Sidekiq::JobLogger
     include Sidekiq::Logging::Shared
 
-    def call(job, _queue)
-      started_at = Time.now.utc
-      yield
-      Sidekiq.logger.info log_job(job, started_at)
-    rescue => exc
-      begin
-        Sidekiq.logger.warn log_job(job, started_at, exc)
-      rescue => ex
-        Sidekiq.logger.error 'Error logging the job execution!'
-        Sidekiq.logger.error "Job: #{job}"
-        Sidekiq.logger.error "Job Exception: #{exc}"
-        Sidekiq.logger.error "Log Exception: #{ex}"
-      end
-      raise
+    def call(job, _queue, &block)
+      log_job(job, &block)
     end
   end
-end
+end

data/sidekiq-logstash.gemspec

@@ -1,31 +1,34 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sidekiq/logstash/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'sidekiq-logstash'
-  spec.version       = Sidekiq::Logstash::VERSION
-  spec.authors       = ['Mattia Giuffrida']
-  spec.email         = ['giuffrida.mattia@gmail.com']
+  spec.name = 'sidekiq-logstash'
+  spec.version = Sidekiq::Logstash::VERSION
+  spec.authors = ['Mattia Giuffrida']
+  spec.email = ['giuffrida.mattia@gmail.com']
 
-  spec.summary       = %q{Logstash plugin for Sidekiq}
-  spec.description   = <<-DESC
-Sidekiq::Logstash turns your Sidekiq log into an organised, aggregated, JSON-syntax log ready to be sent to a logstash server.
-DESC
-  spec.homepage      = 'https://github.com/iMacTia/sidekiq-logstash'
-  spec.license       = 'MIT'
+  spec.summary = 'Logstash plugin for Sidekiq'
+  spec.description = <<~DESC
+    Sidekiq::Logstash turns your Sidekiq log into an organised, aggregated, JSON-syntax log ready to be sent to a logstash server.
+  DESC
+  spec.homepage = 'https://github.com/iMacTia/sidekiq-logstash'
+  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.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', '>= 4.0' , '<6'
+  spec.add_runtime_dependency 'sidekiq', '>= 6.0', '<7'
 
-  spec.add_development_dependency 'bundler', '~> 1.11'
-  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 'factory_girl', '~> 4.0'
+  spec.add_development_dependency 'rspec-json_expectations', '~> 2.1.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-logstash
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Mattia Giuffrida
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -30,48 +30,48 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.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: '4.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        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
@@ -87,19 +87,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: rspec-json_expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.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.
 
@@ -110,19 +124,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".github/workflows/publish.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - bin/test_console
-- gemfiles/sidekiq4.gemfile
-- gemfiles/sidekiq5.gemfile
 - lib/sidekiq/logging/argument_filter.rb
 - lib/sidekiq/logging/logstash_formatter.rb
 - lib/sidekiq/logging/shared.rb
@@ -130,7 +145,6 @@ files:
 - lib/sidekiq/logstash/configuration.rb
 - lib/sidekiq/logstash/version.rb
 - lib/sidekiq/logstash_job_logger.rb
-- lib/sidekiq/middleware/server/logstah_logging.rb
 - sidekiq-logstash.gemspec
 homepage: https://github.com/iMacTia/sidekiq-logstash
 licenses:
@@ -144,15 +158,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Logstash plugin for Sidekiq

data/.travis.yml

@@ -1,10 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.2
-  - 2.3.0
-  - 2.4.0
-before_install: gem install bundler -v 1.11.2
-
-gemfile:
-  - gemfiles/sidekiq4.gemfile
-  - gemfiles/sidekiq5.gemfile

data/gemfiles/sidekiq4.gemfile

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

data/gemfiles/sidekiq5.gemfile

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

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

@@ -1,27 +0,0 @@
-require 'sidekiq/logging/shared'
-
-module Sidekiq
-  module Middleware
-    module Server
-      class LogstashLogging
-        include Sidekiq::Logging::Shared
-
-        def call(_, job, _)
-          started_at = Time.now.utc
-          yield
-          Sidekiq.logger.info log_job(job, started_at)
-        rescue => exc
-          begin
-            Sidekiq.logger.warn log_job(job, started_at, exc)
-          rescue => ex
-            Sidekiq.logger.error 'Error logging the job execution!'
-            Sidekiq.logger.error "Job: #{job}"
-            Sidekiq.logger.error "Job Exception: #{exc}"
-            Sidekiq.logger.error "Log Exception: #{ex}"
-          end
-          raise
-        end
-      end
-    end
-  end
-end