newrelic_rpm 6.6.0.358 → 6.11.0.365

data/lib/new_relic/agent/error_event_aggregator.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
 
 require 'new_relic/agent/event_aggregator'
 require 'new_relic/agent/transaction_error_primitive'
@@ -10,6 +11,7 @@ require 'new_relic/agent/priority_sampled_buffer'
 module NewRelic
   module Agent
     class ErrorEventAggregator < EventAggregator
+      include NewRelic::Coerce
 
       named :ErrorEventAggregator
       capacity_key :'error_collector.max_event_samples_stored'
@@ -17,14 +19,14 @@ module NewRelic
                    :'error_collector.capture_events'
       buffer_class PrioritySampledBuffer
 
-      def record noticed_error, transaction_payload = nil
+      def record noticed_error, transaction_payload = nil, span_id = nil
         return unless enabled?
 
-        priority = (transaction_payload && transaction_payload[:priority]) || rand.round(6)
+        priority = float!((transaction_payload && transaction_payload[:priority]) || rand)
 
         @lock.synchronize do
           @buffer.append(priority: priority) do
-            create_event(noticed_error, transaction_payload)
+            create_event(noticed_error, transaction_payload, span_id)
           end
           notify_if_full
         end
@@ -32,8 +34,8 @@ module NewRelic
 
       private
 
-      def create_event noticed_error, transaction_payload
-        TransactionErrorPrimitive.create noticed_error, transaction_payload
+      def create_event noticed_error, transaction_payload, span_id
+        TransactionErrorPrimitive.create noticed_error, transaction_payload, span_id
       end
     end
   end

data/lib/new_relic/agent/external.rb

@@ -3,8 +3,8 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'new_relic/agent/transaction/tracing'
-require 'new_relic/agent/cross_app_tracing'
-require 'new_relic/agent/cross_app_payload'
+require 'new_relic/agent/distributed_tracing/cross_app_tracing'
+require 'new_relic/agent/distributed_tracing/cross_app_payload'
 
 module NewRelic
   module Agent
@@ -78,7 +78,7 @@ module NewRelic
             #
             if txn_info = rmd[NON_HTTP_CAT_TXN_HEADER]
               payload = CrossAppPayload.new(id, transaction, txn_info)
-              transaction.cross_app_payload = payload
+              transaction.distributed_tracer.cross_app_payload = payload
 
               CrossAppTracing.assign_intrinsic_transaction_attributes state
             end
@@ -112,16 +112,16 @@ module NewRelic
         NewRelic::Agent.record_api_supportability_metric(:get_response_metadata)
         return unless CrossAppTracing.cross_app_enabled?
 
-        return unless (transaction = Tracer.current_transaction)
-        return unless (cross_app_payload = transaction.cross_app_payload)
+        return unless (txn = Tracer.current_transaction)
+        return unless (payload = txn.distributed_tracer.cross_app_payload)
 
         # must freeze the name since we're responding with it
         #
-        transaction.freeze_name_and_execute_if_not_ignored do
+        txn.freeze_name_and_execute_if_not_ignored do
           # build response payload
           #
           rmd = {
-            NewRelicAppData: cross_app_payload.as_json_array(NON_HTTP_CAT_CONTENT_LENGTH)
+            NewRelicAppData: payload.as_json_array(NON_HTTP_CAT_CONTENT_LENGTH)
           }
 
           # obfuscate the generated response metadata JSON

data/lib/new_relic/agent/guid_generator.rb

@@ -0,0 +1,28 @@
+# 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.
+
+module NewRelic
+  module Agent
+    module GuidGenerator
+
+      HEX_DIGITS = (0..15).map{|i| i.to_s(16)}
+
+      module_function
+
+      # This method intentionally does not use SecureRandom, because it relies
+      # on urandom, which raises an exception in MRI when the interpreter runs
+      # out of allocated file descriptors.
+      # The guids generated by this method may not be _secure_, but they are
+      # random enough for our purposes.
+      def generate_guid length = 16
+        guid = ''
+        length.times do |a|
+          guid << HEX_DIGITS[rand(16)]
+        end
+        guid
+      end
+
+    end
+  end
+end

data/lib/new_relic/agent/hostname.rb

@@ -17,8 +17,14 @@ module NewRelic
         end
       end
 
+      # calling hostname with -f on some OS's (NetBSD, FreeBSD, Solaris)
+      # produces invalid option error, but doesn't raise exception.  Instead,
+      # we get back empty string.  So, solution here is to check for non-zero 
+      # exit status and retry the command without the -f flag.
       def self.get_fqdn
-        %x[hostname -f].chomp!
+        fqdn = %x[hostname -f].chomp!
+        fqdn = %x[hostname].chomp! unless $?.exitstatus.zero?
+        fqdn
       rescue => e
         NewRelic::Agent.logger.debug "Unable to determine fqdn #{e}"
         nil

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

@@ -0,0 +1,82 @@
+# 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
+
+module NewRelic
+  module Agent
+    module HTTPClients
+      MUST_IMPLEMENT_ERROR = "Subclasses of %s must implement a :%s method"
+      WHINY_NIL_ERROR = "%s cannot initialize with a nil wrapped_response object."
+
+      # This class provides a public interface for wrapping HTTP requests. This
+      # may be used to create wrappers that are compatible with New Relic's
+      # external request API.
+      #
+      # @api public
+      class AbstractRequest
+
+        def []
+          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
+        end
+
+        def []=
+          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
+        end
+
+        def type
+          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
+        end
+
+        def host_from_header
+          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
+        end
+
+        def host
+          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
+        end
+
+        def method
+          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
+        end
+      end
+
+      # This class implements the adaptor pattern and is used internally provide 
+      # uniform access to the underlying HTTP Client's response object
+      # NOTE: response_object should be non-nil!
+      class AbstractResponse # :nodoc:
+
+        def initialize wrapped_response
+          if wrapped_response.nil? 
+            raise ArgumentError, WHINY_NIL_ERROR % self.class
+          end
+          @wrapped_response = wrapped_response
+        end
+
+        def has_status_code?
+          !!status_code
+        end
+
+        # most HTTP client libraries report the HTTP status code as an integer, so 
+        # we expect status_code to be set only if a non-zero value is present
+        def status_code
+          @status_code ||= get_status_code
+        end
+
+        private 
+
+        def get_status_code_using method_name
+          return unless @wrapped_response.respond_to?(method_name)
+          code = @wrapped_response.send(method_name).to_i
+          code == 0 ? nil : code
+        end
+
+        # Override this method to memoize a non-zero Integer representation 
+        # of HTTP status code from the response object
+        def get_status_code
+          get_status_code_using :code
+        end
+      end
+    end
+  end
+end

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

@@ -1,19 +1,20 @@
 # 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 CurbRequest
-        CURB = 'Curb'.freeze
-        LHOST = 'host'.freeze
-        UHOST = 'Host'.freeze
+        CURB = 'Curb'
+        LHOST = 'host'
+        UHOST = 'Host'
 
-        def initialize( curlobj )
+        def initialize curlobj
           @curlobj = curlobj
         end
 
@@ -34,41 +35,45 @@ module NewRelic
         end
 
         def []( key )
-          @curlobj.headers[ key ]
+          @curlobj.headers[key]
         end
 
-        def []=( key, value )
-          @curlobj.headers[ key ] = value
+        def []=(key, value)
+          @curlobj.headers[key] = value
         end
 
         def uri
-          @uri ||= NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(@curlobj.url)
+          @uri ||= URIUtil.parse_and_normalize_url(@curlobj.url)
         end
       end
 
+      class CurbResponse < AbstractResponse
 
-      class CurbResponse < AbstractRequest
-
-        def initialize(curlobj)
+        def initialize wrapped_response
+          super wrapped_response
           @headers = {}
-          @curlobj = curlobj
         end
 
         def [](key)
-          @headers[ key.downcase ]
+          @headers[key.downcase]
         end
 
         def to_hash
           @headers.dup
         end
 
-        def append_header_data( data )
-          key, value = data.split( /:\s*/, 2 )
-          @headers[ key.downcase ] = value
-          @curlobj._nr_header_str ||= ''
-          @curlobj._nr_header_str << data
+        def append_header_data data
+          key, value = data.split(/:\s*/, 2)
+          @headers[key.downcase] = value
+          @wrapped_response._nr_header_str ||= String.new
+          @wrapped_response._nr_header_str << data
         end
 
+        private
+
+        def get_status_code
+          get_status_code_using :response_code
+        end
       end
 
     end

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