-
Notifications
You must be signed in to change notification settings - Fork 21.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Wrap ActiveJob::Enqueue in evented ActiveSupport::Notification #33171
Conversation
Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @sgrif (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review. Please see the contribution instructions for more information. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice, thanks! Needs a rebase because of the changelog, then I'll merge.
activejob/lib/active_job/logging.rb
Outdated
around_enqueue do |job, block| | ||
key = job.scheduled_at ? "enqueue_at" : "enqueue" | ||
ActiveSupport::Notifications.instrument "#{key}.active_job", | ||
adapter: job.class.queue_adapter, job: job, &block | ||
end |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we keep the old flow? Don't think this needs to be super-DRY.
c250b94
to
2a1884b
Compare
@kaspth I rebased and reverted the flow as you suggested. Thanks! |
Thanks! |
Sorry for digging up this PR, but can we revisit this decision? The main problem with an That's because the instrumenter will always dispatch the notification no matter if the block raised
|
Summary
Instead of firing an event after enqueuing a job, wrap the enqueue in an
ActiveSupport::Notifications
instrumentation block.Other Information
Enables more accurate timing, as it includes time spent writing jobs to the adapter's IO implementation.