newrelic_rpm 4.0.0.332 → 6.13.1

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

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module Agent
@@ -9,20 +9,28 @@ 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          = 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
@@ -31,33 +39,28 @@ 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
 
         def to_array
+          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 ] +
-            [ (@called_nodes ? @called_nodes.map{|s| s.to_array} : []) ]
+            [ (@children ? @children.map{|s| s.to_array} : NewRelic::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 +74,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 +86,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 +102,7 @@ module NewRelic
         def exclusive_duration
           d = duration
 
-          called_nodes.each do |node|
+          children.each do |node|
             d -= node.duration
           end
           d
@@ -105,10 +110,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 +135,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 +148,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
@@ -146,16 +157,6 @@ module NewRelic
           summary.current_nest_count -= 1 if summary
         end
 
-        # This is only for use by developer mode
-        def find_node(id)
-          return self if object_id == id
-          called_nodes.each do |node|
-            found = node.find_node(id)
-            return found if found
-          end
-          nil
-        end
-
         def explain_sql
           return params[:explain_plan] if params.key?(:explain_plan)
 
@@ -169,11 +170,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

@@ -1,69 +1,66 @@
 # 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/transaction/segment'
-require 'new_relic/agent/transaction/datastore_segment'
-require 'new_relic/agent/transaction/external_request_segment'
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module Agent
     class Transaction
       module Tracing
-        module ClassMethods
-          def start_segment name, unscoped_metrics=nil
-            segment = Segment.new name, unscoped_metrics
-            segment.start
-            add_segment segment
-            segment
-          end
 
-          UNKNOWN_PRODUCT = "Unknown".freeze
-          UNKNOWN_OPERATION = "other".freeze
+        attr_reader :current_segment
 
-          def start_datastore_segment product=nil, operation=nil, collection=nil, host=nil, port_path_or_id=nil, database_name=nil
-            product ||= UNKNOWN_PRODUCT
-            operation ||= UNKNOWN_OPERATION
-            segment = DatastoreSegment.new product, operation, collection, host, port_path_or_id, database_name
-            segment.start
-            add_segment segment
-            segment
-          end
+        def async?
+          @async ||= false
+        end
 
-          def start_external_request_segment library, uri, procedure
-            segment = ExternalRequestSegment.new library, uri, procedure
-            segment.start
-            add_segment segment
-            segment
-          end
+        attr_writer :async
+
+        def total_time
+          @total_time ||= 0.0
+        end
 
-          private
+        attr_writer :total_time
 
-          def add_segment segment
-            state = NewRelic::Agent::TransactionState.tl_get
-            if (txn = state.current_transaction) && state.is_execution_traced?
-              txn.add_segment segment
-            else
-              segment.record_metrics = false
-            end
+        def add_segment segment, parent = nil
+          segment.transaction = self
+          segment.parent = parent || current_segment
+          @current_segment = segment
+          if @segments.length < segment_limit
+            @segments << segment
+          else
+            segment.record_on_finish = true
+            ::NewRelic::Agent.logger.debug("Segment limit of #{segment_limit} reached, ceasing collection.")
           end
+          segment.transaction_assigned
         end
 
-        def self.included base
-          base.extend ClassMethods
+        def segment_complete segment
+          @current_segment = segment.parent
         end
 
-        def add_segment segment
-          segment.transaction = self
-          state.traced_method_stack.push_segment state, segment
+        def segment_limit
+          Agent.config[:'transaction_tracer.limit_segments']
         end
 
-        def segment_complete segment
-          state.traced_method_stack.pop_frame(state, segment, segment.name, segment.end_time, segment.record_metrics?)
+        private
+
+        def finalize_segments
+          segments.each { |s| s.finalize }
         end
 
-        def current_segment
-          state.traced_method_stack.last
+
+        WEB_TRANSACTION_TOTAL_TIME   = "WebTransactionTotalTime".freeze
+        OTHER_TRANSACTION_TOTAL_TIME = "OtherTransactionTotalTime".freeze
+
+        def record_total_time_metrics
+          total_time_metric = if recording_web_transaction?
+            WEB_TRANSACTION_TOTAL_TIME
+          else
+            OTHER_TRANSACTION_TOTAL_TIME
+          end
+
+          @metrics.record_unscoped total_time_metric, total_time
+          @metrics.record_unscoped "#{total_time_metric}/#{@frozen_name}", total_time
         end
       end
     end

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

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module Agent

data/lib/new_relic/agent/transaction_error_primitive.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 # This module was introduced and largely extracted from the transaction event aggregator
 # when the synthetics container was extracted from it. Its purpose is to create the data
@@ -8,6 +8,8 @@
 # the transaction event aggregator and the synthetics container.
 
 require 'new_relic/agent/payload_metric_mapping'
+require 'new_relic/agent/distributed_tracing/distributed_trace_payload'
+require 'new_relic/agent/distributed_tracing/distributed_trace_attributes'
 
 module NewRelic
   module Agent
@@ -18,39 +20,48 @@ module NewRelic
       TYPE_KEY                       = 'type'.freeze
       ERROR_CLASS_KEY                = 'error.class'.freeze
       ERROR_MESSAGE_KEY              = 'error.message'.freeze
+      ERROR_EXPECTED_KEY             = 'error.expected'.freeze
       TIMESTAMP_KEY                  = 'timestamp'.freeze
       PORT_KEY                       = 'port'.freeze
       NAME_KEY                       = 'transactionName'.freeze
       DURATION_KEY                   = 'duration'.freeze
+      SAMPLED_KEY                    = 'sampled'.freeze
       GUID_KEY                       = 'nr.transactionGuid'.freeze
       REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
       SYNTHETICS_RESOURCE_ID_KEY     = "nr.syntheticsResourceId".freeze
       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,
           ERROR_MESSAGE_KEY => noticed_error.message,
+          ERROR_EXPECTED_KEY => noticed_error.expected,
           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 payload.key?(:sampled)
+          attrs[PRIORITY_KEY] = payload[:priority]
           append_synthetics payload, attrs
           append_cat payload, attrs
+          DistributedTraceAttributes.copy_to_hash payload, attrs
           PayloadMetricMapping.append_mapped_metrics payload[:metrics], attrs
         end
 

data/lib/new_relic/agent/transaction_event_aggregator.rb

@@ -1,11 +1,12 @@
 # -*- ruby -*-
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'newrelic_rpm' unless defined?( NewRelic )
 require 'new_relic/agent' unless defined?( NewRelic::Agent )
 require 'new_relic/agent/event_aggregator'
+require 'new_relic/agent/priority_sampled_buffer'
 
 module NewRelic
   module Agent
@@ -14,13 +15,17 @@ module NewRelic
       named :TransactionEventAggregator
       capacity_key :'analytics_events.max_samples_stored'
       enabled_key :'analytics_events.enabled'
+      buffer_class PrioritySampledBuffer
+
+      def record 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

data/lib/new_relic/agent/transaction_event_primitive.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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 # This module was introduced and largely extracted from the transaction event aggregator
 # when the synthetics container was extracted from it. Its purpose is to create the data
@@ -8,6 +9,7 @@
 # the transaction event aggregator and the synthetics container.
 
 require 'new_relic/agent/payload_metric_mapping'
+require 'new_relic/agent/distributed_tracing/distributed_trace_attributes'
 
 module NewRelic
   module Agent
@@ -15,28 +17,28 @@ module NewRelic
       include NewRelic::Coerce
       extend self
 
+      COMMA = ','
+
       # The type field of the sample
-      SAMPLE_TYPE              = 'Transaction'.freeze
+      SAMPLE_TYPE              = 'Transaction'
 
       # Strings for static keys of the sample structure
-      TYPE_KEY                       = 'type'.freeze
-      TIMESTAMP_KEY                  = 'timestamp'.freeze
-      NAME_KEY                       = 'name'.freeze
-      DURATION_KEY                   = 'duration'.freeze
-      ERROR_KEY                      = 'error'.freeze
-      GUID_KEY                       = 'nr.guid'.freeze
-      REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
-      CAT_TRIP_ID_KEY                = 'nr.tripId'.freeze
-      CAT_PATH_HASH_KEY              = 'nr.pathHash'.freeze
-      CAT_REFERRING_PATH_HASH_KEY    = 'nr.referringPathHash'.freeze
-      CAT_ALTERNATE_PATH_HASHES_KEY  = 'nr.alternatePathHashes'.freeze
-      APDEX_PERF_ZONE_KEY            = 'nr.apdexPerfZone'.freeze
-      SYNTHETICS_RESOURCE_ID_KEY     = "nr.syntheticsResourceId".freeze
-      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
+      TYPE_KEY                       = 'type'
+      TIMESTAMP_KEY                  = 'timestamp'
+      NAME_KEY                       = 'name'
+      DURATION_KEY                   = 'duration'
+      ERROR_KEY                      = 'error'
+      SAMPLED_KEY                    = 'sampled'
+      PRIORITY_KEY                   = 'priority'
+      GUID_KEY                       = 'nr.guid'
+      REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'
+      CAT_PATH_HASH_KEY              = 'nr.pathHash'
+      CAT_REFERRING_PATH_HASH_KEY    = 'nr.referringPathHash'
+      CAT_ALTERNATE_PATH_HASHES_KEY  = 'nr.alternatePathHashes'
+      APDEX_PERF_ZONE_KEY            = 'nr.apdexPerfZone'
+      SYNTHETICS_RESOURCE_ID_KEY     = "nr.syntheticsResourceId"
+      SYNTHETICS_JOB_ID_KEY          = "nr.syntheticsJobId"
+      SYNTHETICS_MONITOR_ID_KEY      = "nr.syntheticsMonitorId"
 
       def create(payload)
         intrinsics = {
@@ -44,11 +46,15 @@ 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]
         }
 
-        NewRelic::Agent::PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
+        intrinsics[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
+
+        PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
         append_optional_attributes(intrinsics, payload)
+        DistributedTraceAttributes.copy_to_hash payload, intrinsics
 
         attributes = payload[:attributes]
 
@@ -60,7 +66,6 @@ module NewRelic
       def append_optional_attributes(sample, payload)
         optionally_append(GUID_KEY,                       :guid, sample, payload)
         optionally_append(REFERRING_TRANSACTION_GUID_KEY, :referring_transaction_guid, sample, payload)
-        optionally_append(CAT_TRIP_ID_KEY,                :cat_trip_id, sample, payload)
         optionally_append(CAT_PATH_HASH_KEY,              :cat_path_hash, sample, payload)
         optionally_append(CAT_REFERRING_PATH_HASH_KEY,    :cat_referring_path_hash, sample, payload)
         optionally_append(APDEX_PERF_ZONE_KEY,            :apdex_perf_zone, sample, payload)
@@ -70,8 +75,6 @@ module NewRelic
         append_cat_alternate_path_hashes(sample, payload)
       end
 
-      COMMA = ','.freeze
-
       def append_cat_alternate_path_hashes(sample, payload)
         if payload.include?(:cat_alternate_path_hashes)
           sample[CAT_ALTERNATE_PATH_HASHES_KEY] = payload[:cat_alternate_path_hashes].sort.join(COMMA)
@@ -86,19 +89,19 @@ module NewRelic
 
       def custom_attributes attributes
         if attributes
-          result = attributes.custom_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_EVENTS)
+          result = attributes.custom_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
           result.freeze
         else
-          EMPTY_HASH
+          NewRelic::EMPTY_HASH
         end
       end
 
       def agent_attributes attributes
         if attributes
-          result = attributes.agent_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_EVENTS)
+          result = attributes.agent_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
           result.freeze
         else
-          EMPTY_HASH
+          NewRelic::EMPTY_HASH
         end
       end
     end