Move middleware up, right after ActionDispatch::Executor

Author: julienbourdeau

lib/debugbar/engine.rb

@@ -37,7 +37,7 @@ class Engine < ::Rails::Engine
 
     initializer 'debugbar.inject_middlewares' do |app|
       next unless Debugbar.config.enabled?
-      app.middleware.insert_after ActionDispatch::RequestId, Debugbar::TrackCurrentRequest
+      app.middleware.insert_after ActionDispatch::Executor, Debugbar::TrackCurrentRequest
     end
 
     initializer 'debugbar.subscribe' do

lib/debugbar/middlewares/track_current_request.rb

@@ -9,12 +9,15 @@ def call(env)
 
       return @app.call(env) if Debugbar::Current.ignore?
 
-      Debugbar::Current.new_request!(env['action_dispatch.request_id'])
+      Debugbar::Current.new_request!(SecureRandom.uuid)
 
       res = @app.call(env)
 
       # TODO: Remove this if statement?
-      if Debugbar::Current.request&.id
+      # We check meta because the frontend doesn't support request without meta yet.
+      # It might happen with ActionController::Live where the following code
+      # will run BEFORE ActionControllerEventSubscriber.process_action is called
+      if Debugbar::Current.request&.meta
         # filename = "#{Time.now.to_i}--#{Debugbar::Current.request.meta.dig(:params, :controller)}_#{Debugbar::Current.request.meta.dig(:params, :action).gsub('/', '_')}.json"
         # File.open(Rails.root.join('_requests', filename), "w") do |f|
         #   f.write(Debugbar::Current.request.to_json)