instrumentation.rb in newrelic_rpm-8.10.0

- old
+ new

@@ -12,25 +12,25 @@
         LIBRARY = 'RabbitMQ'
         DEFAULT_NAME = 'Default'
         DEFAULT_TYPE = :direct
         SLASH = '/'
 
-        def exchange_name name
+        def exchange_name(name)
           name.empty? ? DEFAULT_NAME : name
         end
 
-        def exchange_type delivery_info, channel
+        def exchange_type(delivery_info, channel)
           if di_exchange = delivery_info[:exchange]
             return DEFAULT_TYPE if di_exchange.empty?
             return channel.exchanges[delivery_info[:exchange]].type if channel.exchanges[di_exchange]
           end
         end
 
         module Exchange
           include Bunny
 
-          def publish_with_tracing payload, opts = {}
+          def publish_with_tracing(payload, opts = {})
             begin
               destination = exchange_name(name)
 
               tracing_enabled =
                 NewRelic::Agent::CrossAppTracing.cross_app_enabled? ||
@@ -45,14 +45,14 @@
                 reply_to: opts[:reply_to],
                 correlation_id: opts[:correlation_id],
                 exchange_type: type
               )
             rescue => e
-              NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Exchange#publish", e
+              NewRelic::Agent.logger.error("Error starting message broker segment in Bunny::Exchange#publish", e)
               yield
             else
-              NewRelic::Agent::Tracer.capture_segment_error segment do
+              NewRelic::Agent::Tracer.capture_segment_error(segment) do
                 yield
               end
             ensure
               segment.finish if segment
             end
@@ -89,14 +89,14 @@
                 exchange_type: exch_type,
                 queue_name: name,
                 start_time: t0
               )
             rescue => e
-              NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Queue#pop", e
+              NewRelic::Agent.logger.error("Error starting message broker segment in Bunny::Queue#pop", e)
             else
               if bunny_error
-                segment.notice_error bunny_error
+                segment.notice_error(bunny_error)
                 raise bunny_error
               end
             ensure
               segment.finish if segment
             end
@@ -112,14 +112,14 @@
                 library: LIBRARY,
                 destination_type: type,
                 destination_name: name
               )
             rescue => e
-              NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Queue#purge", e
+              NewRelic::Agent.logger.error("Error starting message broker segment in Bunny::Queue#purge", e)
               yield
             else
-              NewRelic::Agent::Tracer.capture_segment_error segment do
+              NewRelic::Agent::Tracer.capture_segment_error(segment) do
                 yield
               end
             ensure
               segment.finish if segment
             end
@@ -127,10 +127,10 @@
         end
 
         module Consumer
           include Bunny
 
-          def call_with_tracing *args
+          def call_with_tracing(*args)
             delivery_info, message_properties, _ = args
             queue_name = queue.respond_to?(:name) ? queue.name : queue
 
             NewRelic::Agent::Messaging.wrap_amqp_consume_transaction(
               library: LIBRARY,