ActiveSupport::Reloader should not report exception

Since it always delegate to an actual executor that does report
them already, this cause exceptions to be reported twice.

Fix: rails#46100

Author: byroot

activesupport/lib/active_support/execution_wrapper.rb

@@ -91,7 +91,7 @@ def self.wrap(source: "application.active_support")
       begin
         yield
       rescue => error
-        error_reporter.report(error, handled: false, source: source)
+        error_reporter&.report(error, handled: false, source: source)
         raise
       ensure
         instance.complete!
@@ -108,7 +108,7 @@ def self.perform # :nodoc:
       end
     end
 
-    def self.error_reporter
+    def self.error_reporter # :nodoc:
       ActiveSupport.error_reporter
     end
 

activesupport/lib/active_support/reloader.rb

@@ -68,8 +68,15 @@ def self.run!(reset: false) # :nodoc:
 
     # Run the supplied block as a work unit, reloading code as needed
     def self.wrap(**kwargs)
+      return yield if active?
+
       executor.wrap(**kwargs) do
-        super
+        instance = run!
+        begin
+          yield
+        ensure
+          instance.complete!
+        end
       end
     end
 

activesupport/test/reloader_test.rb

@@ -85,6 +85,17 @@ def test_class_unload_block
     assert_equal [:before_unload, :unload, :after_unload, :body], called
   end
 
+  def test_report_errors_once
+    reports = ErrorCollector.record do
+      assert_raises RuntimeError do
+        reloader.wrap do
+          raise "Oops"
+        end
+      end
+    end
+    assert_equal 1, reports.size
+  end
+
   private
     def new_reloader(&check)
       Class.new(ActiveSupport::Reloader).tap do |r|