Notify When Sidekiq Job Defined Threshold or sidekiq.attempt_threshold is Reached

CHANGELOG.md

@@ -4,6 +4,8 @@ CHANGELOG](http://keepachangelog.com/) for how to update this file. This project
 adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Changed
+- Issue a Notification from a Sidekiq job when either the `sidekiq.attempt_threshold` is reached OR if the job defined retry threshold is reached, whichever comes first.
 
 ## [4.1.0] - 2018-10-16
 ### Added

lib/honeybadger/plugins/sidekiq.rb

@@ -25,7 +25,15 @@ def call(worker, msg, queue)
             ::Sidekiq.configure_server do |sidekiq|
               sidekiq.error_handlers << lambda {|ex, params|
                 job = params[:job] || params
-                return if job['retry'.freeze] && job['retry_count'.freeze].to_i < config[:'sidekiq.attempt_threshold'].to_i
+                retry_count = job['retry_count'.freeze].to_i
+                retry_opt = job['retry'.freeze]
+                max_retries = if retry_opt.is_a?(Integer)
+                  [retry_opt - 1, config[:'sidekiq.attempt_threshold'].to_i].min
+                else
+                  config[:'sidekiq.attempt_threshold'].to_i
+                end
+
+                return if retry_opt && retry_count < max_retries
                 opts = {parameters: params}
                 opts[:component] = job['wrapped'.freeze] || job['class'.freeze] if config[:'sidekiq.use_component']
                 Honeybadger.notify(ex, opts)

spec/unit/honeybadger/plugins/sidekiq_spec.rb

@@ -141,6 +141,15 @@ def self.configure_server
                 sidekiq_config.error_handlers[0].call(exception, job_context)
               end
             end
+
+            context "and the retry count meets the job set threshold" do
+              let(:job) { { 'retry_count' => 2, 'retry' => 2 } }
+
+              it "notifies Honeybadger" do
+                expect(Honeybadger).to receive(:notify).with(exception, { parameters: job_context, component: nil }).once
+                sidekiq_config.error_handlers[0].call(exception, job_context)
+              end
+            end
           end
         end
       end