exception_handling 2.14.0 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0376880c57db8a6bc22e3f3c12aa587baacdbc89aa0a21d1d7ed325d785fa56d'
-  data.tar.gz: 7eacb94e4c3cf1e08b7836bbe26595bcb61031f6ccf592bba55621fb82bdce7e
+  metadata.gz: 71ab070f1ab59f2f12838fb7d123fa541a71a8bb42fe0d057f06acb015bf32a2
+  data.tar.gz: 1c268f42c4a302c88b98411890db5a4870d31bb96ca712e0f6463ba6629f188a
 SHA512:
-  metadata.gz: b409daeb7a13834e93badcfedb27dea72306f3ff25a97638b58724cf29f43c0010ad4ab1afef020603ce58ee965fe9c51aa44fcf21b9c22fd950799ce3c7b912
-  data.tar.gz: 99a954e50c9e0902235e27437badec5b83c62f3161dd73b375b7b50259894c512b6e649fd200b3d2c69c0b91fd8cedac1891d4b09ecf82054e95c539a7010cbc
+  metadata.gz: f571e8c9dd62c70eba4b01c917af6c4715e3d4750900fec8ad7e4a3d5c67fc30ddc299c1456b48adef17c74a3860769806fd0df4e410cb5180c3f778e58c1aad
+  data.tar.gz: 98f1596f0a95e1591a768b23574c76e4b4039b54a7bb95f07b4f6d41d40336bae360b7ce76750cc5fec7d9c1a64c78ffc4c72d15b88b4924734bab228bb30c94

data/.github/workflows/pipeline.yml

@@ -13,9 +13,16 @@ jobs:
         - Gemfile
         - gemfiles/rails_5.gemfile
         - gemfiles/rails_6.gemfile
+        - gemfiles/rails_7.gemfile
         exclude:
         - gemfile: Gemfile
           ruby: 2.5
+        - gemfile: gemfiles/rails_7.gemfile
+          ruby: 2.5
+        - gemfile: Gemfile
+          ruby: 2.6
+        - gemfile: gemfiles/rails_7.gemfile
+          ruby: 2.6
         - gemfile: gemfiles/rails_5.gemfile
           ruby: '3.0'
         - gemfile: gemfiles/rails_5.gemfile
@@ -27,7 +34,7 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 2.2.29
+        bundler: 2.3.26
         bundler-cache: true
     - name: Unit tests
       run: bundle exec rspec

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.5

data/Appraisals

@@ -11,3 +11,9 @@ appraise "rails-6" do
   gem 'actionpack',    '~> 6.0'
   gem 'activesupport', '~> 6.0'
 end
+
+appraise "rails-7" do
+  gem 'actionmailer',  '~> 7.0'
+  gem 'actionpack',    '~> 7.0'
+  gem 'activesupport', '~> 7.0'
+end

data/CHANGELOG.md

@@ -2,7 +2,17 @@
 
 Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+**Note:** this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [2.16.0] - 2023-05-01
+### Added
+- Add interface for automatically adding honeybadger tags `ExceptionHandling.honeybadger_auto_tagger=`
+
+## [2.15.0] - 2023-03-07
+### Added
+- Added support for ActionMailer 7.x
+- Added support for ActionPack 7.x
+- Added support for ActiveSupport 7.x
 
 ## [2.14.0] - 2023-02-22
 ### Added
@@ -103,6 +113,8 @@ Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0
 ### Changed
 - No longer depends on hobo_support. Uses invoca-utils 0.3 instead.
 
+[2.16.0]: https://github.com/Invoca/exception_handling/compare/v2.15.0...v2.16.0
+[2.15.0]: https://github.com/Invoca/exception_handling/compare/v2.14.0...v2.15.0
 [2.14.0]: https://github.com/Invoca/exception_handling/compare/v2.13.0...v2.14.0
 [2.13.0]: https://github.com/Invoca/exception_handling/compare/v2.12.0...v2.13.0
 [2.12.0]: https://github.com/Invoca/exception_handling/compare/v2.11.3...v2.12.0

data/Gemfile

@@ -2,15 +2,11 @@
 
 source 'https://rubygems.org'
 
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
-  "https://github.com/#{repo_name}.git"
-end
-
 gemspec
 
-gem 'actionmailer', '< 6.1'
-gem 'activesupport', '< 6.1'
+gem 'actionmailer', '~> 6.0'
+gem 'actionpack', '~> 6.0'
+gem 'activesupport', '~> 6.0'
 gem 'appraisal', '~> 2.2'
 gem 'honeybadger', '~> 4.11'
 gem 'pry'

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    exception_handling (2.14.0)
-      actionmailer (>= 5.2, < 7.0)
-      actionpack (>= 5.2, < 7.0)
-      activesupport (>= 5.2, < 7.0)
+    exception_handling (2.16.0)
+      actionmailer (>= 5.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       contextual_logger (~> 1.0)
       escalate (~> 0.3)
       eventmachine (~> 1.0)
@@ -144,8 +144,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (< 6.1)
-  activesupport (< 6.1)
+  actionmailer (~> 6.0)
+  actionpack (~> 6.0)
+  activesupport (~> 6.0)
   appraisal (~> 2.2)
   exception_handling!
   honeybadger (~> 4.11)
@@ -158,4 +159,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.2.29
+   2.3.22

data/README.md

@@ -25,24 +25,26 @@ Or install it yourself as:
 Add some code to initialize the settings in your application.
 For example:
 
-    require "exception_handling"
-
-    # required
-    ExceptionHandling.server_name             = Cluster['server_name']
-    ExceptionHandling.sender_address          = %("Exceptions" <exceptions@example.com>)
-    ExceptionHandling.exception_recipients    = ['exceptions@example.com']
-    ExceptionHandling.logger                  = Rails.logger
-
-    # optional
-    ExceptionHandling.escalation_recipients   = ['escalation@example.com']
-    ExceptionHandling.filter_list_filename    = "#{Rails.root}/config/exception_filters.yml"
-    ExceptionHandling.email_environment       = Rails.env
-    ExceptionHandling.eventmachine_safe       = false
-    ExceptionHandling.eventmachine_synchrony  = false
-    ExceptionHandling.sensu_host              = "127.0.0.1"
-    ExceptionHandling.sensu_port              = 3030
-    ExceptionHandling.sensu_prefix            = ""
-
+```ruby
+require "exception_handling"
+
+# required
+ExceptionHandling.server_name             = Cluster['server_name']
+ExceptionHandling.sender_address          = %("Exceptions" <exceptions@example.com>)
+ExceptionHandling.exception_recipients    = ['exceptions@example.com']
+ExceptionHandling.logger                  = Rails.logger
+
+# optional
+ExceptionHandling.escalation_recipients   = ['escalation@example.com']
+ExceptionHandling.filter_list_filename    = "#{Rails.root}/config/exception_filters.yml"
+ExceptionHandling.email_environment       = Rails.env
+ExceptionHandling.eventmachine_safe       = false
+ExceptionHandling.eventmachine_synchrony  = false
+ExceptionHandling.sensu_host              = "127.0.0.1"
+ExceptionHandling.sensu_port              = 3030
+ExceptionHandling.sensu_prefix            = ""
+ExceptionHandling.honeybadger_auto_tagger = ->(exception) { [] } # See "Automatically Tagging Exceptions" section below for examples
+```
 
 ## Usage
 
@@ -62,6 +64,40 @@ Then call any method available in the `ExceptionHandling::Methods` mixin:
       flash.now['error'] = "A specific error occurred. Support has been notified."
     end
 
+### Tagging Exceptions in Honeybadger
+
+⚠️ Honeybadger differentiates tags by spaces and/or commas, so you should **not** include spaces or commas in your tags.
+
+⚠️ Tags are case-sensitive.
+
+#### Manually Tagging Exceptions
+
+Add `:honeybadger_tags` to your `log_context` usage with an array of strings.
+
+```ruby
+log_error(ex, "A specific error occurred.", honeybadger_tags: ["critical", "sequoia"])
+```
+
+**Note**: Manual tags will be merged with any automatic tags.
+
+#### Automatically Tagging Exceptions (`honeybadger_auto_tagger=`)
+
+Configure exception handling so that you can automatically apply multiple tags to exceptions sent to honeybadger.
+
+The Proc must accept an `exception` argument that will be the exception in question and must always return an array of strings (the array can be empty).
+
+Example to enable auto-tagging:
+```ruby
+ExceptionHandling.honeybadger_auto_tagger = ->(exception) do
+  exception.message.match?(/fire/) ? ["high-urgency", "danger"] : ["low-urgency"]
+end
+```
+
+Example to disable auto-tagging:
+```ruby
+ExceptionHandling.honeybadger_auto_tagger = nil
+```
+
 ## Custom Hooks
 
 ### custom_data_hook

data/exception_handling.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
     "allowed_push_host" => "https://rubygems.org"
   }
 
-  spec.add_dependency 'actionmailer',      '>= 5.2', '< 7.0'
-  spec.add_dependency 'actionpack',        '>= 5.2', '< 7.0'
-  spec.add_dependency 'activesupport',     '>= 5.2', '< 7.0'
+  spec.add_dependency 'actionmailer',      '>= 5.2'
+  spec.add_dependency 'actionpack',        '>= 5.2'
+  spec.add_dependency 'activesupport',     '>= 5.2'
   spec.add_dependency 'contextual_logger', '~> 1.0'
   spec.add_dependency 'escalate',          '~> 0.3'
   spec.add_dependency 'eventmachine',      '~> 1.0'

data/gemfiles/rails_5.gemfile

@@ -2,8 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "actionmailer", "~> 5.2"
-gem "activesupport", "~> 5.2"
 gem "appraisal", "~> 2.2"
 gem "honeybadger", "~> 4.11"
 gem "pry"
@@ -13,6 +11,8 @@ gem "rspec"
 gem "rspec_junit_formatter"
 gem "rubocop"
 gem "test-unit"
+gem "actionmailer", "~> 5.2"
 gem "actionpack", "~> 5.2"
+gem "activesupport", "~> 5.2"
 
 gemspec path: "../"

data/gemfiles/rails_6.gemfile

@@ -2,8 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "actionmailer", "~> 6.0"
-gem "activesupport", "~> 6.0"
 gem "appraisal", "~> 2.2"
 gem "honeybadger", "~> 4.11"
 gem "pry"
@@ -13,6 +11,8 @@ gem "rspec"
 gem "rspec_junit_formatter"
 gem "rubocop"
 gem "test-unit"
+gem "actionmailer", "~> 6.0"
 gem "actionpack", "~> 6.0"
+gem "activesupport", "~> 6.0"
 
 gemspec path: "../"

data/gemfiles/rails_7.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 2.2"
+gem "honeybadger", "~> 4.11"
+gem "pry"
+gem "pry-byebug"
+gem "rake"
+gem "rspec"
+gem "rspec_junit_formatter"
+gem "rubocop"
+gem "test-unit"
+gem "actionmailer", "~> 7.0"
+gem "actionpack", "~> 7.0"
+gem "activesupport", "~> 7.0"
+
+gemspec path: "../"

data/lib/exception_handling/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExceptionHandling
-  VERSION = '2.14.0'
+  VERSION = '2.16.0'
 end

data/lib/exception_handling.rb

@@ -114,6 +114,7 @@ module ExceptionHandling # never included
     attr_reader :filter_list_filename
     attr_reader :eventmachine_safe
     attr_reader :eventmachine_synchrony
+    attr_reader :honeybadger_auto_tagger
 
     @filter_list_filename = "./config/exception_filters.yml"
     @email_environment = ""
@@ -154,6 +155,14 @@ module ExceptionHandling # never included
       @exception_catalog ||= ExceptionCatalog.new(@filter_list_filename)
     end
 
+    # rubocop:disable Style/TrivialAccessors
+    # @param value [Proc|nil] Proc that accepts 1 parameter that will be the exception object or nil to disable the auto-tagger.
+    #                         The proc is always expected to return an array of strings. The array can be empty.
+    def honeybadger_auto_tagger=(value)
+      @honeybadger_auto_tagger = value
+    end
+    # rubocop:enable Style/TrivialAccessors
+
     #
     # internal settings (don't set directly)
     #
@@ -270,9 +279,10 @@ module ExceptionHandling # never included
     def send_exception_to_honeybadger(exception_info)
       exception             = exception_info.exception
       exception_description = exception_info.exception_description
+
       # Note: Both commas and spaces are treated as delimiters for the :tags string. Space-delimiters are not officially documented.
       # https://github.com/honeybadger-io/honeybadger-ruby/pull/422
-      tags = exception_info.honeybadger_tags.join(' ')
+      tags = (honeybadger_auto_tags(exception) + exception_info.honeybadger_tags).join(' ')
       response = Honeybadger.notify(error_class: exception_description ? exception_description.filter_name : exception.class.name,
                                     error_message: exception.message.to_s,
                                     exception:     exception,
@@ -286,6 +296,18 @@ module ExceptionHandling # never included
       :failure
     end
 
+    # @param exception [Exception]
+    #
+    # @return [Array<String>]
+    def honeybadger_auto_tags(exception)
+      @honeybadger_auto_tagger&.call(exception) || []
+    rescue => ex
+      traces = ex.backtrace.join("\n")
+      message = "Unable to execute honeybadger_auto_tags callback. #{ExceptionHandling.encode_utf8(ex.message.to_s)} #{traces}\n"
+      ExceptionHandling.log_info(message)
+      []
+    end
+
     #
     # Check if Honeybadger defined.
     #

data/spec/unit/exception_handling_spec.rb

@@ -107,6 +107,11 @@ describe ExceptionHandling do
   class SmtpClientErrbackStub < SmtpClientStub
   end
 
+  before(:each) do
+    # Reset this for every test since they are applied to the class
+    ExceptionHandling.honeybadger_auto_tagger = nil
+  end
+
   context "with warn and honeybadger notify stubbed" do
     before do
       allow(ExceptionHandling).to receive(:warn).with(any_args)
@@ -149,6 +154,14 @@ describe ExceptionHandling do
           expect(service_name: 'exception_handling').to eq(logged_excluding_reload_filter.last[:context])
         end
 
+        it "passes :honeybadger_tags in log context to honeybadger" do
+          expect(Honeybadger).to receive(:notify).with(hash_including({ tags: "  , awesome  ,  totallytubular,  " }))
+          ExceptionHandling.log_error('This is an Error', 'This is the prefix context', honeybadger_tags: '  , awesome  ,  totallytubular,  ')
+
+          expect(Honeybadger).to receive(:notify).with(hash_including({ tags: "    cool  neat" }))
+          ExceptionHandling.log_error('This is an Error', 'This is the prefix context', honeybadger_tags: ["  ", " cool ", "neat"])
+        end
+
         it "logs with Severity::FATAL" do
           ExceptionHandling.log_error('This is a Warning', service_name: 'exception_handling')
           expect('FATAL').to eq(logged_excluding_reload_filter.last[:severity])
@@ -1245,6 +1258,53 @@ describe ExceptionHandling do
         expect(logged_excluding_reload_filter.size).to eq(3)
       end
     end
+
+    context "#honeybadger_auto_tagger=" do
+      context "with proc that runs successfully" do
+        before do
+          ExceptionHandling.honeybadger_auto_tagger =
+            ->(exception) do
+              if exception.message =~ /donuts/
+                ['donut-error', 'high-urgency']
+              else
+                ['low-urgency']
+              end
+            end
+        end
+
+        context "without manually passed tags" do
+          let(:exception) { StandardError.new("We are out of chocolate milk") }
+
+          it "adds tags from autotagger" do
+            expect(Honeybadger).to receive(:notify).with(hash_including({ tags: "low-urgency" }))
+            ExceptionHandling.log_error(exception, nil)
+          end
+        end
+
+        context "with manually passed tags" do
+          let(:exception) { StandardError.new("The donuts are burning") }
+
+          it "merges tags from autotagger with manually passed tags" do
+            expect(Honeybadger).to receive(:notify).with(hash_including({ tags: "donut-error high-urgency upset-customers" }))
+            ExceptionHandling.log_error(exception, nil, honeybadger_tags: ["upset-customers"])
+          end
+        end
+      end
+    end
+
+    context "with proc that raises an exception" do
+      let(:exception) { StandardError.new("Something else occurred") }
+
+      before do
+        ExceptionHandling.honeybadger_auto_tagger = ->(_exception) { raise StandardError, "boom" }
+      end
+
+      it "logs a message and returns [] for the tags" do
+        expect(Honeybadger).to receive(:notify).with(hash_including({ tags: "some-other-tag" }))
+        expect(ExceptionHandling).to receive(:log_info).with(/Unable to execute honeybadger_auto_tags callback. boom/)
+        ExceptionHandling.log_error(exception, nil, honeybadger_tags: ["some-other-tag"])
+      end
+    end
   end
 
   context "ExceptionHandling < 3.0 " do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exception_handling
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.16.0
 platform: ruby
 authors:
 - Invoca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-22 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,9 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -57,9 +45,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -67,9 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: contextual_logger
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +149,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
+- ".tool-versions"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -178,6 +161,7 @@ files:
 - exception_handling.gemspec
 - gemfiles/rails_5.gemfile
 - gemfiles/rails_6.gemfile
+- gemfiles/rails_7.gemfile
 - lib/exception_handling.rb
 - lib/exception_handling/escalate_callback.rb
 - lib/exception_handling/exception_catalog.rb