Added log "Rendering ...", when starting to render a template, to log that we have started to render something, at the very beginning.

This helps to easily identify queries from controller vs views

Fixes #23710

2 files changed, 10 insertions, 0 deletions

diff --git a/actionview/lib/action_view/log_subscriber.rb b/actionview/lib/action_view/log_subscriber.rb
index aa38db2a3a..2d59033cb3 100644
--- a/actionview/lib/action_view/log_subscriber.rb
+++ b/actionview/lib/action_view/log_subscriber.rb
@@ -30,6 +30,15 @@ module ActionView
       end
     end
 
+
+    def start_rendering(event)
+      info do
+        message = "Rendering #{from_rails_root(event.payload[:identifier])}"
+        message << " within #{from_rails_root(event.payload[:layout])}" if event.payload[:layout]
+        message
+      end
+    end
+
     def logger
       ActionView::Base.logger
     end
diff --git a/actionview/lib/action_view/renderer/template_renderer.rb b/actionview/lib/action_view/renderer/template_renderer.rb
index 9d15bbfca7..fd550d95e1 100644
--- a/actionview/lib/action_view/renderer/template_renderer.rb
+++ b/actionview/lib/action_view/renderer/template_renderer.rb
@@ -50,6 +50,7 @@ module ActionView
       view, locals = @view, locals || {}
 
       render_with_layout(layout_name, locals) do |layout|
+        ActiveSupport::Notifications.instrument("start_rendering.action_view", identifier: template.identifier, layout: layout.try(:virtual_path))
         instrument(:template, :identifier => template.identifier, :layout => layout.try(:virtual_path)) do
           template.render(view, locals) { |*name| view._layout_for(*name) }
         end