newrelic_rpm 9.0.0 → 9.1.0

data/lib/new_relic/agent/http_clients/abstract.rb

@@ -5,8 +5,8 @@
 module NewRelic
   module Agent
     module HTTPClients
-      MUST_IMPLEMENT_ERROR = "Subclasses of %s must implement a :%s method"
-      WHINY_NIL_ERROR = "%s cannot initialize with a nil wrapped_response object."
+      MUST_IMPLEMENT_ERROR = 'Subclasses of %s must implement a :%s method'
+      WHINY_NIL_ERROR = '%s cannot initialize with a nil wrapped_response object.'
 
       # This class provides a public interface for wrapping HTTP requests. This
       # may be used to create wrappers that are compatible with New Relic's
@@ -14,28 +14,16 @@ module NewRelic
       #
       # @api public
       class AbstractRequest
-        def []
-          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
-        end
-
-        def []=
-          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
-        end
-
-        def type
-          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
-        end
-
-        def host_from_header
-          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
+        %i[[] []= type host_from_header host method headers uri].each do |name|
+          define_method(name) do
+            not_implemented(name)
+          end
         end
 
-        def host
-          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
-        end
+        private
 
-        def method
-          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
+        def not_implemented(method_name)
+          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, method_name]
         end
       end
 

data/lib/new_relic/agent/http_clients/curb_wrappers.rb

@@ -33,16 +33,20 @@ module NewRelic
         end
 
         def [](key)
-          @curlobj.headers[key]
+          headers[key]
         end
 
         def []=(key, value)
-          @curlobj.headers[key] = value
+          headers[key] = value
         end
 
         def uri
           @uri ||= URIUtil.parse_and_normalize_url(@curlobj.url)
         end
+
+        def headers
+          @curlobj.headers
+        end
       end
 
       class CurbResponse < AbstractResponse
@@ -62,7 +66,7 @@ module NewRelic
         def append_header_data(data)
           key, value = data.split(/:\s*/, 2)
           @headers[key.downcase] = value
-          @wrapped_response._nr_header_str ||= String.new
+          @wrapped_response._nr_header_str ||= +''
           @wrapped_response._nr_header_str << data
         end
 

data/lib/new_relic/agent/http_clients/excon_wrappers.rb

@@ -46,7 +46,7 @@ module NewRelic
       class ExconHTTPRequest < AbstractRequest
         attr_reader :method
 
-        EXCON = "Excon"
+        EXCON = 'Excon'
         LHOST = 'host'
         UHOST = 'Host'
         COLON = ':'
@@ -65,7 +65,6 @@ module NewRelic
         end
 
         def host_from_header
-          headers = @datum[:headers]
           if hostname = (headers[LHOST] || headers[UHOST])
             hostname.split(COLON).first
           end
@@ -76,18 +75,21 @@ module NewRelic
         end
 
         def [](key)
-          @datum[:headers][key]
+          headers[key]
         end
 
         def []=(key, value)
-          @datum[:headers] ||= {}
-          @datum[:headers][key] = value
+          headers[key] = value
         end
 
         def uri
           url = "#{@scheme}://#{host}:#{@port}#{@path}"
           URIUtil.parse_and_normalize_url(url)
         end
+
+        def headers
+          @datum[:headers]
+        end
       end
     end
   end

data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb

@@ -56,6 +56,10 @@ module NewRelic
         def []=(key, value)
           @wrapped_request.headers[key] = value
         end
+
+        def headers
+          @wrapped_request.headers.to_hash
+        end
       end
     end
   end

data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb

@@ -25,7 +25,7 @@ module NewRelic
       class HTTPClientRequest < AbstractRequest
         attr_reader :request
 
-        HTTP_CLIENT = "HTTPClient".freeze
+        HTTP_CLIENT = 'HTTPClient'.freeze
         LHOST = 'host'.freeze
         UHOST = 'Host'.freeze
         COLON = ':'.freeze
@@ -57,12 +57,16 @@ module NewRelic
         end
 
         def [](key)
-          request.headers[key]
+          headers[key]
         end
 
         def []=(key, value)
           request.http_header[key] = value
         end
+
+        def headers
+          request.headers
+        end
       end
     end
   end

data/lib/new_relic/agent/http_clients/net_http_wrappers.rb

@@ -61,7 +61,7 @@ module NewRelic
             ::NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(@request.path)
           else
             connection_address = @connection.address
-            if connection_address =~ Resolv::IPv6::Regex
+            if Resolv::IPv6::Regex.match?(connection_address)
               connection_address = "[#{connection_address}]"
             end
 
@@ -71,6 +71,10 @@ module NewRelic
             )
           end
         end
+
+        def headers
+          @request.instance_variable_get(:@header)
+        end
       end
     end
   end

data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb

@@ -42,7 +42,7 @@ module NewRelic
           end
         end
 
-        TYPHOEUS = "Typhoeus".freeze
+        TYPHOEUS = 'Typhoeus'.freeze
 
         def type
           TYPHOEUS
@@ -66,14 +66,17 @@ module NewRelic
         end
 
         def [](key)
-          return nil unless @request.options && @request.options[:headers]
+          return nil unless @request.options && headers
 
-          @request.options[:headers][key]
+          headers[key]
         end
 
         def []=(key, value)
-          @request.options[:headers] ||= {}
-          @request.options[:headers][key] = value
+          headers[key] = value
+        end
+
+        def headers
+          @request.options[:headers] || {}
         end
 
         def uri

data/lib/new_relic/agent/http_clients/uri_util.rb

@@ -36,11 +36,11 @@ module NewRelic
               uri = ::URI.parse(url)
             end
           end
-          uri.host.downcase! unless uri.host.nil?
+          uri.host&.downcase!
           uri
         end
 
-        QUESTION_MARK = "?"
+        QUESTION_MARK = '?'
 
         def self.strip_query_string(fragment)
           if fragment.include?(QUESTION_MARK)

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

@@ -27,11 +27,14 @@ module NewRelic
         end
 
         def controller_name_for_metric(payload)
+          return unless payload
           # redirect_to
-          return payload[:request].controller_class.controller_path if payload[:request] && payload[:request].controller_class
+          return payload[:request].controller_class.controller_path if payload[:request].respond_to?(:controller_class) && payload[:request].controller_class&.respond_to?(:controller_path)
 
           # unpermitted_parameters
-          ::NewRelic::LanguageSupport.constantize(payload[:context][:controller]).controller_path if payload[:context] && payload[:context][:controller]
+          if payload[:context]&.[](:controller) && constantized_class = ::NewRelic::LanguageSupport.constantize(payload[:context][:controller])
+            constantized_class.respond_to?(:controller_path) ? constantized_class.controller_path : nil
+          end
         end
       end
     end

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

@@ -19,7 +19,7 @@ module NewRelic
           else
             # if this transaction is ignored, make sure child
             # transaction are also ignored
-            state.current_transaction.ignore! if state.current_transaction
+            state.current_transaction&.ignore!
             NewRelic::Agent.instance.push_trace_execution_flag(false)
           end
         rescue => e
@@ -90,7 +90,8 @@ module NewRelic
         end
 
         def queue_start(request)
-          if request && request.respond_to?(:env)
+          # the following line needs else branch coverage
+          if request && request.respond_to?(:env) # rubocop:disable Style/SafeNavigation
             QueueTime.parse_frontend_timestamp(request.env, Process.clock_gettime(Process::CLOCK_REALTIME))
           end
         end

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

@@ -75,7 +75,7 @@ module NewRelic
           # so do not mistake rendering a collection for rendering a file.
           if identifier.nil? && name != RENDER_COLLECTION_EVENT_NAME
             'file'
-          elsif identifier =~ /template$/
+          elsif /template$/.match?(identifier)
             identifier
           elsif identifier && (parts = identifier.split('/')).size > 1
             parts[-2..-1].join('/')
@@ -99,11 +99,11 @@ module NewRelic
         end
 
         def finish
-          @finishable.finish if @finishable
+          @finishable&.finish
         end
 
         def notice_error(error)
-          @finishable.notice_error(error) if @finishable
+          @finishable&.notice_error(error)
         end
       end
     end

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

@@ -57,7 +57,7 @@ module NewRelic
 
           # Don't nest transactions if we're already in a web transaction.
           # Probably inline processing the job if that happens, so just trace.
-          if txn && txn.recording_web_transaction?
+          if txn&.recording_web_transaction?
             run_in_trace(job, block, :Consume)
           elsif txn && !txn.recording_web_transaction?
             ::NewRelic::Agent::Transaction.set_default_transaction_name(

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

@@ -13,7 +13,8 @@ module NewRelic
             ::ActiveRecord::Base.send("#{statement.config[:adapter]}_connection",
               statement.config)
           end
-          if connection && connection.respond_to?(:execute)
+          # the following line needs else branch coverage
+          if connection && connection.respond_to?(:execute) # rubocop:disable Style/SafeNavigation
             return connection.execute("EXPLAIN #{statement.sql}")
           end
         end
@@ -43,7 +44,7 @@ module NewRelic
           end
         end
 
-        if RUBY_VERSION < "2.7.0"
+        if RUBY_VERSION < '2.7.0'
           def log_with_newrelic_instrumentation(*args, &block)
             state = NewRelic::Agent::Tracer.state
 

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

@@ -49,7 +49,7 @@ module NewRelic
 
             alias_method(:delete_all_without_newrelic, :delete_all)
 
-            if RUBY_VERSION < "2.7.0"
+            if RUBY_VERSION < '2.7.0'
               def delete_all(*args, &blk)
                 ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
                   delete_all_without_newrelic(*args, &blk)
@@ -92,9 +92,9 @@ module NewRelic
           end
         end
 
-        ACTIVE_RECORD = "ActiveRecord".freeze
-        OTHER = "other".freeze
-        MAKARA_SUFFIX = "_makara".freeze
+        ACTIVE_RECORD = 'ActiveRecord'.freeze
+        OTHER = 'other'.freeze
+        MAKARA_SUFFIX = '_makara'.freeze
 
         # convert vendor (makara, etc.) wrapper names to their bare names
         # ex: postgresql_makara -> postgresql
@@ -102,7 +102,7 @@ module NewRelic
           # TODO: OLD RUBIES - RUBY_VERSION < 2.5
           # With Ruby 2.5+ we could use #delete_suffix instead of #chomp for a
           # potential speed boost
-          return adapter_name.chomp(MAKARA_SUFFIX) if adapter_name && adapter_name.end_with?(MAKARA_SUFFIX)
+          return adapter_name.chomp(MAKARA_SUFFIX) if adapter_name&.end_with?(MAKARA_SUFFIX)
 
           adapter_name
         end
@@ -118,7 +118,7 @@ module NewRelic
         SPACE = ' '.freeze
 
         def split_name(name)
-          if name && name.respond_to?(:split)
+          if name&.respond_to?(:split)
             name.split(SPACE)
           else
             NewRelic::EMPTY_ARRAY
@@ -163,47 +163,50 @@ module NewRelic
         end
 
         PRODUCT_NAMES = {
-          "mysql" => "MySQL",
-          "mysql2" => "MySQL",
+          'mysql' => 'MySQL',
+          'mysql2' => 'MySQL',
 
-          "postgresql" => "Postgres",
+          'postgresql' => 'Postgres',
 
-          "sqlite3" => "SQLite",
+          'sqlite3' => 'SQLite',
 
           # https://rubygems.org/gems/activerecord-jdbcpostgresql-adapter
-          "jdbcmysql" => "MySQL",
+          'jdbcmysql' => 'MySQL',
 
           # https://rubygems.org/gems/activerecord-jdbcpostgresql-adapter
-          "jdbcpostgresql" => "Postgres",
+          'jdbcpostgresql' => 'Postgres',
 
           # https://rubygems.org/gems/activerecord-postgis-adapter
-          "postgis" => "Postgres",
+          'postgis' => 'Postgres',
 
           # https://rubygems.org/gems/activerecord-jdbcsqlite3-adapter
-          "jdbcsqlite3" => "SQLite",
+          'jdbcsqlite3' => 'SQLite',
 
           # https://rubygems.org/gems/activerecord-jdbcderby-adapter
-          "derby" => "Derby",
-          "jdbcderby" => "Derby",
+          'derby' => 'Derby',
+          'jdbcderby' => 'Derby',
 
           # https://rubygems.org/gems/activerecord-jdbc-adapter
-          "jdbc" => "JDBC",
+          'jdbc' => 'JDBC',
 
           # https://rubygems.org/gems/activerecord-jdbcmssql-adapter
-          "jdbcmssql" => "MSSQL",
-          "mssql" => "MSSQL",
+          'jdbcmssql' => 'MSSQL',
+          'mssql' => 'MSSQL',
 
           # https://rubygems.org/gems/activerecord-sqlserver-adapter
-          "sqlserver" => "MSSQL",
+          'sqlserver' => 'MSSQL',
 
           # https://rubygems.org/gems/activerecord-odbc-adapter
-          "odbc" => "ODBC",
+          'odbc' => 'ODBC',
 
           # https://rubygems.org/gems/activerecord-oracle_enhanced-adapter
-          "oracle_enhanced" => "Oracle"
+          'oracle_enhanced' => 'Oracle',
+
+          # https://rubygems.org/gems/activerecord-amazon-timestream-adapter
+          'amazon_timestream' => 'Timestream'
         }.freeze
 
-        ACTIVE_RECORD_DEFAULT_PRODUCT_NAME = "ActiveRecord".freeze
+        ACTIVE_RECORD_DEFAULT_PRODUCT_NAME = 'ActiveRecord'.freeze
 
         def map_product(adapter_name)
           PRODUCT_NAMES.fetch(adapter_name, ACTIVE_RECORD_DEFAULT_PRODUCT_NAME)
@@ -213,24 +216,24 @@ module NewRelic
           extend self
 
           PRODUCT_SYMBOLS = {
-            "mysql" => :mysql,
-            "mysql2" => :mysql,
-            "jdbcmysql" => :mysql,
+            'mysql' => :mysql,
+            'mysql2' => :mysql,
+            'jdbcmysql' => :mysql,
 
-            "postgresql" => :postgres,
-            "jdbcpostgresql" => :postgres,
-            "postgis" => :postgres
+            'postgresql' => :postgres,
+            'jdbcpostgresql' => :postgres,
+            'postgis' => :postgres
           }.freeze
 
           DATASTORE_DEFAULT_PORTS = {
-            :mysql => "3306",
-            :postgres => "5432"
+            :mysql => '3306',
+            :postgres => '5432'
           }.freeze
 
-          DEFAULT = "default".freeze
-          UNKNOWN = "unknown".freeze
-          SLASH = "/".freeze
-          LOCALHOST = "localhost".freeze
+          DEFAULT = 'default'.freeze
+          UNKNOWN = 'unknown'.freeze
+          SLASH = '/'.freeze
+          LOCALHOST = 'localhost'.freeze
 
           def adapter_from_config(config)
             bare_name = NewRelic::Agent::Instrumentation::ActiveRecordHelper.bare_adapter_name(config[:adapter])

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

@@ -16,7 +16,7 @@ module NewRelic
 
         module BaseExtensions4x
           # https://github.com/rails/rails/blob/4-1-stable/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb#L371
-          def log(sql, name = "SQL", binds = [], statement_name = nil)
+          def log(sql, name = 'SQL', binds = [], statement_name = nil)
             @instrumenter.instrument(
               SQL_ACTIVE_RECORD,
               :sql => sql,
@@ -38,7 +38,7 @@ module NewRelic
 
         module BaseExtensions50
           # https://github.com/rails/rails/blob/5-0-stable/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb#L582
-          def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil)
+          def log(sql, name = 'SQL', binds = [], type_casted_binds = [], statement_name = nil)
             @instrumenter.instrument(
               SQL_ACTIVE_RECORD,
               sql: sql,
@@ -56,7 +56,7 @@ module NewRelic
 
         module BaseExtensions51
           # https://github.com/rails/rails/blob/5-1-stable/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb#L603
-          def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil) # :doc:
+          def log(sql, name = 'SQL', binds = [], type_casted_binds = [], statement_name = nil) # :doc:
             @instrumenter.instrument(
               SQL_ACTIVE_RECORD,
               sql: sql,

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

@@ -11,7 +11,7 @@ module NewRelic
         ACTIVE_RECORD = 'ActiveRecord'.freeze
 
         module BaseExtensions
-          if RUBY_VERSION < "2.7.0"
+          if RUBY_VERSION < '2.7.0'
             def save(*args, &blk)
               ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
                 super
@@ -46,7 +46,7 @@ module NewRelic
           # Starting in v5.1.6, this call no longer happens. We'll
           # have to set the database metrics explicitly now.
           #
-          if RUBY_VERSION < "2.7.0"
+          if RUBY_VERSION < '2.7.0'
             def touch(*args, **kwargs, &blk)
               ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
                 super

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

@@ -33,7 +33,7 @@ module NewRelic
           # defensive.
           return if defined?(cached?)
 
-          if defined?(::ActiveRecord) && ::ActiveRecord::VERSION::STRING >= "5.1.0"
+          if defined?(::ActiveRecord) && ::ActiveRecord::VERSION::STRING >= '5.1.0'
             def cached?(payload)
               payload.fetch(:cached, false)
             end
@@ -74,7 +74,8 @@ module NewRelic
             ::ActiveRecord::Base.send("#{statement.config[:adapter]}_connection",
               statement.config)
           end
-          if connection && connection.respond_to?(:exec_query)
+          # the following line needs else branch coverage
+          if connection && connection.respond_to?(:exec_query) # rubocop:disable Style/SafeNavigation
             return connection.exec_query("EXPLAIN #{statement.sql}",
               "Explain #{statement.name}",
               statement.binds)

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

@@ -46,7 +46,7 @@ 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
@@ -90,7 +90,7 @@ 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)
@@ -113,7 +113,7 @@ 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

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

@@ -236,7 +236,8 @@ module NewRelic
           end
 
           def self.prefix_for_category(txn, category = nil)
-            category ||= (txn && txn.category)
+            # the following line needs else branch coverage
+            category ||= (txn && txn.category) # rubocop:disable Style/SafeNavigation
             case category
             when :controller then ::NewRelic::Agent::Transaction::CONTROLLER_PREFIX
             when :web then ::NewRelic::Agent::Transaction::CONTROLLER_PREFIX
@@ -360,7 +361,7 @@ module NewRelic
           skip_tracing = do_not_trace? || !state.is_execution_traced?
 
           if skip_tracing
-            state.current_transaction.ignore! if state.current_transaction
+            state.current_transaction&.ignore!
             NewRelic::Agent.disable_all_tracing { return yield }
           end
 
@@ -386,7 +387,8 @@ module NewRelic
               raise
             end
           ensure
-            finishable.finish if finishable
+            # the following line needs else branch coverage
+            finishable.finish if finishable # rubocop:disable Style/SafeNavigation
           end
         end
 

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

@@ -7,7 +7,7 @@ require_relative 'instrumentation'
 module NewRelic::Agent::Instrumentation
   module Curb
     module Chain
-      def self.instrument!
+      def self.instrument! # rubocop:disable Metrics/AbcSize
         Curl::Easy.class_eval do
           include NewRelic::Agent::Instrumentation::Curb::Easy
 

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

@@ -81,7 +81,7 @@ module NewRelic
           def perform_with_tracing
             return yield if first_request_is_serial?
 
-            trace_execution_scoped("External/Multiple/Curb::Multi/perform") do
+            trace_execution_scoped('External/Multiple/Curb::Multi/perform') do
               yield
             end
           end
@@ -107,7 +107,7 @@ module NewRelic
               request._nr_instrumented = true
             end
           rescue => err
-            NewRelic::Agent.logger.error("Untrapped exception", err)
+            NewRelic::Agent.logger.error('Untrapped exception', err)
           end
 
           # Create request and response adapter objects for the specified +request+
@@ -141,12 +141,12 @@ module NewRelic
             request._nr_original_on_complete = original_callback
             request.on_complete do |finished_request|
               begin
-                segment.process_response_headers(wrapped_response) if segment
+                segment&.process_response_headers(wrapped_response)
               ensure
                 ::NewRelic::Agent::Transaction::Segment.finish(segment)
                 # Make sure the existing completion callback is run, and restore the
                 # on_complete callback to how it was before.
-                original_callback.call(finished_request) if original_callback
+                original_callback&.call(finished_request)
                 remove_instrumentation_callbacks(request)
               end
             end
@@ -173,7 +173,7 @@ module NewRelic
                   segment.notice_error(noticeable_error)
                 end
               ensure
-                original_callback.call(failed_request, error) if original_callback
+                original_callback&.call(failed_request, error)
                 remove_failure_callback(failed_request)
               end
             end

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

@@ -8,7 +8,7 @@ require_relative 'curb/prepend'
 DependencyDetection.defer do
   named :curb
 
-  CURB_MIN_VERSION = Gem::Version.new("0.8.1")
+  CURB_MIN_VERSION = Gem::Version.new('0.8.1')
 
   depends_on do
     defined?(Curl) && defined?(Curl::CURB_VERSION) &&