Yield the payload notifications for further modification (like adding the result).

1 files changed, 2 insertions, 8 deletions

diff --git a/activesupport/lib/active_support/notifications/instrumenter.rb b/activesupport/lib/active_support/notifications/instrumenter.rb
index 85c5199946..f3d877efe7 100644
--- a/activesupport/lib/active_support/notifications/instrumenter.rb
+++ b/activesupport/lib/active_support/notifications/instrumenter.rb
@@ -13,19 +13,13 @@ module ActiveSupport
 
       # Instrument the given block by measuring the time taken to execute it
       # and publish it.
-      def instrument(name, payload={}, add_result=false)
+      def instrument(name, payload={})
         time = Time.now
-        result = yield if block_given?
-        payload.merge!(:result => result) if add_result
+        result = yield(payload) if block_given?
         @notifier.publish(name, time, Time.now, @id, payload)
         result
       end
 
-      # The same as instrument, but adds the result as payload.
-      def instrument!(name, payload={}, &block)
-        instrument(name, payload, true, &block)
-      end
-
       private
         def unique_id
           SecureRandom.hex(10)