adding start / finish on the instrumenter, adding tests for the class

1 files changed, 17 insertions, 6 deletions

diff --git a/activesupport/lib/active_support/notifications/instrumenter.rb b/activesupport/lib/active_support/notifications/instrumenter.rb
index ab0b162ee0..1ee7ca06bb 100644
--- a/activesupport/lib/active_support/notifications/instrumenter.rb
+++ b/activesupport/lib/active_support/notifications/instrumenter.rb
@@ -7,7 +7,7 @@ module ActiveSupport
       attr_reader :id
 
       def initialize(notifier)
-        @id = unique_id
+        @id       = unique_id
         @notifier = notifier
       end
 
@@ -15,21 +15,32 @@ module ActiveSupport
       # and publish it. Notice that events get sent even if an error occurs
       # in the passed-in block.
       def instrument(name, payload={})
-        @notifier.start(name, @id, payload)
+        start name, payload
         begin
           yield
         rescue Exception => e
           payload[:exception] = [e.class.name, e.message]
           raise e
         ensure
-          @notifier.finish(name, @id, payload)
+          finish name, payload
         end
       end
 
+      # Send a start notification with +name+ and +payload+.
+      def start(name, payload)
+        @notifier.start name, @id, payload
+      end
+
+      # Send a finish notification with +name+ and +payload+.
+      def finish(name, payload)
+        @notifier.finish name, @id, payload
+      end
+
       private
-        def unique_id
-          SecureRandom.hex(10)
-        end
+
+      def unique_id
+        SecureRandom.hex(10)
+      end
     end
 
     class Event