newrelic_rpm 6.9.0.363 → 6.12.0.367

data/lib/new_relic/agent/instrumentation/httpclient.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 :httpclient
@@ -38,12 +38,14 @@ DependencyDetection.defer do
           response = nil
           segment.add_request_headers wrapped_request
 
-          do_get_block_without_newrelic(req, proxy, conn, &block)
+          NewRelic::Agent::Tracer.capture_segment_error segment do
+            do_get_block_without_newrelic(req, proxy, conn, &block)
+          end
           response = conn.pop
           conn.push response
 
           wrapped_response = ::NewRelic::Agent::HTTPClients::HTTPClientResponse.new(response)
-          segment.read_response_headers wrapped_response
+          segment.process_response_headers wrapped_response
 
           response
         ensure

data/lib/new_relic/agent/instrumentation/ignore_actions.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/memcache.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.
 
 # NOTE there are multiple implementations of the MemCache client in Ruby,
 # each with slightly different API's and semantics.
@@ -46,7 +46,9 @@ module NewRelic
                   operation: method_name
                 )
                 begin
-                  send method_name_without, *args, &block
+                  NewRelic::Agent::Tracer.capture_segment_error segment do
+                    send method_name_without, *args, &block
+                  end
                 ensure
                   if NewRelic::Agent.config[:capture_memcache_keys]
                     segment.notice_nosql_statement "#{method_name} #{args.first.inspect}"

data/lib/new_relic/agent/instrumentation/memcache/dalli.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
@@ -66,7 +66,9 @@ module NewRelic
                 ::NewRelic::Agent::Instrumentation::Memcache::Dalli.assign_instance_to(segment, self)
 
                 begin
-                  send_multiget_without_newrelic_trace(keys)
+                  NewRelic::Agent::Tracer.capture_segment_error segment do                  
+                    send_multiget_without_newrelic_trace(keys)
+                  end
                 ensure
                   if ::NewRelic::Agent.config[:capture_memcache_keys]
                     segment.notice_nosql_statement "#{SEND_MULTIGET_METRIC_NAME} #{keys.inspect}"
@@ -87,7 +89,9 @@ module NewRelic
               define_method method_name do |*args, &block|
                 segment = NewRelic::Agent::Tracer.start_segment name: "Ruby/Memcached/Dalli/#{method_name}"
                 begin
-                  __send__ method_name_without, *args, &block
+                  NewRelic::Agent::Tracer.capture_segment_error segment do                  
+                    __send__ method_name_without, *args, &block
+                  end
                 ensure
                   segment.finish if segment
                 end

data/lib/new_relic/agent/instrumentation/merb/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 'set'
 

data/lib/new_relic/agent/instrumentation/merb/errors.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 = :merb_error

data/lib/new_relic/agent/instrumentation/middleware_proxy.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/method_tracer'
 require 'new_relic/agent/transaction'
@@ -27,10 +27,18 @@ module NewRelic
             @middleware_class = middleware_class
           end
 
-          def new(*args, &blk)
-            middleware_instance = @middleware_class.new(*args, &blk)
-            MiddlewareProxy.wrap(middleware_instance)
+          if RUBY_VERSION < "2.7.0"
+            def new(*args, &blk)
+              middleware_instance = @middleware_class.new(*args, &blk)
+              MiddlewareProxy.wrap(middleware_instance)
+            end
+          else
+            def new(*args, **kwargs, &blk)
+              middleware_instance = @middleware_class.new(*args, **kwargs, &blk)
+              MiddlewareProxy.wrap(middleware_instance)
+            end
           end
+
         end
 
         def self.is_sinatra_app?(target)

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

@@ -1,6 +1,7 @@
 # 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/method_tracer'
 require 'new_relic/agent/transaction'
@@ -26,7 +27,10 @@ module NewRelic
   module Agent
     module Instrumentation
       module MiddlewareTracing
-        TXN_STARTED_KEY = 'newrelic.transaction_started'.freeze
+
+        TXN_STARTED_KEY = 'newrelic.transaction_started'
+        CONTENT_TYPE    = 'Content-Type'
+        CONTENT_LENGTH  = 'Content-Length'
 
         def _nr_has_middleware_tracing
           true
@@ -56,8 +60,6 @@ module NewRelic
           end
         end
 
-        CONTENT_TYPE = 'Content-Type'.freeze
-
         def capture_response_content_type(state, result)
           if result.is_a?(Array) && state.current_transaction
             _, headers, _ = result
@@ -65,12 +67,12 @@ module NewRelic
           end
         end
 
-        CONTENT_LENGTH = 'Content-Length'.freeze
-
         def capture_response_content_length(state, result)
           if result.is_a?(Array) && state.current_transaction
             _, headers, _ = result
-            state.current_transaction.response_content_length = headers[CONTENT_LENGTH]
+            length = headers[CONTENT_LENGTH]
+            length = length.reduce(0){|sum, h| sum + h.to_i} if length.is_a?(Array)
+            state.current_transaction.response_content_length = length
           end
         end
 

data/lib/new_relic/agent/instrumentation/mongo.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 :mongo
@@ -87,7 +87,9 @@ DependencyDetection.defer do
 
         begin
           result = NewRelic::Agent.disable_all_tracing do
-            instrument_without_new_relic_trace(name, payload, &block)
+            NewRelic::Agent::Tracer.capture_segment_error segment do
+              instrument_without_new_relic_trace(name, payload, &block)
+            end
           end
 
           new_relic_notice_statement(segment, payload, name) if segment
@@ -109,7 +111,9 @@ DependencyDetection.defer do
 
         begin
           result = NewRelic::Agent.disable_all_tracing do
-            save_without_new_relic_trace(doc, opts, &block)
+            NewRelic::Agent::Tracer.capture_segment_error segment do
+              save_without_new_relic_trace(doc, opts, &block)
+            end
           end
 
           new_relic_notice_statement(segment, doc, :save) if segment
@@ -131,7 +135,9 @@ DependencyDetection.defer do
 
         begin
           result = NewRelic::Agent.disable_all_tracing do
-            ensure_index_without_new_relic_trace(spec, opts, &block)
+            NewRelic::Agent::Tracer.capture_segment_error segment do
+              ensure_index_without_new_relic_trace(spec, opts, &block)
+            end
           end
 
           spec = case spec

data/lib/new_relic/agent/instrumentation/mongodb_command_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.
 require 'new_relic/agent/datastores/mongo/event_formatter'
 
 module NewRelic
@@ -19,11 +19,35 @@ module NewRelic
           end
         end
 
+        ERROR_KEYS = %w{ writeErrors writeConcernError writeConcernErrors }.freeze
+
+        def error_key_present?(event)
+          if reply = event.reply
+            ERROR_KEYS.detect{ |key| reply[key] }
+          end
+        rescue
+          false
+        end
+
         def completed(event)
           begin
             return unless NewRelic::Agent::Tracer.tracing_enabled?
             segment = segments.delete(event.operation_id)
-            segment.finish if segment
+            return unless segment
+
+            # operations that succeed but have errors return CommandSucceeded 
+            # with an error_key that is populated with error specfics
+            if error_key = error_key_present?(event)
+              # taking the last error as there can potentially be many
+              attributes = event.reply[error_key][-1]
+              segment.notice_error Mongo::Error.new("%s (%s)" % [attributes["errmsg"], attributes["code"]])
+
+            # failing commands return a CommandFailed event with an error message
+            # in the form of "% (%s)" for the message and code
+            elsif event.is_a? Mongo::Monitoring::Event::CommandFailed
+              segment.notice_error Mongo::Error.new(event.message)
+            end
+            segment.finish
           rescue Exception => e
             log_notification_error('completed', e)
           end
@@ -39,7 +63,7 @@ module NewRelic
           port_path_or_id = port_path_or_id_from_address event.address
           segment = NewRelic::Agent::Tracer.start_datastore_segment(
             product: MONGODB,
-            operation: event.command_name,
+            operation: operation(event.command_name),
             collection: collection(event),
             host: host,
             port_path_or_id: port_path_or_id,
@@ -49,6 +73,15 @@ module NewRelic
           segment
         end
 
+        def operation(command_name)
+          # from 2.0 to 2.5, :findandmodify was the command_name
+          if command_name == :findandmodify
+            :findAndModify 
+          else
+            command_name
+          end
+        end
+
         def collection(event)
           event.command[COLLECTION] || event.command[:collection] || event.command.values.first
         end

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