newrelic_rpm 8.7.0 → 8.11.0

data/lib/new_relic/agent/connect/response_handler.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
   module Agent
@@ -19,7 +19,7 @@ module NewRelic
         # Can accommodate most arbitrary data - anything extra is
         # ignored unless we say to do something with it here.
         def configure_agent(config_data)
-          return if config_data == nil
+          return if config_data.nil?
 
           @agent.agent_id = config_data['agent_run_id']
 
@@ -37,16 +37,16 @@ module NewRelic
 
         def add_server_side_config(config_data)
           if config_data['agent_config']
-            ::NewRelic::Agent.logger.debug "Using config from server"
+            ::NewRelic::Agent.logger.debug("Using config from server")
           end
 
-          ::NewRelic::Agent.logger.debug "Server provided config: #{config_data.inspect}"
+          ::NewRelic::Agent.logger.debug("Server provided config: #{config_data.inspect}")
           server_config = NewRelic::Agent::Configuration::ServerSource.new(config_data, @config)
           @config.replace_or_add_config(server_config)
         end
 
         def add_security_policy_config(security_policies)
-          ::NewRelic::Agent.logger.info 'Installing security policies'
+          ::NewRelic::Agent.logger.info('Installing security policies')
           security_policy_source = NewRelic::Agent::Configuration::SecurityPolicySource.new(security_policies)
           @config.replace_or_add_config(security_policy_source)
           # drop data collected before applying security policies

data/lib/new_relic/agent/custom_event_aggregator.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/event_aggregator'
 require 'new_relic/agent/attribute_processing'
@@ -20,7 +20,7 @@ module NewRelic
       enabled_key :'custom_insights_events.enabled'
 
       def record(type, attributes)
-        unless attributes.is_a? Hash
+        unless attributes.is_a?(Hash)
           raise ArgumentError, "Expected Hash but got #{attributes.class}"
         end
 
@@ -57,19 +57,19 @@ module NewRelic
         @type_strings = Hash.new { |hash, key| hash[key] = key.to_s.freeze }
       end
 
-      def after_harvest metadata
+      def after_harvest(metadata)
         dropped_count = metadata[:seen] - metadata[:captured]
         note_dropped_events(metadata[:seen], dropped_count)
         record_supportability_metrics(metadata[:seen], metadata[:captured], dropped_count)
       end
 
-      def note_dropped_events total_count, dropped_count
+      def note_dropped_events(total_count, dropped_count)
         if dropped_count > 0
           NewRelic::Agent.logger.warn("Dropped #{dropped_count} custom events out of #{total_count}.")
         end
       end
 
-      def record_supportability_metrics total_count, captured_count, dropped_count
+      def record_supportability_metrics(total_count, captured_count, dropped_count)
         engine = NewRelic::Agent.instance.stats_engine
         engine.tl_record_supportability_metric_count("Events/Customer/Seen", total_count)
         engine.tl_record_supportability_metric_count("Events/Customer/Sent", captured_count)

data/lib/new_relic/agent/database/explain_plan_helpers.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/obfuscator'
 require 'new_relic/agent/database/postgres_explain_obfuscator'

data/lib/new_relic/agent/database/obfuscation_helpers.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
   module Agent

data/lib/new_relic/agent/database/obfuscator.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/obfuscation_helpers'
 
@@ -50,7 +50,7 @@ module NewRelic
         def default_sql_obfuscator(sql)
           stmt = sql.kind_of?(Statement) ? sql : Statement.new(sql)
 
-          if stmt.sql.end_with? ELLIPSIS
+          if stmt.sql.end_with?(ELLIPSIS)
             return QUERY_TOO_LARGE_MESSAGE
           end
 

data/lib/new_relic/agent/database/postgres_explain_obfuscator.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
   module Agent

data/lib/new_relic/agent/database.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 'singleton'
 require 'new_relic/agent/database/explain_plan_helpers'
@@ -118,28 +118,28 @@ module NewRelic
         return statement.explain || []
       end
 
-      KNOWN_OPERATIONS = [
-        'alter',
-        'select',
-        'update',
-        'delete',
-        'insert',
-        'create',
-        'show',
-        'set',
-        'exec',
-        'execute',
-        'call'
+      KNOWN_OPERATIONS = %w[
+        alter
+        select
+        update
+        delete
+        insert
+        create
+        show
+        set
+        exec
+        execute
+        call
       ]
-
+      OTHER_OPERATION = 'other'.freeze
       SQL_COMMENT_REGEX = Regexp.new('/\*.*?\*/', Regexp::MULTILINE).freeze
 
       def parse_operation_from_query(sql)
         sql = Helper.correctly_encoded(sql).gsub(SQL_COMMENT_REGEX, NewRelic::EMPTY_STR)
-        if sql =~ /(\w+)/
-          op = $1.downcase
-          return op if KNOWN_OPERATIONS.include?(op)
-        end
+        return unless sql =~ /(\w+)/
+
+        op = Regexp.last_match(1).downcase
+        KNOWN_OPERATIONS.include?(op) ? op : OTHER_OPERATION
       end
 
       class ConnectionManager
@@ -157,7 +157,7 @@ module NewRelic
           return connection if connection
 
           begin
-            @connections[config] = connector.call(config)
+            @connections[config] = yield(config)
           rescue => e
             ::NewRelic::Agent.logger.error("Caught exception trying to get connection to DB for explain.", e)
             nil
@@ -236,7 +236,7 @@ module NewRelic
 
         NEWLINE = "\n".freeze
 
-        def append_sql new_sql
+        def append_sql(new_sql)
           return if new_sql.empty?
           @sql = Database.truncate_query(@sql << NEWLINE << new_sql)
         end
@@ -258,7 +258,7 @@ module NewRelic
           # between usage of mysql and mysql2. Obfuscation is the same, though.
           elsif adapter == MYSQL2_PREFIX
             :mysql2
-          elsif adapter.start_with? SQLITE_PREFIX
+          elsif adapter.start_with?(SQLITE_PREFIX)
             :sqlite
           else
             adapter.to_sym

data/lib/new_relic/agent/database_adapter.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
   module Agent

data/lib/new_relic/agent/datastores/metric_helper.rb

@@ -1,15 +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
 
 module NewRelic
   module Agent
     module Datastores
       module MetricHelper
         ROLLUP_METRIC = "Datastore/all".freeze
-        WEB_ROLLUP_METRIC = "Datastore/allWeb".freeze
-        OTHER_ROLLUP_METRIC = "Datastore/allOther".freeze
-        DEFAULT_PRODUCT_NAME = "ActiveRecord".freeze
         OTHER = "Other".freeze
 
         ALL = "all".freeze
@@ -48,15 +45,15 @@ module NewRelic
           end
         end
 
-        def self.scoped_metric_for product, operation, collection = nil
+        def self.scoped_metric_for(product, operation, collection = nil)
           if collection
-            statement_metric_for product, collection, operation
+            statement_metric_for(product, collection, operation)
           else
-            operation_metric_for product, operation
+            operation_metric_for(product, operation)
           end
         end
 
-        def self.unscoped_metrics_for product, operation, collection = nil, host = nil, port_path_or_id = nil
+        def self.unscoped_metrics_for(product, operation, collection = nil, host = nil, port_path_or_id = nil)
           suffix = all_suffix
 
           metrics = [
@@ -67,14 +64,14 @@ module NewRelic
           ]
 
           if NewRelic::Agent.config[:'datastore_tracer.instance_reporting.enabled'] && host && port_path_or_id
-            metrics.unshift instance_metric_for(product, host, port_path_or_id)
+            metrics.unshift(instance_metric_for(product, host, port_path_or_id))
           end
-          metrics.unshift operation_metric_for(product, operation) if collection
+          metrics.unshift(operation_metric_for(product, operation)) if collection
 
           metrics
         end
 
-        def self.product_operation_collection_for product, operation, collection = nil, generic_product = nil
+        def self.product_operation_collection_for(product, operation, collection = nil, generic_product = nil)
           if overrides = overridden_operation_and_collection
             if should_override?(overrides, product, generic_product)
               operation = overrides[0] || operation
@@ -90,7 +87,7 @@ module NewRelic
           # Order of these metrics matters--the first metric in the list will
           # be treated as the scoped metric in a bunch of different cases.
           metrics = unscoped_metrics_for(product, operation, collection, host, port_path_or_id)
-          metrics.unshift scoped_metric_for(product, operation, collection)
+          metrics.unshift(scoped_metric_for(product, operation, collection))
 
           metrics
         end
@@ -101,7 +98,9 @@ module NewRelic
         end
 
         def self.operation_from_sql(sql)
-          NewRelic::Agent::Database.parse_operation_from_query(sql) || OTHER
+          operation = NewRelic::Agent::Database.parse_operation_from_query(sql)
+          operation = OTHER if operation.eql?(NewRelic::Agent::Database::OTHER_OPERATION)
+          operation
         end
 
         # Allow Transaction#with_database_metric_name to override our

data/lib/new_relic/agent/datastores/mongo/event_formatter.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/datastores/mongo/obfuscator'
 
 module NewRelic
@@ -9,10 +10,10 @@ module NewRelic
       module Mongo
         module EventFormatter
           # Keys that will get their values replaced with '?'.
-          OBFUSCATE_KEYS = ['filter', 'query', 'pipeline'].freeze
+          OBFUSCATE_KEYS = %w[filter query pipeline].freeze
 
           # Keys that will get completely removed from the statement.
-          DENYLISTED_KEYS = ['deletes', 'documents', 'updates'].freeze
+          DENYLISTED_KEYS = %w[deletes documents updates].freeze
 
           def self.format(command_name, database_name, command)
             return nil unless NewRelic::Agent.config[:'mongo.capture_queries']

data/lib/new_relic/agent/datastores/mongo/metric_translator.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/datastores/mongo/obfuscator'
 require 'new_relic/agent/datastores/metric_helper'
@@ -57,8 +57,6 @@ module NewRelic
             nil
           end
 
-          MONGO_PRODUCT_NAME = "MongoDB".freeze
-
           def self.collection_in_selector?(payload)
             payload[:collection] == '$cmd' && payload[:selector]
           end
@@ -121,7 +119,7 @@ module NewRelic
             name == :findandmodify && payload[:selector] && payload[:selector][:remove]
           end
 
-          def self.create_indexes?(name, paylod)
+          def self.create_indexes?(name, _payload)
             name == :createIndexes
           end
 

data/lib/new_relic/agent/datastores/mongo/obfuscator.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
   module Agent
@@ -10,7 +10,7 @@ module NewRelic
           ALLOWLIST = [:operation].freeze
 
           def self.obfuscate_statement(source, allowlist = ALLOWLIST)
-            if source.is_a? Hash
+            if source.is_a?(Hash)
               obfuscated = {}
               source.each do |key, value|
                 if allowlist.include?(key)

data/lib/new_relic/agent/datastores/mongo.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
   module Agent

data/lib/new_relic/agent/datastores/redis.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
   module Agent
@@ -25,7 +25,7 @@ module NewRelic
 
         def self.format_command(command_with_args)
           if Agent.config[:'transaction_tracer.record_redis_arguments']
-            result = ""
+            result = String.new('')
 
             append_command_with_args(result, command_with_args)
 
@@ -36,7 +36,7 @@ module NewRelic
         end
 
         def self.format_pipeline_commands(commands_with_args)
-          result = ""
+          result = String.new('')
 
           commands_with_args.each do |command|
             if result.length >= MAXIMUM_COMMAND_LENGTH

data/lib/new_relic/agent/datastores.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/datastores/metric_helper'
 
@@ -43,7 +43,7 @@ module NewRelic
 
             visibility = NewRelic::Helper.instance_method_visibility(klass, method_name)
 
-            alias_method method_name_without_newrelic, method_name
+            alias_method(method_name_without_newrelic, method_name)
 
             define_method(method_name) do |*args, &blk|
               segment = NewRelic::Agent::Tracer.start_datastore_segment(
@@ -57,8 +57,8 @@ module NewRelic
               end
             end
 
-            send visibility, method_name
-            send visibility, method_name_without_newrelic
+            send(visibility, method_name)
+            send(visibility, method_name_without_newrelic)
           end
         end
       end

data/lib/new_relic/agent/deprecator.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
   module Agent

data/lib/new_relic/agent/distributed_tracing/cross_app_payload.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
   module Agent

data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb

@@ -1,5 +1,4 @@
 # -*- ruby -*-
-# 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
@@ -52,7 +51,7 @@ module NewRelic
         result
       end
 
-      def insert_cross_app_header headers
+      def insert_cross_app_header(headers)
         return unless CrossAppTracing.cross_app_enabled?
 
         @is_cross_app_caller = true
@@ -60,17 +59,17 @@ module NewRelic
         trip_id = cat_trip_id
         path_hash = cat_path_hash
 
-        insert_request_headers headers, txn_guid, trip_id, path_hash
+        insert_request_headers(headers, txn_guid, trip_id, path_hash)
       end
 
-      def add_message_cat_headers headers
+      def add_message_cat_headers(headers)
         return unless CrossAppTracing.cross_app_enabled?
         @is_cross_app_caller = true
-        insert_message_headers headers,
+        insert_message_headers(headers,
           transaction.guid,
           cat_trip_id,
           cat_path_hash,
-          transaction.raw_synthetics_header
+          transaction.raw_synthetics_header)
       end
 
       def record_cross_app_metrics
@@ -90,7 +89,7 @@ module NewRelic
 
       private
 
-      def insert_message_headers headers, txn_guid, trip_id, path_hash, synthetics_header
+      def insert_message_headers(headers, txn_guid, trip_id, path_hash, synthetics_header)
         headers[NR_MESSAGE_BROKER_ID_HEADER] = obfuscator.obfuscate(Agent.config[:cross_process_id])
         headers[NR_MESSAGE_BROKER_TXN_HEADER] = obfuscator.obfuscate(::JSON.dump([txn_guid, false, trip_id, path_hash]))
         headers[NR_MESSAGE_BROKER_SYNTHETICS_HEADER] = synthetics_header if synthetics_header
@@ -148,7 +147,7 @@ module NewRelic
         if Agent.config[:cross_process_id] && Agent.config[:cross_process_id].length > 0
           true
         else
-          NewRelic::Agent.logger.debug "No cross_process_id configured"
+          NewRelic::Agent.logger.debug("No cross_process_id configured")
           false
         end
       end
@@ -157,7 +156,7 @@ module NewRelic
         if Agent.config[:encoding_key] && Agent.config[:encoding_key].length > 0
           true
         else
-          NewRelic::Agent.logger.debug "No encoding_key set"
+          NewRelic::Agent.logger.debug("No encoding_key set")
           false
         end
       end
@@ -172,7 +171,7 @@ module NewRelic
         @obfuscator ||= NewRelic::Agent::Obfuscator.new(Agent.config[:encoding_key])
       end
 
-      def insert_request_headers request, txn_guid, trip_id, path_hash
+      def insert_request_headers(request, txn_guid, trip_id, path_hash)
         cross_app_id = NewRelic::Agent.config[:cross_process_id]
         txn_data = ::JSON.dump([txn_guid, false, trip_id, path_hash])
 
@@ -184,7 +183,7 @@ module NewRelic
         if !!response[NR_APPDATA_HEADER]
           true
         else
-          NewRelic::Agent.logger.debug "No #{NR_APPDATA_HEADER} header"
+          NewRelic::Agent.logger.debug("No #{NR_APPDATA_HEADER} header")
           false
         end
       end
@@ -214,27 +213,27 @@ module NewRelic
         !!(xp_id =~ /\A\d+#\d+\z/)
       end
 
-      def message_has_crossapp_request_header? headers
+      def message_has_crossapp_request_header?(headers)
         !!headers[NR_MESSAGE_BROKER_ID_HEADER]
       end
 
-      def reject_messaging_cat_headers headers
+      def reject_messaging_cat_headers(headers)
         headers.reject { |k, _| k == NR_MESSAGE_BROKER_ID_HEADER || k == NR_MESSAGE_BROKER_TXN_HEADER }
       end
 
-      def trusts? id
+      def trusts?(id)
         split_id = id.match(/(\d+)#\d+/)
         return false if split_id.nil?
 
-        NewRelic::Agent.config[:trusted_account_ids].include? split_id.captures.first.to_i
+        NewRelic::Agent.config[:trusted_account_ids].include?(split_id.captures.first.to_i)
       end
 
-      def trusted_valid_cross_app_id? id
+      def trusted_valid_cross_app_id?(id)
         valid_cross_app_id?(id) && trusts?(id)
       end
 
       # From inbound request headers
-      def assign_intrinsic_transaction_attributes state
+      def assign_intrinsic_transaction_attributes(state)
         # We expect to get the before call to set the id (if we have it) before
         # this, and then write our custom parameter when the transaction starts
         return unless (txn = state.current_transaction)

data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.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
@@ -24,7 +23,7 @@ module NewRelic
 
       # This method extracts intrinsics from the transaction_payload and
       # inserts them into the specified destination.
-      def copy_to_hash transaction_payload, destination
+      def copy_to_hash(transaction_payload, destination)
         return unless enabled?
         INTRINSIC_KEYS.each do |key|
           value = transaction_payload[key]
@@ -34,17 +33,17 @@ module NewRelic
 
       # This method extracts intrinsics from the transaction_payload and
       # inserts them as intrinsics in the specified transaction_attributes
-      def copy_to_attributes transaction_payload, destination
+      def copy_to_attributes(transaction_payload, destination)
         return unless enabled?
         INTRINSIC_KEYS.each do |key|
-          next unless transaction_payload.key? key
-          destination.add_intrinsic_attribute key, transaction_payload[key]
+          next unless transaction_payload.key?(key)
+          destination.add_intrinsic_attribute(key, transaction_payload[key])
         end
       end
 
       # This method takes all distributed tracing intrinsics from the transaction
       # and the trace_payload, and populates them into the destination
-      def copy_from_transaction transaction, trace_payload, destination
+      def copy_from_transaction(transaction, trace_payload, destination)
         destination[GUID_KEY] = transaction.guid
         destination[SAMPLED_KEY] = transaction.sampled?
         destination[TRACE_ID_KEY] = transaction.trace_id
@@ -53,18 +52,18 @@ module NewRelic
           destination[PARENT_SPAN_ID_KEY] = transaction.parent_span_id
         end
 
-        copy_parent_attributes transaction, trace_payload, destination
+        copy_parent_attributes(transaction, trace_payload, destination)
       end
 
-      def copy_parent_attributes transaction, trace_payload, destination
+      def copy_parent_attributes(transaction, trace_payload, destination)
         transport_type = transaction.distributed_tracer.caller_transport_type
-        destination[PARENT_TRANSPORT_TYPE_KEY] = DistributedTraceTransportType.from transport_type
+        destination[PARENT_TRANSPORT_TYPE_KEY] = DistributedTraceTransportType.from(transport_type)
 
         if trace_payload
           destination[PARENT_TYPE_KEY] = trace_payload.parent_type
           destination[PARENT_APP_KEY] = trace_payload.parent_app_id
           destination[PARENT_ACCOUNT_ID_KEY] = trace_payload.parent_account_id
-          destination[PARENT_TRANSPORT_DURATION_KEY] = transaction.calculate_transport_duration trace_payload
+          destination[PARENT_TRANSPORT_DURATION_KEY] = transaction.calculate_transport_duration(trace_payload)
 
           if parent_transaction_id = transaction.distributed_tracer.parent_transaction_id
             destination[PARENT_TRANSACTION_ID_KEY] = parent_transaction_id