Use #report parameters in error context middleware

`ErrorReporter#report` has a number of other parameters besides context.
`source` in particular can be useful for creating metadata based on the
source of the error. Error context middleware `#call` now has the same
signature as `#report`.

Author: dersam

activesupport/CHANGELOG.md

@@ -2,7 +2,7 @@
 
     When reporting an error, the error context middleware will be called with the reported error
     and base execution context. The stack may mutate the context hash. The mutated context will
-    then be passed to error subscribers.
+    then be passed to error subscribers. Middleware receives the same parameters as `ErrorReporter#report`.
 
     *Andrew Novoselac*, *Sam Schmidt*
 

activesupport/lib/active_support/error_reporter.rb

@@ -209,7 +209,7 @@ def set_context(...)
     # before passing to subscribers. Allows creation of entries in error context that
     # are shared by all subscribers.
     #
-    # A context middleware receives the error and current state of the context hash.
+    # A context middleware receives the same parameters as #report.
     # It must return a hash - the middleware stack returns the hash after it has
     # run through all middlewares. A middleware can mutate or replace the hash.
     #
@@ -242,7 +242,10 @@ def report(error, handled: true, severity: handled ? :warning : :error, context:
 
       full_context = @context_middlewares.execute(
         error,
-        ActiveSupport::ExecutionContext.to_h.merge(context || {})
+        context: ActiveSupport::ExecutionContext.to_h.merge(context || {}),
+        handled:,
+        severity:,
+        source:
       )
 
       disabled_subscribers = ActiveSupport::IsolatedExecutionState[self]
@@ -308,9 +311,9 @@ def use(middleware)
           @stack << middleware
         end
 
-        # Run all middlewares in the stack on an error and context.
-        def execute(error, context)
-          @stack.inject(context) { |c, middleware| middleware.call(error, c) }
+        # Run all middlewares in the stack
+        def execute(error, handled:, severity:, context:, source:)
+          @stack.inject(context) { |c, middleware| middleware.call(error, context: c, handled:, severity:, source:) }
         end
       end
   end

activesupport/test/error_reporter_test.rb

@@ -364,7 +364,7 @@ def report(_error, handled:, severity:, context:, source:)
   end
 
   test "error context middleware can mutate context hash" do
-    middleware = -> (_, context) { context.merge({ foo: :bar }) }
+    middleware = -> (_, context:, **kwargs) { context.merge({ foo: :bar }) }
 
     error = ArgumentError.new("Oops")
 
@@ -375,13 +375,13 @@ def report(_error, handled:, severity:, context:, source:)
   end
 
   class MyErrorContextMiddleware
-    def call(_, context)
+    def call(_, context:, **kwargs)
       context.merge({ bar: :baz })
     end
   end
 
   test "can have multiple error context middlewares" do
-    @reporter.add_middleware(-> (_, context) { context.merge({ foo: :bar }) })
+    @reporter.add_middleware(-> (_, context:, **kwargs) { context.merge({ foo: :bar }) })
     @reporter.add_middleware(MyErrorContextMiddleware.new)
 
     error = ArgumentError.new("Oops")
@@ -391,11 +391,28 @@ def call(_, context)
   end
 
   test "last error context middleware to update a key wins" do
-    @reporter.add_middleware(-> (_, context) { context.merge({ foo: :bar }) })
-    @reporter.add_middleware(-> (_, context) { context.merge({ foo: :baz }) })
+    @reporter.add_middleware(-> (_, context:, **kwargs) { context.merge({ foo: :bar }) })
+    @reporter.add_middleware(-> (_, context:, **kwargs) { context.merge({ foo: :baz }) })
     error = ArgumentError.new("Oops")
     @reporter.report(error)
 
     assert_equal [[error, true, :warning, "application", { foo: :baz }]], @subscriber.events
   end
+
+  test "error context middleware receives same parameters as #report" do
+    reported_error = ArgumentError.new("Oops")
+    @reporter.add_middleware(-> (error, context:, handled:, severity:, source:) {
+        assert_equal reported_error, error
+        assert_equal Hash.new, context
+        assert_equal true, handled
+        assert_equal :warning, severity
+        assert_equal ActiveSupport::ErrorReporter::DEFAULT_SOURCE, source
+
+        context.merge({ foo: :bar })
+      })
+
+    @reporter.report(reported_error)
+
+    assert_equal [[reported_error, true, :warning, "application", { foo: :bar }]], @subscriber.events
+  end
 end