newrelic_rpm 8.7.0 → 8.11.0

data/lib/new_relic/agent/instrumentation/acts_as_solr.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require 'new_relic/agent/database'
 
@@ -43,7 +43,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info 'Installing ActsAsSolr instrumentation'
+    ::NewRelic::Agent.logger.info('Installing ActsAsSolr instrumentation')
     deprecation_msg = 'The instrumentation for ActsAsSolr is deprecated. ' \
       'It will be removed in version 9.0.0.' \
 

data/lib/new_relic/agent/instrumentation/authlogic.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 DependencyDetection.defer do
   @name = :authlogic
@@ -12,7 +12,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info 'Installing Authlogic instrumentation'
+    ::NewRelic::Agent.logger.info('Installing Authlogic instrumentation')
     deprecation_msg = 'The instrumentation for Authlogic is deprecated. ' \
       'It will be removed in version 9.0.0.' \
 

data/lib/new_relic/agent/instrumentation/bunny/chain.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic::Agent::Instrumentation
   module Bunny
@@ -8,25 +8,25 @@ module NewRelic::Agent::Instrumentation
       ::Bunny::Exchange.class_eval do
         include NewRelic::Agent::Instrumentation::Bunny::Exchange
 
-        alias_method :publish_without_new_relic, :publish
+        alias_method(:publish_without_new_relic, :publish)
 
-        def publish payload, opts = {}
-          publish_with_tracing(payload, opts) { publish_without_new_relic payload, opts }
+        def publish(payload, opts = {})
+          publish_with_tracing(payload, opts) { publish_without_new_relic(payload, opts) }
         end
       end
 
       ::Bunny::Queue.class_eval do
         include NewRelic::Agent::Instrumentation::Bunny::Queue
 
-        alias_method :pop_without_new_relic, :pop
+        alias_method(:pop_without_new_relic, :pop)
 
         def pop(opts = {:manual_ack => false}, &block)
-          pop_with_tracing { pop_without_new_relic opts, &block }
+          pop_with_tracing { pop_without_new_relic(opts, &block) }
         end
 
-        alias_method :purge_without_new_relic, :purge
+        alias_method(:purge_without_new_relic, :purge)
 
-        def purge *args
+        def purge(*args)
           purge_with_tracing { purge_without_new_relic(*args) }
         end
       end
@@ -34,9 +34,9 @@ module NewRelic::Agent::Instrumentation
       ::Bunny::Consumer.class_eval do
         include NewRelic::Agent::Instrumentation::Bunny::Consumer
 
-        alias_method :call_without_new_relic, :call
+        alias_method(:call_without_new_relic, :call)
 
-        def call *args
+        def call(*args)
           call_with_tracing(*args) { call_without_new_relic(*args) }
         end
       end

data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
@@ -14,11 +13,11 @@ module NewRelic
         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]
@@ -28,7 +27,7 @@ module NewRelic
         module Exchange
           include Bunny
 
-          def publish_with_tracing payload, opts = {}
+          def publish_with_tracing(payload, opts = {})
             begin
               destination = exchange_name(name)
 
@@ -47,10 +46,10 @@ module NewRelic
                 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
@@ -91,10 +90,10 @@ module NewRelic
                 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
@@ -114,10 +113,10 @@ module NewRelic
                 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
@@ -129,7 +128,7 @@ module NewRelic
         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
 

data/lib/new_relic/agent/instrumentation/bunny/prepend.rb

@@ -1,13 +1,13 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic::Agent::Instrumentation
   module Bunny::Prepend
     module Exchange
       include NewRelic::Agent::Instrumentation::Bunny::Exchange
 
-      def publish payload, opts = {}
+      def publish(payload, opts = {})
         publish_with_tracing(payload, opts) { super }
       end
     end
@@ -19,7 +19,7 @@ module NewRelic::Agent::Instrumentation
         pop_with_tracing { super }
       end
 
-      def purge *args
+      def purge(*args)
         purge_with_tracing { super }
       end
     end
@@ -27,7 +27,7 @@ module NewRelic::Agent::Instrumentation
     module Consumer
       include NewRelic::Agent::Instrumentation::Bunny::Consumer
 
-      def call *args
+      def call(*args)
         call_with_tracing(*args) { super }
       end
     end

data/lib/new_relic/agent/instrumentation/bunny.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
@@ -15,7 +14,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info 'Installing Bunny instrumentation'
+    ::NewRelic::Agent.logger.info('Installing Bunny instrumentation')
     require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/messaging'
     require 'new_relic/agent/transaction/message_broker_segment'

data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb

@@ -1,10 +1,11 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require 'new_relic/agent/transaction'
 require 'new_relic/agent/instrumentation/queue_time'
 require 'new_relic/agent/instrumentation/ignore_actions'
+
 module NewRelic
   module Agent
     # @api public
@@ -48,7 +49,7 @@ module NewRelic
         NR_DO_NOT_TRACE_KEY = :'@do_not_trace'
         NR_IGNORE_APDEX_KEY = :'@ignore_apdex'
         NR_IGNORE_ENDUSER_KEY = :'@ignore_enduser'
-        NR_DEFAULT_OPTIONS = {}.freeze
+        NR_DEFAULT_OPTIONS = NewRelic::EMPTY_HASH
 
         # @api public
         module ClassMethods
@@ -81,9 +82,9 @@ module NewRelic
 
           def newrelic_ignore_aspect(property, specifiers = {}) # :nodoc:
             if specifiers.empty?
-              self.newrelic_write_attr property, true
+              self.newrelic_write_attr(property, true)
             elsif !(Hash === specifiers)
-              ::NewRelic::Agent.logger.error "newrelic_#{property} takes an optional hash with :only and :except lists of actions (illegal argument type '#{specifiers.class}')"
+              ::NewRelic::Agent.logger.error("newrelic_#{property} takes an optional hash with :only and :except lists of actions (illegal argument type '#{specifiers.class}')")
             else
               # symbolize the incoming values
               specifiers = specifiers.inject({}) do |memo, (key, values)|
@@ -94,7 +95,7 @@ module NewRelic
                 end
                 memo
               end
-              self.newrelic_write_attr property, specifiers
+              self.newrelic_write_attr(property, specifiers)
             end
           end
 
@@ -165,10 +166,6 @@ module NewRelic
           def add_transaction_tracer(method, options = {})
             NewRelic::Agent.record_api_supportability_metric(:add_transaction_tracer)
 
-            # The metric path:
-            options[:name] ||= method.to_s
-
-            argument_list = generate_argument_list(options)
             traced_method, punctuation = parse_punctuation(method)
             with_method_name, without_method_name = build_method_names(traced_method, punctuation)
 
@@ -177,7 +174,13 @@ module NewRelic
               return
             end
 
-            class_eval <<-EOC
+            # The metric path:
+            options[:name] ||= method.to_s
+
+            code_info = NewRelic::Agent::MethodTracerHelpers.code_information(self, method)
+            argument_list = generate_argument_list(options.merge(code_info))
+
+            class_eval(<<-EOC)
               def #{with_method_name}(*args, &block)
                 perform_action_with_newrelic_trace(#{argument_list.join(',')}) do
                   #{without_method_name}(*args, &block)
@@ -186,12 +189,12 @@ module NewRelic
               ruby2_keywords(:#{with_method_name}) if respond_to?(:ruby2_keywords, true)
             EOC
 
-            visibility = NewRelic::Helper.instance_method_visibility self, method
+            visibility = NewRelic::Helper.instance_method_visibility(self, method)
 
-            alias_method without_method_name, method.to_s
-            alias_method method.to_s, with_method_name
-            send visibility, method
-            send visibility, with_method_name
+            alias_method(without_method_name, method.to_s)
+            alias_method(method.to_s, with_method_name)
+            send(visibility, method)
+            send(visibility, with_method_name)
             ::NewRelic::Agent.logger.debug("Traced transaction: class = #{self.name}, method = #{method.to_s}, options = #{options.inspect}")
           end
 
@@ -227,6 +230,8 @@ module NewRelic
 
         class TransactionNamer
           def self.name_for(txn, traced_obj, category, options = {})
+            return options[:transaction_name] if options[:transaction_name]
+
             "#{prefix_for_category(txn, category)}#{path_name(traced_obj, options)}"
           end
 
@@ -410,14 +415,14 @@ module NewRelic
           end
         end
 
-        # overrideable method to determine whether to trace an action
+        # overridable method to determine whether to trace an action
         # or not - you may override this in your controller and supply
         # your own logic for ignoring transactions.
         def do_not_trace?
           _is_filtered?(NR_DO_NOT_TRACE_KEY)
         end
 
-        # overrideable method to determine whether to trace an action
+        # overridable method to determine whether to trace an action
         # for purposes of apdex measurement - you can use this to
         # ignore things like api calls or other fast non-user-facing
         # actions
@@ -441,6 +446,9 @@ module NewRelic
           txn_options[:apdex_start_time] = queue_start_time
           txn_options[:ignore_apdex] = ignore_apdex?
           txn_options[:ignore_enduser] = ignore_enduser?
+          NewRelic::Agent::MethodTracerHelpers::SOURCE_CODE_INFORMATION_PARAMETERS.each do |parameter|
+            txn_options[parameter] = trace_options[parameter]
+          end
           txn_options
         end
 

data/lib/new_relic/agent/instrumentation/curb/chain.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
@@ -16,46 +15,46 @@ module NewRelic::Agent::Instrumentation
             http_head_with_tracing { http_head_without_newrelic(*args, &blk) }
           end
 
-          alias_method :http_head_without_newrelic, :http_head
-          alias_method :http_head, :http_head_with_newrelic
+          alias_method(:http_head_without_newrelic, :http_head)
+          alias_method(:http_head, :http_head_with_newrelic)
 
           def http_post_with_newrelic(*args, &blk)
             http_post_with_tracing { http_post_without_newrelic(*args, &blk) }
           end
 
-          alias_method :http_post_without_newrelic, :http_post
-          alias_method :http_post, :http_post_with_newrelic
+          alias_method(:http_post_without_newrelic, :http_post)
+          alias_method(:http_post, :http_post_with_newrelic)
 
           def http_put_with_newrelic(*args, &blk)
             http_put_with_tracing { http_put_without_newrelic(*args, &blk) }
           end
 
-          alias_method :http_put_without_newrelic, :http_put
-          alias_method :http_put, :http_put_with_newrelic
+          alias_method(:http_put_without_newrelic, :http_put)
+          alias_method(:http_put, :http_put_with_newrelic)
 
           # Hook the #http method to set the verb.
-          def http_with_newrelic verb
+          def http_with_newrelic(verb)
             http_with_tracing(verb) { http_without_newrelic(verb) }
           end
 
-          alias_method :http_without_newrelic, :http
-          alias_method :http, :http_with_newrelic
+          alias_method(:http_without_newrelic, :http)
+          alias_method(:http, :http_with_newrelic)
 
           # Hook the #perform method to mark the request as non-parallel.
           def perform_with_newrelic
             perform_with_tracing { perform_without_newrelic }
           end
 
-          alias_method :perform_without_newrelic, :perform
-          alias_method :perform, :perform_with_newrelic
+          alias_method(:perform_without_newrelic, :perform)
+          alias_method(:perform, :perform_with_newrelic)
 
           # Record the HTTP verb for future #perform calls
-          def method_with_newrelic verb
+          def method_with_newrelic(verb)
             method_with_tracing(verb) { method_without_newrelic(verb) }
           end
 
-          alias_method :method_without_newrelic, :method
-          alias_method :method, :method_with_newrelic
+          alias_method(:method_without_newrelic, :method)
+          alias_method(:method, :method_with_newrelic)
 
           # We override this method in order to ensure access to header_str even
           # though we use an on_header callback
@@ -63,8 +62,8 @@ module NewRelic::Agent::Instrumentation
             header_str_with_tracing { header_str_without_newrelic }
           end
 
-          alias_method :header_str_without_newrelic, :header_str
-          alias_method :header_str, :header_str_with_newrelic
+          alias_method(:header_str_without_newrelic, :header_str)
+          alias_method(:header_str, :header_str_with_newrelic)
         end
 
         Curl::Multi.class_eval do
@@ -72,19 +71,19 @@ module NewRelic::Agent::Instrumentation
 
           # Add CAT with callbacks if the request is serial
           def add_with_newrelic(curl)
-            add_with_tracing(curl) { add_without_newrelic curl }
+            add_with_tracing(curl) { add_without_newrelic(curl) }
           end
 
-          alias_method :add_without_newrelic, :add
-          alias_method :add, :add_with_newrelic
+          alias_method(:add_without_newrelic, :add)
+          alias_method(:add, :add_with_newrelic)
 
           # Trace as an External/Multiple call if the first request isn't serial.
           def perform_with_newrelic(&blk)
             perform_with_tracing { perform_without_newrelic(&blk) }
           end
 
-          alias_method :perform_without_newrelic, :perform
-          alias_method :perform, :perform_with_newrelic
+          alias_method(:perform_without_newrelic, :perform)
+          alias_method(:perform, :perform_with_newrelic)
         end
       end
     end

data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
@@ -9,7 +8,6 @@ module NewRelic
       module Curb
         module Easy
           attr_accessor :_nr_instrumented,
-            :_nr_failure_instrumented,
             :_nr_http_verb,
             :_nr_header_str,
             :_nr_original_on_header,
@@ -35,7 +33,7 @@ module NewRelic
           end
 
           # Hook the #http method to set the verb.
-          def http_with_tracing verb
+          def http_with_tracing(verb)
             self._nr_http_verb = verb.to_s.upcase
             yield
           end
@@ -48,7 +46,7 @@ module NewRelic
           end
 
           # Record the HTTP verb for future #perform calls
-          def method_with_tracing verb
+          def method_with_tracing(verb)
             self._nr_http_verb = verb.upcase
             yield
           end
@@ -99,7 +97,7 @@ module NewRelic
               procedure: wrapped_request.method
             )
 
-            segment.add_request_headers wrapped_request
+            segment.add_request_headers(wrapped_request)
 
             # install all callbacks
             unless request._nr_instrumented
@@ -129,9 +127,9 @@ module NewRelic
             request._nr_header_str = nil
             request.on_header do |header_data|
               if original_callback
-                original_callback.call header_data
+                original_callback.call(header_data)
               else
-                wrapped_response.append_header_data header_data
+                wrapped_response.append_header_data(header_data)
                 header_data.length
               end
             end
@@ -143,7 +141,7 @@ module NewRelic
             request._nr_original_on_complete = original_callback
             request.on_complete do |finished_request|
               begin
-                segment.process_response_headers wrapped_response
+                segment.process_response_headers(wrapped_response) if segment
               ensure
                 segment.finish if segment
                 # Make sure the existing completion callback is run, and restore the
@@ -158,24 +156,30 @@ module NewRelic
           # NOTE:  on_failure is not always called, so we're not always
           # unhooking the callback.  No harm/no foul in production, but
           # definitely something to beware of if debugging callback issues
-          # _nr_failure_instrumented exists to prevent infinitely chaining
+          # @__newrelic_original_callback exists to prevent infinitely chaining
           # our on_failure callback hook.
-          def install_failure_callback(request, wrapped_response, segment)
-            return if request._nr_failure_instrumented
+          def install_failure_callback(request, _wrapped_response, segment)
             original_callback = request.on_failure
+
+            nr_original_callback = original_callback.instance_variable_get(:@__newrelic_original_callback)
+            original_callback = nr_original_callback || original_callback
+
             request._nr_original_on_failure = original_callback
-            request.on_failure do |failed_request, error|
+
+            newrelic_callback = proc do |failed_request, error|
               begin
                 if segment
-                  noticible_error = NewRelic::Agent::NoticibleError.new error[0].name, error[-1]
-                  segment.notice_error noticible_error
+                  noticeable_error = NewRelic::Agent::NoticeableError.new(error[0].name, error[-1])
+                  segment.notice_error(noticeable_error)
                 end
               ensure
                 original_callback.call(failed_request, error) if original_callback
                 remove_failure_callback(failed_request)
               end
-              request._nr_failure_instrumented = true
             end
+            newrelic_callback.instance_variable_set(:@__newrelic_original_callback, original_callback)
+
+            request.on_failure(&newrelic_callback)
           end
 
           # on_failure callbacks cannot be removed in the on_complete
@@ -192,7 +196,6 @@ module NewRelic
           # fires before the on_failure callback.
           def remove_failure_callback(request)
             request.on_failure(&request._nr_original_on_failure)
-            request._nr_failure_instrumented = false
           end
 
           private

data/lib/new_relic/agent/instrumentation/curb/prepend.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
@@ -25,7 +24,7 @@ module NewRelic
               http_put_with_tracing { super }
             end
 
-            def http verb
+            def http(verb)
               http_with_tracing(verb) { super }
             end
 
@@ -33,7 +32,7 @@ module NewRelic
               perform_with_tracing { super }
             end
 
-            def method verb
+            def method(verb)
               method_with_tracing(verb) { super }
             end
 

data/lib/new_relic/agent/instrumentation/curb.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require_relative 'curb/chain'
 require_relative 'curb/prepend'
@@ -16,7 +16,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info 'Installing Curb instrumentation'
+    ::NewRelic::Agent.logger.info('Installing Curb instrumentation')
     require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/http_clients/curb_wrappers'
   end