From d139c1c1c6f4021bbd02f29b5605d27e1aaa3f17 Mon Sep 17 00:00:00 2001 From: hramadan Date: Wed, 8 Feb 2023 14:57:56 -0700 Subject: [PATCH 1/4] Replace 'MessageBroker/' with 'ActiveSupport/' --- lib/new_relic/agent/instrumentation/active_job.rb | 2 +- test/multiverse/suites/rails/activejob_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/new_relic/agent/instrumentation/active_job.rb b/lib/new_relic/agent/instrumentation/active_job.rb index d09d3cfa6e..0b644eb83b 100644 --- a/lib/new_relic/agent/instrumentation/active_job.rb +++ b/lib/new_relic/agent/instrumentation/active_job.rb @@ -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}/Queue/#{event}/Named/#{job.queue_name}", code_information: code_information_for_job(job)) do block.call end diff --git a/test/multiverse/suites/rails/activejob_test.rb b/test/multiverse/suites/rails/activejob_test.rb index 340838c023..7ac79587de 100644 --- a/test/multiverse/suites/rails/activejob_test.rb +++ b/test/multiverse/suites/rails/activejob_test.rb @@ -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/ActiveJob::Inline/Queue/Produce/Named" + PERFORM_PREFIX = "ActiveJob/ActiveJob::Inline/Queue/Consume/Named" PERFORM_TRANSACTION_NAME = 'OtherTransaction/ActiveJob::Inline/MyJob/execute' PERFORM_TRANSACTION_ROLLUP = 'OtherTransaction/ActiveJob::Inline/all' From 3f7f7d96cc73dde89866d5de362dba65429f8421 Mon Sep 17 00:00:00 2001 From: hramadan Date: Wed, 8 Feb 2023 17:53:51 -0700 Subject: [PATCH 2/4] Trim adapter --- lib/new_relic/agent/instrumentation/active_job.rb | 2 +- test/multiverse/suites/rails/activejob_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/new_relic/agent/instrumentation/active_job.rb b/lib/new_relic/agent/instrumentation/active_job.rb index 0b644eb83b..b44fc5d330 100644 --- a/lib/new_relic/agent/instrumentation/active_job.rb +++ b/lib/new_relic/agent/instrumentation/active_job.rb @@ -71,7 +71,7 @@ def self.perform(job, block) end def self.run_in_trace(job, block, event) - trace_execution_scoped("ActiveJob/#{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 diff --git a/test/multiverse/suites/rails/activejob_test.rb b/test/multiverse/suites/rails/activejob_test.rb index 7ac79587de..981eec28d9 100644 --- a/test/multiverse/suites/rails/activejob_test.rb +++ b/test/multiverse/suites/rails/activejob_test.rb @@ -60,8 +60,8 @@ def after_teardown end end - ENQUEUE_PREFIX = "ActiveJob/ActiveJob::Inline/Queue/Produce/Named" - PERFORM_PREFIX = "ActiveJob/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' From 09a7fe3d610107c40aa267df49a91570c85742ae Mon Sep 17 00:00:00 2001 From: hramadan Date: Wed, 8 Feb 2023 18:17:25 -0700 Subject: [PATCH 3/4] Udate changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 766e2b4bcf..3cdc5b9689 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 cateterogized 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) From 2864447e894b1a6c0119952fdc49646a286780d7 Mon Sep 17 00:00:00 2001 From: James Bunch Date: Wed, 8 Feb 2023 18:30:24 -0800 Subject: [PATCH 4/4] Update CHANGELOG.md spelling fix --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cdc5b9689..bf932a3947 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -87,7 +87,7 @@ - **Renamed ActiveJob metrics** - Previously, ActiveJob was cateterogized 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`. + 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**