Merge pull request rails#44454 from jhawthorn/rack_logger_finish_with_state

Use finish_with_state inside Rack::Logger

Author: jhawthorn

railties/lib/rails/rack/logger.rb

@@ -31,13 +31,17 @@ def call(env)
       private
         def call_app(request, env) # :doc:
           instrumenter = ActiveSupport::Notifications.instrumenter
-          instrumenter.start "request.action_dispatch", request: request
+          instrumenter_state = instrumenter.start "request.action_dispatch", request: request
+          instrumenter_finish = -> () {
+            instrumenter.finish_with_state(instrumenter_state, "request.action_dispatch", request: request)
+          }
+
           logger.info { started_request_message(request) }
           status, headers, body = @app.call(env)
-          body = ::Rack::BodyProxy.new(body) { finish(request) }
+          body = ::Rack::BodyProxy.new(body, &instrumenter_finish)
           [status, headers, body]
         rescue Exception
-          finish(request)
+          instrumenter_finish.call
           raise
         ensure
           ActiveSupport::LogSubscriber.flush_all!
@@ -65,11 +69,6 @@ def compute_tags(request) # :doc:
           end
         end
 
-        def finish(request)
-          instrumenter = ActiveSupport::Notifications.instrumenter
-          instrumenter.finish "request.action_dispatch", request: request
-        end
-
         def logger
           Rails.logger
         end