Merge pull request #2510 from emotion-studio/hotfix/nil-exception

hotfix: prevent exception in record_one_broadcast_with_new_relic
newrelic · Mar 22, 2024 · 7aef0a5 · 7aef0a5
2 parents 4948613 + 9665e9a
commit 7aef0a5
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/instrumentation.rb b/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/instrumentation.rb
@@ -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