newrelic_rpm 6.3.0.355 → 6.8.0.360

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

@@ -52,8 +52,7 @@ module NewRelic
 
           return unless record_metrics?
 
-          insert_cross_app_header         request
-          insert_distributed_trace_header request
+          insert_context_propagation_headers request
         rescue => e
           NewRelic::Agent.logger.error "Error in add_request_headers", e
         end
@@ -200,9 +199,20 @@ module NewRelic
           end
         end
 
-        def insert_cross_app_header request
-          return unless CrossAppTracing.cross_app_enabled?
+        def insert_context_propagation_headers request
+          return unless transaction
+
+          if transaction.trace_context_enabled?
+            insert_trace_context_headers request
+          elsif transaction.nr_distributed_tracing_enabled?
+            insert_distributed_trace_header request
+          elsif CrossAppTracing.cross_app_enabled?
+            insert_cross_app_header request
+          end
+        end
 
+
+        def insert_cross_app_header request
           transaction.is_cross_app_caller = true
           txn_guid = transaction.guid
           trip_id   = transaction && transaction.cat_trip_id
@@ -214,11 +224,14 @@ module NewRelic
         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
 
+        def insert_trace_context_headers request
+          transaction.insert_trace_context carrier: request
+        end
+
         EXTERNAL_ALL = "External/all".freeze
 
         def add_unscoped_metrics

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

@@ -11,7 +11,7 @@ module NewRelic
         class FinishedTraceError < StandardError; end
 
         attr_reader :start_time, :root_node
-        attr_accessor :transaction_name, :guid, :xray_session_id, :attributes,
+        attr_accessor :transaction_name, :guid, :attributes,
                       :node_count, :finished, :threshold, :profile
 
         ROOT = "ROOT".freeze
@@ -40,11 +40,6 @@ module NewRelic
           self.root_node.duration
         end
 
-        def forced?
-          return true if NewRelic::Coerce.int_or_nil(xray_session_id)
-          false
-        end
-
         def synthetics_resource_id
           intrinsic_attributes = attributes.intrinsic_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER)
           intrinsic_attributes[:synthetics_resource_id]
@@ -148,8 +143,8 @@ module NewRelic
             encoder.encode(trace_tree(attributes_hash)),
             NewRelic::Coerce.string(self.guid),
             nil,
-            forced?,
-            NewRelic::Coerce.int_or_nil(xray_session_id),
+            false, # forced?,
+            nil, # NewRelic::Coerce.int_or_nil(xray_session_id),
             NewRelic::Coerce.string(self.synthetics_resource_id)
           ]
         end

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

@@ -48,7 +48,6 @@ module NewRelic
           trace.guid = transaction.guid
           trace.attributes = transaction.attributes
           trace.threshold = transaction.threshold
-          trace.xray_session_id = transaction.xray_session_id
           trace.finished = true
         end
       end

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

@@ -0,0 +1,159 @@
+# 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.
+require 'new_relic/agent/trace_context'
+require 'new_relic/agent/distributed_trace_payload'
+require 'new_relic/agent/distributed_trace_intrinsics'
+require 'new_relic/agent/distributed_trace_metrics'
+
+module NewRelic
+  module Agent
+    class Transaction
+      attr_accessor :trace_context_header_data
+      attr_reader   :trace_state_payload
+
+      module TraceContext
+        EMPTY_STRING                      = ''.freeze
+        SUPPORTABILITY_PREFIX             = "Supportability/TraceContext".freeze
+        CREATE_PREFIX                     = "#{SUPPORTABILITY_PREFIX}/Create".freeze
+        ACCEPT_PREFIX                     = "#{SUPPORTABILITY_PREFIX}/Accept".freeze
+        TRACESTATE_PREFIX                 = "#{SUPPORTABILITY_PREFIX}/TraceState".freeze
+        
+        CREATE_SUCCESS_METRIC             = "#{CREATE_PREFIX}/Success".freeze
+        CREATE_EXCEPTION_METRIC           = "#{CREATE_PREFIX}/Exception".freeze
+        
+        ACCEPT_SUCCESS_METRIC             = "#{ACCEPT_PREFIX}/Success".freeze
+        ACCEPT_EXCEPTION_METRIC           = "#{ACCEPT_PREFIX}/Exception".freeze
+        IGNORE_MULTIPLE_ACCEPT_METRIC     = "#{ACCEPT_PREFIX}/Ignored/Multiple".freeze
+        IGNORE_ACCEPT_AFTER_CREATE_METRIC = "#{ACCEPT_PREFIX}/Ignored/CreateBeforeAccept".freeze
+        
+        NO_NR_ENTRY_TRACESTATE_METRIC     = "#{TRACESTATE_PREFIX}/NoNrEntry".freeze
+        INVALID_TRACESTATE_PAYLOAD_METRIC = "#{TRACESTATE_PREFIX}/InvalidPayload".freeze
+
+        def insert_trace_context \
+            format: NewRelic::Agent::TraceContext::FORMAT_HTTP,
+            carrier: nil
+          
+          return unless trace_context_enabled?
+          NewRelic::Agent::TraceContext.insert \
+            format: format,
+            carrier: carrier,
+            trace_id: trace_id,
+            parent_id: current_segment.guid,
+            trace_flags: 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 = NewRelic::Agent::TraceContext::AccountHelpers.trace_state_entry_key
+          payload = create_trace_state_payload
+
+          if payload
+            entry = NewRelic::Agent::TraceContext.create_trace_state_entry \
+              entry_key,
+              payload.to_s
+          else
+            entry = EMPTY_STRING
+          end
+
+          trace_context_header_data ? trace_context_header_data.trace_state(entry) : entry
+        end
+
+        def create_trace_state_payload
+          unless trace_context_enabled?
+            NewRelic::Agent.logger.warn "Not configured to create WC3 trace context payload"
+            return
+          end
+
+          if Agent.config[:'span_events.enabled']
+            TraceContextPayload.create \
+              parent_account_id: Agent.config[:account_id],
+              parent_app_id: Agent.config[:primary_application_id],
+              transaction_id: guid,
+              sampled: sampled?,
+              priority: priority,
+              id: current_segment.guid
+          elsif trace_context_header_data
+            trace_context_header_data.trace_state_payload
+          end
+        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 trace_context_header_data
+          unless trace_context_enabled?
+            NewRelic::Agent.logger.warn "Not configured to accept WC3 trace context payload"
+            return false
+          end
+          return false if ignore_trace_context?
+          
+          @trace_context_header_data = trace_context_header_data
+          @trace_id = @trace_context_header_data.trace_id
+          @parent_span_id = @trace_context_header_data.parent_id
+
+          return false unless payload = assign_trace_state_payload
+
+          @parent_transaction_id = payload.transaction_id
+
+          unless payload.sampled.nil?
+            self.sampled = payload.sampled
+            self.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 append_trace_context_info transaction_payload
+          return unless trace_context_enabled?
+          DistributedTraceIntrinsics.copy_from_transaction \
+              self,
+              trace_state_payload,
+              transaction_payload
+        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
+      end
+
+      def trace_context_inserted?
+        @trace_context_inserted ||= false
+      end
+
+      W3C_FORMAT = "w3c".freeze
+
+      def trace_context_enabled?
+        Agent.config[:'distributed_tracing.enabled'] && (Agent.config[:'distributed_tracing.format'] == W3C_FORMAT) && Agent.instance.connected?
+      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)

data/lib/new_relic/agent/transaction_error_primitive.rb

@@ -9,6 +9,7 @@
 
 require 'new_relic/agent/payload_metric_mapping'
 require 'new_relic/agent/distributed_trace_payload'
+require 'new_relic/agent/distributed_trace_intrinsics'
 
 module NewRelic
   module Agent
@@ -54,11 +55,11 @@ module NewRelic
         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 +76,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

data/lib/new_relic/agent/transaction_event_primitive.rb

@@ -8,7 +8,7 @@
 # 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_trace_intrinsics'
 
 module NewRelic
   module Agent
@@ -51,11 +51,11 @@ module NewRelic
         PRIORITY_KEY  => payload[:priority]
         }
 
-        intrinsics[SAMPLED_KEY] = payload[:'sampled'] if Agent.config[:'distributed_tracing.enabled']
+        intrinsics[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
 
         NewRelic::Agent::PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
         append_optional_attributes(intrinsics, payload)
-        append_distributed_trace_intrinsics(intrinsics, payload)
+        DistributedTraceIntrinsics.copy_to_hash payload, intrinsics
 
         attributes = payload[:attributes]
 
@@ -84,14 +84,6 @@ module NewRelic
         end
       end
 
-      def append_distributed_trace_intrinsics(sample, payload)
-        return unless Agent.config[:'distributed_tracing.enabled']
-        DistributedTracePayload::INTRINSIC_KEYS.each do |key|
-          value = payload[key]
-          sample[key] = value unless value.nil?
-        end
-      end
-
       def optionally_append(sample_key, payload_key, sample, payload)
         if payload.include?(payload_key)
           sample[sample_key] = string(payload[payload_key])

data/lib/new_relic/agent/transaction_event_recorder.rb

@@ -14,9 +14,9 @@ module NewRelic
       attr_reader :transaction_event_aggregator
       attr_reader :synthetics_event_aggregator
 
-      def initialize
-        @transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new
-        @synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new
+      def initialize events
+        @transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new events
+        @synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new events
       end
 
       def record payload

data/lib/new_relic/agent/transaction_sampler.rb

@@ -4,7 +4,6 @@
 
 require 'new_relic/agent/transaction/slowest_sample_buffer'
 require 'new_relic/agent/transaction/synthetics_sample_buffer'
-require 'new_relic/agent/transaction/xray_sample_buffer'
 require 'new_relic/agent/transaction/trace_builder'
 
 module NewRelic
@@ -19,13 +18,10 @@ module NewRelic
     #
     # @api public
     class TransactionSampler
-      attr_reader :last_sample, :xray_sample_buffer
+      attr_reader :last_sample
 
       def initialize
-        @xray_sample_buffer = NewRelic::Agent::Transaction::XraySampleBuffer.new
-
         @sample_buffers = []
-        @sample_buffers << @xray_sample_buffer
         @sample_buffers << NewRelic::Agent::Transaction::SlowestSampleBuffer.new
         @sample_buffers << NewRelic::Agent::Transaction::SyntheticsSampleBuffer.new
 

data/lib/new_relic/cli/commands/deployments.rb

@@ -39,7 +39,7 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
     control.env = @environment if @environment
 
     load_yaml_from_env(control.env)
-    @appname ||= NewRelic::Agent.config.app_names[0] || control.env || 'development'
+    @appname ||= NewRelic::Agent.config[:app_name][0] || control.env || 'development'
     @license_key ||= NewRelic::Agent.config[:license_key]
 
     setup_logging(control.env)

data/lib/new_relic/coerce.rb

@@ -3,15 +3,16 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 module NewRelic
-  # We really don't want to send bad values to the collector, and it doesn't
-  # accept types like Rational that have occasionally slipped into our data.
-  #
-  # These methods are intended to safely coerce things into the form we want,
-  # to provide documentation of expected types on to_collector_array methods,
-  # and to log failures if totally invalid data gets into outgoing data
   module Coerce
     module_function
 
+    # We really don't want to send bad values to the collector, and it doesn't
+    # accept types like Rational that have occasionally slipped into our data.
+    #
+    # These non-bang methods are intended to safely coerce things into the form we want,
+    # to provide documentation of expected types on to_collector_array methods,
+    # and to log failures if totally invalid data gets into outgoing data
+
     def int(value, context=nil)
       Integer(value)
     rescue => error
@@ -61,6 +62,28 @@ module NewRelic
       end
     end
 
+    def int! value
+      return nil unless value_or_nil(value)
+      Integer(value)
+    end
+
+    # Use when you plan to perform a boolean check using the integer 1
+    # for true and the integer 0 for false
+    # String values will be converted to 0
+    def boolean_int! value
+      value.to_i
+    end
+
+    def float! value
+      return nil unless value_or_nil(value)
+      value.to_f
+    end
+
+    def value_or_nil value
+      return nil if value.nil? || value.empty?
+      value
+    end
+
     def log_failure(value, type, context, error)
       msg = "Unable to convert '#{value}' to #{type}"
       msg += " in context '#{context}'" if context