newrelic_rpm 6.8.0.360 → 9.2.2

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

@@ -1,19 +1,19 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
-require 'new_relic/agent/datastores/mongo/obfuscator'
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
+
+require_relative '../nosql_obfuscator'
 
 module NewRelic
   module Agent
     module Datastores
       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']
@@ -26,6 +26,7 @@ module NewRelic
 
             command.each do |key, value|
               next if DENYLISTED_KEYS.include?(key)
+
               if OBFUSCATE_KEYS.include?(key)
                 obfuscated = obfuscate(value)
                 result[key] = obfuscated if obfuscated
@@ -38,7 +39,7 @@ module NewRelic
 
           def self.obfuscate(statement)
             if NewRelic::Agent.config[:'mongo.obfuscate_queries']
-              statement = Obfuscator.obfuscate_statement(statement)
+              statement = NewRelic::Agent::Datastores::NosqlObfuscator.obfuscate_statement(statement)
             end
             statement
           end

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

@@ -1,8 +1,8 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# 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/nosql_obfuscator'
 require 'new_relic/agent/datastores/metric_helper'
 
 module NewRelic
@@ -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
@@ -53,12 +53,10 @@ module NewRelic
 
             [name.to_s, collection]
           rescue => e
-            NewRelic::Agent.logger.debug("Failure during Mongo metric generation", e)
+            NewRelic::Agent.logger.debug('Failure during Mongo metric generation', e)
             nil
           end
 
-          MONGO_PRODUCT_NAME = "MongoDB".freeze
-
           def self.collection_in_selector?(payload)
             payload[:collection] == '$cmd' && payload[:selector]
           end
@@ -66,10 +64,10 @@ module NewRelic
           NAMES_IN_SELECTOR = [
             :findandmodify,
 
-            "aggregate",
-            "count",
-            "group",
-            "mapreduce",
+            'aggregate',
+            'count',
+            'group',
+            'mapreduce',
 
             :distinct,
 
@@ -79,7 +77,7 @@ module NewRelic
 
             :collstats,
             :renameCollection,
-            :drop,
+            :drop
           ]
 
           def self.command_key_from_selector(payload)
@@ -93,18 +91,18 @@ module NewRelic
             if command_key
               command_key.to_sym
             else
-              NewRelic::Agent.increment_metric("Supportability/Mongo/UnknownCollection")
+              NewRelic::Agent.increment_metric('Supportability/Mongo/UnknownCollection')
               payload[:selector].first.first unless command_key
             end
           end
 
-          CMD_COLLECTION = "$cmd".freeze
+          CMD_COLLECTION = '$cmd'.freeze
 
           def self.get_collection_from_selector(command_key, payload)
             if command_key
               payload[:selector][command_key]
             else
-              NewRelic::Agent.increment_metric("Supportability/Mongo/UnknownCollection")
+              NewRelic::Agent.increment_metric('Supportability/Mongo/UnknownCollection')
               CMD_COLLECTION
             end
           end
@@ -121,16 +119,16 @@ 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
 
           def self.create_index?(name, payload)
-            name == :insert && payload[:collection] == "system.indexes"
+            name == :insert && payload[:collection] == 'system.indexes'
           end
 
           def self.drop_indexes?(name, payload)
-            name == :deleteIndexes && payload[:selector] && payload[:selector][:index] == "*"
+            name == :deleteIndexes && payload[:selector] && payload[:selector][:index] == '*'
           end
 
           def self.drop_index?(name, payload)
@@ -168,7 +166,7 @@ module NewRelic
           end
 
           def self.collection_name_from_group_selector(payload)
-            payload[:selector]["group"]["ns"]
+            payload[:selector]['group']['ns']
           end
 
           def self.collection_name_from_rename_selector(payload)
@@ -176,9 +174,7 @@ module NewRelic
             parts.shift
             parts.join('.')
           end
-
         end
-
       end
     end
   end

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

@@ -1,28 +1,23 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# 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 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)
+          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/nosql_obfuscator.rb

@@ -0,0 +1,41 @@
+# 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 NosqlObfuscator
+        ALLOWLIST = [:operation].freeze
+
+        def self.obfuscate_statement(source, allowlist = ALLOWLIST)
+          if source.is_a?(Hash)
+            obfuscated = {}
+            source.each do |key, value|
+              if allowlist.include?(key)
+                obfuscated[key] = value
+              else
+                obfuscated[key] = obfuscate_value(value, allowlist)
+              end
+            end
+            obfuscated
+          else
+            obfuscate_value(source, allowlist)
+          end
+        end
+
+        QUESTION_MARK = '?'.freeze
+
+        def self.obfuscate_value(value, allowlist = ALLOWLIST)
+          if value.is_a?(Hash)
+            obfuscate_statement(value, allowlist)
+          elsif value.is_a?(Array)
+            value.map { |v| obfuscate_value(v, allowlist) }
+          else
+            QUESTION_MARK
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,20 +1,16 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# 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 Redis
-        MULTI_OPERATION = 'multi'
-        PIPELINE_OPERATION = 'pipeline'
-        BINARY_DATA_PLACEHOLDER = "<binary data>"
-        PRODUCT_NAME = 'Redis'
-        CONNECT = 'connect'
+        BINARY_DATA_PLACEHOLDER = '<binary data>'
 
         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)
 
@@ -29,20 +25,18 @@ module NewRelic
 
         def self.format_command(command_with_args)
           if Agent.config[:'transaction_tracer.record_redis_arguments']
-            result = ""
+            result = +''
 
             append_command_with_args(result, command_with_args)
 
             trim_result(result) if result.length >= MAXIMUM_COMMAND_LENGTH
             result.strip!
             result
-          else
-            nil
           end
         end
 
         def self.format_pipeline_commands(commands_with_args)
-          result = ""
+          result = +''
 
           commands_with_args.each do |command|
             if result.length >= MAXIMUM_COMMAND_LENGTH
@@ -89,7 +83,7 @@ module NewRelic
         end
 
         def self.is_supported_version?
-          Gem::Version.new(::Redis::VERSION) >= Gem::Version.new("3.0.0")
+          Gem::Version.new(::Redis::VERSION) >= Gem::Version.new('3.0.0')
         end
 
         def self.ellipsize(result, string)
@@ -112,8 +106,8 @@ module NewRelic
         end
 
         def self.safe_from_third_party_gem?
-          if NewRelic::LanguageSupport.bundled_gem?("newrelic-redis")
-            ::NewRelic::Agent.logger.info("Not installing New Relic supported Redis instrumentation because the third party newrelic-redis gem is present")
+          if NewRelic::LanguageSupport.bundled_gem?('newrelic-redis')
+            ::NewRelic::Agent.logger.info('Not installing New Relic supported Redis instrumentation because the third party newrelic-redis gem is present')
             false
           else
             true
@@ -121,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

@@ -1,6 +1,6 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# 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'
 
@@ -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,18 +32,18 @@ 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
+            alias_method(method_name_without_newrelic, method_name)
 
             define_method(method_name) do |*args, &blk|
               segment = NewRelic::Agent::Tracer.start_datastore_segment(
@@ -54,12 +53,12 @@ module NewRelic
               begin
                 send(method_name_without_newrelic, *args, &blk)
               ensure
-                segment.finish if segment
+                ::NewRelic::Agent::Transaction::Segment.finish(segment)
               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
@@ -123,11 +122,11 @@ 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
-            segment.finish if segment
+            ::NewRelic::Agent::Transaction::Segment.finish(segment)
           end
         end
       end
@@ -202,7 +201,6 @@ module NewRelic
         end
         nil
       end
-
     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/rpm/blob/master/LICENSE for complete details.
+# 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/{cross_app_payload.rb → 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/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic
   module Agent
@@ -8,28 +8,29 @@ 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
+          transaction.guid,
+          false
         ]
       end