newrelic_rpm 8.9.0 → 8.10.1

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

@@ -1,8 +1,10 @@
 # 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/datastores/metric_helper'
+require 'new_relic/constants'
 
 module NewRelic
   module Agent
@@ -18,7 +20,7 @@ module NewRelic
 
         def instrument_save_methods
           ::ActiveRecord::Base.class_eval do
-            alias_method :save_without_newrelic, :save
+            alias_method(:save_without_newrelic, :save)
 
             def save(*args, &blk)
               ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
@@ -26,7 +28,7 @@ module NewRelic
               end
             end
 
-            alias_method :save_without_newrelic!, :save!
+            alias_method(:save_without_newrelic!, :save!)
 
             def save!(*args, &blk)
               ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
@@ -38,7 +40,7 @@ module NewRelic
 
         def instrument_relation_methods
           ::ActiveRecord::Relation.class_eval do
-            alias_method :update_all_without_newrelic, :update_all
+            alias_method(:update_all_without_newrelic, :update_all)
 
             def update_all(*args, &blk)
               ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
@@ -46,7 +48,7 @@ module NewRelic
               end
             end
 
-            alias_method :delete_all_without_newrelic, :delete_all
+            alias_method(:delete_all_without_newrelic, :delete_all)
 
             if RUBY_VERSION < "2.7.0"
               def delete_all(*args, &blk)
@@ -62,7 +64,7 @@ module NewRelic
               end
             end
 
-            alias_method :destroy_all_without_newrelic, :destroy_all
+            alias_method(:destroy_all_without_newrelic, :destroy_all)
 
             def destroy_all(*args, &blk)
               ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
@@ -70,7 +72,7 @@ module NewRelic
               end
             end
 
-            alias_method :calculate_without_newrelic, :calculate
+            alias_method(:calculate_without_newrelic, :calculate)
 
             def calculate(*args, &blk)
               ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
@@ -79,7 +81,7 @@ module NewRelic
             end
 
             if method_defined?(:pluck)
-              alias_method :pluck_without_newrelic, :pluck
+              alias_method(:pluck_without_newrelic, :pluck)
 
               def pluck(*args, &blk)
                 ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
@@ -106,22 +108,21 @@ module NewRelic
           adapter_name
         end
 
-        def product_operation_collection_for name, sql, adapter_name
+        def product_operation_collection_for(name, sql, adapter_name)
           product = map_product(bare_adapter_name(adapter_name))
           splits = split_name(name)
           model = model_from_splits(splits)
           operation = operation_from_splits(splits, sql)
-          NewRelic::Agent::Datastores::MetricHelper.product_operation_collection_for product, operation, model, ACTIVE_RECORD
+          NewRelic::Agent::Datastores::MetricHelper.product_operation_collection_for(product, operation, model, ACTIVE_RECORD)
         end
 
         SPACE = ' '.freeze
-        EMPTY = NewRelic::EMPTY_ARRAY
 
         def split_name(name)
           if name && name.respond_to?(:split)
             name.split(SPACE)
           else
-            EMPTY
+            NewRelic::EMPTY_ARRAY
           end
         end
 
@@ -252,7 +253,7 @@ module NewRelic
               configured_value
             end
           rescue => e
-            NewRelic::Agent.logger.debug "Failed to retrieve ActiveRecord host: #{e}"
+            NewRelic::Agent.logger.debug("Failed to retrieve ActiveRecord host: #{e}")
             UNKNOWN
           end
 
@@ -272,13 +273,13 @@ module NewRelic
               UNKNOWN
             end
           rescue => e
-            NewRelic::Agent.logger.debug "Failed to retrieve ActiveRecord port_path_or_id: #{e}"
+            NewRelic::Agent.logger.debug("Failed to retrieve ActiveRecord port_path_or_id: #{e}")
             UNKNOWN
           end
 
           SUPPORTED_ADAPTERS = [:mysql, :postgres].freeze
 
-          def supported_adapter? config
+          def supported_adapter?(config)
             config && SUPPORTED_ADAPTERS.include?(adapter_from_config(config))
           end
 

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

@@ -1,6 +1,7 @@
 # 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/instrumentation/active_record_subscriber'
 require 'new_relic/agent/instrumentation/active_record_prepend'
@@ -95,7 +96,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info 'Installing notifications based Active Record instrumentation'
+    ::NewRelic::Agent.logger.info('Installing notifications based Active Record instrumentation')
   end
 
   executes do
@@ -149,7 +150,7 @@ DependencyDetection.defer do
         && ::ActiveRecord::VERSION::MINOR.to_i == 1 \
         && ::ActiveRecord::VERSION::TINY.to_i >= 6
 
-      ::ActiveRecord::Base.prepend ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions516
+      ::ActiveRecord::Base.prepend(::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions516)
     end
   end
 end

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

@@ -1,6 +1,7 @@
 # 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/prepend_supportability'
 

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

@@ -1,6 +1,8 @@
 # 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/instrumentation/active_record_helper'
 require 'new_relic/agent/instrumentation/notifications_subscriber'
 
@@ -79,7 +81,7 @@ module NewRelic
               statement.binds)
           end
         rescue => e
-          NewRelic::Agent.logger.debug "Couldn't fetch the explain plan for #{statement} due to #{e}"
+          NewRelic::Agent.logger.debug("Couldn't fetch the explain plan for #{statement} due to #{e}")
         end
 
         def active_record_config(payload)
@@ -114,7 +116,7 @@ module NewRelic
         end
 
         def start_segment(config, payload)
-          sql = Helper.correctly_encoded payload[:sql]
+          sql = Helper.correctly_encoded(payload[:sql])
           product, operation, collection = ActiveRecordHelper.product_operation_collection_for(
             payload[:name],
             sql,
@@ -138,7 +140,7 @@ module NewRelic
             port_path_or_id: port_path_or_id,
             database_name: database)
 
-          segment._notice_sql sql, config, @explainer, payload[:binds], payload[:name]
+          segment._notice_sql(sql, config, @explainer, payload[:binds], payload[:name])
           segment
         end
       end

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

@@ -1,6 +1,7 @@
 # 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/instrumentation/active_storage_subscriber'
 
@@ -13,7 +14,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info 'Installing ActiveStorage instrumentation'
+    ::NewRelic::Agent.logger.info('Installing ActiveStorage instrumentation')
   end
 
   executes do

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

@@ -1,34 +1,36 @@
 # 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/instrumentation/notifications_subscriber'
 
 module NewRelic
   module Agent
     module Instrumentation
       class ActiveStorageSubscriber < NotificationsSubscriber
-        def start name, id, payload
+        def start(name, id, payload)
           return unless state.is_execution_traced?
-          start_segment name, id, payload
+          start_segment(name, id, payload)
         rescue => e
-          log_notification_error e, name, 'start'
+          log_notification_error(e, name, 'start')
         end
 
-        def finish name, id, payload
+        def finish(name, id, payload)
           return unless state.is_execution_traced?
-          finish_segment id, payload
+          finish_segment(id, payload)
         rescue => e
-          log_notification_error e, name, 'finish'
+          log_notification_error(e, name, 'finish')
         end
 
-        def start_segment name, id, payload
-          segment = Tracer.start_segment name: metric_name(name, payload)
+        def start_segment(name, id, payload)
+          segment = Tracer.start_segment(name: metric_name(name, payload))
           segment.params[:key] = payload[:key]
-          segment.params[:exist] = payload[:exist] if payload.key? :exist
-          push_segment id, segment
+          segment.params[:exist] = payload[:exist] if payload.key?(:exist)
+          push_segment(id, segment)
         end
 
-        def finish_segment id, payload
+        def finish_segment(id, payload)
           if segment = pop_segment(id)
             if exception = exception_object(payload)
               segment.notice_error(exception)
@@ -37,9 +39,9 @@ module NewRelic
           end
         end
 
-        def metric_name name, payload
+        def metric_name(name, payload)
           service = payload[:service]
-          method = method_from_name name
+          method = method_from_name(name)
           "Ruby/ActiveStorage/#{service}Service/#{method}"
         end
 
@@ -54,7 +56,7 @@ module NewRelic
           end
         end
 
-        def method_from_name name
+        def method_from_name(name)
           METHOD_NAME_MAPPING[name]
         end
       end

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

@@ -1,6 +1,7 @@
 # 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 ActiveSupportLogger

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

@@ -1,6 +1,7 @@
 # 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
   module Agent

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

@@ -1,6 +1,7 @@
 # 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 ActiveSupportLogger::Prepend

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

@@ -1,6 +1,7 @@
 # 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 'active_support_logger/instrumentation'
 require_relative 'active_support_logger/chain'
@@ -12,7 +13,7 @@ DependencyDetection.defer do
   depends_on { defined?(::ActiveSupport::Logger) }
 
   executes do
-    ::NewRelic::Agent.logger.info 'Installing ActiveSupport::Logger instrumentation'
+    ::NewRelic::Agent.logger.info('Installing ActiveSupport::Logger instrumentation')
 
     if use_prepend?
       # the only method currently instrumented is a class method

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

@@ -1,6 +1,7 @@
 # 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 +44,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,7 @@
 # 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 +13,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,7 @@
 # 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 +9,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 +35,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

@@ -14,11 +14,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 +28,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 +47,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 +91,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 +114,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 +129,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,14 @@
 # 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 +20,7 @@ module NewRelic::Agent::Instrumentation
         pop_with_tracing { super }
       end
 
-      def purge *args
+      def purge(*args)
         purge_with_tracing { super }
       end
     end
@@ -27,7 +28,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

@@ -15,7 +15,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,12 @@
 # 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
@@ -81,9 +83,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 +96,7 @@ module NewRelic
                 end
                 memo
               end
-              self.newrelic_write_attr property, specifiers
+              self.newrelic_write_attr(property, specifiers)
             end
           end
 
@@ -179,7 +181,7 @@ module NewRelic
             code_info = NewRelic::Agent::MethodTracerHelpers.code_information(self, method)
             argument_list = generate_argument_list(options.merge(code_info))
 
-            class_eval <<-EOC
+            class_eval(<<-EOC)
               def #{with_method_name}(*args, &block)
                 perform_action_with_newrelic_trace(#{argument_list.join(',')}) do
                   #{without_method_name}(*args, &block)
@@ -188,12 +190,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
 
@@ -229,6 +231,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