airbrake 13.0.3 → 13.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29da4f7ace6d408a64f855ddab6385fd40863235694a22cd31f5e46d1ae9c957
-  data.tar.gz: 4c08d2305072b5b48936e87dd2e53bf1610459637c7e23c7e75e118e475232b9
+  metadata.gz: 36be71feb2a3c598d076b4b2ba57a68b8d27b477c62411db53af82c521a10e1f
+  data.tar.gz: 50dbe6f23edc841ef8d027bab37efe3c2fd423925ca56c6113edbb2d13d60022
 SHA512:
-  metadata.gz: 9ddb0e206f5723439061ca14af99f2c228f80f6db5907f07a16a8fde611b4f1e13533a0dea5e5b27d564a90e3044fb449fa09731274042c59fbb84bdb7f83af1
-  data.tar.gz: b78091a0e4391c27eea3c884130e1c6515cf10cf417ea29ec6c6df32075f5917dead2efd2f6e42395a64142f761d3870408ba5f7c7fb3ed1a90f53204c7bc8b2
+  metadata.gz: 716a0ab382e63107913652c09a4f095ee7506d196cfaeb709fa5cf99feecfe5888c3fce2453e543f92c8bd9c35cf9bd570d97b1cff8cebdb888747d8e58c6dae
+  data.tar.gz: cf8e839c634fa6530cb0f0eb1a1b1e6115d1fff13e87378c4d9c4d395675ba6c3c924e7b0f0c0a2c60c53d9321d06a94d27314bcdb5902988afbae32395230ff

data/lib/airbrake/rails/event.rb

@@ -17,7 +17,6 @@ module Airbrake
 
       def initialize(*args)
         @event = ActiveSupport::Notifications::Event.new(*args)
-        @rails_7_or_greater = ::Rails::VERSION::MAJOR >= 7
       end
 
       def method
@@ -54,7 +53,11 @@ module Airbrake
         #
         # Relevant commit:
         # https://github.com/rails/rails/commit/81d0dc90becfe0b8e7f7f26beb66c25d84b8ec7f
-        @rails_7_or_greater ? @event.time / MILLISECOND : @event.time
+        #
+        # Ensure this conversion is applied exclusively for Rails 7.0
+        return @event.time / MILLISECOND if rails_7_0?
+
+        @event.time
       end
 
       def groups
@@ -88,6 +91,10 @@ module Airbrake
       def duration
         @event.duration
       end
+
+      def rails_7_0?
+        ::Rails::VERSION::MAJOR == 7 && ::Rails::VERSION::MINOR == 0
+      end
     end
   end
 end

data/lib/airbrake/sidekiq/retryable_jobs_filter.rb

@@ -6,17 +6,20 @@ module Airbrake
     # by Sidekiq
     # @since v7.3.0
     class RetryableJobsFilter
-      if Gem::Version.new(::Sidekiq::VERSION) < Gem::Version.new('5.0.0')
+      SIDEKIQ_GTE_5_0_0 = Gem::Version.new(::Sidekiq::VERSION) >= Gem::Version.new('5.0.0')
+      SIDEKIQ_GTE_7_0_0 = Gem::Version.new(::Sidekiq::VERSION) >= Gem::Version.new('7.0.0')
+
+      if SIDEKIQ_GTE_5_0_0
+        require 'sidekiq/job_retry'
+        DEFAULT_MAX_RETRY_ATTEMPTS = ::Sidekiq::JobRetry::DEFAULT_MAX_RETRY_ATTEMPTS
+      else
         require 'sidekiq/middleware/server/retry_jobs'
         DEFAULT_MAX_RETRY_ATTEMPTS = \
           ::Sidekiq::Middleware::Server::RetryJobs::DEFAULT_MAX_RETRY_ATTEMPTS
-      else
-        require 'sidekiq/job_retry'
-        DEFAULT_MAX_RETRY_ATTEMPTS = ::Sidekiq::JobRetry::DEFAULT_MAX_RETRY_ATTEMPTS
       end
 
       def initialize(max_retries: nil)
-        @max_retries = max_retries
+        @retries_before_notify = max_retries
       end
 
       def call(notice)
@@ -36,8 +39,8 @@ module Airbrake
       end
 
       def max_attempts_for(job)
-        if @max_retries
-          @max_retries
+        if @retries_before_notify
+          @retries_before_notify
         elsif job['retry'].is_a?(Integer)
           job['retry']
         else
@@ -46,7 +49,10 @@ module Airbrake
       end
 
       def max_retries
-        @max_retries ||= ::Sidekiq.options[:max_retries] || DEFAULT_MAX_RETRY_ATTEMPTS
+        @max_retries ||= begin
+          config = SIDEKIQ_GTE_7_0_0 ? ::Sidekiq.default_configuration : ::Sidekiq.options
+          config[:max_retries] || DEFAULT_MAX_RETRY_ATTEMPTS
+        end
       end
     end
   end

data/lib/airbrake/version.rb

@@ -3,5 +3,5 @@
 # We use Semantic Versioning v2.0.0
 # More information: http://semver.org/
 module Airbrake
-  AIRBRAKE_VERSION = '13.0.3'
+  AIRBRAKE_VERSION = '13.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 13.0.3
+  version: 13.0.5
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-20 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake-ruby
@@ -349,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.20
 signing_key:
 specification_version: 4
 summary: Airbrake is an online tool that provides robust exception tracking in any