sidekiq-logstash 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7da540744ff32bbe1218075f40fa979c9b5a9bdb7211c45df40ec8191b2b51cc
-  data.tar.gz: '09e58a7cd2504538079fc8493e7fef3a59a9217736a0b1bf1425f6ba208f20c8'
+  metadata.gz: f64be7ef6c83dfa222803106ef0f335851dcf9711197cc910323f6e73f7b33b0
+  data.tar.gz: 9669782de8205832ac862926a024955edb4c994eb7ab2710f1b0e4608895b74a
 SHA512:
-  metadata.gz: 746c123b2341c14f1d565d830f489a5eddb6591ba56f6c72ffaafd737524126cd24df17fdc808af5b8271fa88f94c5e5356d37e923ba5327cf849a56080d7d7e
-  data.tar.gz: f79226102532246d67bffcbe478d6e30781838d995d7c50f627e6a309f49f1a1b347aa7dbc1720733985a217a98d9c97d77db71ff53097d4b29c8fcd217012bc
+  metadata.gz: 9121ef3c47bfb9ba1e51ba7b6916cc92e98160efc0b393ead66003534729f92b00732216263812552eab10240f8f9f1664135f48550b81501ec7160d7fd8a103
+  data.tar.gz: 172dfaff1de740be03eea5787e0bae44ed766169569dba233c5845a0db48a3e3adfdc8f84be3ae2ca04b3a387193c73c968634eb355e5a322bfcbfe8623f10cd

data/.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3
+          ruby-version: 3.2
           bundler-cache: true
 
       - name: Run rubocop
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['3.0', '3.1', '3.2', '3.3']
+        ruby: ['3.2', '3.3', '3.4']
 
     steps:
       - uses: actions/checkout@v4

data/.github/workflows/publish.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-ruby@v1
         with:
-          ruby-version: 3
+          ruby-version: 3.2
 
       - name: Publish to RubyGems
         run: |

data/.rubocop.yml

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

data/README.md

@@ -33,7 +33,7 @@ Sidekiq::Logstash turns your [Sidekiq](https://github.com/mperham/sidekiq) log i
 Add one of the following lines to your application's Gemfile:
 
 ```ruby
-gem 'sidekiq-logstash', '~> 3.0' # Sidekiq 7
+gem 'sidekiq-logstash', '~> 3.0' # Sidekiq 7 or 8
 gem 'sidekiq-logstash', '~> 2.0' # Sidekiq 6
 gem 'sidekiq-logstash', '< 2' # Sidekiq 5 or older
 ```

data/lib/sidekiq/logging/exception_utils.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Sidekiq
+  module Logging
+    # Utility that allows us to get a hash representation of an exception
+    module ExceptionUtils
+      module_function
+
+      def get_exception_with_cause_hash(exc, parent_backtrace = nil, max_depth_left: 1)
+        error_hash = {
+          'class' => exc.class.to_s,
+          'message' => exc.message,
+          'backtrace' => backtrace_for(exc, parent_backtrace)
+        }
+
+        if (cause = exc.cause) && max_depth_left.positive?
+          # Pass the current backtrace as the parent_backtrace to the cause to shorten cause's backtrace list
+          error_hash['cause'] = get_exception_with_cause_hash(cause, exc.backtrace, max_depth_left: max_depth_left - 1)
+        end
+
+        error_hash
+      end
+
+      def backtrace_for(exception, parent_backtrace = nil)
+        backtrace = exception.backtrace || []
+        if parent_backtrace
+          common_lines = backtrace.reverse.zip(parent_backtrace.reverse).take_while { |a, b| a == b }
+
+          backtrace = backtrace[0...-common_lines.length] if common_lines.any?
+        end
+
+        backtrace
+      end
+    end
+  end
+end

data/lib/sidekiq/logging/logstash_formatter.rb

@@ -7,7 +7,7 @@ module Sidekiq
     # Class that takes a log payload and format it to be Logstash-compatible.
     class LogstashFormatter
       def call(severity, _time, _progname, data)
-        json_data = { severity: severity }
+        json_data = { severity: }
 
         if data.is_a? Hash
           json_data.merge!(data)

data/lib/sidekiq/logging/shared.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'sidekiq/exception_utils'
+require 'sidekiq/logging/exception_utils'
 
 module Sidekiq
   module Logging
@@ -54,7 +54,7 @@ module Sidekiq
 
         config = Sidekiq::Logstash.configuration
         if config.log_job_exception_with_causes
-          payload['error'] = ExceptionUtils.get_exception_with_cause_hash(
+          payload['error'] = Sidekiq::Logging::ExceptionUtils.get_exception_with_cause_hash(
             exc, max_depth_left: config.causes_logging_max_depth
           )
         else
@@ -66,7 +66,7 @@ module Sidekiq
             payload['error_cause'] = {
               'class' => cause.class.to_s,
               'message' => cause.message,
-              'backtrace' => ExceptionUtils.backtrace_for(cause, exc.backtrace)
+              'backtrace' => Sidekiq::Logging::ExceptionUtils.backtrace_for(cause, exc.backtrace)
             }
           end
         end

data/lib/sidekiq/logstash/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Logstash
-    VERSION = '3.2.0'
+    VERSION = '3.3.0'
   end
 end

data/lib/sidekiq/logstash_job_logger.rb

@@ -8,8 +8,8 @@ module Sidekiq
   class LogstashJobLogger < ::Sidekiq::JobLogger
     include Sidekiq::Logging::Shared
 
-    def call(job, _queue, &block)
-      log_job(job, &block)
+    def call(job, _queue, &)
+      log_job(job, &)
     end
   end
 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 = '>= 3.0.0'
+  spec.required_ruby_version = '>= 3.2.0'
 
   spec.add_dependency 'logstash-event', '~> 1.2'
-  spec.add_dependency 'sidekiq', '~> 7.0'
+  spec.add_dependency 'sidekiq', '~> 8.0'
 
   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: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Mattia Giuffrida
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-29 00:00:00.000000000 Z
+date: 2025-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 description: 'Sidekiq::Logstash turns your Sidekiq log into an organised, aggregated,
   JSON-syntax log ready to be sent to a logstash server.
 
@@ -60,8 +60,8 @@ files:
 - bin/console
 - bin/setup
 - bin/test_console
-- lib/sidekiq/exception_utils.rb
 - lib/sidekiq/logging/argument_filter.rb
+- lib/sidekiq/logging/exception_utils.rb
 - lib/sidekiq/logging/logstash_formatter.rb
 - lib/sidekiq/logging/shared.rb
 - lib/sidekiq/logstash.rb
@@ -74,7 +74,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -82,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.19
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Logstash plugin for Sidekiq
 test_files: []

data/lib/sidekiq/exception_utils.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-# Utility that allows us to get a hash representation of an exception
-module ExceptionUtils
-  module_function
-
-  def get_exception_with_cause_hash(exc, parent_backtrace = nil, max_depth_left: 1)
-    error_hash = {
-      'class' => exc.class.to_s,
-      'message' => exc.message,
-      'backtrace' => backtrace_for(exc, parent_backtrace)
-    }
-
-    if (cause = exc.cause) && max_depth_left.positive?
-      # Pass the current backtrace as the parent_backtrace to the cause to shorten cause's backtrace list
-      error_hash['cause'] = get_exception_with_cause_hash(cause, exc.backtrace, max_depth_left: max_depth_left - 1)
-    end
-
-    error_hash
-  end
-
-  def backtrace_for(exception, parent_backtrace = nil)
-    backtrace = exception.backtrace || []
-    if parent_backtrace
-      common_lines = backtrace.reverse.zip(parent_backtrace.reverse).take_while { |a, b| a == b }
-
-      backtrace = backtrace[0...-common_lines.length] if common_lines.any?
-    end
-
-    backtrace
-  end
-end