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

hotfix: prevent exception in record_one_broadcast_with_new_relic #2510

Merged
merged 2 commits into from
Mar 22, 2024
Merged

hotfix: prevent exception in record_one_broadcast_with_new_relic #2510

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f76e26
hotfix: prevent exception in record_one_broadcast_with_new_relic
nathan-appere Mar 14, 2024
9665e9a
Fix error reporting
nathan-appere Mar 22, 2024
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
10 changes: 7 additions & 3 deletions lib/new_relic/agent/instrumentation/active_support_broadcast_logger/instrumentation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@
module NewRelic::Agent::Instrumentation
module ActiveSupportBroadcastLogger
def record_one_broadcast_with_new_relic(*args)
broadcasts[1..-1].each { |broadcasted_logger| broadcasted_logger.instance_variable_set(:@skip_instrumenting, true) }
yield
broadcasts.each { |broadcasted_logger| broadcasted_logger.instance_variable_set(:@skip_instrumenting, false) }
if broadcasts && broadcasts[1..-1]
broadcasts[1..-1].each { |broadcasted_logger| broadcasted_logger.instance_variable_set(:@skip_instrumenting, true) }
yield
broadcasts.each { |broadcasted_logger| broadcasted_logger.instance_variable_set(:@skip_instrumenting, false) }
else
NewRelic::Agent.logger.error('Error recording broadcasted logger')
end
end
end
end
Loading