exception_handling 2.16.0 → 3.0.pre.1

data/lib/exception_handling/methods.rb

@@ -1,15 +1,65 @@
 # frozen_string_literal: true
 
 require 'active_support/concern'
-require_relative 'logging_methods'
 
 module ExceptionHandling
   module Methods # included on models and controllers
     extend ActiveSupport::Concern
-    include ExceptionHandling::LoggingMethods
 
     protected
 
+    def log_error(exception_or_string, exception_context = '')
+      controller = self if respond_to?(:request) && respond_to?(:session)
+      ExceptionHandling.log_error(exception_or_string, exception_context, controller)
+    end
+
+    def log_error_rack(exception_or_string, exception_context = '', rack_filter = '')
+      ExceptionHandling.log_error_rack(exception_or_string, exception_context, rack_filter)
+    end
+
+    def log_warning(message)
+      ExceptionHandling.log_warning(message)
+    end
+
+    def log_info(message)
+      ExceptionHandling.logger.info(message)
+    end
+
+    def log_debug(message)
+      ExceptionHandling.logger.debug(message)
+    end
+
+    def ensure_safe(exception_context = "")
+      yield
+    rescue => ex
+      log_error ex, exception_context
+      nil
+    end
+
+    def escalate_error(exception_or_string, email_subject)
+      ExceptionHandling.escalate_error(exception_or_string, email_subject)
+    end
+
+    def escalate_warning(message, email_subject)
+      ExceptionHandling.escalate_warning(message, email_subject)
+    end
+
+    def ensure_escalation(*args)
+      ExceptionHandling.ensure_escalation(*args) do
+        yield
+      end
+    end
+
+    def alert_warning(*args)
+      ExceptionHandling.alert_warning(*args)
+    end
+
+    def ensure_alert(*args)
+      ExceptionHandling.ensure_alert(*args) do
+        yield
+      end
+    end
+
     def long_controller_action_timeout
       if defined?(Rails) && Rails.respond_to?(:env) && Rails.env == 'test'
         300
@@ -38,10 +88,7 @@ module ExceptionHandling
     end
 
     included do
-      Deprecation3_0.deprecation_warning('ExceptionHandling::Methods', 'include LoggingMethods; in controllers, set your own around_filter to set logging context')
-      if respond_to? :around_filter
-        around_filter :set_current_controller
-      end
+      around_filter :set_current_controller if respond_to? :around_filter
     end
 
     class_methods do

data/lib/exception_handling/testing.rb

@@ -4,7 +4,7 @@
 
 module ExceptionHandling
   module Testing
-    class ControllerStubBase
+    class ControllerStub
 
       class Request
         attr_accessor :parameters, :protocol, :host, :request_uri, :env, :session_options
@@ -25,7 +25,7 @@ module ExceptionHandling
         attr_accessor :around_filter_method
 
         def around_filter(method)
-          self.around_filter_method = method
+          ControllerStub.around_filter_method = method
         end
       end
 
@@ -44,6 +44,14 @@ module ExceptionHandling
           end
       end
 
+      def simulate_around_filter(&block)
+        set_current_controller(&block)
+      end
+
+      def controller_name
+        "ControllerStub"
+      end
+
       def action_name
         "test_action"
       end
@@ -51,27 +59,9 @@ module ExceptionHandling
       def complete_request_uri
         "#{@request.protocol}#{@request.host}#{@request.request_uri}"
       end
-    end
-
-    class LoggingMethodsControllerStub < ControllerStubBase
-      include ExceptionHandling::LoggingMethods
-
-      def controller_name
-        "LoggingMethodsControllerStub"
-      end
-    end
 
-    class MethodsControllerStub < ControllerStubBase
       include ExceptionHandling::Methods
       set_long_controller_action_timeout 2
-
-      def simulate_around_filter(&block)
-        set_current_controller(&block)
-      end
-
-      def controller_name
-        "MethodsControllerStub"
-      end
     end
   end
 end

data/lib/exception_handling/version.rb

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

data/lib/exception_handling.rb

@@ -1,21 +1,20 @@
 # frozen_string_literal: true
 
-require 'digest'
 require 'timeout'
 require 'active_support'
-require 'active_support/core_ext'
+require 'active_support/core_ext/hash'
 require 'contextual_logger'
 
 require 'invoca/utils'
 
-require 'exception_handling/mailer'
-require 'exception_handling/sensu'
-require 'exception_handling/methods'
-require 'exception_handling/log_stub_error'
-require 'exception_handling/exception_description'
-require 'exception_handling/exception_catalog'
-require 'exception_handling/exception_info'
-require 'exception_handling/escalate_callback'
+require "exception_handling/mailer"
+require "exception_handling/sensu"
+require "exception_handling/methods"
+require "exception_handling/log_stub_error"
+require "exception_handling/exception_description"
+require "exception_handling/exception_catalog"
+require "exception_handling/exception_info"
+require "exception_handling/honeybadger_callbacks.rb"
 
 _ = ActiveSupport::HashWithIndifferentAccess
 
@@ -30,8 +29,6 @@ module ExceptionHandling # never included
   AUTHENTICATION_HEADERS = ['HTTP_AUTHORIZATION', 'X-HTTP_AUTHORIZATION', 'X_HTTP_AUTHORIZATION', 'REDIRECT_X_HTTP_AUTHORIZATION'].freeze
   HONEYBADGER_STATUSES   = [:success, :failure, :skipped].freeze
 
-  Deprecation3_0 = ActiveSupport::Deprecation.new('3.0', 'exception_handling')
-
   class << self
 
     #
@@ -53,28 +50,15 @@ module ExceptionHandling # never included
       @exception_recipients or raise ArgumentError, "You must assign a value to #{name}.exception_recipients"
     end
 
-    def configured?
-      !@logger.nil?
-    end
-
     def logger
       @logger or raise ArgumentError, "You must assign a value to #{name}.logger"
     end
 
     def logger=(logger)
-      @logger = if logger.nil? || logger.is_a?(ContextualLogger::LoggerMixin)
-                  logger
-                else
-                  Deprecation3_0.deprecation_warning('implicit extend with ContextualLogger::LoggerMixin', 'extend your logger instance or include into your logger class first')
-                  logger.extend(ContextualLogger::LoggerMixin)
-                end
-      EscalateCallback.register_if_configured!
+      @logger = logger.is_a?(ContextualLogger) ? logger : ContextualLogger.new(logger)
     end
 
-    def default_metric_name(exception_data, exception, treat_like_warning, include_prefix: true)
-      include_prefix and Deprecation3_0.deprecation_warning("the 'expection_handling.' prefix in ExceptionHandling::default_metric_name",
-                                                            "do not rely on metric names including the 'exception_handling.' prefix.")
-
+    def default_metric_name(exception_data, exception, treat_like_warning)
       metric_name = if exception_data['metric_name']
                       exception_data['metric_name']
                     elsif exception.is_a?(ExceptionHandling::Warning)
@@ -86,7 +70,7 @@ module ExceptionHandling # never included
                       "exception"
                     end
 
-      "#{'exception_handling.' if include_prefix}#{metric_name}"
+      "exception_handling.#{metric_name}"
     end
 
     def default_honeybadger_metric_name(honeybadger_status)
@@ -114,7 +98,6 @@ 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 = ""
@@ -155,14 +138,6 @@ 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)
     #
@@ -202,18 +177,13 @@ module ExceptionHandling # never included
     #   Called directly by our code, usually from rescue blocks.
     #   Writes to log file and may send to honeybadger
     #
-    # TODO: the **log_context means we can never have context named treat_like_warning. In general, keyword args will be conflated with log_context.
-    # Ideally we'd separate to log_context from the other keywords so they don't interfere in any way. Or have no keyword args.
-    #
     # Functional Test Operation:
     #   Calls into handle_stub_log_error and returns. no log file. no honeybadger
     #
-    def log_error(exception_or_string, exception_context = '', controller = nil, treat_like_warning: false, **log_context, &data_callback)
+    def log_error(exception_or_string, exception_context = '', treat_like_warning: false, **log_context, &data_callback)
       ex = make_exception(exception_or_string)
       timestamp = set_log_error_timestamp
-      exception_info = ExceptionInfo.new(ex, exception_context, timestamp,
-                                         controller: controller || current_controller, data_callback: data_callback,
-                                         log_context: log_context)
+      exception_info = ExceptionInfo.new(ex, exception_context, timestamp, current_controller, data_callback)
 
       if stub_handler
         stub_handler.handle_stub_log_error(exception_info.data)
@@ -240,13 +210,7 @@ module ExceptionHandling # never included
     #
     def write_exception_to_log(ex, exception_context, timestamp, log_context = {})
       ActiveSupport::Deprecation.silence do
-        log_message = "#{exception_context}\n#{ex.class}: (#{encode_utf8(ex.message.to_s)}):\n  " + clean_backtrace(ex).join("\n  ") + "\n\n"
-
-        if ex.is_a?(Warning)
-          ExceptionHandling.logger.warn("\nExceptionHandlingWarning (Warning:#{timestamp}) #{log_message}", **log_context)
-        else
-          ExceptionHandling.logger.fatal("\nExceptionHandlingError (Error:#{timestamp}) #{log_message}", **log_context)
-        end
+        ExceptionHandling.logger.fatal("\nExceptionHandlingError (Error:#{timestamp}) #{ex.class} #{exception_context} (#{encode_utf8(ex.message.to_s)}):\n  " + clean_backtrace(ex).join("\n  ") + "\n\n", log_context)
       end
     end
 
@@ -279,16 +243,11 @@ 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 = (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,
                                     context:       exception_info.honeybadger_context_data,
-                                    controller:    exception_info.controller_name,
-                                    tags:          tags)
+                                    controller:    exception_info.controller_name)
       response ? :success : :failure
     rescue Exception => ex
       warn("ExceptionHandling.send_exception_to_honeybadger rescued exception while logging #{exception_info.exception_context}:\n#{exception.class}: #{exception.message}:\n#{ex.class}: #{ex.message}\n#{ex.backtrace.join("\n")}")
@@ -296,18 +255,6 @@ 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.
     #
@@ -318,41 +265,38 @@ module ExceptionHandling # never included
     #
     # Expects passed in hash to only include keys which be directly set on the Honeybadger config
     #
-    def enable_honeybadger(**config)
+    def enable_honeybadger(config = {})
       Bundler.require(:honeybadger)
+      HoneybadgerCallbacks.register_callbacks
       Honeybadger.configure do |config_klass|
         config.each do |k, v|
-          if k == :before_notify
-            config_klass.send(k, v)
-          else
-            config_klass.send(:"#{k}=", v)
-          end
+          config_klass.send(:"#{k}=", v)
         end
       end
     end
 
-    def log_warning(message, **log_context)
+    def log_warning(message, log_context = {})
       warning = Warning.new(message)
       warning.set_backtrace([])
       log_error(warning, **log_context)
     end
 
-    def log_info(message, **log_context)
-      ExceptionHandling.logger.info(message, **log_context)
+    def log_info(message, log_context = {})
+      ExceptionHandling.logger.info(message, log_context)
     end
 
-    def log_debug(message, **log_context)
-      ExceptionHandling.logger.debug(message, **log_context)
+    def log_debug(message, log_context = {})
+      ExceptionHandling.logger.debug(message, log_context)
     end
 
-    def ensure_safe(exception_context = "", **log_context)
+    def ensure_safe(exception_context = "", log_context = {})
       yield
     rescue => ex
       log_error(ex, exception_context, **log_context)
       nil
     end
 
-    def ensure_completely_safe(exception_context = "", **log_context)
+    def ensure_completely_safe(exception_context = "", log_context = {})
       yield
     rescue SystemExit, SystemStackError, NoMemoryError, SecurityError, SignalException
       raise
@@ -367,29 +311,26 @@ module ExceptionHandling # never included
       escalate(email_subject, ex, last_exception_timestamp, production_support_recipients)
     end
 
-    def escalate_error(exception_or_string, email_subject, custom_recipients = nil, **log_context)
+    def escalate_error(exception_or_string, email_subject, custom_recipients = nil, log_context = {})
       ex = make_exception(exception_or_string)
       log_error(ex, **log_context)
       escalate(email_subject, ex, last_exception_timestamp, custom_recipients)
     end
 
-    def escalate_warning(message, email_subject, custom_recipients = nil, **log_context)
+    def escalate_warning(message, email_subject, custom_recipients = nil, log_context = {})
       ex = Warning.new(message)
       log_error(ex, **log_context)
       escalate(email_subject, ex, last_exception_timestamp, custom_recipients)
     end
 
-    def ensure_escalation(email_subject, custom_recipients = nil, **log_context)
+    def ensure_escalation(email_subject, custom_recipients = nil, log_context = {})
       yield
     rescue => ex
-      escalate_error(ex, email_subject, custom_recipients, **log_context)
+      escalate_error(ex, email_subject, custom_recipients, log_context)
       nil
     end
 
-    deprecate :escalate_to_production_support, :escalate_error, :escalate_warning, :ensure_escalation,
-      deprecator: ActiveSupport::Deprecation.new('3.0', 'ExceptionHandling')
-
-    def alert_warning(exception_or_string, alert_name, exception_context, **log_context)
+    def alert_warning(exception_or_string, alert_name, exception_context, log_context)
       ex = make_exception(exception_or_string)
       log_error(ex, exception_context, **log_context)
       begin
@@ -399,10 +340,10 @@ module ExceptionHandling # never included
       end
     end
 
-    def ensure_alert(alert_name, exception_context, **log_context)
+    def ensure_alert(alert_name, exception_context, log_context = {})
       yield
     rescue => ex
-      alert_warning(ex, alert_name, exception_context, **log_context)
+      alert_warning(ex, alert_name, exception_context, log_context)
       nil
     end
 
@@ -419,7 +360,7 @@ module ExceptionHandling # never included
       result
     end
 
-    def log_periodically(exception_key, interval, message, **log_context)
+    def log_periodically(exception_key, interval, message, log_context = {})
       self.periodic_exception_intervals ||= {}
       last_logged = self.periodic_exception_intervals[exception_key]
       if !last_logged || ((last_logged + interval) < Time.now)
@@ -522,6 +463,4 @@ module ExceptionHandling # never included
       end
     end
   end
-
-  EscalateCallback.register_if_configured!
 end

data/semaphore_ci/setup.sh

@@ -0,0 +1,3 @@
+#!/bin/sh -x
+
+bundle install --path vendor/bundle

data/{spec → test}/helpers/exception_helpers.rb

@@ -7,7 +7,7 @@ module ExceptionHelpers
 
   def exception_with_nil_message
     exception_with_nil_message = RuntimeError.new(nil)
-    allow(exception_with_nil_message).to receive(:message).and_return(nil)
+    stub(exception_with_nil_message).message { nil }
     exception_with_nil_message
   end
 
@@ -15,6 +15,6 @@ module ExceptionHelpers
 
   def capture_notifications
     @sent_notifications = []
-    allow(ExceptionHandling).to receive(:send_exception_to_honeybadger).with(any_args) { |exception_info| @sent_notifications << exception_info }
+    stub(ExceptionHandling).send_exception_to_honeybadger(anything) { |exception_info| @sent_notifications << exception_info }
   end
 end

data/{spec/spec_helper.rb → test/test_helper.rb}

@@ -1,9 +1,15 @@
 # frozen_string_literal: true
 
-require 'rspec'
-require 'rspec/mocks'
-require 'rspec_junit_formatter'
-
+require 'active_support'
+require 'active_support/time'
+require 'active_support/test_case'
+require 'active_model'
+require 'action_mailer'
+require 'action_dispatch'
+require 'hobo_support'
+require 'shoulda'
+require 'rr'
+require 'minitest/autorun'
 require 'pry'
 require 'honeybadger'
 require 'contextual_logger'
@@ -11,31 +17,26 @@ require 'contextual_logger'
 require 'exception_handling'
 require 'exception_handling/testing'
 
+ActiveSupport::TestCase.test_order = :sorted
+
 class LoggerStub
-  include ContextualLogger::LoggerMixin
-  attr_accessor :logged, :level
+  include ContextualLogger
+  attr_accessor :logged
 
   def initialize
-    @level = Logger::Severity::DEBUG
-    @progname = nil
-    @logdev = nil
     clear
   end
 
-  def debug(message, log_context = {})
-    logged << { message: message, context: log_context, severity: 'DEBUG' }
-  end
-
   def info(message, log_context = {})
-    logged << { message: message, context: log_context, severity: 'INFO' }
+    logged << { message: message, context: log_context }
   end
 
   def warn(message, log_context = {})
-    logged << { message: message, context: log_context, severity: 'WARN' }
+    logged << { message: message, context: log_context }
   end
 
   def fatal(message, log_context = {})
-    logged << { message: message, context: log_context, severity: 'FATAL' }
+    logged << { message: message, context: log_context }
   end
 
   def clear
@@ -76,17 +77,27 @@ end
 
 ActionMailer::Base.delivery_method = :test
 
+_ = ActiveSupport
+_ = ActiveSupport::TestCase
 
-module TestHelper
-  @constant_overrides = []
-  class << self
-    attr_accessor :constant_overrides
-  end
+class ActiveSupport::TestCase
+  @@constant_overrides = []
+
+  setup do
+    unless @@constant_overrides.nil? || @@constant_overrides.empty?
+      raise "Uh-oh! constant_overrides left over: #{@@constant_overrides.inspect}"
+    end
 
+    unless defined?(Rails) && defined?(Rails.env)
+      module ::Rails
+        class << self
+          attr_writer :env
 
-  def setup_constant_overrides
-    unless TestHelper.constant_overrides.nil? || TestHelper.constant_overrides.empty?
-      raise "Uh-oh! constant_overrides left over: #{TestHelper.constant_overrides.inspect}"
+          def env
+            @env ||= 'test'
+          end
+        end
+      end
     end
 
     Time.now_override = nil
@@ -106,8 +117,8 @@ module TestHelper
     ExceptionHandling.sensu_prefix            = ""
   end
 
-  def teardown_constant_overrides
-    TestHelper.constant_overrides&.reverse&.each do |parent_module, k, v|
+  teardown do
+    @@constant_overrides&.reverse&.each do |parent_module, k, v|
       ExceptionHandling.ensure_safe "constant cleanup #{k.inspect}, #{parent_module}(#{parent_module.class})::#{v.inspect}(#{v.class})" do
         silence_warnings do
           if v == :never_defined
@@ -118,7 +129,7 @@ module TestHelper
         end
       end
     end
-    TestHelper.constant_overrides = []
+    @@constant_overrides = []
   end
 
   def set_test_const(const_name, value)
@@ -138,7 +149,7 @@ module TestHelper
         end
       end
 
-    TestHelper.constant_overrides << [final_parent_module, final_const_name, original_value]
+    @@constant_overrides << [final_parent_module, final_const_name, original_value]
 
     silence_warnings { final_parent_module.const_set(final_const_name, value) }
   end
@@ -150,15 +161,15 @@ module TestHelper
     else
       original_count = 0
     end
-    expect(ActionMailer::Base.deliveries.size - original_count).to eq(expected), "wrong number of emails#{': ' + message.to_s if message}"
+    assert_equal expected, ActionMailer::Base.deliveries.size - original_count, "wrong number of emails#{': ' + message.to_s if message}"
   end
 end
 
 def assert_equal_with_diff(arg1, arg2, msg = '')
   if arg1 == arg2
-    expect(true).to be_truthy # To keep the assertion count accurate
+    assert true # To keep the assertion count accurate
   else
-    expect(arg1).to eq(arg2), "#{msg}\n#{Diff.compare(arg1, arg2)}"
+    assert_equal arg1, arg2, "#{msg}\n#{Diff.compare(arg1, arg2)}"
   end
 end
 
@@ -189,35 +200,3 @@ class Time
     end
   end
 end
-
-RSpec.configure do |config|
-  config.add_formatter(RspecJunitFormatter, 'spec/reports/rspec.xml')
-  config.include TestHelper
-
-  config.before(:each) do
-    setup_constant_overrides
-    unless defined?(Rails) && defined?(Rails.env)
-      module Rails
-        class << self
-          attr_writer :env
-
-          def env
-            @env ||= 'test'
-          end
-        end
-      end
-    end
-  end
-
-  config.after(:each) do
-    teardown_constant_overrides
-  end
-
-  config.mock_with :rspec do |mocks|
-    mocks.verify_partial_doubles = true
-  end
-
-  config.expect_with(:rspec, :test_unit)
-
-  RSpec::Support::ObjectFormatter.default_instance.max_formatted_output_length = 2_000
-end