newrelic_rpm 6.13.0 → 7.1.0

data/lib/new_relic/agent/configuration/manager.rb

@@ -23,7 +23,7 @@ module NewRelic
         end
 
         def has_key?(key)
-          @cache.has_key?[key]
+          @cache.has_key? key
         end
 
         def keys
@@ -345,7 +345,7 @@ module NewRelic
         end
 
         def reset_cache
-          @cache = Hash.new {|hash,key| hash[key] = self.fetch(key) }
+          @cache = Hash.new { |hash,key| hash[key] = self.fetch(key) }
         end
 
         def log_config(direction, source)

data/lib/new_relic/agent/database_adapter.rb

@@ -0,0 +1,33 @@
+# 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.
+
+module NewRelic
+  module Agent
+    class DatabaseAdapter
+      VERSIONS = {
+        '6.1.0' => proc { ActiveRecord::Base.connection_db_config.configuration_hash[:adapter] },
+        '4.0.0' => proc { ActiveRecord::Base.connection_config[:adapter] },
+        '3.0.0' => proc { |env| ActiveRecord::Base.configurations[env]['adapter'] }
+      }
+
+      def self.value
+        return unless defined? ActiveRecord::Base
+        new(::NewRelic::Control.instance.env, ActiveRecord::VERSION::STRING).value
+      end
+
+      attr_reader :env, :version
+
+      def initialize(env, version)
+        @env = env
+        @version = Gem::Version.new(version)
+      end
+
+      def value
+        match = VERSIONS.keys.find { |key| version >= Gem::Version.new(key) }
+        return unless match
+        VERSIONS[match].call(env)
+      end
+    end
+  end
+end

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

@@ -6,11 +6,7 @@ module NewRelic
   module Agent
     module Datastores
       module Redis
-        MULTI_OPERATION = 'multi'
-        PIPELINE_OPERATION = 'pipeline'
         BINARY_DATA_PLACEHOLDER = "<binary data>"
-        PRODUCT_NAME = 'Redis'
-        CONNECT = 'connect'
 
         MAXIMUM_COMMAND_LENGTH = 1000
         MAXIMUM_ARGUMENT_LENGTH = 64

data/lib/new_relic/agent/distributed_tracing.rb

@@ -24,72 +24,6 @@ module NewRelic
       extend NewRelic::SupportabilityHelper
       extend self
       
-      # Create a payload object containing the current transaction's
-      # tracing properties (e.g., duration, priority).  You can use
-      # this object to generate headers to inject into a network
-      # request, so that the downstream service can participate in a
-      # distributed trace.
-      #
-      # @return [DistributedTracePayload] Payload for the current
-      #                                   transaction, or +nil+ if we
-      #                                   could not create the payload
-      #
-      # @api public
-      #
-      # @deprecated See {#create_distributed_trace_headers} instead.
-      #
-      def create_distributed_trace_payload
-        Deprecator.deprecate :create_distributed_trace_payload, :create_distributed_trace_headers
-
-        unless Agent.config[:'distributed_tracing.enabled']
-          NewRelic::Agent.logger.warn "Not configured to create New Relic distributed trace payload"
-          return nil
-        end
-
-        return unless transaction = Transaction.tl_current
-        transaction.distributed_tracer.create_distributed_trace_payload
-      rescue => e
-        NewRelic::Agent.logger.error 'error during create_distributed_trace_payload', e
-        nil
-      end
-
-      # Decode a JSON string containing distributed trace properties
-      # (e.g., calling application, priority) and apply them to the
-      # current transaction.  You can use it to receive distributed
-      # tracing information protocols the agent does not already
-      # support.
-      #
-      # This method will fail if you call it after calling
-      # {#create_distributed_trace_payload}.
-      #
-      # @param payload [String] Incoming distributed trace payload,
-      #                         either as a JSON string or as a
-      #                         header-friendly string returned from
-      #                         {DistributedTracePayload#http_safe}
-      #
-      # @return nil
-      #
-      # @api public
-      #
-      # @deprecated See {#accept_distributed_trace_headers} instead
-      #
-      def accept_distributed_trace_payload payload
-        Deprecator.deprecate :accept_distributed_trace_payload, :accept_distributed_trace_headers
-
-        unless Agent.config[:'distributed_tracing.enabled']
-          NewRelic::Agent.logger.warn "Not configured to accept New Relic distributed trace payload"
-          return nil
-        end
-
-        return unless transaction = Transaction.tl_current
-        transaction.distributed_tracer.accept_distributed_trace_payload(payload)
-        nil
-      rescue => e
-        NewRelic::Agent.logger.error 'error during accept_distributed_trace_payload', e
-        nil
-      end
-
-
       # Adds the Distributed Trace headers so that the downstream service can participate in a
       # distributed trace. This method should be called every time an outbound call is made
       # since the header payload contains a timestamp.

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

@@ -52,14 +52,14 @@ module NewRelic
         result
       end
 
-      def insert_cross_app_header request
+      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
         path_hash = cat_path_hash
 
-        insert_request_headers request, txn_guid, trip_id, path_hash
+        insert_request_headers headers, txn_guid, trip_id, path_hash
       end
 
       def add_message_cat_headers headers

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

@@ -28,7 +28,7 @@ module NewRelic
         # accept that the stdlib URI module doesn't handle. If we find that
         # Addressable is around, use that to normalize out our URL's.
         def self.parse_and_normalize_url(url)
-          uri = url
+          uri = url.dup
           unless ::URI === uri
             if defined?(::Addressable::URI)
               address = ::Addressable::URI.parse(url)

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

@@ -23,12 +23,11 @@ module NewRelic
           log_notification_error(e, name, 'start')
         end
 
-        def finish(name, id, payload) #THREAD_LOCAL_ACCESS
+        def finish(name, id, payload)
           if segment = pop_segment(id)
-
-          if exception = exception_object(payload)
-            segment.notice_error exception
-          end
+            if exception = exception_object(payload)
+              segment.notice_error exception
+            end
             segment.finish
           end
         rescue => e

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

@@ -20,37 +20,19 @@ module NewRelic
           ::ActiveRecord::Base.class_eval do
             alias_method :save_without_newrelic, :save
             
-            if RUBY_VERSION < "2.7.0"
-              def save(*args, &blk)
-                ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
-                  save_without_newrelic(*args, &blk)
-                end
-              end
-            else
-              def save(*args, **kwargs, &blk)
-                ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
-                  save_without_newrelic(*args, **kwargs, &blk)
-                end
+            def save(*args, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
+                save_without_newrelic(*args, &blk)
               end
-
             end
 
             alias_method :save_without_newrelic!, :save!
 
-            if RUBY_VERSION < "2.7.0"
-              def save!(*args, &blk)
-                ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
-                  save_without_newrelic!(*args, &blk)
-                end
-              end
-            else
-              def save!(*args, **kwargs, &blk)
-                ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
-                  save_without_newrelic!(*args, **kwargs, &blk)
-                end
+            def save!(*args, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
+                save_without_newrelic!(*args, &blk)
               end
             end
-
           end
         end
 
@@ -58,17 +40,9 @@ module NewRelic
           ::ActiveRecord::Relation.class_eval do
             alias_method :update_all_without_newrelic, :update_all
 
-            if RUBY_VERSION < "2.7.0"
-              def update_all(*args, &blk)
-                ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                  update_all_without_newrelic(*args, &blk)
-                end
-              end
-            else
-              def update_all(*args, **kwargs, &blk)
-                ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                  update_all_without_newrelic(*args, **kwargs, &blk)
-                end
+            def update_all(*args, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+                update_all_without_newrelic(*args, &blk)
               end
             end
             
@@ -90,52 +64,31 @@ module NewRelic
 
             alias_method :destroy_all_without_newrelic, :destroy_all
 
-            if RUBY_VERSION < "2.7.0"
-              def destroy_all(*args, &blk)
-                ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                  destroy_all_without_newrelic(*args, &blk)
-                end
-              end
-            else
-              def destroy_all(*args, **kwargs, &blk)
-                ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                  destroy_all_without_newrelic(*args, **kwargs, &blk)
-                end
+            def destroy_all(*args, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+                destroy_all_without_newrelic(*args, &blk)
               end
             end
 
+
             alias_method :calculate_without_newrelic, :calculate
 
-            if RUBY_VERSION < "2.7.0"
-              def calculate(*args, &blk)
-                ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                  calculate_without_newrelic(*args, &blk)
-                end
-              end
-            else
-              def calculate(*args, **kwargs, &blk)
-                ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                  calculate_without_newrelic(*args, **kwargs, &blk)
-                end
+            def calculate(*args, &blk)
+              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+                calculate_without_newrelic(*args, &blk)
               end
             end
 
+
             if method_defined?(:pluck)
               alias_method :pluck_without_newrelic, :pluck
 
-              if RUBY_VERSION < "2.7.0"
-                def pluck(*args, &blk)
-                  ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                    pluck_without_newrelic(*args, &blk)
-                  end
-                end
-              else
-                def pluck(*args, **kwargs, &blk)
-                  ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                    pluck_without_newrelic(*args, **kwargs, &blk)
-                  end
+              def pluck(*args, &blk)
+                ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+                  pluck_without_newrelic(*args, &blk)
                 end
               end
+
             end
           end
         end

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

@@ -92,22 +92,6 @@ DependencyDetection.defer do
       !NewRelic::Agent::Instrumentation::ActiveRecordSubscriber.subscribed?
   end
 
-
-  depends_on do
-    # If the deprecated :disable_active_record_4 setting is true, and
-    # the active record version is four, disable!
-    NewRelic::Agent.config[:disable_active_record_4] == false \
-        || ::ActiveRecord::VERSION::MAJOR.to_i != 4
-  end
-
-  depends_on do
-    # If the deprecated :disable_active_record_5 setting is true, and
-    # the active record version is five, disable!
-    NewRelic::Agent.config[:disable_active_record_5] == false \
-        || ::ActiveRecord::VERSION::MAJOR.to_i  != 5
-  end
-
-
   executes do
     ::NewRelic::Agent.logger.info 'Installing notifications based Active Record instrumentation'
   end

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

@@ -62,68 +62,34 @@ module NewRelic
         end
 
         module RelationExtensions
-          if RUBY_VERSION < "2.7.0"
-            def update_all(*args, &blk)
-              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                super
-              end
-            end
-  
-            def delete_all(*args, &blk)
-              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                super
-              end
-            end
-  
-            def destroy_all(*args, &blk)
-              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                super
-              end
-            end
-  
-            def calculate(*args, &blk)
-              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                super
-              end
-            end
-  
-            def pluck(*args, &blk)
-              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                super
-              end
-            end
-            
-          else
-            def update_all(*args, **kwargs, &blk)
-              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                super
-              end
+          def update_all(*args, &blk)
+            ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+              super
             end
-  
-            def delete_all(*args, **kwargs, &blk)
-              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                super
-              end
-            end
-  
-            def destroy_all(*args, **kwargs, &blk)
-              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                super
-              end
+          end
+
+          def delete_all(*args, &blk)
+            ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+              super
             end
-  
-            def calculate(*args, **kwargs, &blk)
-              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                super
-              end
+          end
+
+          def destroy_all(*args, &blk)
+            ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+              super
             end
-  
-            def pluck(*args, **kwargs, &blk)
-              ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
-                super
-              end
+          end
+
+          def calculate(*args, &blk)
+            ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+              super
             end
+          end
 
+          def pluck(*args, &blk)
+            ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+              super
+            end
           end
         end
       end

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

@@ -84,8 +84,6 @@ module NewRelic
         end
 
         def active_record_config(payload)
-          return unless payload[:connection_id]
-
           # handle if the notification payload provides the AR connection
           # available in Rails 6+ & our ActiveRecordNotifications#log extension
           if payload[:connection]
@@ -93,8 +91,8 @@ module NewRelic
             return connection_config if connection_config
           end
 
+          return unless connection_id = payload[:connection_id]
           connection = nil
-          connection_id = payload[:connection_id]
 
           ::ActiveRecord::Base.connection_handler.connection_pool_list.each do |handler|
             connection = handler.connections.detect do |conn|