Merge pull request #36221 from jhawthorn/middleware_instrumentation

Only build middleware proxy when instrumentating

2 files changed, 4 insertions, 4 deletions

diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb
index 8724f9bcdb..1d68a359dc 100644
--- a/actionpack/test/controller/show_exceptions_test.rb
+++ b/actionpack/test/controller/show_exceptions_test.rb
@@ -99,7 +99,7 @@ module ShowExceptions
   class ShowFailsafeExceptionsTest < ActionDispatch::IntegrationTest
     def test_render_failsafe_exception
       @app = ShowExceptionsOverriddenController.action(:boom)
-      middleware = @app.instance_variable_get(:@middleware)
+      middleware = @app
       @exceptions_app = middleware.instance_variable_get(:@exceptions_app)
       middleware.instance_variable_set(:@exceptions_app, nil)
       $stderr = StringIO.new
diff --git a/actionpack/test/dispatch/middleware_stack_test.rb b/actionpack/test/dispatch/middleware_stack_test.rb
index 90f2eccd19..c534e60c74 100644
--- a/actionpack/test/dispatch/middleware_stack_test.rb
+++ b/actionpack/test/dispatch/middleware_stack_test.rb
@@ -121,9 +121,6 @@ class MiddlewareStackTest < ActiveSupport::TestCase
   end
 
   test "instruments the execution of middlewares" do
-    app = @stack.build(proc { |env| [200, {}, []] })
-    env = {}
-
     events = []
 
     subscriber = proc do |*args|
@@ -131,6 +128,9 @@ class MiddlewareStackTest < ActiveSupport::TestCase
     end
 
     ActiveSupport::Notifications.subscribed(subscriber, "process_middleware.action_dispatch") do
+      app = @stack.build(proc { |env| [200, {}, []] })
+
+      env = {}
       app.call(env)
     end