newrelic_rpm 6.9.0.363 → 6.13.1

data/lib/new_relic/agent/instrumentation/net.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.
 
 DependencyDetection.defer do
   named :net_http
@@ -17,32 +17,69 @@ DependencyDetection.defer do
 
   executes do
     class Net::HTTP
-      def request_with_newrelic_trace(request, *args, &block)
-        wrapped_request = NewRelic::Agent::HTTPClients::NetHTTPRequest.new(self, request)
 
-        segment = NewRelic::Agent::Tracer.start_external_request_segment(
-          library: wrapped_request.type,
-          uri: wrapped_request.uri,
-          procedure: wrapped_request.method
-        )
-
-        begin
-          response = nil
-          segment.add_request_headers wrapped_request
-
-          # RUBY-1244 Disable further tracing in request to avoid double
-          # counting if connection wasn't started (which calls request again).
-          NewRelic::Agent.disable_all_tracing do
-            response = request_without_newrelic_trace( request, *args, &block )
+      if RUBY_VERSION < "2.7.0"
+        def request_with_newrelic_trace(request, *args, &block)
+          wrapped_request = NewRelic::Agent::HTTPClients::NetHTTPRequest.new(self, request)
+  
+          segment = NewRelic::Agent::Tracer.start_external_request_segment(
+            library: wrapped_request.type,
+            uri: wrapped_request.uri,
+            procedure: wrapped_request.method
+          )
+  
+          begin
+            response = nil
+            segment.add_request_headers wrapped_request
+  
+            # RUBY-1244 Disable further tracing in request to avoid double
+            # 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
+                request_without_newrelic_trace(request, *args, &block)
+              end
+            end
+  
+            wrapped_response = NewRelic::Agent::HTTPClients::NetHTTPResponse.new response
+            segment.process_response_headers wrapped_response
+            response
+          ensure
+            segment.finish
+          end
+        end  
+      else
+        def request_with_newrelic_trace(request, *args, **kwargs, &block)
+          wrapped_request = NewRelic::Agent::HTTPClients::NetHTTPRequest.new(self, request)
+  
+          segment = NewRelic::Agent::Tracer.start_external_request_segment(
+            library: wrapped_request.type,
+            uri: wrapped_request.uri,
+            procedure: wrapped_request.method
+          )
+  
+          begin
+            response = nil
+            segment.add_request_headers wrapped_request
+  
+            # RUBY-1244 Disable further tracing in request to avoid double
+            # 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
+                request_without_newrelic_trace(request, *args, **kwargs, &block)
+              end
+            end
+  
+            wrapped_response = NewRelic::Agent::HTTPClients::NetHTTPResponse.new response
+            segment.process_response_headers wrapped_response
+            response
+          ensure
+            segment.finish
           end
-
-          segment.read_response_headers response
-          response
-        ensure
-          segment.finish
         end
+    
       end
 
+
       alias request_without_newrelic_trace request
       alias request request_with_newrelic_trace
     end

data/lib/new_relic/agent/instrumentation/notifications_subscriber.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.
 
 module NewRelic
   module Agent
@@ -8,6 +8,7 @@ module NewRelic
       class NotificationsSubscriber
         def initialize
           @queue_key = ['NewRelic', self.class.name, object_id].join('-')
+          define_exception_method
         end
 
         def self.subscribed?
@@ -22,7 +23,7 @@ module NewRelic
 
           notifier = ActiveSupport::Notifications.notifier
 
-          instance_variable_names.each do |name| 
+          instance_variable_names.each do |name|
             if notifier.instance_variable_defined?(name)
               subscribers = notifier.instance_variable_get(name)
               if subscribers.is_a? Array
@@ -69,6 +70,29 @@ module NewRelic
         def state
           NewRelic::Agent::Tracer.state
         end
+
+        def define_exception_method
+          # we don't expect this to be called more than once, but we're being
+          # defensive.
+          return if defined?(exception_object)
+          return unless defined?(::ActiveSupport)
+          if ::ActiveSupport::VERSION::STRING < "5.0.0"
+            # Earlier versions of Rails did not add the exception itself to the
+            # payload asssessible via :exception_object, so we create a stand-in
+            # error object from the given class name and message.
+            # NOTE: no backtrace available this way, but we can notice the error
+            # well enough to send the necessary info the UI requires to present it.
+            def exception_object(payload)
+              exception_class, message = payload[:exception]
+              return nil unless exception_class
+              NewRelic::Agent::NoticibleError.new exception_class, message
+            end
+          else
+            def exception_object(payload)
+              payload[:exception_object]
+            end
+          end
+        end
       end
 
     end

data/lib/new_relic/agent/instrumentation/padrino.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.
 
 require 'new_relic/agent/instrumentation/sinatra'
 
@@ -43,25 +43,49 @@ 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)
+        if RUBY_VERSION < "2.7.0"
+          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
-          rescue => e
-            ::NewRelic::Agent.logger.debug("Failed during invoke_route to set transaction name", e)
+  
+            invoke_route_without_newrelic(*args, &block)
+          end
+        else
+          def invoke_route_with_newrelic(*args, **kwargs, &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, **kwargs, &block)
           end
-
-          invoke_route_without_newrelic(*args, &block)
         end
+
       end
     end
   end

data/lib/new_relic/agent/instrumentation/passenger_instrumentation.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.
 
 DependencyDetection.defer do
   @name = :passenger

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

data/lib/new_relic/agent/instrumentation/rack.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.
 
 require 'new_relic/agent/instrumentation/controller_instrumentation'
 
@@ -81,22 +81,45 @@ module NewRelic
       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)
+
+        if RUBY_VERSION < "2.7.0"
+          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
+        else
+          def run_with_newrelic(app, *args, **kwargs)
+            if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
+              wrapped_app = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true)
+              run_without_newrelic(wrapped_app, *args, **kwargs)
+            else
+              run_without_newrelic(app, *args, **kwargs)
+            end
+          end          
         end
 
-        def use_with_newrelic(middleware_class, *args, &blk)
-          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)
+        if RUBY_VERSION < "2.7.0"
+          def use_with_newrelic(middleware_class, *args, &blk)
+            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
+        else
+          def use_with_newrelic(middleware_class, *args, **kwargs, &blk)
+            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, **kwargs, &blk)
+            else
+              use_without_newrelic(middleware_class, *args, **kwargs, &blk)
+            end
+          end  
         end
 
         # We patch this method for a reason that actually has nothing to do with

data/lib/new_relic/agent/instrumentation/rails/action_controller.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.
 
 require 'new_relic/agent/parameter_filtering'
 

data/lib/new_relic/agent/instrumentation/rails/action_web_service.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.
 
 DependencyDetection.defer do
   @name = :rails_action_web_service

data/lib/new_relic/agent/instrumentation/rails3/action_controller.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.
 
 require 'new_relic/agent/parameter_filtering'
 

data/lib/new_relic/agent/instrumentation/rails_middleware.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.
 
 require 'new_relic/agent/instrumentation/middleware_proxy'
 

data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.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.
 require 'new_relic/agent/instrumentation/action_cable_subscriber'
 require 'new_relic/agent/prepend_supportability'
 

data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.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.
 require 'new_relic/agent/instrumentation/action_controller_subscriber'
 require 'new_relic/agent/prepend_supportability'
 

data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.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.
 require 'new_relic/agent/instrumentation/action_view_subscriber'
 require 'new_relic/agent/prepend_supportability'
 

data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.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.
 
 DependencyDetection.defer do
   @name = :rainbows

data/lib/new_relic/agent/instrumentation/rake.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.
 
 DependencyDetection.defer do
   # Why not :rake? newrelic-rake used that name, so avoid conflicting
@@ -8,6 +8,7 @@ DependencyDetection.defer do
 
   depends_on do
     defined?(::Rake) &&
+      defined?(::Rake::VERSION) &&
       ::NewRelic::Agent.config[:'disable_rake'] == false &&
       ::NewRelic::Agent.config[:'rake.tasks'].any? &&
       ::NewRelic::Agent::Instrumentation::RakeInstrumentation.should_install?
@@ -23,26 +24,51 @@ DependencyDetection.defer do
       class Task
         alias_method :invoke_without_newrelic, :invoke
 
-        def invoke(*args)
-          unless NewRelic::Agent::Instrumentation::RakeInstrumentation.should_trace? name
-            return invoke_without_newrelic(*args)
-          end
 
-          begin
-            timeout = NewRelic::Agent.config[:'rake.connect_timeout']
-            NewRelic::Agent.instance.wait_on_connect(timeout)
-          rescue => e
-            NewRelic::Agent.logger.error("Exception in wait_on_connect", e)
-            return invoke_without_newrelic(*args)
+        if RUBY_VERSION < "2.7.0"
+          def invoke(*args)
+            unless NewRelic::Agent::Instrumentation::RakeInstrumentation.should_trace? name
+              return invoke_without_newrelic(*args)
+            end
+  
+            begin
+              timeout = NewRelic::Agent.config[:'rake.connect_timeout']
+              NewRelic::Agent.instance.wait_on_connect(timeout)
+            rescue => e
+              NewRelic::Agent.logger.error("Exception in wait_on_connect", e)
+              return invoke_without_newrelic(*args)
+            end
+  
+            NewRelic::Agent::Instrumentation::RakeInstrumentation.before_invoke_transaction(self)
+  
+            NewRelic::Agent::Tracer.in_transaction(name: "OtherTransaction/Rake/invoke/#{name}", category: :rake) do
+              NewRelic::Agent::Instrumentation::RakeInstrumentation.record_attributes(args, self)
+              invoke_without_newrelic(*args)
+            end
           end
-
-          NewRelic::Agent::Instrumentation::RakeInstrumentation.before_invoke_transaction(self)
-
-          NewRelic::Agent::Tracer.in_transaction(name: "OtherTransaction/Rake/invoke/#{name}", category: :rake) do
-            NewRelic::Agent::Instrumentation::RakeInstrumentation.record_attributes(args, self)
-            invoke_without_newrelic(*args)
+        else
+          def invoke(*args, **kwargs)
+            unless NewRelic::Agent::Instrumentation::RakeInstrumentation.should_trace? name
+              return invoke_without_newrelic(*args, **kwargs)
+            end
+  
+            begin
+              timeout = NewRelic::Agent.config[:'rake.connect_timeout']
+              NewRelic::Agent.instance.wait_on_connect(timeout)
+            rescue => e
+              NewRelic::Agent.logger.error("Exception in wait_on_connect", e)
+              return invoke_without_newrelic(*args, **kwargs)
+            end
+  
+            NewRelic::Agent::Instrumentation::RakeInstrumentation.before_invoke_transaction(self)
+  
+            NewRelic::Agent::Tracer.in_transaction(name: "OtherTransaction/Rake/invoke/#{name}", category: :rake) do
+              NewRelic::Agent::Instrumentation::RakeInstrumentation.record_attributes(args, self)
+              invoke_without_newrelic(*args, **kwargs)
+            end
           end
         end
+
       end
     end
   end
@@ -86,11 +112,20 @@ module NewRelic
 
           task.instance_variable_set(:@__newrelic_instrumented_execute, true)
           task.instance_eval do
-            def execute(*args, &block)
-              NewRelic::Agent::MethodTracer.trace_execution_scoped("Rake/execute/#{self.name}") do
-                super
+            if RUBY_VERSION < "2.7.0"
+              def execute(*args, &block)
+                NewRelic::Agent::MethodTracer.trace_execution_scoped("Rake/execute/#{self.name}") do
+                  super
+                end
+              end
+            else
+              def execute(*args, **kwargs, &block)
+                NewRelic::Agent::MethodTracer.trace_execution_scoped("Rake/execute/#{self.name}") do
+                  super
+                end
               end
             end
+
           end
 
           instrument_execute_on_prereqs(task)