Demo execution_context for error reporter

Author: adrianna-chang-shopify

activesupport/lib/active_support/error_reporter.rb

@@ -37,6 +37,7 @@ def initialize(*subscribers, logger: nil)
       @logger = logger
       @debug_mode = false
       @context_middlewares = ErrorContextMiddlewareStack.new
+      @execution_context = ExecutionContext.new
     end
 
     # Evaluates the given block, reporting and swallowing any unhandled error.
@@ -200,7 +201,7 @@ def disable(subscriber)
     #   Rails.error.set_context(section: "checkout", user_id: @user.id)
     #
     def set_context(...)
-      ActiveSupport::ExecutionContext.set(...)
+      @execution_context.set(...)
     end
 
     # Add a middleware to modify the error context before it is sent to subscribers.
@@ -274,6 +275,10 @@ def report(error, handled: true, severity: handled ? :warning : :error, context:
       nil
     end
 
+    def clear_context
+      @execution_context.clear
+    end
+
     private
       def ensure_backtrace(error)
         return if error.frozen? # re-raising won't add a backtrace

activesupport/lib/active_support/railtie.rb

@@ -44,6 +44,12 @@ class Railtie < Rails::Railtie # :nodoc:
       app.executor.to_complete         { ActiveSupport::ExecutionContext.clear }
     end
 
+    initializer "active_support.reset_error_reporter_context" do |app|
+      app.reloader.before_class_unload { ActiveSupport.error_reporter.clear_context }
+      app.executor.to_run              { ActiveSupport.error_reporter.clear_context }
+      app.executor.to_complete         { ActiveSupport.error_reporter.clear_context }
+    end
+
     initializer "active_support.reset_all_current_attributes_instances" do |app|
       app.reloader.before_class_unload { ActiveSupport::CurrentAttributes.clear_all }
       app.executor.to_run              { ActiveSupport::CurrentAttributes.reset_all }