newrelic_rpm 6.15.0 → 7.0.0

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

@@ -31,6 +31,8 @@ module NewRelic
             middleware_instance = @middleware_class.new(*args, &blk)
             MiddlewareProxy.wrap(middleware_instance)
           end
+
+          ruby2_keywords(:new) if respond_to?(:ruby2_keywords, true)
         end
 
         def self.is_sinatra_app?(target)

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

@@ -34,7 +34,14 @@ DependencyDetection.defer do
     )
   end
 
+  # TODO: Remove in 8.0.0 release
   def install_mongo_instrumentation
+    ::NewRelic::Agent::Deprecator.deprecate "install_mongo_instrumentation", "install_mongo_command_subscriber", "8.0.0"
+    ::NewRelic::Agent.logger.warn("Installing deprecated Mongo instrumentation. " \
+        "This instrumentation will be removed in a future release. " \
+        "Update Mongo version to >= 2.1.0 for updated instrumentation"
+    )
+
     require 'new_relic/agent/datastores/mongo/metric_translator'
     require 'new_relic/agent/datastores/mongo/statement_formatter'
 

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

@@ -0,0 +1,39 @@
+# 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.
+
+require_relative 'net_http/chain'
+require_relative 'net_http/prepend'
+
+DependencyDetection.defer do
+  named :net_http
+
+  depends_on do
+    defined?(Net) && defined?(Net::HTTP)
+  end
+
+  executes do
+    ::NewRelic::Agent.logger.info 'Installing Net:HTTP Wrappers'
+    require 'new_relic/agent/http_clients/net_http_wrappers'
+  end
+
+  conflicts_with_prepend do
+    defined?(::Airbrake)
+  end
+
+  conflicts_with_prepend do
+    defined?(::Rack::MiniProfiler)
+  end
+
+  conflicts_with_prepend do
+    source_location_for(Net::HTTP, "request") =~ /airbrake|profiler/i
+  end
+
+  executes do
+    if use_prepend?
+      prepend_instrument ::Net::HTTP, ::NewRelic::Agent::Instrumentation::NetHTTP::Prepend
+    else 
+      chain_instrument ::NewRelic::Agent::Instrumentation::NetHTTP::Chain
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# 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.
+
+require_relative 'instrumentation'
+
+
+module NewRelic::Agent::Instrumentation
+  module NetHTTP
+    module Chain
+      def self.instrument!
+        Net::HTTP.class_eval do
+          include NewRelic::Agent::Instrumentation::NetHTTP
+
+          def request_with_newrelic_trace(request, *args, &block)
+            request_with_tracing(request) { request_without_newrelic_trace(request, *args, &block) }
+          end  
+    
+          alias request_without_newrelic_trace request
+          alias request request_with_newrelic_trace
+        end
+      end
+    end
+  end
+end

data/lib/new_relic/agent/instrumentation/{net_prepend.rb → net_http/instrumentation.rb}

@@ -5,8 +5,8 @@
 module NewRelic 
   module Agent 
     module Instrumentation
-      module NetPrepend
-        def request(request, *args, &block)
+      module NetHTTP
+        def request_with_tracing(request)
           wrapped_request = NewRelic::Agent::HTTPClients::NetHTTPRequest.new(self, request)
 
           segment = NewRelic::Agent::Tracer.start_external_request_segment(
@@ -23,7 +23,7 @@ module NewRelic
             # counting if connection wasn't started (which calls request again).
             NewRelic::Agent.disable_all_tracing do
               response = NewRelic::Agent::Tracer.capture_segment_error segment do
-                super
+                yield
               end
             end
   

data/lib/new_relic/agent/instrumentation/net_http/prepend.rb

@@ -0,0 +1,21 @@
+# 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.
+
+require_relative 'instrumentation'
+
+module NewRelic 
+  module Agent 
+    module Instrumentation
+      module NetHTTP
+        module Prepend
+          include NewRelic::Agent::Instrumentation::NetHTTP
+          
+          def request(request, *args, &block)
+            request_with_tracing(request) { super }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,69 +2,34 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
-require 'new_relic/agent/instrumentation/sinatra'
+# Our Padrino instrumentation relies heavily on the fact that Padrino is
+# built on Sinatra. Although it wires up a lot of its own routing logic,
+# we only need to patch into Padrino's dispatch to get things started.
+#
+# Parts of the Sinatra instrumentation (such as the TransactionNamer) are
+# aware of Padrino as a potential target in areas where both Sinatra and
+# Padrino run through the same code.
+
+require_relative 'sinatra'
+require_relative 'padrino/chain'
+require_relative 'padrino/instrumentation'
+require_relative 'padrino/prepend'
 
 DependencyDetection.defer do
   @name = :padrino
+  configure_with :sinatra
 
-  depends_on do
-    !NewRelic::Agent.config[:disable_sinatra] &&
-      defined?(::Padrino) && defined?(::Padrino::Routing::InstanceMethods)
-  end
+  depends_on { defined?(::Padrino) && defined?(::Padrino::Routing::InstanceMethods) }
 
   executes do
     ::NewRelic::Agent.logger.info 'Installing Padrino instrumentation'
-
-    # Our Padrino instrumentation relies heavily on the fact that Padrino is
-    # built on Sinatra. Although it wires up a lot of its own routing logic,
-    # we only need to patch into Padrino's dispatch to get things started.
-    #
-    # Parts of the Sinatra instrumentation (such as the TransactionNamer) are
-    # aware of Padrino as a potential target in areas where both Sinatra and
-    # Padrino run through the same code.
-    module ::Padrino::Routing::InstanceMethods
-      include NewRelic::Agent::Instrumentation::Sinatra
-
-      alias dispatch_without_newrelic dispatch!
-      alias dispatch! dispatch_with_newrelic
-
-      # Padrino 0.13 mustermann routing
-      if private_method_defined?(:invoke_route)
-        include NewRelic::Agent::Instrumentation::Padrino
-
-        alias invoke_route_without_newrelic invoke_route
-        alias invoke_route invoke_route_with_newrelic
-      end
+    if use_prepend?
+      prepend_instrument ::Padrino::Routing::InstanceMethods, NewRelic::Agent::Instrumentation::Padrino::Prepend
+    else
+      chain_instrument NewRelic::Agent::Instrumentation::Padrino::Chain
     end
   end
 end
 
-module NewRelic
-  module Agent
-    module Instrumentation
-      module Padrino
 
-        def invoke_route_with_newrelic(*args, &block)
-          begin
-            env["newrelic.last_route"] = args[0].original_path
-          rescue => e
-            ::NewRelic::Agent.logger.debug("Failed determining last route in Padrino", e)
-          end
 
-          begin
-            txn_name = ::NewRelic::Agent::Instrumentation::Sinatra::TransactionNamer.transaction_name_for_route(env, request)
-            unless txn_name.nil?
-              ::NewRelic::Agent::Transaction.set_default_transaction_name(
-                "#{self.class.name}/#{txn_name}", :sinatra)
-            end
-          rescue => e
-            ::NewRelic::Agent.logger.debug("Failed during invoke_route to set transaction name", e)
-          end
-
-          invoke_route_without_newrelic(*args, &block)
-        end
-
-      end
-    end
-  end
-end

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

@@ -0,0 +1,34 @@
+# 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::Agent::Instrumentation
+  module Padrino
+    module Chain
+      def self.instrument!
+        ::Padrino::Routing::InstanceMethods.module_eval do
+          include NewRelic::Agent::Instrumentation::Sinatra
+
+          def dispatch_with_newrelic
+            dispatch_with_tracing { dispatch_without_newrelic }
+          end
+
+          alias dispatch_without_newrelic dispatch!
+          alias dispatch! dispatch_with_newrelic
+
+          # Padrino 0.13 mustermann routing
+          if private_method_defined?(:invoke_route)
+            include NewRelic::Agent::Instrumentation::Padrino
+
+            def invoke_route_with_newrelic(*args, &block)
+              invoke_route_with_tracing(*args) { invoke_route_without_newrelic(*args, &block) }
+            end
+
+            alias invoke_route_without_newrelic invoke_route
+            alias invoke_route invoke_route_with_newrelic
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# 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::Agent::Instrumentation
+  module Padrino
+    def invoke_route_with_tracing(*args)
+      begin
+        env["newrelic.last_route"] = args[0].original_path
+      rescue => e
+        ::NewRelic::Agent.logger.debug("Failed determining last route in Padrino", e)
+      end
+
+      begin
+        txn_name = ::NewRelic::Agent::Instrumentation::Sinatra::TransactionNamer.transaction_name_for_route(env, request)
+        unless txn_name.nil?
+          ::NewRelic::Agent::Transaction.set_default_transaction_name(
+            "#{self.class.name}/#{txn_name}", :sinatra)
+        end
+      rescue => e
+        ::NewRelic::Agent.logger.debug("Failed during invoke_route to set transaction name", e)
+      end
+
+      yield
+    end
+  end
+end

data/lib/new_relic/agent/instrumentation/padrino/prepend.rb

@@ -0,0 +1,20 @@
+# 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::Agent::Instrumentation
+  module Padrino
+    module Prepend
+      include NewRelic::Agent::Instrumentation::Sinatra
+      include NewRelic::Agent::Instrumentation::Padrino
+
+      def dispatch
+        dispatch_with_tracing { super }
+      end
+
+      def invoke_route(*args, &block)
+        invoke_route_with_tracing(*args) { super }
+      end
+    end
+  end
+end

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

@@ -4,134 +4,10 @@
 
 require 'new_relic/agent/instrumentation/controller_instrumentation'
 
-module NewRelic
-  module Agent
-    module Instrumentation
-      module RackHelpers
-        def self.version_supported?
-          rack_version_supported? || puma_rack_version_supported?
-        end
-
-        def self.rack_version_supported?
-          return false unless defined? ::Rack
-
-          version = Gem::Version.new(::Rack.release)
-          min_version = Gem::Version.new('1.1.0')
-          version >= min_version
-        end
-
-        def self.puma_rack_version_supported?
-          return false unless defined? ::Puma::Const::PUMA_VERSION
-
-          version = Gem::Version.new(::Puma::Const::PUMA_VERSION)
-          min_version = Gem::Version.new('2.12.0')
-          version >= min_version
-        end
-
-        def self.middleware_instrumentation_enabled?
-          version_supported? && !::NewRelic::Agent.config[:disable_middleware_instrumentation]
-        end
-
-        def self.check_for_late_instrumentation(app)
-          return if defined?(@checked_for_late_instrumentation) && @checked_for_late_instrumentation
-          @checked_for_late_instrumentation = true
-          if middleware_instrumentation_enabled?
-            if ::NewRelic::Agent::Instrumentation::MiddlewareProxy.needs_wrapping?(app)
-              ::NewRelic::Agent.logger.info("We weren't able to instrument all of your Rack middlewares.",
-                                            "To correct this, ensure you 'require \"newrelic_rpm\"' before setting up your middleware stack.")
-            end
-          end
-        end
-
-        def self.instrument_builder builder_class
-          ::NewRelic::Agent.logger.info "Installing deferred #{builder_class} instrumentation"
-
-          builder_class.class_eval do
-            class << self
-              attr_accessor :_nr_deferred_detection_ran
-            end
-            self._nr_deferred_detection_ran = false
-
-            include ::NewRelic::Agent::Instrumentation::RackBuilder
-
-            alias_method :to_app_without_newrelic, :to_app
-            alias_method :to_app, :to_app_with_newrelic_deferred_dependency_detection
-
-            if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
-              ::NewRelic::Agent.logger.info "Installing #{builder_class} middleware instrumentation"
-              alias_method :run_without_newrelic, :run
-              alias_method :run, :run_with_newrelic
-
-              alias_method :use_without_newrelic, :use
-              alias_method :use, :use_with_newrelic
-            end
-          end
-
-          def self.instrument_url_map url_map_class
-            url_map_class.class_eval do
-              alias_method :initialize_without_newrelic, :initialize
-
-              def initialize(map = {})
-                traced_map = ::NewRelic::Agent::Instrumentation::RackURLMap.generate_traced_map(map)
-                initialize_without_newrelic(traced_map)
-              end
-            end
-          end
-        end
-      end
-
-      module RackBuilder
-
-        def run_with_newrelic(app, *args)
-          if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
-            wrapped_app = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true)
-            run_without_newrelic(wrapped_app, *args)
-          else
-            run_without_newrelic(app, *args)
-          end
-        end
-
-        def use_with_newrelic(middleware_class, *args, &blk)
-          return if middleware_class.nil?
-          if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
-            wrapped_middleware_class = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.for_class(middleware_class)
-            use_without_newrelic(wrapped_middleware_class, *args, &blk)
-          else
-            use_without_newrelic(middleware_class, *args, &blk)
-          end
-        end
-
-        # We patch this method for a reason that actually has nothing to do with
-        # instrumenting rack itself. It happens to be a convenient and
-        # easy-to-hook point that happens late in the startup sequence of almost
-        # every application, making it a good place to do a final call to
-        # DependencyDetection.detect!, since all libraries are likely loaded at
-        # this point.
-        def to_app_with_newrelic_deferred_dependency_detection
-          unless self.class._nr_deferred_detection_ran
-            NewRelic::Agent.logger.info "Doing deferred dependency-detection before Rack startup"
-            DependencyDetection.detect!
-            self.class._nr_deferred_detection_ran = true
-          end
-
-          result = to_app_without_newrelic
-          ::NewRelic::Agent::Instrumentation::RackHelpers.check_for_late_instrumentation(result)
-
-          result
-        end
-      end
-
-      module RackURLMap
-        def self.generate_traced_map(map)
-          map.inject({}) do |traced_map, (url, handler)|
-            traced_map[url] = NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(handler, true)
-            traced_map
-          end
-        end
-      end
-    end
-  end
-end
+require_relative 'rack/helpers'
+require_relative 'rack/instrumentation'
+require_relative 'rack/chain'
+require_relative 'rack/prepend'
 
 DependencyDetection.defer do
   named :rack
@@ -141,20 +17,27 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent::Instrumentation::RackHelpers.instrument_builder ::Rack::Builder
+    if use_prepend?
+      prepend_instrument ::Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Prepend
+    else
+      chain_instrument_target ::Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Chain
+    end
   end
 end
 
-
 DependencyDetection.defer do
   named :puma_rack
 
   depends_on do
-    defined?(::Puma::Rack::Builder) && !NewRelic::Agent.config[:disable_puma_rack]
+    defined?(::Puma::Rack::Builder)
   end
 
   executes do
-    ::NewRelic::Agent::Instrumentation::RackHelpers.instrument_builder ::Puma::Rack::Builder
+    if use_prepend?
+      prepend_instrument ::Puma::Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Prepend
+    else
+      chain_instrument_target ::Puma::Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Chain
+    end
   end
 end
 
@@ -166,12 +49,16 @@ DependencyDetection.defer do
   end
 
   depends_on do
-    ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled? &&
-      !::NewRelic::Agent.config[:disable_rack]
+    ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
   end
 
   executes do
-    ::NewRelic::Agent::Instrumentation::RackHelpers.instrument_url_map ::Rack::URLMap
+    if use_prepend?
+      prepend_instrument ::Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Prepend
+    else
+      chain_instrument_target ::Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Chain
+      ::NewRelic::Agent::Instrumentation::RackHelpers.instrument_url_map 
+    end
   end
 end
 
@@ -179,15 +66,18 @@ DependencyDetection.defer do
   named :puma_rack_urlmap
 
   depends_on do
-    defined? Puma::Rack::URLMap
+    defined?(Puma::Rack::URLMap)
   end
 
   depends_on do
-    ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled? &&
-      !::NewRelic::Agent.config[:disable_puma_rack]
+    ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
   end
 
   executes do
-    ::NewRelic::Agent::Instrumentation::RackHelpers.instrument_url_map ::Puma::Rack::URLMap
+    if use_prepend?
+      prepend_instrument ::Puma::Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Prepend
+    else
+      chain_instrument_target ::Puma::Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Chain
+    end
   end
 end