honeybadger 4.5.6 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baff304bc3d7912d3643efbc651829441b80b52d7a48d8c2ecb7bc9ab35aac81
-  data.tar.gz: 3892040a92da339c9f41960c61a2ad30d16597f984f630e595cc2b9fd1c7e31a
+  metadata.gz: a0a903cc9a64fe0e5b5bcbfef32b81656217d38316ffc66d368d8cc8982bdc04
+  data.tar.gz: fd4ff117b94da660a2039ebc106e7c29430834f3c691c6940cc1bc483dcbc0ac
 SHA512:
-  metadata.gz: e29645665a943c5e9055bd0ecd481f289ffb230c113a776311317b6d3ce65f6003bfa0cc7dd2e7461b1ca0b226e36fa73288d27dda124832051b059d090ef7e5
-  data.tar.gz: 834c71bf1fd0d35512025d73c39485bb95fb513001acec616c342d2a4a42b4c297690415c2a2e4e00098f4d890646bc0427ff4b6f05552d94e44f77de7e6894c
+  metadata.gz: e3f58753fa625545ffba12aaa7d9a86e3f8c7c8e3dc6ca1eaa518dd69e1636ef03d4a4b8a71677f34d8816166700102962e94288cb4e82913d1f5c2c0b6564f7
+  data.tar.gz: 33459d61b1eae5ab575f65a0ff6b1b7e64a891538b4f5508fe3a45b72fa8c47830a55007858f8aaef97b1c5eaf22a6efdfa3e9147e53eda9a9cde8e854335f7f

data/CHANGELOG.md

@@ -5,6 +5,15 @@ adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [4.6.0] - 2020-03-12
+### Fixed
+- Fixed issue where Sidekiq.attempt_threshold was triggering 2 attempts ahead
+  of the setting
+- Dup notify opts before mutating (#345)
+### Changed
+- Breadcrumbs on by default
+- Added Faktory plugin -@scottrobertson
+
 ## [4.5.6] - 2020-01-08
 ### Fixed
 - Fix remaining Ruby 2.7 deprecation warnings

data/lib/honeybadger/agent.rb

@@ -115,6 +115,8 @@ module Honeybadger
     # @return [String] UUID reference to the notice within Honeybadger.
     # @return [false] when ignored.
     def notify(exception_or_opts, opts = {})
+      opts = opts.dup
+
       if exception_or_opts.is_a?(Exception)
         opts[:exception] = exception_or_opts
       elsif exception_or_opts.respond_to?(:to_hash)

data/lib/honeybadger/config/defaults.rb

@@ -279,6 +279,11 @@ module Honeybadger
         default: 0,
         type: Integer
       },
+      :'faktory.attempt_threshold' => {
+        description: 'The number of attempts before notifications will be sent.',
+        default: 0,
+        type: Integer
+      },
       :'sidekiq.use_component' => {
         description: 'Automatically set the component to the class of the job. Helps with grouping.',
         default: true,
@@ -295,8 +300,8 @@ module Honeybadger
         type: Boolean
       },
       :'breadcrumbs.enabled' => {
-        description: 'Enable/Disable breadcrumb functionality.',
-        default: false,
+        description: 'Disable breadcrumb functionality.',
+        default: true,
         type: Boolean
       },
       :'breadcrumbs.active_support_notifications' => {

data/lib/honeybadger/plugins/faktory.rb

@@ -0,0 +1,52 @@
+require 'honeybadger/plugin'
+require 'honeybadger/ruby'
+
+module Honeybadger
+  module Plugins
+    module Faktory
+      class Middleware
+        def call(worker, job)
+          Honeybadger.clear!
+          yield
+        end
+      end
+
+      Plugin.register do
+        requirement { defined?(::Faktory) }
+
+        execution do
+          ::Faktory.configure_worker do |faktory|
+            faktory.worker_middleware do |chain|
+              chain.prepend Middleware
+            end
+          end
+
+          ::Faktory.configure_worker do |faktory|
+            faktory.error_handlers << lambda do |ex, params|
+              opts = {parameters: params}
+
+              if job = params[:job]
+                if (threshold = config[:'faktory.attempt_threshold'].to_i) > 0
+                  # If job.failure is nil, it is the first attempt. The first
+                  # retry has a job.failure.retry_count of 0, which would be
+                  # the second attempt in our case.
+                  retry_count = job.dig('failure', 'retry_count')
+                  attempt = retry_count ? retry_count + 1 : 0
+
+                  limit = [job['retry'].to_i, threshold].min
+
+                  return if attempt < limit
+                end
+
+                opts[:component] = job['jobtype']
+                opts[:action] = 'perform'
+              end
+
+              Honeybadger.notify(ex, opts)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/honeybadger/plugins/sidekiq.rb

@@ -25,20 +25,30 @@ module Honeybadger
             ::Sidekiq.configure_server do |sidekiq|
               sidekiq.error_handlers << lambda {|ex, params|
                 job = params[:job] || params
-                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
+                job_retry = job['retry'.freeze]
+
+                if (threshold = config[:'sidekiq.attempt_threshold'].to_i) > 0 && job_retry
+                  # We calculate the job attempts to determine the need to
+                  # skip. Sidekiq's first job execution will have nil for the
+                  # 'retry_count' job key. The first retry will have 0 set for
+                  # the 'retry_count' key, incrementing on each execution
+                  # afterwards.
+                  retry_count = job['retry_count'.freeze]
+                  attempt = retry_count ? retry_count + 1 : 0
+
+                  # Ensure we account for modified max_retries setting
+                  retry_limit = job_retry == true ? (sidekiq.options[:max_retries] || 25) : job_retry.to_i
+                  limit = [retry_limit, threshold].min
+
+                  return if attempt < limit
                 end
 
-                return if retry_opt && retry_count < max_retries
                 opts = {parameters: params}
                 if config[:'sidekiq.use_component']
                   opts[:component] = job['wrapped'.freeze] || job['class'.freeze]
                   opts[:action] = 'perform' if opts[:component]
                 end
+
                 Honeybadger.notify(ex, opts)
               }
             end

data/lib/honeybadger/version.rb

@@ -1,4 +1,4 @@
 module Honeybadger
   # The current String Honeybadger version.
-  VERSION = '4.5.6'.freeze
+  VERSION = '4.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 4.5.6
+  version: 4.6.0
 platform: ruby
 authors:
 - Honeybadger Industries LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies: []
 description: Make managing application errors a more pleasant experience.
 email:
@@ -65,6 +65,7 @@ files:
 - lib/honeybadger/plugins/breadcrumbs.rb
 - lib/honeybadger/plugins/delayed_job.rb
 - lib/honeybadger/plugins/delayed_job/plugin.rb
+- lib/honeybadger/plugins/faktory.rb
 - lib/honeybadger/plugins/lambda.rb
 - lib/honeybadger/plugins/local_variables.rb
 - lib/honeybadger/plugins/passenger.rb
@@ -152,8 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Error reports you can be happy about.