Remove custom middleware for context clearing, rely on on_complete instead

adrianna-chang-shopify · adrianna-chang-shopify · commit 2e8ae5760940 · 2025-08-05T14:32:00.000-04:00
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
@@ -70,7 +70,6 @@ class MissingController < NameError
     autoload :HostAuthorization
     autoload :RequestId
     autoload :Callbacks
-    autoload :ClearEventReporterContext
     autoload :Cookies
     autoload :ActionableExceptions
     autoload :DebugExceptions
diff --git a/actionpack/lib/action_dispatch/middleware/clear_event_reporter_context.rb b/actionpack/lib/action_dispatch/middleware/clear_event_reporter_context.rb
diff --git a/actionpack/test/dispatch/clear_event_reporter_context_test.rb b/actionpack/test/dispatch/clear_event_reporter_context_test.rb
diff --git a/activejob/lib/active_job/railtie.rb b/activejob/lib/active_job/railtie.rb
@@ -98,17 +98,6 @@ class Railtie < Rails::Railtie # :nodoc:
       end
     end
 
-    initializer "active_job.clear_event_reporter_context" do
-      ActiveSupport.on_load(:active_job) do
-        ActiveJob::Callbacks.singleton_class.set_callback(:execute, :around) do |_, inner|
-          ActiveSupport.event_reporter.clear_context
-          inner.call
-        ensure
-          ActiveSupport.event_reporter.clear_context
-        end
-      end
-    end
-
     initializer "active_job.query_log_tags" do |app|
       query_logs_tags_enabled = app.config.respond_to?(:active_record) &&
         app.config.active_record.query_log_tags_enabled &&
diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb
@@ -52,6 +52,7 @@ class Railtie < Rails::Railtie # :nodoc:
       app.executor.to_complete do
         ActiveSupport::CurrentAttributes.clear_all
         ActiveSupport::ExecutionContext.pop
+        ActiveSupport.event_reporter.clear_context
       end
 
       ActiveSupport.on_load(:active_support_test_case) do
diff --git a/railties/lib/rails/application/default_middleware_stack.rb b/railties/lib/rails/application/default_middleware_stack.rb
@@ -58,7 +58,6 @@ def build_stack
             middleware.use ::Rails::Rack::SilenceRequest, path: path
           end
 
-          middleware.use ::ActionDispatch::ClearEventReporterContext
           middleware.use ::Rails::Rack::Logger, config.log_tags
           middleware.use ::ActionDispatch::ShowExceptions, show_exceptions_app
           middleware.use ::ActionDispatch::DebugExceptions, app, config.debug_exception_response_format
diff --git a/railties/test/commands/middleware_test.rb b/railties/test/commands/middleware_test.rb
@@ -36,7 +36,6 @@ def app
       "Rack::MethodOverride",
       "ActionDispatch::RequestId",
       "ActionDispatch::RemoteIp",
-      "ActionDispatch::ClearEventReporterContext",
       "Rails::Rack::Logger",
       "ActionDispatch::ShowExceptions",
       "ActionDispatch::DebugExceptions",
@@ -72,7 +71,6 @@ def app
       "Rack::MethodOverride",
       "ActionDispatch::RequestId",
       "ActionDispatch::RemoteIp",
-      "ActionDispatch::ClearEventReporterContext",
       "Rails::Rack::Logger",
       "ActionDispatch::ShowExceptions",
       "ActionDispatch::DebugExceptions",
@@ -105,7 +103,6 @@ def app
       "Rack::Runtime",
       "ActionDispatch::RequestId",
       "ActionDispatch::RemoteIp",
-      "ActionDispatch::ClearEventReporterContext",
       "Rails::Rack::Logger",
       "ActionDispatch::ShowExceptions",
       "ActionDispatch::DebugExceptions",
