newrelic_rpm 6.9.0.363 → 6.10.0.364

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

@@ -1,20 +1,21 @@
 # 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.
+# frozen_string_literal: true
 
-require 'new_relic/agent/http_clients/abstract_request'
+require_relative 'abstract'
 
 module NewRelic
   module Agent
     module HTTPClients
-      class ExconHTTPResponse
-        def initialize(response)
-          @response = response
+      class ExconHTTPResponse < AbstractResponse
+        def initialize wrapped_response
+          super wrapped_response
+
           # Since HTTP headers are case-insensitive, we normalize all of them to
           # upper case here, and then also in our [](key) implementation.
           @normalized_headers = {}
-          headers = response.respond_to?(:headers) ? response.headers : response[:headers]
-          (headers || {}).each do |key, val|
+          (get_attribute(:headers) || {}).each do |key, val|
             @normalized_headers[key.upcase] = val
           end
         end
@@ -26,15 +27,30 @@ module NewRelic
         def to_hash
           @normalized_headers.dup
         end
+
+        private
+
+        def get_attribute name
+          if @wrapped_response.respond_to?(name) 
+            @wrapped_response.send(name) 
+          else
+            @wrapped_response[name]
+          end
+        end
+
+        def get_status_code
+          code = get_attribute(:status).to_i
+          code == 0 ? nil : code
+        end
       end
 
       class ExconHTTPRequest < AbstractRequest
         attr_reader :method
 
-        EXCON = "Excon".freeze
-        LHOST = 'host'.freeze
-        UHOST = 'Host'.freeze
-        COLON = ':'.freeze
+        EXCON = "Excon"
+        LHOST = 'host'
+        UHOST = 'Host'
+        COLON = ':'
 
         def initialize(datum)
           @datum = datum
@@ -70,9 +86,8 @@ module NewRelic
         end
 
         def uri
-          ::NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(
-            "#{@scheme}://#{host}:#{@port}#{@path}"
-            )
+          url = "#{@scheme}://#{host}:#{@port}#{@path}"
+          URIUtil.parse_and_normalize_url url
         end
       end
     end

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

@@ -1,39 +1,35 @@
 # 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.
+# frozen_string_literal: true
 
-require 'new_relic/agent/http_clients/abstract_request'
+require_relative 'abstract'
 
 module NewRelic
   module Agent
     module HTTPClients
-      class HTTPResponse
-        attr_reader :response
-
-        def initialize(response)
-          @response = response
-        end
-
+      class HTTPResponse < AbstractResponse
         def [](key)
-          _, value = response.headers.find { |k,_| key.downcase == k.downcase }
+          _, value = @wrapped_response.headers.find{ |k, _| key.downcase == k.downcase }
           value unless value.nil?
         end
 
         def to_hash
-          response.headers
+          @wrapped_response.headers
         end
       end
 
       class HTTPRequest < AbstractRequest
-        HTTP_RB = 'http.rb'.freeze
-        HOST    = 'host'.freeze
-        COLON   = ':'.freeze
+        HTTP_RB = 'http.rb'
+        HOST    = 'host'
+        COLON   = ':'
 
-        attr_reader :request, :uri
+        def initialize wrapped_request
+          @wrapped_request = wrapped_request
+        end
 
-        def initialize(request)
-          @request = request
-          @uri = request.uri
+        def uri
+          @uri ||= URIUtil.parse_and_normalize_url(@wrapped_request.uri)
         end
 
         def type
@@ -47,19 +43,19 @@ module NewRelic
         end
 
         def host
-          host_from_header || request.host
+          host_from_header || @wrapped_request.host
         end
 
         def method
-          request.verb.upcase
+          @wrapped_request.verb.upcase
         end
 
         def [](key)
-          request.headers[key]
+          @wrapped_request.headers[key]
         end
 
         def []=(key, value)
-          request.headers[key] = value
+          @wrapped_request.headers[key] = value
         end
       end
     end

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

@@ -1,21 +1,17 @@
 # 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.
+# frozen_string_literal: true
 
-require 'new_relic/agent/http_clients/abstract_request'
+require_relative 'abstract'
 
 module NewRelic
   module Agent
     module HTTPClients
-      class HTTPClientResponse
-        attr_reader :response
-
-        def initialize(response)
-          @response = response
-        end
+      class HTTPClientResponse < AbstractResponse
 
         def [](key)
-          response.headers.each do |k,v|
+          @wrapped_response.headers.each do |k,v|
             if key.downcase == k.downcase
               return v
             end
@@ -24,12 +20,12 @@ module NewRelic
         end
 
         def to_hash
-          response.headers
+          @wrapped_response.headers
         end
       end
 
       class HTTPClientRequest < AbstractRequest
-        attr_reader :request, :uri
+        attr_reader :request
 
         HTTP_CLIENT = "HTTPClient".freeze
         LHOST = 'host'.freeze
@@ -38,7 +34,6 @@ module NewRelic
 
         def initialize(request)
           @request = request
-          @uri = request.header.request_uri
         end
 
         def type
@@ -59,6 +54,10 @@ module NewRelic
           host_from_header || uri.host.to_s
         end
 
+        def uri
+          @uri ||= URIUtil.parse_and_normalize_url(request.header.request_uri)
+        end
+
         def [](key)
           request.headers[key]
         end

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

@@ -1,26 +1,38 @@
 # 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.
+# frozen_string_literal: true
 
-require 'new_relic/agent/http_clients/abstract_request'
+require_relative 'abstract'
 
 module NewRelic
   module Agent
     module HTTPClients
+      class NetHTTPResponse < AbstractResponse
+
+        def [](key)
+          @wrapped_response[key]
+        end
+
+        def to_hash
+          @wrapped_response.to_hash
+        end
+      end
+
       class NetHTTPRequest < AbstractRequest
         def initialize(connection, request)
           @connection = connection
           @request = request
         end
 
-        NET_HTTP = 'Net::HTTP'.freeze
+        NET_HTTP = 'Net::HTTP'
 
         def type
           NET_HTTP
         end
 
-        HOST = 'host'.freeze
-        COLON = ':'.freeze
+        HOST = 'host'
+        COLON = ':'
 
         def host_from_header
           if hostname = self[HOST]

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

@@ -1,16 +1,14 @@
 # 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.
+# frozen_string_literal: true
 
-require 'new_relic/agent/http_clients/abstract_request'
+require_relative 'abstract'
 
 module NewRelic
   module Agent
     module HTTPClients
-      class TyphoeusHTTPResponse
-        def initialize(response)
-          @response = response
-        end
+      class TyphoeusHTTPResponse < AbstractResponse
 
         def [](key)
           unless headers.nil?
@@ -33,7 +31,7 @@ module NewRelic
         private
 
         def headers
-          @response.headers
+          @wrapped_response.headers
         end
       end
 

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

@@ -2,6 +2,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.
+# frozen_string_literal: true
 
 # This module includes utilities for manipulating URIs, particularly from the
 # context of Net::HTTP requests. We don't always have direct access to the full
@@ -41,10 +42,10 @@ module NewRelic
           uri
         end
 
-        QUESTION_MARK = "?".freeze
+        QUESTION_MARK = "?"
 
         def self.strip_query_string(fragment)
-          if(fragment.include?(QUESTION_MARK))
+          if fragment.include? QUESTION_MARK
             fragment.split(QUESTION_MARK).first
           else
             fragment

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

@@ -29,7 +29,10 @@ module NewRelic
         def finish(name, id, payload) #THREAD_LOCAL_ACCESS
           return unless state.is_execution_traced?
 
-          notice_error payload if payload.key? :exception
+          if exception = exception_object(payload)
+            NewRelic::Agent.notice_error exception
+          end
+
           finishable = pop_segment(id)
           finishable.finish if finishable
         rescue => e
@@ -51,10 +54,6 @@ module NewRelic
         def action_name(name)
           name.gsub DOT_ACTION_CABLE, NewRelic::EMPTY_STR
         end
-
-        def notice_error(payload)
-          NewRelic::Agent.notice_error payload[:exception_object]
-        end
       end
     end
   end

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

@@ -35,6 +35,10 @@ module NewRelic
           if state.is_execution_traced? \
               && !should_ignore(payload, controller_class(payload))
 
+            if exception = exception_object(payload)
+              finishable.notice_error(exception)
+            end
+
             finishable.finish
           else
             Agent.instance.pop_trace_execution_flag

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

@@ -24,8 +24,13 @@ module NewRelic
         end
 
         def finish(name, id, payload) #THREAD_LOCAL_ACCESS
-          event = pop_segment(id)
-          event.finish if event
+          if segment = pop_segment(id)
+
+          if exception = exception_object(payload)
+            segment.notice_error exception
+          end
+            segment.finish
+          end
         rescue => e
           log_notification_error(e, name, 'finish')
         end
@@ -97,6 +102,10 @@ module NewRelic
         def finish
           @finishable.finish if @finishable
         end
+
+        def notice_error error
+          @finishable.notice_error error if @finishable
+        end
       end
     end
 

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

@@ -43,7 +43,7 @@ module NewRelic
           end
         end
 
-        def log_with_newrelic_instrumentation(*args, &block) #THREAD_LOCAL_ACCESS
+        def log_with_newrelic_instrumentation(*args, &block)
           state = NewRelic::Agent::Tracer.state
 
           if !state.is_execution_traced?
@@ -78,7 +78,9 @@ module NewRelic
           segment._notice_sql(sql, @config, EXPLAINER)
 
           begin
-            log_without_newrelic_instrumentation(*args, &block)
+            NewRelic::Agent::Tracer.capture_segment_error segment do
+              log_without_newrelic_instrumentation(*args, &block)
+            end
           ensure
             segment.finish if segment
           end

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

@@ -58,8 +58,13 @@ module NewRelic
           return if cached?(payload)
           return unless state.is_execution_traced?
 
-          segment = pop_segment(id)
-          segment.finish if segment
+          if segment = pop_segment(id)
+            if exception = exception_object(payload)
+              segment.notice_error(exception)
+            end
+            segment.finish
+          end
+
         rescue => e
           log_notification_error(e, name, 'finish')
         end

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

@@ -16,7 +16,7 @@ module NewRelic
 
         def finish name, id, payload
           return unless state.is_execution_traced?
-          finish_segment id
+          finish_segment id, payload
         rescue => e
           log_notification_error e, name, 'finish'
         end
@@ -28,9 +28,13 @@ module NewRelic
           push_segment id, segment
         end
 
-        def finish_segment id
-          segment = pop_segment id
-          segment.finish if segment
+        def finish_segment id, payload
+          if segment = pop_segment(id)
+            if exception = exception_object(payload)
+              segment.notice_error(exception)
+            end
+            segment.finish
+          end
         end
 
         def metric_name name, payload

data/lib/new_relic/agent/instrumentation/bunny.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.
+# frozen_string_literal: true
 
 DependencyDetection.defer do
   named :bunny
@@ -41,10 +42,11 @@ DependencyDetection.defer do
             )
           rescue => e
             NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Exchange#publish", e
-          end
-
-          begin
             publish_without_new_relic payload, opts
+          else
+            NewRelic::Agent::Tracer.capture_segment_error segment do
+              publish_without_new_relic payload, opts
+            end
           ensure
             segment.finish if segment
           end
@@ -55,28 +57,40 @@ DependencyDetection.defer do
         alias_method :pop_without_new_relic, :pop
 
         def pop(opts = {:manual_ack => false}, &block)
-          t0 = Time.now
-          msg = pop_without_new_relic opts, &block
-          delivery_info, message_properties, _payload = msg
+          bunny_error, delivery_info, message_properties, _payload = nil, nil, nil, nil
+          begin
+            t0 = Time.now
+            msg = pop_without_new_relic opts, &block
+            delivery_info, message_properties, _payload = msg
+          rescue StandardError => error
+            bunny_error = error
+          end
 
           begin
-            if delivery_info
-              exchange_name = NewRelic::Agent::Instrumentation::Bunny.exchange_name(delivery_info.exchange)
-              exchange_type = NewRelic::Agent::Instrumentation::Bunny.exchange_type(delivery_info, channel)
-
-              segment = NewRelic::Agent::Messaging.start_amqp_consume_segment(
-                library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
-                destination_name: exchange_name,
-                delivery_info: delivery_info,
-                message_properties: message_properties,
-                exchange_type: exchange_type,
-                queue_name: name,
-                start_time: t0
-              )
+            exchange_name, exchange_type = if delivery_info
+              [ NewRelic::Agent::Instrumentation::Bunny.exchange_name(delivery_info.exchange),
+                NewRelic::Agent::Instrumentation::Bunny.exchange_type(delivery_info, channel) ]
+            else
+              [ NewRelic::Agent::Instrumentation::Bunny.exchange_name(NewRelic::EMPTY_STR),
+                NewRelic::Agent::Instrumentation::Bunny.exchange_type({}, channel) ]
             end
 
+            segment = NewRelic::Agent::Messaging.start_amqp_consume_segment(
+              library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
+              destination_name: exchange_name,
+              delivery_info: (delivery_info || {}),
+              message_properties: (message_properties || {headers: {}}),
+              exchange_type: exchange_type,
+              queue_name: name,
+              start_time: t0
+            )
           rescue => e
             NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Queue#pop", e
+          else
+            if bunny_error
+              segment.notice_error bunny_error
+              raise bunny_error
+            end
           ensure
             segment.finish if segment
           end
@@ -97,10 +111,11 @@ DependencyDetection.defer do
             )
           rescue => e
             NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Queue#purge", e
-          end
-
-          begin
             purge_without_new_relic(*args)
+          else
+            NewRelic::Agent::Tracer.capture_segment_error segment do
+              purge_without_new_relic(*args)
+            end
           ensure
             segment.finish if segment
           end
@@ -134,18 +149,20 @@ module NewRelic
   module Agent
     module Instrumentation
       module Bunny
-        LIBRARY = 'RabbitMQ'.freeze
-        DEFAULT = 'Default'.freeze
-        SLASH   = '/'.freeze
+        LIBRARY = 'RabbitMQ'
+        DEFAULT_NAME = 'Default'
+        DEFAULT_TYPE = :direct
+
+        SLASH   = '/'
 
         class << self
           def exchange_name name
-            name.empty? ? DEFAULT : name
+            name.empty? ? DEFAULT_NAME : name
           end
 
           def exchange_type delivery_info, channel
             if di_exchange = delivery_info[:exchange]
-              return :direct if di_exchange.empty?
+              return DEFAULT_TYPE if di_exchange.empty?
               return channel.exchanges[delivery_info[:exchange]].type if channel.exchanges[di_exchange]
             end
           end