sentry-sidekiq 6.5.0 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0a76eaa44bbf8e4f50a9b1c1598cced9409ab25cddc70f682a954b5b531054c
-  data.tar.gz: f141aeaa68ef849ef8ea70b76a3d2441ea40bde2bc03611086144daf01f4cfe4
+  metadata.gz: 5c7fbbeba293c6bee632748e38c7d46150f6dd1256b8452dab432c9ae1c16329
+  data.tar.gz: 42093226a4882d561d89b1116c1b95c8f120d7376d231a122672facff7c65d00
 SHA512:
-  metadata.gz: 1cb96492fd3f3a1174937e454c9b909e7cd22d3e5dfcc080eb9af823fc5b89ec56c124a402ca65950bd351bed6d36f6e772ae6732ba59a47527f3dec0bbfefdc
-  data.tar.gz: '09be7e85fdb5ba7c31fe771414f044224bf8d16c05b9c6a5b60768d4ade0f77a099182355f9146af54bf5f34b00c52f203caca449e48d5787f208074ceb717d8'
+  metadata.gz: 4bb0c9e624ba98bf4b5ad962a20722b8c9a6ef0bfd79682deb0d393d46ae64369f8fa25074a6942bb2f54d60b5843f91c4887f42b9eb9dbfde28a38138235da9
+  data.tar.gz: 166a47b9d2ee322490466afccfdc4a3ced407791301a97a9a3330685140e246a2879e29b3206bed7256d513e482145ad854f4027f04ad6a0f6e7f1d7f15b59fc

data/lib/sentry/sidekiq/error_handler.rb

@@ -21,12 +21,14 @@ module Sentry
         scope = Sentry.get_current_scope
         scope.set_transaction_name(context_filter.transaction_name, source: :task) unless scope.transaction_name
 
+        retry_lim = retry_limit(context, sidekiq_config)
+
         # If Sentry is configured to only report an error _after_ all retries have been exhausted,
         # and if the job is retryable, and have not exceeded the retry_limit,
         # return early.
         if Sentry.configuration.sidekiq.report_after_job_retries && retryable?(context)
           retry_count = context.dig(:job, "retry_count")
-          if retry_count.nil? || retry_count < retry_limit(context, sidekiq_config) - 1
+          if retry_count.nil? || retry_count < retry_lim - 1
             return
           end
         end
@@ -43,8 +45,10 @@ module Sentry
           # attempt 2 - this is your first retry so retry_count is 0
           # attempt 3 - you have retried once, retry_count is 1
           attempt = retry_count.nil? ? 1 : retry_count.to_i + 2
+          # Cap at the final attempt so jobs with fewer retries than the threshold still report.
+          effective_threshold = [attempt_threshold, retry_lim + 1].min
 
-          return if attempt < attempt_threshold
+          return if attempt < effective_threshold
         end
 
         Sentry::Sidekiq.capture_exception(

data/lib/sentry/sidekiq/version.rb

@@ -2,6 +2,6 @@
 
 module Sentry
   module Sidekiq
-    VERSION = "6.5.0"
+    VERSION = "6.6.0"
   end
 end

data/sentry-sidekiq.gemspec

@@ -30,6 +30,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", "~> 6.5.0"
+  spec.add_dependency "sentry-ruby", "~> 6.6.0"
   spec.add_dependency "sidekiq", ">= 5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sentry-sidekiq
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 6.6.0
 platform: ruby
 authors:
 - Sentry Team
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.5.0
+        version: 6.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.5.0
+        version: 6.6.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -65,15 +65,15 @@ files:
 - lib/sentry/sidekiq/sentry_context_middleware.rb
 - lib/sentry/sidekiq/version.rb
 - sentry-sidekiq.gemspec
-homepage: https://github.com/getsentry/sentry-ruby/tree/6.5.0/sentry-sidekiq
+homepage: https://github.com/getsentry/sentry-ruby/tree/6.6.0/sentry-sidekiq
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/getsentry/sentry-ruby/tree/6.5.0/sentry-sidekiq
-  source_code_uri: https://github.com/getsentry/sentry-ruby/tree/6.5.0/sentry-sidekiq
-  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/6.5.0/CHANGELOG.md
+  homepage_uri: https://github.com/getsentry/sentry-ruby/tree/6.6.0/sentry-sidekiq
+  source_code_uri: https://github.com/getsentry/sentry-ruby/tree/6.6.0/sentry-sidekiq
+  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/6.6.0/CHANGELOG.md
   bug_tracker_uri: https://github.com/getsentry/sentry-ruby/issues
-  documentation_uri: http://www.rubydoc.info/gems/sentry-sidekiq/6.5.0
+  documentation_uri: http://www.rubydoc.info/gems/sentry-sidekiq/6.6.0
 rdoc_options: []
 require_paths:
 - lib