sentry-sidekiq 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 190358badacd5bf9dad3a146e770c0b94611aa26c80b55bc75878373c930209c
-  data.tar.gz: ab2e94c5aba038a3afd72f673dcba48245d890ef4834d82748570360fb7cbe42
+  metadata.gz: 6cd295531adb3dd14814bfa16a5dbdfee77a3f0db73ad99abd1126e01e60ffc1
+  data.tar.gz: 8770a632c91a527d6c931a8aece097a4cddc9c325b87a247799739859948035e
 SHA512:
-  metadata.gz: 6097d32f63c9fee8247e39201e309487999a628fc048f8a7fab51b6aa57764cc965b8e76adad4a7fe376b91b74b62199f7aff80297a9a7a17ea0e528ccbc15ae
-  data.tar.gz: d8ef6a8cd5a309adc72d19cf6e5c90fb269fc512d680caeb1430f398479e72a494cda206f79ffe07c73ce905c3fcf80c3dd5399c29e3fd050023442aec906c1e
+  metadata.gz: 0d153c74df75bcbfafbce65750a7b1fc95935ec9ef8a70dee516f11406f062662f58e269c3504d9faefee39099a09cddcc9a538ce747d98475eeb97149d5b6fb
+  data.tar.gz: 5b7dc7124ffd09989b2884e13b37d505437e457dfb2a835d322fc465d25f0afdf14ee454bccd8466183f9a429eb6266854b84c11d2bb52965c9eb5dbfff2d3e1

data/lib/sentry/sidekiq/error_handler.rb

@@ -11,11 +11,9 @@ module Sentry
         scope = Sentry.get_current_scope
         scope.set_transaction_name(context_filter.transaction_name) unless scope.transaction_name
 
-        retry_option = context.dig(:job, "retry")
-
-        if Sentry.configuration.sidekiq.report_after_job_retries && retry_option.is_a?(Integer) && retry_option.positive?
+        if Sentry.configuration.sidekiq.report_after_job_retries && retryable?(context)
           retry_count = context.dig(:job, "retry_count")
-          if retry_count.nil? || retry_count < retry_option - 1
+          if retry_count.nil? || retry_count < retry_limit(context) - 1
             return
           end
         end
@@ -26,6 +24,27 @@ module Sentry
           hint: { background: false }
         )
       end
+
+      private
+
+      def retryable?(context)
+        retry_option = context.dig(:job, "retry")
+        # when `retry` is not specified, it's default is `true` and it means 25 retries.
+        retry_option == true || (retry_option.is_a?(Integer) && retry_option.positive?)
+      end
+
+      def retry_limit(context)
+        limit = context.dig(:job, "retry")
+
+        case limit
+        when Integer
+          limit
+        when TrueClass
+          ::Sidekiq.options[:max_retries] || 25
+        else
+          0
+        end
+      end
     end
   end
 end

data/lib/sentry/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Sidekiq
-    VERSION = "5.0.1"
+    VERSION = "5.0.2"
   end
 end

data/sentry-sidekiq.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sentry-ruby-core", "~> 5.0.1"
+  spec.add_dependency "sentry-ruby-core", "~> 5.0.2"
   spec.add_dependency "sidekiq", ">= 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-sidekiq
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-23 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sentry-ruby-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement