Use namespaces in notifications.

6 files changed, 27 insertions, 18 deletions

diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 69ed84da95..22360735b9 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -62,9 +62,9 @@ module ActionController #:nodoc:
       end
 
       def log_event(name, before, after, instrumenter_id, payload)
-        if name.to_s =~ /(read|write|cache|expire|exist)_(fragment|page)\??/
+        if name.to_s =~ /actioncontroller\.((read|write|expire|exist)_(fragment|page)\??)/
           key_or_path = payload[:key] || payload[:path]
-          human_name  = name.to_s.humanize
+          human_name  = $1.humanize
           duration    = (after - before) * 1000
           logger.info("#{human_name} #{key_or_path.inspect} (%.1fms)" % duration)
         else
diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb
index f569d0dd8b..91f781a44d 100644
--- a/actionpack/lib/action_controller/caching/fragments.rb
+++ b/actionpack/lib/action_controller/caching/fragments.rb
@@ -53,7 +53,7 @@ module ActionController #:nodoc:
         return content unless cache_configured?
         key = fragment_cache_key(key)
 
-        ActiveSupport::Notifications.instrument(:write_fragment, :key => key) do
+        instrument_fragment_cache :write_fragment, key do
           cache_store.write(key, content, options)
         end
         content
@@ -64,7 +64,7 @@ module ActionController #:nodoc:
         return unless cache_configured?
         key = fragment_cache_key(key)
 
-        ActiveSupport::Notifications.instrument(:read_fragment, :key => key) do
+        instrument_fragment_cache :read_fragment, key do
           cache_store.read(key, options)
         end
       end
@@ -74,7 +74,7 @@ module ActionController #:nodoc:
         return unless cache_configured?
         key = fragment_cache_key(key)
 
-        ActiveSupport::Notifications.instrument(:exist_fragment?, :key => key) do
+        instrument_fragment_cache :exist_fragment?, key do
           cache_store.exist?(key, options)
         end
       end
@@ -101,16 +101,18 @@ module ActionController #:nodoc:
         key = fragment_cache_key(key) unless key.is_a?(Regexp)
         message = nil
 
-        ActiveSupport::Notifications.instrument(:expire_fragment, :key => key) do
+        instrument_fragment_cache :expire_fragment, key do
           if key.is_a?(Regexp)
-            message = "Expired fragments matching: #{key.source}"
             cache_store.delete_matched(key, options)
           else
-            message = "Expired fragment: #{key}"
             cache_store.delete(key, options)
           end
         end
       end
+
+      def instrument_fragment_cache(name, key)
+        ActiveSupport::Notifications.instrument("actioncontroller.#{name}", :key => key){ yield }
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb
index d46f528c7e..4498abcdbe 100644
--- a/actionpack/lib/action_controller/caching/pages.rb
+++ b/actionpack/lib/action_controller/caching/pages.rb
@@ -64,7 +64,7 @@ module ActionController #:nodoc:
           return unless perform_caching
           path = page_cache_path(path)
 
-          ActiveSupport::Notifications.instrument(:expire_page, :path => path) do
+          instrument_page_cache :expire_page, path do
             File.delete(path) if File.exist?(path)
           end
         end
@@ -75,7 +75,7 @@ module ActionController #:nodoc:
           return unless perform_caching
           path = page_cache_path(path)
 
-          ActiveSupport::Notifications.instrument(:cache_page, :path => path) do
+          instrument_page_cache :write_page, path do
             FileUtils.makedirs(File.dirname(path))
             File.open(path, "wb+") { |f| f.write(content) }
           end
@@ -107,6 +107,10 @@ module ActionController #:nodoc:
           def page_cache_path(path)
             page_cache_directory + page_cache_file(path)
           end
+
+          def instrument_page_cache(name, path)
+            ActiveSupport::Notifications.instrument("actioncontroller.#{name}", :path => path){ yield }
+          end
       end
 
       # Expires the page that was cached with the +options+ as a key. Example:
diff --git a/actionpack/lib/action_controller/metal/logger.rb b/actionpack/lib/action_controller/metal/logger.rb
index 4f4370e5f0..0dcab86f10 100644
--- a/actionpack/lib/action_controller/metal/logger.rb
+++ b/actionpack/lib/action_controller/metal/logger.rb
@@ -15,7 +15,8 @@ module ActionController
     attr_internal :view_runtime
 
     def process_action(action)
-      ActiveSupport::Notifications.instrument(:process_action, :controller => self, :action => action) do
+      ActiveSupport::Notifications.instrument("actioncontroller.process_action",
+        :controller => self, :action => action) do
         super
       end
     end
@@ -50,7 +51,7 @@ module ActionController
       # This is the hook invoked by ActiveSupport::Notifications.subscribe.
       # If you need to log any event, overwrite the method and do it here.
       def log_event(name, before, after, instrumenter_id, payload) #:nodoc:
-        if name == :process_action
+        if name == "actioncontroller.process_action"
           duration     = [(after - before) * 1000, 0.01].max
           controller   = payload[:controller]
           request      = controller.request
@@ -66,7 +67,7 @@ module ActionController
           message << " [#{request.request_uri rescue "unknown"}]"
 
           logger.info(message)
-        elsif name == :render_template
+        elsif name == "actionview.render_template"
           # TODO Make render_template logging work if you are using just ActionView
           duration = (after - before) * 1000
           message = "Rendered #{payload[:identifier]}"
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 5158415c20..4459ef6124 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -215,12 +215,13 @@ module ActionView
         options = @options
 
         if @collection
-          ActiveSupport::Notifications.instrument(:render_collection, :path => @path,
-                                                  :count => @collection.size) do
+          ActiveSupport::Notifications.instrument("actionview.render_collection",
+            :path => @path, :count => @collection.size) do
             render_collection
           end
         else
-          content = ActiveSupport::Notifications.instrument(:render_partial, :path => @path) do
+          content = ActiveSupport::Notifications.instrument("actionview.render_partial",
+            :path => @path) do
             render_partial
           end
 
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 48316cac53..578cfe1177 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -93,7 +93,7 @@ module ActionView
     def _render_template(template, layout = nil, options = {})
       locals = options[:locals] || {}
 
-      content = ActiveSupport::Notifications.instrument(:render_template,
+      content = ActiveSupport::Notifications.instrument("actionview.render_template",
                 :identifier => template.identifier, :layout => (layout ? layout.identifier : nil)) do
         template.render(self, locals)
       end
@@ -109,7 +109,8 @@ module ActionView
     end
 
     def _render_layout(layout, locals, &block)
-      ActiveSupport::Notifications.instrument(:render_layout, :identifier => layout.identifier) do
+      ActiveSupport::Notifications.instrument("actionview.render_layout",
+        :identifier => layout.identifier) do
         layout.render(self, locals){ |*name| _layout_for(*name, &block) }
       end
     end