newrelic_rpm 4.8.0.341 → 5.0.0.342

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

@@ -14,92 +14,79 @@ module NewRelic
           !!distributed_trace_payload
         end
 
-        def create_distributed_trace_payload url = nil
+        SUPPORTABILITY_CREATE_PAYLOAD_SUCCESS   = "Supportability/DistributedTrace/CreatePayload/Success".freeze
+        SUPPORTABILITY_CREATE_PAYLOAD_EXCEPTION = "Supportability/DistributedTrace/CreatePayload/Exception".freeze
+
+        def create_distributed_trace_payload
           return unless Agent.config[:'distributed_tracing.enabled']
-          self.order += 1
-          DistributedTracePayload.for_transaction self, url
+          self.distributed_trace_payload_created = true
+          payload = DistributedTracePayload.for_transaction self
+          NewRelic::Agent.increment_metric SUPPORTABILITY_CREATE_PAYLOAD_SUCCESS
+          payload
+        rescue => e
+          NewRelic::Agent.increment_metric SUPPORTABILITY_CREATE_PAYLOAD_EXCEPTION
+          NewRelic::Agent.logger.warn "Failed to create distributed trace payload", e
+          nil
         end
 
-        LBRACE = "{".freeze
+        SUPPORTABILITY_ACCEPT_PAYLOAD_SUCCESS   = "Supportability/DistributedTrace/AcceptPayload/Success".freeze
+        SUPPORTABILITY_ACCEPT_PAYLOAD_EXCEPTION = "Supportability/DistributedTrace/AcceptPayload/Exception".freeze
 
-        def accept_distributed_trace_payload transport_type, payload
+        def accept_distributed_trace_payload payload
           return unless Agent.config[:'distributed_tracing.enabled']
-          if distributed_trace_payload
-            NewRelic::Agent.increment_metric "Supportability/DistributedTracing/AcceptFailure/PayloadAlreadyAccepted"
-            return false
-          elsif self.order > 0
-            NewRelic::Agent.increment_metric "Supportability/DistributedTracing/AcceptFailure/CreateDistributedTracePayload-before-AcceptDistributedTracePayload"
-            return false
-          elsif name_frozen?
-            NewRelic::Agent.increment_metric "Supportability/DistributedTracing/AcceptFailure/BrowserAgentInjected"
-            return false
-          end
+          return false if check_payload_ignored(payload)
+          return false unless payload = decode_payload(payload)
+          return false unless check_valid_version(payload)
+          return false unless check_trusted_account(payload)
 
-          payload = if payload.start_with? LBRACE
-            DistributedTracePayload.from_json payload
-          else
-            DistributedTracePayload.from_http_safe payload
-          end
-
-          payload.caller_transport_type = transport_type
-          self.distributed_trace_payload = payload
-
-          self.sampled = payload.sampled unless payload.sampled.nil?
+          assign_payload_and_sampling_params(payload)
 
+          NewRelic::Agent.increment_metric SUPPORTABILITY_ACCEPT_PAYLOAD_SUCCESS
           true
         rescue => e
-          NewRelic::Agent.increment_metric "Supportability/DistributedTracing/AcceptFailure/Unknown"
+          NewRelic::Agent.increment_metric SUPPORTABILITY_ACCEPT_PAYLOAD_EXCEPTION
           NewRelic::Agent.logger.warn "Failed to accept distributed trace payload", e
           false
         end
 
-        def distributed_tracing_trip_id
+        def trace_id
           if distributed_trace_payload
-            distributed_trace_payload.trip_id
+            distributed_trace_payload.trace_id
           else
             guid
           end
         end
 
-        def parent_ids
-          if distributed_trace_payload &&
-               distributed_trace_payload.parent_ids &&
-               distributed_trace_payload.parent_ids.last != guid
-            inbound_ids = distributed_trace_payload.parent_ids.dup
-            inbound_ids.push guid
-            if inbound_ids.size > 3
-              inbound_ids.shift
-            end
-            inbound_ids
-          else
-            [guid]
-          end
+        def parent_id
+          # The payload comes from our parent transaction, so its ID
+          # is our parent ID.
+          #
+          distributed_trace_payload && distributed_trace_payload.id
         end
 
-        def depth
-          if distributed_trace_payload
-            distributed_trace_payload.depth
-          else
-            1
-          end
+        def grandparent_id
+          # The payload comes from our parent transaction, so its
+          # parent ID is our grandparent ID.
+          #
+          distributed_trace_payload && distributed_trace_payload.parent_id
         end
 
-        def order
-          @order ||= 0
+        def distributed_trace_payload_created?
+          @distributed_trace_payload_created ||=  false
         end
 
-        attr_writer :order
+        attr_writer :distributed_trace_payload_created
 
-        def append_distributed_tracing_info payload
+        def append_distributed_trace_info transaction_payload
           return unless Agent.config[:'distributed_tracing.enabled']
           if distributed_trace_payload
-            distributed_trace_payload.assign_intrinsics self, payload
-          elsif order > 0
-            DistributedTracePayload.assign_initial_intrinsics self, payload
+            distributed_trace_payload.assign_intrinsics self, transaction_payload
+          elsif distributed_trace_payload_created?
+            DistributedTracePayload.assign_intrinsics_for_first_trace self, transaction_payload
           end
         end
 
-        def assign_distributed_tracing_intrinsics
+        def assign_distributed_trace_intrinsics
           return unless Agent.config[:'distributed_tracing.enabled']
           DistributedTracePayload::INTRINSIC_KEYS.each do |key|
             next unless value = @payload[key]
@@ -115,7 +102,78 @@ module NewRelic
           return unless distributed_trace_payload
           (start_time.to_f * 1000 - distributed_trace_payload.timestamp) / 1000
         end
+
+        private
+
+        SUPPORTABILITY_CREATE_BEFORE_ACCEPT_PAYLOAD   = "Supportability/DistributedTrace/AcceptPayload/Ignored/CreateBeforeAccept".freeze
+        SUPPORTABILITY_MULTIPLE_ACCEPT_PAYLOAD        = "Supportability/DistributedTrace/AcceptPayload/Ignored/Multiple".freeze
+        SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_NULL    = "Supportability/DistributedTrace/AcceptPayload/Ignored/Null".freeze
+        SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_BROWSER = "Supportability/DistributedTrace/AcceptPayload/Ignored/BrowserAgentInjected".freeze
+
+        def check_payload_ignored(payload)
+          if payload.nil?
+            NewRelic::Agent.increment_metric SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_NULL
+            return true
+          elsif distributed_trace_payload
+            NewRelic::Agent.increment_metric SUPPORTABILITY_MULTIPLE_ACCEPT_PAYLOAD
+            return true
+          elsif distributed_trace_payload_created?
+            NewRelic::Agent.increment_metric SUPPORTABILITY_CREATE_BEFORE_ACCEPT_PAYLOAD
+            return true
+          end
+          false
+        end
+
+        SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_PARSE_EXCEPTION = "Supportability/DistributedTrace/AcceptPayload/ParseException".freeze
+        LBRACE = "{".freeze
+
+        def decode_payload(payload)
+          if payload.start_with? LBRACE
+            DistributedTracePayload.from_json payload
+          else
+            DistributedTracePayload.from_http_safe payload
+          end
+        rescue => e
+          NewRelic::Agent.increment_metric SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_PARSE_EXCEPTION
+          NewRelic::Agent.logger.warn "Error parsing distributed trace payload", e
+          nil
+        end
+
+        SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_MAJOR_VERSION = "Supportability/DistributedTrace/AcceptPayload/Ignored/MajorVersion".freeze
+
+        def check_valid_version(payload)
+          if DistributedTracePayload.major_version_matches?(payload)
+            true
+          else
+            NewRelic::Agent.increment_metric SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_MAJOR_VERSION
+            false
+          end
+        end
+
+        SUPPORTABILITY_PAYLOAD_ACCEPT_UNTRUSTED_ACCOUNT = "Supportability/DistributedTrace/AcceptPayload/Ignored/UntrustedAccount".freeze
+
+        def check_trusted_account(payload)
+          trusted_account_ids = NewRelic::Agent.config[:trusted_account_ids]
+          trusted = trusted_account_ids.include?(payload.parent_account_id.to_i)
+
+          unless trusted
+            NewRelic::Agent.increment_metric SUPPORTABILITY_PAYLOAD_ACCEPT_UNTRUSTED_ACCOUNT
+            return false
+          end
+
+          true
+        end
+
+        def assign_payload_and_sampling_params(payload)
+          self.distributed_trace_payload = payload
+
+          unless payload.sampled.nil?
+            self.sampled = payload.sampled
+            self.priority = payload.priority if payload.priority
+          end
+        end
       end
     end
   end
 end
+

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

@@ -50,14 +50,9 @@ module NewRelic
           synthetics_header = transaction && transaction.raw_synthetics_header
           insert_synthetics_header request, synthetics_header if synthetics_header
 
-          return unless record_metrics? && CrossAppTracing.cross_app_enabled?
+          return unless record_metrics?
 
-          transaction_state.is_cross_app_caller = true
-          txn_guid = transaction_state.request_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
+          insert_cross_app_header         request
           insert_distributed_trace_header request
         rescue => e
           NewRelic::Agent.logger.error "Error in add_request_headers", e
@@ -206,11 +201,22 @@ module NewRelic
           end
         end
 
+        def insert_cross_app_header request
+          return unless CrossAppTracing.cross_app_enabled?
+
+          transaction_state.is_cross_app_caller = true
+          txn_guid = transaction_state.request_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
+
         X_NEWRELIC_TRACE_HEADER = "X-NewRelic-Trace".freeze
 
         def insert_distributed_trace_header request
           return unless Agent.config[:'distributed_tracing.enabled']
-          payload = transaction.create_distributed_trace_payload uri
+          payload = transaction.create_distributed_trace_payload
           request[X_NEWRELIC_TRACE_HEADER] = payload.http_safe
         end
 
@@ -261,7 +267,7 @@ module NewRelic
         def add_caller_by_duration_metrics
           prefix = if transaction.distributed_trace?
             payload = transaction.distributed_trace_payload
-            "DurationByCaller/#{payload.caller_type}/#{payload.caller_account_id}/#{payload.caller_app_id}/transport"
+            "DurationByCaller/#{payload.parent_type}/#{payload.parent_account_id}/#{payload.parent_app_id}/transport"
           else
             DURATION_BY_CALLER_UNKOWN_PREFIX
           end
@@ -273,7 +279,7 @@ module NewRelic
         def record_transport_duration_metrics
           return unless transaction.distributed_trace?
           payload = transaction.distributed_trace_payload
-          prefix = "TransportDuration/#{payload.caller_type}/#{payload.caller_account_id}/#{payload.caller_app_id}/transport"
+          prefix = "TransportDuration/#{payload.parent_type}/#{payload.parent_account_id}/#{payload.parent_app_id}/transport"
           metric_cache.record_unscoped "#{prefix}/#{ALL_SUFFIX}", transaction.transport_duration
           metric_cache.record_unscoped "#{prefix}/#{transaction_type_suffix}", transaction.transport_duration
         end
@@ -284,7 +290,7 @@ module NewRelic
           return unless transaction.exceptions.size > 0
           prefix = if transaction.distributed_trace?
             payload = transaction.distributed_trace_payload
-            "ErrorsByCaller/#{payload.caller_type}/#{payload.caller_account_id}/#{payload.caller_app_id}/transport"
+            "ErrorsByCaller/#{payload.parent_type}/#{payload.parent_account_id}/#{payload.parent_app_id}/transport"
           else
             ERRORS_BY_CALLER_UNKOWN_PREFIX
           end

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

@@ -83,21 +83,29 @@ module NewRelic
           if destination_type == :temporary_queue || destination_type == :temporary_topic
             @name << TEMP
           else
-            @name << NAMED << destination_name
+            @name << NAMED << destination_name.to_s
           end
 
           @name
         end
 
+        NEWRELIC_TRACE_KEY = "NewRelicTrace".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
+        end
+
         def transaction= t
           super
-          if headers && transaction && action == :produce && record_metrics? && CrossAppTracing.cross_app_enabled?
-            transaction.add_message_cat_headers headers
+          if headers && transaction && action == :produce && record_metrics?
+            insert_distributed_trace_header
+            transaction.add_message_cat_headers headers if CrossAppTracing.cross_app_enabled?
           end
         rescue => e
           NewRelic::Agent.logger.error "Error during message header processing", e
         end
-
       end
     end
   end

data/lib/new_relic/agent/transaction_error_primitive.rb

@@ -24,7 +24,7 @@ module NewRelic
       PORT_KEY                       = 'port'.freeze
       NAME_KEY                       = 'transactionName'.freeze
       DURATION_KEY                   = 'duration'.freeze
-      SAMPLED_KEY                    = 'nr.sampled'.freeze
+      SAMPLED_KEY                    = 'sampled'.freeze
       GUID_KEY                       = 'nr.transactionGuid'.freeze
       REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
       SYNTHETICS_RESOURCE_ID_KEY     = "nr.syntheticsResourceId".freeze
@@ -53,7 +53,7 @@ module NewRelic
         if payload
           attrs[NAME_KEY] = payload[:name]
           attrs[DURATION_KEY] = payload[:duration]
-          attrs[SAMPLED_KEY] = payload[:'nr.sampled'] if Agent.config[:'distributed_tracing.enabled']
+          attrs[SAMPLED_KEY] = payload[:'sampled'] if Agent.config[:'distributed_tracing.enabled']
           append_synthetics payload, attrs
           append_cat payload, attrs
           append_distributed_trace_intrinsics payload, attrs
@@ -74,18 +74,12 @@ module NewRelic
         sample[REFERRING_TRANSACTION_GUID_KEY] = payload[:referring_transaction_guid] if payload[:referring_transaction_guid]
       end
 
-      OTHER_GUID_KEY = "nr.guid".freeze
-
       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
-        # guid has a different name for transaction events
-        if sample.key? OTHER_GUID_KEY
-          sample[GUID_KEY] = sample.delete OTHER_GUID_KEY
-        end
       end
     end
   end

data/lib/new_relic/agent/transaction_event_aggregator.rb

@@ -6,7 +6,7 @@
 require 'newrelic_rpm' unless defined?( NewRelic )
 require 'new_relic/agent' unless defined?( NewRelic::Agent )
 require 'new_relic/agent/event_aggregator'
-require 'new_relic/agent/distributed_trace_priority_sampled_buffer'
+require 'new_relic/agent/priority_sampled_buffer'
 
 module NewRelic
   module Agent
@@ -15,27 +15,30 @@ module NewRelic
       named :TransactionEventAggregator
       capacity_key :'analytics_events.max_samples_stored'
       enabled_key :'analytics_events.enabled'
-      buffer_class DistributedTracePrioritySampledBuffer
+      buffer_class PrioritySampledBuffer
+
+      def append priority: nil, event:nil, &blk
+        unless(event || priority && blk)
+          raise ArgumentError, "Expected priority and block, or event"
+        end
 
-      def append event=nil, &blk
-        raise ArgumentError, "Expected argument or block, but received both" if event && blk
         return unless enabled?
 
         @lock.synchronize do
-          @buffer.append event, &blk
+          @buffer.append priority: priority, event: event, &blk
           notify_if_full
         end
       end
 
-      # events that are selected to be sampled have priority of other events (ie
-      # the ones passed to append)
-      def append_sampled event=nil, &blk
-        raise ArgumentError, "Expected argument or block, but received both" if event && blk
-        return unless enabled?
-
+      def merge! payload, adjust_count = true
         @lock.synchronize do
-          @buffer.append_sampled event, &blk
-          notify_if_full
+          _, samples = payload
+
+          if adjust_count
+            @buffer.decrement_lifetime_counts_by samples.count
+          end
+
+          samples.each { |s| @buffer.append event: s }
         end
       end
 

data/lib/new_relic/agent/transaction_event_primitive.rb

@@ -25,7 +25,8 @@ module NewRelic
       NAME_KEY                       = 'name'.freeze
       DURATION_KEY                   = 'duration'.freeze
       ERROR_KEY                      = 'error'.freeze
-      SAMPLED_KEY                    = 'nr.sampled'.freeze
+      SAMPLED_KEY                    = 'sampled'.freeze
+      PRIORITY_KEY                   = 'priority'.freeze
       GUID_KEY                       = 'nr.guid'.freeze
       REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
       CAT_TRIP_ID_KEY                = 'nr.tripId'.freeze
@@ -47,10 +48,11 @@ module NewRelic
         NAME_KEY      => string(payload[:name]),
         DURATION_KEY  => float(payload[:duration]),
         TYPE_KEY      => SAMPLE_TYPE,
-        ERROR_KEY     => payload[:error]
+        ERROR_KEY     => payload[:error],
+        PRIORITY_KEY  => payload[:priority]
         }
 
-        intrinsics[SAMPLED_KEY] = payload[:'nr.sampled'] if Agent.config[:'distributed_tracing.enabled']
+        intrinsics[SAMPLED_KEY] = payload[:'sampled'] if Agent.config[:'distributed_tracing.enabled']
 
         NewRelic::Agent::PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
         append_optional_attributes(intrinsics, payload)

data/lib/new_relic/agent/transaction_event_recorder.rb

@@ -22,14 +22,12 @@ module NewRelic
       def record payload
         return unless NewRelic::Agent.config[:'analytics_events.enabled']
 
-        if sampled_event? payload
-          transaction_event_aggregator.append_sampled { create_event(payload) }
-        elsif synthetics_event? payload
+        if synthetics_event? payload
           event = create_event payload
           _, rejected = synthetics_event_aggregator.append_or_reject event
-          transaction_event_aggregator.append event if rejected
+          transaction_event_aggregator.append event: event if rejected
         else
-          transaction_event_aggregator.append { create_event(payload) }
+          transaction_event_aggregator.append(priority: payload[:priority]) { create_event(payload) }
         end
       end
 
@@ -41,12 +39,6 @@ module NewRelic
         payload.key? :synthetics_resource_id
       end
 
-      SAMPLED_KEY = 'nr.sampled'
-
-      def sampled_event? payload
-        !!payload[SAMPLED_KEY]
-      end
-
       def drop_buffered_data
         transaction_event_aggregator.reset!
         synthetics_event_aggregator.reset!