newrelic_rpm 4.5.0.337 → 4.6.0.338

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

@@ -18,6 +18,8 @@ module NewRelic
           super name, start_time
         end
 
+        private
+
         def record_metrics
           if record_scoped_metric?
             metric_cache.record_scoped_and_unscoped name, duration, exclusive_duration
@@ -29,8 +31,6 @@ module NewRelic
           end
         end
 
-        private
-
         def append_unscoped_metric metric
           if @unscoped_metrics
             if Array === @unscoped_metrics
@@ -48,7 +48,6 @@ module NewRelic
         end
 
         def segment_complete
-          Agent.instance.transaction_sampler.add_node_parameters params if params?
         end
       end
     end

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

@@ -15,10 +15,12 @@ module NewRelic
                       :attributes, :node_count, :finished, :threshold,
                       :profile
 
+        ROOT = "ROOT".freeze
+
         def initialize(start_time)
           @start_time = start_time
           @node_count = 0
-          @root_node = NewRelic::Agent::Transaction::TraceNode.new(0.0, "ROOT")
+          @root_node = NewRelic::Agent::Transaction::TraceNode.new(ROOT, 0.0, nil, nil, nil)
           @prepared = false
         end
 
@@ -27,7 +29,12 @@ module NewRelic
         end
 
         def count_nodes
-          self.node_count
+          node_count = 0
+          each_node do |node|
+            next if node == root_node
+            node_count +=1
+          end
+          node_count
         end
 
         def duration
@@ -51,7 +58,7 @@ module NewRelic
         def create_node(time_since_start, metric_name = nil)
           raise FinishedTraceError.new "Can't create additional node for finished trace." if self.finished
           self.node_count += 1
-          NewRelic::Agent::Transaction::TraceNode.new(time_since_start, metric_name)
+          NewRelic::Agent::Transaction::TraceNode.new(metric_name, time_since_start)
         end
 
         def each_node(&block)
@@ -111,6 +118,8 @@ module NewRelic
           @root_node.each_node_with_nest_tracking(&block)
         end
 
+        EMPTY_HASH = {}.freeze
+
         def trace_tree
           destination = NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER
 
@@ -120,8 +129,8 @@ module NewRelic
 
           [
             NewRelic::Coerce.float(self.start_time),
-            {},
-            {},
+            EMPTY_HASH,
+            EMPTY_HASH,
             self.root_node.to_array,
             {
               'agentAttributes' => agent_attributes,

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

@@ -0,0 +1,58 @@
+# 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/helper'
+require 'new_relic/agent/transaction/trace'
+require 'new_relic/agent/transaction/trace_node'
+
+module NewRelic
+  module Agent
+    class Transaction
+      module TraceBuilder
+        extend self
+
+        def build_trace transaction
+          trace = Trace.new transaction.start_time
+          trace.root_node.exit_timestamp = transaction.end_time - transaction.start_time
+          copy_attributes transaction, trace
+          first, *rest = transaction.segments
+          relationship_map = rest.group_by { |s| s.parent }
+          trace.root_node.children << process_segments(transaction, first, trace.root_node, relationship_map)
+          trace
+        end
+
+        private
+
+        # recursively builds a transaction trace from the flat list of segments
+        def process_segments transaction, segment, parent, relationship_map
+          current = create_trace_node transaction, segment, parent
+
+          if children = relationship_map[segment]
+            current.children = children.map! do |child|
+              process_segments transaction, child, current, relationship_map
+            end
+          end
+
+          current
+        end
+
+        def create_trace_node transaction, segment, parent
+          relative_start = segment.start_time - transaction.start_time
+          relative_end = segment.end_time - transaction.start_time
+          TraceNode.new segment.name, relative_start, relative_end, segment.params, parent
+        end
+
+        def copy_attributes transaction, trace
+          trace.transaction_name = transaction.best_name
+          trace.uri = transaction.request_path
+          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
+    end
+  end
+end

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

@@ -9,20 +9,21 @@ module NewRelic
         attr_reader :entry_timestamp
         # The exit timestamp will be relative except for the outermost sample which will
         # have a timestamp.
-        attr_reader :exit_timestamp
+        attr_accessor :exit_timestamp
+
         attr_reader :parent_node
 
-        attr_accessor :metric_name, :params
+        attr_accessor :metric_name
 
         UNKNOWN_NODE_NAME = '<unknown>'.freeze
 
-        def initialize(timestamp, metric_name)
-          @entry_timestamp = timestamp
+        def initialize(metric_name, relative_start, relative_end=nil, params=nil, parent=nil)
+          @entry_timestamp = relative_start
           @metric_name     = metric_name || UNKNOWN_NODE_NAME
-          @exit_timestamp  = nil
-          @called_nodes    = nil
-          @params          = {}
-          @parent_node     = nil
+          @exit_timestamp  = relative_end
+          @children    = nil
+          @params          = params
+          @parent_node     = parent
         end
 
         # sets the final timestamp on a node to indicate the exit
@@ -31,33 +32,31 @@ module NewRelic
           @exit_timestamp = timestamp
         end
 
-        def add_called_node(s)
-          @called_nodes ||= []
-          @called_nodes << s
-          s.parent_node = self
-        end
-
         def to_s
           to_debug_str(0)
         end
 
+        EMPTY_HASH = {}.freeze
+        EMPTY_ARRAY = [].freeze
+
         def to_array
+          params = @params ? @params : EMPTY_HASH
           [ NewRelic::Helper.time_to_millis(@entry_timestamp),
             NewRelic::Helper.time_to_millis(@exit_timestamp),
             NewRelic::Coerce.string(@metric_name),
             params ] +
-            [ (@called_nodes ? @called_nodes.map{|s| s.to_array} : []) ]
+            [ (@children ? @children.map{|s| s.to_array} : EMPTY_ARRAY) ]
         end
 
         def path_string
-          "#{metric_name}[#{called_nodes.collect {|node| node.path_string }.join('')}]"
+          "#{metric_name}[#{children.collect {|node| node.path_string }.join('')}]"
         end
 
         def to_s_compact
           str = ""
           str << metric_name
-          if called_nodes.any?
-            str << "{#{called_nodes.map { | cs | cs.to_s_compact }.join(",")}}"
+          if children.any?
+            str << "{#{children.map { | cs | cs.to_s_compact }.join(",")}}"
           end
           str
         end
@@ -71,7 +70,7 @@ module NewRelic
               s << "#{tab}    -#{'%-16s' % k}: #{v.to_s[0..80]}\n"
             end
           end
-          called_nodes.each do |cs|
+          children.each do |cs|
             s << cs.to_debug_str(depth + 1)
           end
           s << tab + "<< "
@@ -83,10 +82,12 @@ module NewRelic
           s << " #{metric_name}\n"
         end
 
-        def called_nodes
-          @called_nodes || []
+        def children
+          @children ||= []
         end
 
+        attr_writer :children
+
         # return the total duration of this node
         def duration
           (@exit_timestamp - @entry_timestamp).to_f
@@ -97,7 +98,7 @@ module NewRelic
         def exclusive_duration
           d = duration
 
-          called_nodes.each do |node|
+          children.each do |node|
             d -= node.duration
           end
           d
@@ -105,10 +106,16 @@ module NewRelic
 
         def count_nodes
           count = 1
-          called_nodes.each { | node | count  += node.count_nodes }
+          children.each { | node | count  += node.count_nodes }
           count
         end
 
+        def params
+          @params ||= {}
+        end
+
+        attr_writer :params
+
         def []=(key, value)
           # only create a parameters field if a parameter is set; this will save
           # bandwidth etc as most nodes have no parameters
@@ -124,8 +131,8 @@ module NewRelic
         def each_node(&block)
           block.call self
 
-          if @called_nodes
-            @called_nodes.each do |node|
+          if @children
+            @children.each do |node|
               node.each_node(&block)
             end
           end
@@ -137,8 +144,8 @@ module NewRelic
           summary = block.call self
           summary.current_nest_count += 1 if summary
 
-          if @called_nodes
-            @called_nodes.each do |node|
+          if @children
+            @children.each do |node|
               node.each_node_with_nest_tracking(&block)
             end
           end
@@ -159,11 +166,6 @@ module NewRelic
           NewRelic::Agent::Database.obfuscate_sql(params[:sql].sql)
         end
 
-        def called_nodes=(nodes)
-          @called_nodes = nodes
-        end
-
-        protected
         def parent_node=(s)
           @parent_node = s
         end

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

@@ -88,25 +88,20 @@ module NewRelic
           segment.transaction = self
           segment.parent = current_segment
           @current_segment = segment
-          if @segments.length < Agent.config[:'transaction_tracer.limit_segments']
+          if @segments.length < segment_limit
             @segments << segment
-            transaction_sampler.notice_push_frame state, segment.start_time if transaction_sampler_enabled?
           else
             segment.record_on_finish = true
+            ::NewRelic::Agent.logger.debug("Segment limit of #{segment_limit} reached, ceasing collection.")
           end
         end
 
         def segment_complete segment
           @current_segment = segment.parent
-          if transaction_sampler_enabled? && !segment.record_on_finish?
-            transaction_sampler.notice_pop_frame state, segment.name, segment.end_time
-          end
         end
 
-        private
-
-        def transaction_sampler_enabled?
-          Agent.config[:'transaction_tracer.enabled']
+        def segment_limit
+          Agent.config[:'transaction_tracer.limit_segments']
         end
       end
     end

data/lib/new_relic/agent/transaction_error_primitive.rb

@@ -8,6 +8,7 @@
 # the transaction event aggregator and the synthetics container.
 
 require 'new_relic/agent/payload_metric_mapping'
+require 'new_relic/agent/distributed_trace_payload'
 
 module NewRelic
   module Agent
@@ -22,6 +23,7 @@ module NewRelic
       PORT_KEY                       = 'port'.freeze
       NAME_KEY                       = 'transactionName'.freeze
       DURATION_KEY                   = 'duration'.freeze
+      SAMPLED_KEY                    = 'nr.sampled'.freeze
       GUID_KEY                       = 'nr.transactionGuid'.freeze
       REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
       SYNTHETICS_RESOURCE_ID_KEY     = "nr.syntheticsResourceId".freeze
@@ -49,8 +51,10 @@ 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']
           append_synthetics payload, attrs
           append_cat payload, attrs
+          append_distributed_trace_intrinsics payload, attrs
           PayloadMetricMapping.append_mapped_metrics payload[:metrics], attrs
         end
 
@@ -67,6 +71,20 @@ 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
+
+      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
 end

data/lib/new_relic/agent/transaction_event_aggregator.rb

@@ -6,6 +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'
 
 module NewRelic
   module Agent
@@ -14,6 +15,7 @@ module NewRelic
       named :TransactionEventAggregator
       capacity_key :'analytics_events.max_samples_stored'
       enabled_key :'analytics_events.enabled'
+      buffer_class DistributedTracePrioritySampledBuffer
 
       def append event=nil, &blk
         raise ArgumentError, "Expected argument or block, but received both" if event && blk
@@ -25,6 +27,18 @@ module NewRelic
         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?
+
+        @lock.synchronize do
+          @buffer.append_sampled event, &blk
+          notify_if_full
+        end
+      end
+
       private
 
       def after_harvest metadata

data/lib/new_relic/agent/transaction_event_primitive.rb

@@ -8,6 +8,7 @@
 # the transaction event aggregator and the synthetics container.
 
 require 'new_relic/agent/payload_metric_mapping'
+require 'new_relic/agent/distributed_trace_payload'
 
 module NewRelic
   module Agent
@@ -24,6 +25,7 @@ module NewRelic
       NAME_KEY                       = 'name'.freeze
       DURATION_KEY                   = 'duration'.freeze
       ERROR_KEY                      = 'error'.freeze
+      SAMPLED_KEY                    = 'nr.sampled'.freeze
       GUID_KEY                       = 'nr.guid'.freeze
       REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
       CAT_TRIP_ID_KEY                = 'nr.tripId'.freeze
@@ -35,6 +37,7 @@ module NewRelic
       SYNTHETICS_JOB_ID_KEY          = "nr.syntheticsJobId".freeze
       SYNTHETICS_MONITOR_ID_KEY      = "nr.syntheticsMonitorId".freeze
 
+
       # To avoid allocations when we have empty custom or agent attributes
       EMPTY_HASH = {}.freeze
 
@@ -47,8 +50,11 @@ module NewRelic
         ERROR_KEY     => payload[:error]
         }
 
+        intrinsics[SAMPLED_KEY] = payload[:'nr.sampled'] if Agent.config[:'distributed_tracing.enabled']
+
         NewRelic::Agent::PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
         append_optional_attributes(intrinsics, payload)
+        append_distributed_trace_intrinsics(intrinsics, payload)
 
         attributes = payload[:attributes]
 
@@ -78,6 +84,14 @@ 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])