Skip to content
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.

Sign up for GitHub

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

Remove MessageBroker metric for ActiveJob #1811

Merged
merged 4 commits into from
Feb 9, 2023
Merged

Remove MessageBroker metric for ActiveJob #1811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d139c1c
Replace 'MessageBroker/' with 'ActiveSupport/'
hannahramadan Feb 8, 2023
3f7f7d9
Trim adapter
hannahramadan Feb 9, 2023
09a7fe3
Udate changelog
hannahramadan Feb 9, 2023
2864447
Update CHANGELOG.md
fallwith Feb 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@

The previously deprecated `NewRelic::Agent.disable_transaction_tracing` method has been removed. Users are encouraged to use `NewRelic::Agent.disable_all_tracing` or `NewRelic::Agent.ignore_transaction`.

- **Renamed ActiveJob metrics**

Previously, ActiveJob was categorized as a message broker, which is inaccurate. We've updated the naming of ActiveJob traces from leading with `MessageBroker/ActiveJob` to simply leading with `ActiveJob`.

- **Code cleanup**

Thank you to community member [@esquith](https://github.com/esquith) for contributing some cleanup of orphaned constants in our code base. [PR#1793](https://github.com/newrelic/newrelic-ruby-agent/pull/1793) [PR#1794](https://github.com/newrelic/newrelic-ruby-agent/pull/1794)
Expand Down
2 changes: 1 addition & 1 deletion lib/new_relic/agent/instrumentation/active_job.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def self.perform(job, block)
end

def self.run_in_trace(job, block, event)
trace_execution_scoped("MessageBroker/#{adapter}/Queue/#{event}/Named/#{job.queue_name}",
trace_execution_scoped("ActiveJob/#{adapter.sub(/^ActiveJob::/, '')}/Queue/#{event}/Named/#{job.queue_name}",
code_information: code_information_for_job(job)) do
block.call
end
Expand Down
4 changes: 2 additions & 2 deletions test/multiverse/suites/rails/activejob_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ def after_teardown
end
end

ENQUEUE_PREFIX = "MessageBroker/ActiveJob::Inline/Queue/Produce/Named"
PERFORM_PREFIX = "MessageBroker/ActiveJob::Inline/Queue/Consume/Named"
ENQUEUE_PREFIX = "ActiveJob/Inline/Queue/Produce/Named"
PERFORM_PREFIX = "ActiveJob/Inline/Queue/Consume/Named"

PERFORM_TRANSACTION_NAME = 'OtherTransaction/ActiveJob::Inline/MyJob/execute'
PERFORM_TRANSACTION_ROLLUP = 'OtherTransaction/ActiveJob::Inline/all'
Expand Down