aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorGannon McGibbon <gannon.mcgibbon@gmail.com>2018-10-09 13:58:39 -0400
committerGitHub <noreply@github.com>2018-10-09 13:58:39 -0400
commit88813a98b95fda56232270e6754f553986036e57 (patch)
tree81b1dcc04e5353dcb425886a2a2710bf38f22e86 /activesupport
parent82ac2114a137e4f1a909b24028cd0330752d801c (diff)
parent881f4f38d44fb56db48ecd5683ebfffcc8fc284e (diff)
downloadrails-88813a98b95fda56232270e6754f553986036e57.tar.gz
rails-88813a98b95fda56232270e6754f553986036e57.tar.bz2
rails-88813a98b95fda56232270e6754f553986036e57.zip
Merge pull request #34105 from zvkemp/correct-asn-docs
clarify role of unique_id in ActiveSupport::Notifications [ci skip]
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/notifications.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index 6207de8094..2d8b9c5d86 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -34,7 +34,7 @@ module ActiveSupport
# name # => String, name of the event (such as 'render' from above)
# start # => Time, when the instrumented block started execution
# finish # => Time, when the instrumented block ended execution
- # id # => String, unique ID for this notification
+ # id # => String, unique ID for the instrumenter that fired the event
# payload # => Hash, the payload
# end
#
@@ -59,7 +59,7 @@ module ActiveSupport
# event.payload # => { extra: :information }
#
# The block in the <tt>subscribe</tt> call gets the name of the event, start
- # timestamp, end timestamp, a string with a unique identifier for that event
+ # timestamp, end timestamp, a string with a unique identifier for that event's instrumenter
# (something like "535801666f04d0298cd6"), and a hash with the payload, in
# that order.
#