From d86ccec0979ad60c2430a40864e90dc2f14fd2cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Mon, 5 Aug 2013 18:16:41 -0300
Subject: [PATCH] Use the right instrumentation name

The pattern is event.component

Closes #11769

Conflicts:
	railties/CHANGELOG.md
---
 railties/CHANGELOG.md             | 4 ++++
 railties/lib/rails/rack/logger.rb | 4 ++--
 railties/test/rack_logger_test.rb | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 1965d09297..7a89e5c219 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Fix the event name of action_dispatch requests.
+
+    *Rafael Mendonça França*
+
 *   Make `config.log_level` work with custom loggers.
 
     *Max Shytikov*
diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index 6ed6722c44..ad5fdcf648 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -33,7 +33,7 @@ module Rails
           logger.debug ''
         end
 
-        @instrumenter.start 'action_dispatch.request', request: request
+        @instrumenter.start 'request.action_dispatch', request: request
         logger.info started_request_message(request)
         resp = @app.call(env)
         resp[2] = ::Rack::BodyProxy.new(resp[2]) { finish(request) }
@@ -70,7 +70,7 @@ module Rails
       private
 
       def finish(request)
-        @instrumenter.finish 'action_dispatch.request', request: request
+        @instrumenter.finish 'request.action_dispatch', request: request
       end
 
       def development?
diff --git a/railties/test/rack_logger_test.rb b/railties/test/rack_logger_test.rb
index 3a9392fd26..cfd2c5b50a 100644
--- a/railties/test/rack_logger_test.rb
+++ b/railties/test/rack_logger_test.rb
@@ -38,7 +38,7 @@ module Rails
       def setup
         @subscriber = Subscriber.new
         @notifier = ActiveSupport::Notifications.notifier
-        notifier.subscribe 'action_dispatch.request', subscriber
+        notifier.subscribe 'request.action_dispatch', subscriber
       end
 
       def teardown