sentry-sidekiq 4.8.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 949887e093455257abbf40b7ff7d8adbb3b28a149bc99a9668be4998089fca0c
-  data.tar.gz: c98f7768b82b010bfe34dc78b2920503e2599c1183efea781773d2be44dfa9af
+  metadata.gz: 50408c0630fd4cb16e51723cf2c728966f96850e5fb3add1fe8b787c15a52489
+  data.tar.gz: d21bac14264574baa5798542fb5a461278378cf1109dc19fa3ed8696c7c988e2
 SHA512:
-  metadata.gz: fcfcf7c10ff0ca683834944b711bcf4a57492209b32aca63505db44be6fabcd9ed3e9c1671b8fc3c993a385671c5d88d732b7498140b022d45b9e0466e487780
-  data.tar.gz: 3c6594dba69cfb982254f40442ff6817a57e35c5359e7c330c6717a7855995d463b82f11ab191346575f6054e6b65fce69f12d2a1bcbb5ae3962f448aa939c09
+  metadata.gz: 974593b68dca2bd4cc3eaf0c36ed8d66610ad7c2562bf0b645d8aa0e161b61e162423d5dc33b6b9232e0fd7d3b980c1bf7cdeb6763b7184f91fa6ddcf58f867f
+  data.tar.gz: 16c7113534b1f35e5649f79ec8b7db4a5a4a070ead2a42664a37b6a0dded8d04215a160b4f80431788804519e8de5ebeac9148de1d1958813ae58f6af51edc2a

data/Gemfile

@@ -12,7 +12,7 @@ gem "rexml"
 sidekiq_version = ENV["SIDEKIQ_VERSION"]
 sidekiq_version = "6.0" if sidekiq_version.nil?
 
-gem "rails"
+gem "rails", "< 7.0"
 gem "sidekiq", "~> #{sidekiq_version}"
 
 gem "sentry-ruby", path: "../sentry-ruby"

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 = "4.8.1"
+    VERSION = "5.1.0"
   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", "~> 4.8.1"
+  spec.add_dependency "sentry-ruby-core", "~> 5.1.0"
   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: 4.8.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-22 00:00:00.000000000 Z
+date: 2022-02-10 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: 4.8.1
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.8.1
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement