Merge pull request rails#55435 from byroot/rescue-from-namespace

Fix ActiveSupport::Rescuable not to be coupled with ActionController

Author: byroot

actionpack/lib/action_controller/metal/rescue.rb

@@ -13,6 +13,15 @@ module Rescue
     extend ActiveSupport::Concern
     include ActiveSupport::Rescuable
 
+    module ClassMethods
+      def handler_for_rescue(exception, ...) # :nodoc:
+        if handler = super
+          ActiveSupport::Notifications.instrument("rescue_from_callback.action_controller", exception: exception)
+          handler
+        end
+      end
+    end
+
     # Override this method if you want to customize when detailed exceptions must be
     # shown. This method is only called when `consider_all_requests_local` is
     # `false`. By default, it returns `false`, but someone may set it to

activesupport/lib/active_support/rescuable.rb

@@ -92,7 +92,6 @@ def rescue_with_handler(exception, object: self, visited_exceptions: [])
 
         if handler = handler_for_rescue(exception, object: object)
           handler.call exception
-          ActiveSupport::Notifications.instrument("rescue_from_callback.action_controller", exception: exception)
           exception
         elsif exception
           if visited_exceptions.include?(exception.cause)