newrelic_rpm 6.6.0.358 → 6.11.0

data/lib/new_relic/agent/transaction/external_request_segment.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
 
 require 'new_relic/agent/transaction/segment'
 require 'new_relic/agent/http_clients/uri_util'
@@ -14,10 +15,16 @@ module NewRelic
       #
       # @api public
       class ExternalRequestSegment < Segment
-        attr_reader :library, :uri, :procedure
+        NR_SYNTHETICS_HEADER = 'X-NewRelic-Synthetics'
+        APP_DATA_KEY = 'NewRelicAppData'
 
-        NR_SYNTHETICS_HEADER = 'X-NewRelic-Synthetics'.freeze
+        EXTERNAL_ALL = "External/all"
+        EXTERNAL_ALL_WEB = "External/allWeb"
+        EXTERNAL_ALL_OTHER = "External/allOther"
+        MISSING_STATUS_CODE = "MissingHTTPStatusCode"
 
+        attr_reader :library, :uri, :procedure
+        attr_reader :http_status_code
 
         def initialize library, uri, procedure, start_time = nil # :nodoc:
           @library = library
@@ -25,6 +32,7 @@ module NewRelic
           @procedure = procedure
           @host_header = nil
           @app_data = nil
+          @http_status_code = nil
           super(nil, nil, start_time)
         end
 
@@ -52,8 +60,7 @@ module NewRelic
 
           return unless record_metrics?
 
-          insert_cross_app_header         request
-          insert_distributed_trace_header request
+          transaction.distributed_tracer.insert_headers request
         rescue => e
           NewRelic::Agent.logger.error "Error in add_request_headers", e
         end
@@ -99,10 +106,6 @@ module NewRelic
           @app_data && @app_data[1]
         end
 
-        EXTERNAL_TRANSACTION_PREFIX = 'ExternalTransaction/'.freeze
-        SLASH = '/'.freeze
-        APP_DATA_KEY = 'NewRelicAppData'.freeze
-
         # Obtain an obfuscated +String+ suitable for delivery across public networks that identifies this application
         # and transaction to another application which is also running a New Relic agent. This +String+ can be processed
         # by +process_request_metadata+ on the receiving application.
@@ -124,14 +127,14 @@ module NewRelic
               NewRelicTransaction: [
                 transaction.guid,
                 false,
-                transaction.cat_trip_id,
-                transaction.cat_path_hash
+                transaction.distributed_tracer.cat_trip_id,
+                transaction.distributed_tracer.cat_path_hash
               ]
             }
 
             # flag cross app in the state so transaction knows to add bits to paylaod
             #
-            transaction.is_cross_app_caller = true
+            transaction.distributed_tracer.is_cross_app_caller = true
 
             # add Synthetics header if we have it
             #
@@ -179,8 +182,23 @@ module NewRelic
           super
         end
 
+        def process_response_headers response # :nodoc:
+          set_http_status_code response
+          read_response_headers response
+        end
+
         private
 
+        # Only sets the http_status_code if response.status_code is non-empty value
+        def set_http_status_code response
+          if response.respond_to? :status_code
+            @http_status_code = response.status_code if response.has_status_code?
+          else
+            NewRelic::Agent.logger.warn "Cannot extract HTTP Status Code from response #{response.class.to_s}"
+            NewRelic::Agent.record_metric "#{name}/#{MISSING_STATUS_CODE}", 1
+          end
+        end
+
         def insert_synthetics_header request, header
           request[NR_SYNTHETICS_HEADER] = header
         end
@@ -200,27 +218,6 @@ module NewRelic
           end
         end
 
-        def insert_cross_app_header request
-          return unless CrossAppTracing.cross_app_enabled?
-
-          transaction.is_cross_app_caller = true
-          txn_guid = transaction.guid
-          trip_id   = transaction && transaction.cat_trip_id
-          path_hash = transaction && transaction.cat_path_hash
-
-          CrossAppTracing.insert_request_headers request, txn_guid, trip_id, path_hash
-        end
-
-        NEWRELIC_TRACE_HEADER = "newrelic".freeze
-
-        def insert_distributed_trace_header request
-          return unless Agent.config[:'distributed_tracing.enabled']
-          payload = transaction.create_distributed_trace_payload
-          request[NEWRELIC_TRACE_HEADER] = payload.http_safe if payload
-        end
-
-        EXTERNAL_ALL = "External/all".freeze
-
         def add_unscoped_metrics
           @unscoped_metrics = [ EXTERNAL_ALL,
             "External/#{host}/all",
@@ -232,9 +229,6 @@ module NewRelic
           end
         end
 
-        EXTERNAL_ALL_WEB = "External/allWeb".freeze
-        EXTERNAL_ALL_OTHER = "External/allOther".freeze
-
         def suffixed_rollup_metric
           if Transaction.recording_web_transaction?
             EXTERNAL_ALL_WEB
@@ -258,7 +252,6 @@ module NewRelic
         def record_span_event
           aggregator = ::NewRelic::Agent.agent.span_event_aggregator
           priority   = transaction.priority
-
           aggregator.record(priority: priority) do
             SpanEventPrimitive.for_external_request_segment(self)
           end

data/lib/new_relic/agent/transaction/message_broker_segment.rb

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'new_relic/agent/transaction/segment'
-require 'new_relic/agent/cross_app_tracing'
+require 'new_relic/agent/distributed_tracing/cross_app_tracing'
 
 module NewRelic
   module Agent
@@ -89,18 +89,10 @@ module NewRelic
           @name
         end
 
-        NEWRELIC_TRACE_KEY = "newrelic".freeze
-
-        def insert_distributed_trace_header
-          return unless Agent.config[:'distributed_tracing.enabled']
-          payload = transaction.create_distributed_trace_payload
-          headers[NEWRELIC_TRACE_KEY] = payload.http_safe if payload
-        end
-
         def transaction_assigned
           if headers && transaction && action == :produce && record_metrics?
-            insert_distributed_trace_header
-            transaction.add_message_cat_headers headers if CrossAppTracing.cross_app_enabled?
+            transaction.distributed_tracer.insert_distributed_trace_header headers
+            transaction.distributed_tracer.insert_cat_headers headers
           end
         rescue => e
           NewRelic::Agent.logger.error "Error during message header processing", e

data/lib/new_relic/agent/transaction/segment.rb

@@ -4,6 +4,7 @@
 
 require 'new_relic/agent/transaction/abstract_segment'
 require 'new_relic/agent/span_event_primitive'
+require 'new_relic/agent/attributes'
 
 module NewRelic
   module Agent
@@ -12,13 +13,18 @@ module NewRelic
         # unscoped_metrics can be nil, a string, or array. we do this to save
         # object allocations. if allocations weren't important then we would
         # initialize it as an array that would be empty, have one item, or many items.
-        attr_reader :unscoped_metrics
+        attr_reader :unscoped_metrics, :attributes
 
         def initialize name=nil, unscoped_metrics=nil, start_time=nil
           @unscoped_metrics = unscoped_metrics
+          @attributes = Attributes.new(NewRelic::Agent.instance.attribute_filter)
           super name, start_time
         end
 
+        def add_custom_attributes(p)
+          attributes.merge_custom_attributes(p)
+        end
+
         private
 
         def record_metrics

data/lib/new_relic/agent/transaction/trace.rb

@@ -121,13 +121,11 @@ module NewRelic
           }
         end
 
-        EMPTY_HASH = {}.freeze
-
         def trace_tree attributes_hash
           [
             NewRelic::Coerce.float(self.start_time),
-            EMPTY_HASH,
-            EMPTY_HASH,
+            NewRelic::EMPTY_HASH,
+            NewRelic::EMPTY_HASH,
             self.root_node.to_array,
             attributes_hash
           ]

data/lib/new_relic/agent/transaction/trace_context.rb

@@ -0,0 +1,168 @@
+# 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
+    class Transaction
+      module TraceContext
+        include NewRelic::Coerce
+
+        module AccountHelpers
+          extend self
+
+          def trace_state_entry_key
+            @trace_state_entry_key ||= if Agent.config[:trusted_account_key]
+              "#{Agent.config[:trusted_account_key]}@nr".freeze
+            elsif Agent.config[:account_id]
+              "#{Agent.config[:account_id]}@nr".freeze
+            end
+          end
+        end
+
+        SUPPORTABILITY_PREFIX             = "Supportability/TraceContext"
+        CREATE_PREFIX                     = "#{SUPPORTABILITY_PREFIX}/Create"
+        ACCEPT_PREFIX                     = "#{SUPPORTABILITY_PREFIX}/Accept"
+        TRACESTATE_PREFIX                 = "#{SUPPORTABILITY_PREFIX}/TraceState"
+
+        CREATE_SUCCESS_METRIC             = "#{CREATE_PREFIX}/Success"
+        CREATE_EXCEPTION_METRIC           = "#{CREATE_PREFIX}/Exception"
+
+        ACCEPT_SUCCESS_METRIC             = "#{ACCEPT_PREFIX}/Success"
+        ACCEPT_EXCEPTION_METRIC           = "#{ACCEPT_PREFIX}/Exception"
+        IGNORE_MULTIPLE_ACCEPT_METRIC     = "#{ACCEPT_PREFIX}/Ignored/Multiple"
+        IGNORE_ACCEPT_AFTER_CREATE_METRIC = "#{ACCEPT_PREFIX}/Ignored/CreateBeforeAccept"
+
+        NO_NR_ENTRY_TRACESTATE_METRIC     = "#{TRACESTATE_PREFIX}/NoNrEntry"
+        INVALID_TRACESTATE_PAYLOAD_METRIC = "#{TRACESTATE_PREFIX}/InvalidNrEntry"
+
+        attr_accessor :trace_context_header_data
+        attr_reader   :trace_state_payload
+
+        def trace_parent_header_present? request
+          request[NewRelic::HTTP_TRACEPARENT_KEY]
+        end
+
+        def accept_trace_context_incoming_request request
+          header_data = NewRelic::Agent::DistributedTracing::TraceContext.parse(
+            format: NewRelic::FORMAT_RACK,
+            carrier: request,
+            trace_state_entry_key: AccountHelpers.trace_state_entry_key,
+          )
+          return if header_data.nil?
+
+          accept_trace_context header_data
+        end
+        private :accept_trace_context_incoming_request
+
+        def insert_trace_context_header header, format=NewRelic::FORMAT_NON_RACK
+          return unless Agent.config[:'distributed_tracing.enabled']
+
+          NewRelic::Agent::DistributedTracing::TraceContext.insert \
+            format: format,
+            carrier: header,
+            trace_id: transaction.trace_id.rjust(32, '0').downcase,
+            parent_id: transaction.current_segment.guid,
+            trace_flags: transaction.sampled? ? 0x1 : 0x0,
+            trace_state: create_trace_state
+
+          @trace_context_inserted = true
+
+          NewRelic::Agent.increment_metric CREATE_SUCCESS_METRIC
+          true
+        rescue Exception => e
+          NewRelic::Agent.increment_metric CREATE_EXCEPTION_METRIC
+          NewRelic::Agent.logger.warn "Failed to create trace context payload", e
+          false
+        end
+
+        def create_trace_state
+          entry_key = AccountHelpers.trace_state_entry_key.dup
+          payload = create_trace_state_payload
+
+          if payload
+            entry = NewRelic::Agent::DistributedTracing::TraceContext.create_trace_state_entry \
+              entry_key,
+              payload.to_s
+          else
+            entry = NewRelic::EMPTY_STR
+          end
+
+          trace_context_header_data ? trace_context_header_data.trace_state(entry) : entry
+        end
+
+        def create_trace_state_payload
+          unless Agent.config[:'distributed_tracing.enabled']
+            NewRelic::Agent.logger.warn "Not configured to create WC3 trace context payload"
+            return
+          end
+
+
+          span_guid = Agent.config[:'span_events.enabled'] ? transaction.current_segment.guid : nil
+          transaction_guid = Agent.config[:'analytics_events.enabled'] ? transaction.guid : nil
+
+          TraceContextPayload.create \
+            parent_account_id: Agent.config[:account_id],
+            parent_app_id: Agent.config[:primary_application_id],
+            transaction_id: transaction_guid,
+            sampled: transaction.sampled?,
+            priority: float!(transaction.priority, NewRelic::PRIORITY_PRECISION),
+            id: span_guid
+        end
+
+        def assign_trace_state_payload
+          payload = @trace_context_header_data.trace_state_payload
+          unless payload
+            NewRelic::Agent.increment_metric NO_NR_ENTRY_TRACESTATE_METRIC
+            return false
+          end
+          unless payload.valid?
+            NewRelic::Agent.increment_metric INVALID_TRACESTATE_PAYLOAD_METRIC
+            return false
+          end
+          @trace_state_payload = payload
+        end
+
+        def accept_trace_context header_data
+          return if ignore_trace_context?
+
+          @trace_context_header_data = header_data
+          transaction.trace_id = header_data.trace_id
+          transaction.parent_span_id = header_data.parent_id
+
+          return false unless payload = assign_trace_state_payload
+
+          transaction.distributed_tracer.parent_transaction_id = payload.transaction_id
+
+          unless payload.sampled.nil?
+            transaction.sampled = payload.sampled
+            transaction.priority = payload.priority if payload.priority
+          end
+          NewRelic::Agent.increment_metric ACCEPT_SUCCESS_METRIC
+          true
+        rescue => e
+          NewRelic::Agent.increment_metric ACCEPT_EXCEPTION_METRIC
+          NewRelic::Agent.logger.warn "Failed to accept trace context payload", e
+          false
+        end
+
+        def ignore_trace_context?
+          if trace_context_header_data
+            NewRelic::Agent.increment_metric IGNORE_MULTIPLE_ACCEPT_METRIC
+            return true
+          elsif trace_context_inserted?
+            NewRelic::Agent.increment_metric IGNORE_ACCEPT_AFTER_CREATE_METRIC
+            return true
+          end
+          false
+        end
+
+        def trace_context_inserted?
+          @trace_context_inserted ||= false
+        end
+
+      end
+    end
+  end
+end

data/lib/new_relic/agent/transaction/trace_node.rb

@@ -22,12 +22,17 @@ module NewRelic
           @metric_name     = metric_name || UNKNOWN_NODE_NAME
           @exit_timestamp  = relative_end
           @children        = nil
-          @params          = params.select do |p|
-            NewRelic::Agent.instance.attribute_filter.allows_key? p, AttributeFilter::DST_TRANSACTION_SEGMENTS
-          end if params
+          @params          = select_allowed_params(params)
           @parent_node     = parent
         end
 
+        def select_allowed_params params
+          return unless params
+          params.select do |p|
+            NewRelic::Agent.instance.attribute_filter.allows_key? p, AttributeFilter::DST_TRANSACTION_SEGMENTS
+          end
+        end
+
         # sets the final timestamp on a node to indicate the exit
         # point of the node
         def end_trace(timestamp)
@@ -38,16 +43,13 @@ module NewRelic
           to_debug_str(0)
         end
 
-        EMPTY_HASH = {}.freeze
-        EMPTY_ARRAY = [].freeze
-
         def to_array
-          params = @params ? @params : EMPTY_HASH
+          params = @params ? @params : NewRelic::EMPTY_HASH
           [ NewRelic::Helper.time_to_millis(@entry_timestamp),
             NewRelic::Helper.time_to_millis(@exit_timestamp),
             NewRelic::Coerce.string(@metric_name),
             params ] +
-            [ (@children ? @children.map{|s| s.to_array} : EMPTY_ARRAY) ]
+            [ (@children ? @children.map{|s| s.to_array} : NewRelic::EMPTY_ARRAY) ]
         end
 
         def path_string

data/lib/new_relic/agent/transaction_error_primitive.rb

@@ -8,7 +8,8 @@
 # the transaction event aggregator and the synthetics container.
 
 require 'new_relic/agent/payload_metric_mapping'
-require 'new_relic/agent/distributed_trace_payload'
+require 'new_relic/agent/distributed_tracing/distributed_trace_payload'
+require 'new_relic/agent/distributed_tracing/distributed_trace_intrinsics'
 
 module NewRelic
   module Agent
@@ -31,16 +32,17 @@ module NewRelic
       SYNTHETICS_JOB_ID_KEY          = "nr.syntheticsJobId".freeze
       SYNTHETICS_MONITOR_ID_KEY      = "nr.syntheticsMonitorId".freeze
       PRIORITY_KEY                   = "priority".freeze
+      SPAN_ID_KEY                    = "spanId".freeze
 
-      def create noticed_error, payload
+      def create noticed_error, payload, span_id
         [
-          intrinsic_attributes_for(noticed_error, payload),
+          intrinsic_attributes_for(noticed_error, payload, span_id),
           noticed_error.custom_attributes,
           noticed_error.agent_attributes
         ]
       end
 
-      def intrinsic_attributes_for noticed_error, payload
+      def intrinsic_attributes_for noticed_error, payload, span_id
         attrs = {
           TYPE_KEY => SAMPLE_TYPE,
           ERROR_CLASS_KEY => noticed_error.exception_class_name,
@@ -49,16 +51,17 @@ module NewRelic
           TIMESTAMP_KEY => noticed_error.timestamp.to_f
         }
 
+        attrs[SPAN_ID_KEY] = span_id if span_id
         attrs[PORT_KEY] = noticed_error.request_port if noticed_error.request_port
 
         if payload
           attrs[NAME_KEY] = payload[:name]
           attrs[DURATION_KEY] = payload[:duration]
-          attrs[SAMPLED_KEY] = payload[:'sampled'] if Agent.config[:'distributed_tracing.enabled']
-          attrs[PRIORITY_KEY] = payload[:'priority']
+          attrs[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
+          attrs[PRIORITY_KEY] = payload[:priority]
           append_synthetics payload, attrs
           append_cat payload, attrs
-          append_distributed_trace_intrinsics payload, attrs
+          DistributedTraceIntrinsics.copy_to_hash payload, attrs
           PayloadMetricMapping.append_mapped_metrics payload[:metrics], attrs
         end
 
@@ -75,14 +78,6 @@ module NewRelic
         sample[GUID_KEY] = payload[:guid] if payload[:guid]
         sample[REFERRING_TRANSACTION_GUID_KEY] = payload[:referring_transaction_guid] if payload[:referring_transaction_guid]
       end
-
-      def append_distributed_trace_intrinsics payload, sample
-        return unless Agent.config[:'distributed_tracing.enabled']
-        DistributedTracePayload::INTRINSIC_KEYS.each do |key|
-          value = payload[key]
-          sample[key] = value unless value.nil?
-        end
-      end
     end
   end
 end