newrelic_rpm 7.0.0 → 8.8.0

data/lib/new_relic/agent/database.rb

@@ -9,17 +9,17 @@ require 'new_relic/agent/database/obfuscator'
 module NewRelic
   # columns for a mysql explain plan
   MYSQL_EXPLAIN_COLUMNS = [
-                           "Id",
-                           "Select Type",
-                           "Table",
-                           "Type",
-                           "Possible Keys",
-                           "Key",
-                           "Key Length",
-                           "Ref",
-                           "Rows",
-                           "Extra"
-                          ].freeze
+    "Id",
+    "Select Type",
+    "Table",
+    "Type",
+    "Possible Keys",
+    "Key",
+    "Key Length",
+    "Ref",
+    "Rows",
+    "Extra"
+  ].freeze
 
   module Agent
     module Database
@@ -57,7 +57,7 @@ module NewRelic
         Obfuscator.instance.set_sql_obfuscator(type, &block)
       end
 
-      def record_sql_method(config_section=:transaction_tracer)
+      def record_sql_method(config_section = :transaction_tracer)
         key = record_sql_method_key(config_section)
 
         case Agent.config[key].to_s
@@ -87,11 +87,11 @@ module NewRelic
 
       RECORD_FOR = [:raw, :obfuscated].freeze
 
-      def should_record_sql?(config_section=:transaction_tracer)
+      def should_record_sql?(config_section = :transaction_tracer)
         RECORD_FOR.include?(record_sql_method(config_section))
       end
 
-      def should_collect_explain_plans?(config_section=:transaction_tracer)
+      def should_collect_explain_plans?(config_section = :transaction_tracer)
         should_record_sql?(config_section) &&
           Agent.config["#{config_section}.explain_enabled".to_sym]
       end
@@ -131,15 +131,15 @@ module NewRelic
         '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
@@ -185,7 +185,7 @@ module NewRelic
 
         DEFAULT_QUERY_NAME = "SQL".freeze
 
-        def initialize(sql, config={}, explainer=nil, binds=nil, name=DEFAULT_QUERY_NAME, host=nil, port_path_or_id=nil, database_name=nil)
+        def initialize(sql, config = {}, explainer = nil, binds = nil, name = DEFAULT_QUERY_NAME, host = nil, port_path_or_id = nil, database_name = nil)
           @sql = Database.capture_query(sql)
           @config = config
           @explainer = explainer
@@ -205,9 +205,7 @@ module NewRelic
               Database.obfuscate_sql(self)
             when :raw
               sql.to_s
-            else
-              nil
-            end
+          end
         end
 
         # This takes a connection config hash from ActiveRecord or Sequel and
@@ -220,17 +218,18 @@ module NewRelic
           elsif @config[:uri] && @config[:uri].to_s =~ /^jdbc:([^:]+):/
             # This case is for Sequel with the jdbc-mysql, jdbc-postgres, or jdbc-sqlite3 gems.
             symbolized_adapter($1)
-          else
-            nil
           end
         end
 
         def explain
           return unless explainable?
           handle_exception_in_explain do
-            start = Time.now
+            start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
             plan = @explainer.call(self)
-            ::NewRelic::Agent.record_metric("Supportability/Database/execute_explain_plan", Time.now - start)
+            ::NewRelic::Agent.record_metric(
+              "Supportability/Database/execute_explain_plan",
+              Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+            )
             return process_resultset(plan, adapter) if plan
           end
         end
@@ -244,11 +243,11 @@ module NewRelic
 
         private
 
-        POSTGIS_PREFIX  = 'postgis'.freeze
+        POSTGIS_PREFIX = 'postgis'.freeze
         POSTGRES_PREFIX = 'postgres'.freeze
-        MYSQL_PREFIX    = 'mysql'.freeze
-        MYSQL2_PREFIX   = 'mysql2'.freeze
-        SQLITE_PREFIX   = 'sqlite'.freeze
+        MYSQL_PREFIX = 'mysql'.freeze
+        MYSQL2_PREFIX = 'mysql2'.freeze
+        SQLITE_PREFIX = 'sqlite'.freeze
 
         def symbolized_adapter(adapter)
           if adapter.start_with?(POSTGRES_PREFIX) || adapter == POSTGIS_PREFIX

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

@@ -6,9 +6,9 @@ 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
+        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
 
@@ -48,7 +48,7 @@ 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
           else
@@ -56,7 +56,7 @@ module NewRelic
           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 = [
@@ -74,17 +74,17 @@ module NewRelic
           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
+              operation = overrides[0] || operation
               collection = overrides[1] || collection
             end
           end
           [product, operation, collection]
         end
 
-        def self.metrics_for(product, operation, collection = nil, generic_product = nil, host=nil, port_path_or_id=nil)
+        def self.metrics_for(product, operation, collection = nil, generic_product = nil, host = nil, port_path_or_id = nil)
           product, operation, collection = product_operation_collection_for(product, operation, collection, generic_product)
 
           # Order of these metrics matters--the first metric in the list will
@@ -101,13 +101,15 @@ 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
         # collection and operation
-        def self.overridden_operation_and_collection #THREAD_LOCAL_ACCESS
-          txn   = Tracer.current_transaction
+        def self.overridden_operation_and_collection # THREAD_LOCAL_ACCESS
+          txn = Tracer.current_transaction
           txn ? txn.instrumentation_state[:datastore_override] : nil
         end
 

data/lib/new_relic/agent/datastores/mongo/event_formatter.rb

@@ -8,12 +8,11 @@ module NewRelic
     module Datastores
       module Mongo
         module EventFormatter
-
           # Keys that will get their values replaced with '?'.
-          OBFUSCATE_KEYS = [ 'filter', 'query', 'pipeline' ].freeze
+          OBFUSCATE_KEYS = ['filter', 'query', 'pipeline'].freeze
 
           # Keys that will get completely removed from the statement.
-          DENYLISTED_KEYS = [ 'deletes', 'documents', 'updates' ].freeze
+          DENYLISTED_KEYS = ['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

@@ -15,8 +15,8 @@ module NewRelic
 
             if collection_in_selector?(payload)
               command_key = command_key_from_selector(payload)
-              name        = get_name_from_selector(command_key, payload)
-              collection  = get_collection_from_selector(command_key, payload)
+              name = get_name_from_selector(command_key, payload)
+              collection = get_collection_from_selector(command_key, payload)
             else
               collection = payload[:collection]
             end
@@ -79,7 +79,7 @@ module NewRelic
 
             :collstats,
             :renameCollection,
-            :drop,
+            :drop
           ]
 
           def self.command_key_from_selector(payload)
@@ -176,9 +176,7 @@ module NewRelic
             parts.shift
             parts.join('.')
           end
-
         end
-
       end
     end
   end

data/lib/new_relic/agent/datastores/mongo/obfuscator.rb

@@ -7,7 +7,6 @@ module NewRelic
     module Datastores
       module Mongo
         module Obfuscator
-
           ALLOWLIST = [:operation].freeze
 
           def self.obfuscate_statement(source, allowlist = ALLOWLIST)
@@ -32,7 +31,7 @@ module NewRelic
             if value.is_a?(Hash)
               obfuscate_statement(value, allowlist)
             elsif value.is_a?(Array)
-              value.map {|v| obfuscate_value(v, allowlist)}
+              value.map { |v| obfuscate_value(v, allowlist) }
             else
               QUESTION_MARK
             end

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

@@ -7,22 +7,17 @@ module NewRelic
     module Datastores
       module Mongo
         def self.is_supported_version?
-          # No version constant in < 2.0 versions of Mongo :(
-          defined?(::Mongo) && (defined?(::Mongo::MongoClient) || is_monitoring_enabled?)
-        end
-
-        def self.is_monitoring_enabled?
-          defined?(::Mongo::Monitoring) # @since 2.1.0
+          defined?(::Mongo) && is_monitoring_enabled?
         end
 
         def self.is_unsupported_2x?
-          defined?(::Mongo::VERSION) && Gem::Version.new(::Mongo::VERSION).segments[0] == 2 &&
+          defined?(::Mongo::VERSION) &&
+            Gem::Version.new(::Mongo::VERSION).segments[0] == 2 &&
             !self.is_monitoring_enabled?
         end
 
-        def self.is_version_1_10_or_later?
-          # Again, no VERSION constant in 1.x, so we have to rely on constant checks
-          defined?(::Mongo::CollectionOperationWriter)
+        def self.is_monitoring_enabled?
+          defined?(::Mongo::Monitoring) # @since 2.1.0
         end
       end
     end

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

@@ -10,7 +10,7 @@ module NewRelic
 
         MAXIMUM_COMMAND_LENGTH = 1000
         MAXIMUM_ARGUMENT_LENGTH = 64
-        CHUNK_SIZE   = (MAXIMUM_ARGUMENT_LENGTH - 5) / 2
+        CHUNK_SIZE = (MAXIMUM_ARGUMENT_LENGTH - 5) / 2
         PREFIX_RANGE = (0...CHUNK_SIZE)
         SUFFIX_RANGE = (-CHUNK_SIZE..-1)
 
@@ -32,8 +32,6 @@ module NewRelic
             trim_result(result) if result.length >= MAXIMUM_COMMAND_LENGTH
             result.strip!
             result
-          else
-            nil
           end
         end
 
@@ -117,7 +115,7 @@ module NewRelic
         end
 
         def self.trim_result(result)
-          result.slice!((MAXIMUM_COMMAND_LENGTH-ELLIPSES.length)..-1)
+          result.slice!((MAXIMUM_COMMAND_LENGTH - ELLIPSES.length)..-1)
           result.strip!
           result << ELLIPSES
         end

data/lib/new_relic/agent/datastores.rb

@@ -13,7 +13,6 @@ module NewRelic
     #
     # @api public
     module Datastores
-
       # @!group Tracing query methods
 
       # Add Datastore tracing to a method. This properly generates the metrics
@@ -21,7 +20,7 @@ module NewRelic
       # query content into Transaction Traces. Use wrap if you want to provide
       # that functionality.
       #
-      # @param [Class] clazz the class to instrument
+      # @param [Class] klass the class to instrument
       #
       # @param [String, Symbol] method_name the name of instance method to
       #   instrument
@@ -33,16 +32,16 @@ module NewRelic
       #
       # @api public
       #
-      def self.trace(clazz, method_name, product, operation = method_name)
+      def self.trace(klass, method_name, product, operation = method_name)
         NewRelic::Agent.record_api_supportability_metric(:trace)
 
-        clazz.class_eval do
+        klass.class_eval do
           method_name_without_newrelic = "#{method_name}_without_newrelic"
 
-          if NewRelic::Helper.instance_methods_include?(clazz, method_name) &&
-             !NewRelic::Helper.instance_methods_include?(clazz, method_name_without_newrelic)
+          if NewRelic::Helper.instance_methods_include?(klass, method_name) &&
+              !NewRelic::Helper.instance_methods_include?(klass, method_name_without_newrelic)
 
-            visibility = NewRelic::Helper.instance_method_visibility(clazz, method_name)
+            visibility = NewRelic::Helper.instance_method_visibility(klass, method_name)
 
             alias_method method_name_without_newrelic, method_name
 
@@ -123,7 +122,7 @@ module NewRelic
         ensure
           begin
             if callback
-              elapsed_time = (Time.now - segment.start_time).to_f
+              elapsed_time = Process.clock_gettime(Process::CLOCK_REALTIME) - segment.start_time
               callback.call(result, segment.name, elapsed_time)
             end
           ensure
@@ -202,7 +201,6 @@ module NewRelic
         end
         nil
       end
-
     end
   end
 end

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

@@ -8,26 +8,26 @@ module NewRelic
       attr_reader :id, :transaction, :referring_guid, :referring_trip_id, :referring_path_hash
 
       def initialize(id, transaction, transaction_info)
-        @id                  = id
-        @transaction         = transaction
+        @id = id
+        @transaction = transaction
 
         transaction_info ||= []
-        @referring_guid      = transaction_info[0]
+        @referring_guid = transaction_info[0]
         # unused_flag        = transaction_info[1]
-        @referring_trip_id   = string_or_false_for(transaction_info[2])
+        @referring_trip_id = string_or_false_for(transaction_info[2])
         @referring_path_hash = string_or_false_for(transaction_info[3])
       end
 
       def as_json_array(content_length)
-        queue_time_in_seconds = [transaction.queue_time.to_f, 0.0].max
-        start_time_in_seconds = [transaction.start_time.to_f, 0.0].max
-        app_time_in_seconds   = Time.now.to_f - start_time_in_seconds
+        queue_time_in_seconds = [transaction.queue_time, 0.0].max
+        start_time_in_seconds = [transaction.start_time, 0.0].max
+        app_time_in_seconds = Process.clock_gettime(Process::CLOCK_REALTIME) - start_time_in_seconds
 
         [
           NewRelic::Agent.config[:cross_process_id],
           transaction.best_name,
-          queue_time_in_seconds.to_f,
-          app_time_in_seconds.to_f,
+          queue_time_in_seconds,
+          app_time_in_seconds,
           content_length,
           transaction.guid,
           false

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

@@ -18,7 +18,7 @@ module NewRelic
       # The cross app transaction header for "outgoing" calls
       NR_TXN_HEADER = 'X-NewRelic-Transaction'
 
-      NR_MESSAGE_BROKER_ID_HEADER  = 'NewRelicID'
+      NR_MESSAGE_BROKER_ID_HEADER = 'NewRelicID'
       NR_MESSAGE_BROKER_TXN_HEADER = 'NewRelicTransaction'
       NR_MESSAGE_BROKER_SYNTHETICS_HEADER = 'NewRelicSynthetics'
 
@@ -54,9 +54,10 @@ module NewRelic
 
       def insert_cross_app_header headers
         return unless CrossAppTracing.cross_app_enabled?
+
         @is_cross_app_caller = true
-        txn_guid  = transaction.guid
-        trip_id   = cat_trip_id
+        txn_guid = transaction.guid
+        trip_id = cat_trip_id
         path_hash = cat_path_hash
 
         insert_request_headers headers, txn_guid, trip_id, path_hash
@@ -65,17 +66,20 @@ module NewRelic
       def add_message_cat_headers headers
         return unless CrossAppTracing.cross_app_enabled?
         @is_cross_app_caller = true
-        insert_message_headers headers, 
-          transaction.guid, 
-          cat_trip_id, 
-          cat_path_hash, 
+        insert_message_headers headers,
+          transaction.guid,
+          cat_trip_id,
+          cat_path_hash,
           transaction.raw_synthetics_header
       end
 
       def record_cross_app_metrics
         if (id = cross_app_payload && cross_app_payload.id)
-          app_time_in_seconds = [Time.now.to_f - transaction.start_time.to_f, 0.0].max
-          NewRelic::Agent.record_metric "ClientApplication/#{id}/all", app_time_in_seconds
+          app_time_in_seconds = [
+            Process.clock_gettime(Process::CLOCK_REALTIME) - transaction.start_time,
+            0.0
+          ].max
+          NewRelic::Agent.record_metric("ClientApplication/#{id}/all", app_time_in_seconds)
         end
       end
 
@@ -87,7 +91,7 @@ module NewRelic
       private
 
       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_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
       end
@@ -112,11 +116,11 @@ module NewRelic
         payload[:guid] = transaction.guid
 
         return unless is_cross_app?
-        trip_id             = cat_trip_id
-        path_hash           = cat_path_hash
+        trip_id = cat_trip_id
+        path_hash = cat_path_hash
         referring_path_hash = cat_referring_path_hash
 
-        payload[:cat_trip_id]             = trip_id             if trip_id
+        payload[:cat_trip_id] = trip_id if trip_id
         payload[:cat_referring_path_hash] = referring_path_hash if referring_path_hash
 
         if path_hash
@@ -131,6 +135,7 @@ module NewRelic
 
       ###############
       module_function
+
       ###############
 
       def cross_app_enabled?
@@ -169,9 +174,9 @@ module NewRelic
 
       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])
+        txn_data = ::JSON.dump([txn_guid, false, trip_id, path_hash])
 
-        request[NR_ID_HEADER]  = obfuscator.obfuscate(cross_app_id)
+        request[NR_ID_HEADER] = obfuscator.obfuscate(cross_app_id)
         request[NR_TXN_HEADER] = obfuscator.obfuscate(txn_data)
       end
 
@@ -214,7 +219,7 @@ module NewRelic
       end
 
       def reject_messaging_cat_headers headers
-        headers.reject {|k,_| k == NR_MESSAGE_BROKER_ID_HEADER || k == NR_MESSAGE_BROKER_TXN_HEADER}
+        headers.reject { |k, _| k == NR_MESSAGE_BROKER_ID_HEADER || k == NR_MESSAGE_BROKER_TXN_HEADER }
       end
 
       def trusts? id

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

@@ -10,16 +10,16 @@ module NewRelic
 
       # Intrinsic Keys
       INTRINSIC_KEYS = [
-        PARENT_TYPE_KEY                = "parent.type",
-        PARENT_APP_KEY                 = "parent.app",
-        PARENT_ACCOUNT_ID_KEY          = "parent.account",
-        PARENT_TRANSPORT_TYPE_KEY      = "parent.transportType",
-        PARENT_TRANSPORT_DURATION_KEY  = "parent.transportDuration",
-        GUID_KEY                       = "guid",
-        TRACE_ID_KEY                   = "traceId",
-        PARENT_TRANSACTION_ID_KEY      = "parentId",
-        PARENT_SPAN_ID_KEY             = "parentSpanId",
-        SAMPLED_KEY                    = "sampled",
+        PARENT_TYPE_KEY = "parent.type",
+        PARENT_APP_KEY = "parent.app",
+        PARENT_ACCOUNT_ID_KEY = "parent.account",
+        PARENT_TRANSPORT_TYPE_KEY = "parent.transportType",
+        PARENT_TRANSPORT_DURATION_KEY = "parent.transportDuration",
+        GUID_KEY = "guid",
+        TRACE_ID_KEY = "traceId",
+        PARENT_TRANSACTION_ID_KEY = "parentId",
+        PARENT_SPAN_ID_KEY = "parentSpanId",
+        SAMPLED_KEY = "sampled"
       ].freeze
 
       # This method extracts intrinsics from the transaction_payload and
@@ -64,7 +64,6 @@ module NewRelic
           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
 
           if parent_transaction_id = transaction.distributed_tracer.parent_transaction_id
@@ -78,7 +77,6 @@ module NewRelic
       def enabled?
         return Agent.config[:'distributed_tracing.enabled']
       end
-
     end
   end
 end