newrelic_rpm 4.0.0.332 → 6.13.1

data/lib/new_relic/agent/transaction.rb

@@ -1,14 +1,18 @@
 # 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
 
-require 'new_relic/agent/transaction_timings'
 require 'new_relic/agent/instrumentation/queue_time'
 require 'new_relic/agent/transaction_metrics'
 require 'new_relic/agent/method_tracer_helpers'
-require 'new_relic/agent/transaction/attributes'
+require 'new_relic/agent/attributes'
 require 'new_relic/agent/transaction/request_attributes'
 require 'new_relic/agent/transaction/tracing'
+require 'new_relic/agent/transaction/distributed_tracer'
+require 'new_relic/agent/transaction_time_aggregator'
+require 'new_relic/agent/deprecator'
+require 'new_relic/agent/guid_generator'
 
 module NewRelic
   module Agent
@@ -20,28 +24,36 @@ module NewRelic
       include Tracing
 
       # for nested transactions
-      SUBTRANSACTION_PREFIX        = 'Nested/'.freeze
-      CONTROLLER_PREFIX            = 'Controller/'.freeze
-      MIDDLEWARE_PREFIX            = 'Middleware/Rack/'.freeze
-      TASK_PREFIX                  = 'OtherTransaction/Background/'.freeze
-      RAKE_PREFIX                  = 'OtherTransaction/Rake/'.freeze
-      RACK_PREFIX                  = 'Controller/Rack/'.freeze
-      SINATRA_PREFIX               = 'Controller/Sinatra/'.freeze
-      GRAPE_PREFIX                 = 'Controller/Grape/'.freeze
-      ACTION_CABLE_PREFIX          = 'Controller/ActionCable/'.freeze
-      OTHER_TRANSACTION_PREFIX     = 'OtherTransaction/'.freeze
-
-      CONTROLLER_MIDDLEWARE_PREFIX = 'Controller/Middleware/Rack'.freeze
-
-      NESTED_TRACE_STOP_OPTIONS    = { :metric => true }.freeze
-      WEB_TRANSACTION_CATEGORIES   = [:controller, :uri, :rack, :sinatra, :grape, :middleware, :action_cable].freeze
+      NESTED_TRANSACTION_PREFIX    = "Nested/"
+      CONTROLLER_PREFIX            = "Controller/"
+      MIDDLEWARE_PREFIX            = "Middleware/Rack/"
+      OTHER_TRANSACTION_PREFIX     = "OtherTransaction/"
+      TASK_PREFIX                  = "#{OTHER_TRANSACTION_PREFIX}Background/"
+      RAKE_PREFIX                  = "#{OTHER_TRANSACTION_PREFIX}Rake/"
+      MESSAGE_PREFIX               = "#{OTHER_TRANSACTION_PREFIX}Message/"
+      RACK_PREFIX                  = "#{CONTROLLER_PREFIX}Rack/"
+      SINATRA_PREFIX               = "#{CONTROLLER_PREFIX}Sinatra/"
+      GRAPE_PREFIX                 = "#{CONTROLLER_PREFIX}Grape/"
+      ACTION_CABLE_PREFIX          = "#{CONTROLLER_PREFIX}ActionCable/"
+
+      WEB_TRANSACTION_CATEGORIES   = [:web, :controller, :uri, :rack, :sinatra, :grape, :middleware, :action_cable].freeze
       TRANSACTION_NAMING_SOURCES   = [:child, :api].freeze
 
-      MIDDLEWARE_SUMMARY_METRICS   = ['Middleware/all'.freeze].freeze
-      EMPTY_SUMMARY_METRICS        = [].freeze
+      MIDDLEWARE_SUMMARY_METRICS   = ["Middleware/all"].freeze
+      WEB_SUMMARY_METRIC           = "HttpDispatcher"
+      OTHER_SUMMARY_METRIC         = "#{OTHER_TRANSACTION_PREFIX}all"
+      QUEUE_TIME_METRIC            = "WebFrontend/QueueTime"
 
-      TRACE_OPTIONS_SCOPED         = { :metric => true, :scoped_metric => true }.freeze
-      TRACE_OPTIONS_UNSCOPED       = { :metric => true, :scoped_metric => false }.freeze
+      APDEX_S                       = "S"
+      APDEX_T                       = "T"
+      APDEX_F                       = "F"
+      APDEX_ALL_METRIC              = "ApdexAll"
+      APDEX_METRIC                  = "Apdex"
+      APDEX_OTHER_METRIC            = "ApdexOther"
+      APDEX_TXN_METRIC_PREFIX       = "Apdex/"
+      APDEX_OTHER_TXN_METRIC_PREFIX = "ApdexOther/Transaction/"
+
+      JRUBY_CPU_TIME_ERROR = "Error calculating JRuby CPU Time"
 
       # reference to the transaction state managing this transaction
       attr_accessor :state
@@ -60,16 +72,22 @@ module NewRelic
                     :process_cpu_start,
                     :http_response_code,
                     :response_content_length,
-                    :response_content_type
+                    :response_content_type,
+                    :parent_span_id
 
       attr_reader :guid,
                   :metrics,
                   :gc_start_snapshot,
                   :category,
-                  :frame_stack,
-                  :cat_path_hashes,
                   :attributes,
-                  :payload
+                  :payload,
+                  :nesting_max_depth,
+                  :segments,
+                  :end_time,
+                  :duration
+
+      attr_writer :sampled,
+                  :priority
 
       # Populated with the trace sample once this transaction is completed.
       attr_reader :transaction_trace
@@ -79,28 +97,37 @@ module NewRelic
 
       # Return the currently active transaction, or nil.
       def self.tl_current
-        TransactionState.tl_get.current_transaction
+        Tracer.current_transaction
       end
 
-      def self.set_default_transaction_name(name, category = nil, node_name = nil) #THREAD_LOCAL_ACCESS
+      def self.set_default_transaction_name(partial_name, category = nil) #THREAD_LOCAL_ACCESS
         txn  = tl_current
-        name = txn.make_transaction_name(name, category)
-        txn.name_last_frame(node_name || name)
+        name = name_from_partial(partial_name, category || txn.category)
         txn.set_default_transaction_name(name, category)
       end
 
-      def self.set_overriding_transaction_name(name, category = nil) #THREAD_LOCAL_ACCESS
+      def self.set_overriding_transaction_name(partial_name, category = nil) #THREAD_LOCAL_ACCESS
         txn = tl_current
         return unless txn
 
-        name = txn.make_transaction_name(name, category)
-
-        txn.name_last_frame(name)
+        name = name_from_partial(partial_name, category || txn.category)
         txn.set_overriding_transaction_name(name, category)
       end
 
+      def self.name_from_partial(partial_name, category)
+        namer = Instrumentation::ControllerInstrumentation::TransactionNamer
+        "#{namer.prefix_for_category(self, category)}#{partial_name}"
+      end
+
       def self.wrap(state, name, category, options = {})
-        Transaction.start(state, category, options.merge(:transaction_name => name))
+        Deprecator.deprecate 'Transaction.wrap',
+                             'Tracer#in_transaction'
+
+        finishable = Tracer.start_transaction_or_segment(
+              name: name,
+              category: category,
+              options: options
+            )
 
         begin
           # We shouldn't raise from Transaction.start, but only wrap the yield
@@ -110,96 +137,36 @@ module NewRelic
           Transaction.notice_error(e)
           raise e
         ensure
-          Transaction.stop(state)
+          finishable.finish if finishable
         end
       end
 
-      def self.start(state, category, options)
-        category ||= :controller
-        txn = state.current_transaction
-
-        if txn
-          txn.create_nested_frame(state, category, options)
-        else
-          txn = start_new_transaction(state, category, options)
-        end
-
-        txn
-      rescue => e
-        NewRelic::Agent.logger.error("Exception during Transaction.start", e)
-        nil
-      end
-
       def self.start_new_transaction(state, category, options)
         txn = Transaction.new(category, options)
         state.reset(txn)
         txn.state = state
-        txn.start(state)
+        txn.start
         txn
       end
 
-      FAILED_TO_STOP_MESSAGE = "Failed during Transaction.stop because there is no current transaction"
-
-      def self.stop(state, end_time=Time.now)
-        txn = state.current_transaction
-
-        if txn.nil?
-          NewRelic::Agent.logger.error(FAILED_TO_STOP_MESSAGE)
-          return
-        end
-
-        nested_frame = txn.frame_stack.pop
-
-        if txn.frame_stack.empty?
-          txn.stop(state, end_time, nested_frame)
-          state.reset
-        else
-          nested_name = nested_transaction_name(nested_frame.name)
-
-          if nested_name.start_with?(MIDDLEWARE_PREFIX)
-            summary_metrics = MIDDLEWARE_SUMMARY_METRICS
-          else
-            summary_metrics = EMPTY_SUMMARY_METRICS
-          end
-
-          NewRelic::Agent::MethodTracerHelpers.trace_execution_scoped_footer(
-            state,
-            nested_frame.start_time.to_f,
-            nested_name,
-            summary_metrics,
-            nested_frame,
-            NESTED_TRACE_STOP_OPTIONS,
-            end_time.to_f)
-        end
-
-        :transaction_stopped
-      rescue => e
-        state.reset
-        NewRelic::Agent.logger.error("Exception during Transaction.stop", e)
-        nil
-      end
-
       def self.nested_transaction_name(name)
         if name.start_with?(CONTROLLER_PREFIX) || name.start_with?(OTHER_TRANSACTION_PREFIX)
-          "#{SUBTRANSACTION_PREFIX}#{name}"
+          "#{NESTED_TRANSACTION_PREFIX}#{name}"
         else
           name
         end
       end
 
-      # Indicate that you don't want to keep the currently saved transaction
-      # information
-      def self.abort_transaction! #THREAD_LOCAL_ACCESS
-        state = NewRelic::Agent::TransactionState.tl_get
-        txn = state.current_transaction
-        txn.abort_transaction!(state) if txn
+      # discards the currently saved transaction information
+      def self.abort_transaction!
+        if txn = Tracer.current_transaction
+          txn.abort_transaction!
+        end
       end
 
       # See NewRelic::Agent.notice_error for options and commentary
-      def self.notice_error(e, options={}) #THREAD_LOCAL_ACCESS
-        state = NewRelic::Agent::TransactionState.tl_get
-        txn = state.current_transaction
-        if txn
+      def self.notice_error(e, options={})
+        if txn = Tracer.current_transaction
           txn.notice_error(e, options)
         elsif NewRelic::Agent.instance
           NewRelic::Agent.instance.error_collector.notice_error(e, options)
@@ -212,6 +179,8 @@ module NewRelic
       # @api public
       #
       def self.recording_web_transaction? #THREAD_LOCAL_ACCESS
+        NewRelic::Agent.record_api_supportability_metric(:recording_web_transaction?)
+
         txn = tl_current
         txn && txn.recording_web_transaction?
       end
@@ -239,6 +208,7 @@ module NewRelic
 
       def add_agent_attribute(key, value, default_destinations)
         @attributes.add_agent_attribute(key, value, default_destinations)
+        current_segment.add_agent_attribute(key, value) if current_segment
       end
 
       def self.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
@@ -251,6 +221,7 @@ module NewRelic
 
       def merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
         @attributes.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
+        current_segment.merge_untrusted_agent_attributes(attributes, prefix, default_destinations) if current_segment
       end
 
       @@java_classes_loaded = false
@@ -266,8 +237,9 @@ module NewRelic
       end
 
       def initialize(category, options)
-        @frame_stack = []
-        @has_children = false
+        @nesting_max_depth = 0
+        @current_segment = nil
+        @segments = []
 
         self.default_name = options[:transaction_name]
         @overridden_name    = nil
@@ -275,6 +247,8 @@ module NewRelic
 
         @category = category
         @start_time = Time.now
+        @end_time = nil
+        @duration = nil
         @apdex_start = options[:apdex_start_time] || @start_time
         @jruby_cpu_start = jruby_cpu_time
         @process_cpu_start = process_cpu
@@ -283,14 +257,18 @@ module NewRelic
 
         @exceptions = {}
         @metrics = TransactionMetrics.new
-        @guid = generate_guid
-        @cat_path_hashes = nil
+        @guid = NewRelic::Agent::GuidGenerator.generate_guid
 
         @ignore_this_transaction = false
-        @ignore_apdex = false
-        @ignore_enduser = false
+        @ignore_apdex = options.fetch(:ignore_apdex, false)
+        @ignore_enduser = options.fetch(:ignore_enduser, false)
         @ignore_trace = false
 
+        @sampled = nil
+        @priority = nil
+
+        @starting_thread_id = Thread.current.object_id
+
         @attributes = Attributes.new(NewRelic::Agent.instance.attribute_filter)
 
         merge_request_parameters(@filtered_params)
@@ -302,6 +280,30 @@ module NewRelic
         end
       end
 
+      def distributed_tracer
+        @distributed_tracer ||= DistributedTracer.new(self)
+      end
+
+      def sampled?
+        return unless Agent.config[:'distributed_tracing.enabled']
+        if @sampled.nil?
+          @sampled = NewRelic::Agent.instance.adaptive_sampler.sampled?
+        end
+        @sampled
+      end
+
+      def trace_id
+        @trace_id ||= NewRelic::Agent::GuidGenerator.generate_guid 32
+      end
+
+      def trace_id=(value)
+        @trace_id = value
+      end
+
+      def priority
+        @priority ||= (sampled? ? 1.0 + rand : rand).round(NewRelic::PRIORITY_PRECISION)
+      end
+
       def referer
         @request_attributes && @request_attributes.referer
       end
@@ -340,28 +342,10 @@ module NewRelic
         @default_name = Helper.correctly_encoded(name)
       end
 
-      def create_nested_frame(state, category, options)
-        @has_children = true
-        if options[:filtered_params] && !options[:filtered_params].empty?
-          @filtered_params = options[:filtered_params]
-          merge_request_parameters(options[:filtered_params])
-        end
-
-        frame_stack.push NewRelic::Agent::MethodTracerHelpers.trace_execution_scoped_header(state, Time.now.to_f)
-        name_last_frame(options[:transaction_name])
-
-        set_default_transaction_name(options[:transaction_name], category)
-      end
-
       def merge_request_parameters(params)
         merge_untrusted_agent_attributes(params, :'request.parameters', AttributeFilter::DST_NONE)
       end
 
-      def make_transaction_name(name, category=nil)
-        namer = Instrumentation::ControllerInstrumentation::TransactionNamer
-        "#{namer.prefix_for_category(self, category)}#{name}"
-      end
-
       def set_default_transaction_name(name, category)
         return log_frozen_name(name) if name_frozen?
         if influences_transaction_name?(category)
@@ -378,27 +362,25 @@ module NewRelic
         end
       end
 
-      def name_last_frame(name)
-        frame_stack.last.name = name
-      end
-
       def log_frozen_name(name)
         NewRelic::Agent.logger.warn("Attempted to rename transaction to '#{name}' after transaction name was already frozen as '#{@frozen_name}'.")
         nil
       end
 
       def influences_transaction_name?(category)
-        !category || frame_stack.size == 1 || similar_category?(category)
+        !category || nesting_max_depth == 1 || similar_category?(category)
       end
 
       def best_name
-        @frozen_name  || @overridden_name ||
-          @default_name || NewRelic::Agent::UNKNOWN_METRIC
+        @frozen_name ||
+        @overridden_name ||
+        @default_name ||
+        NewRelic::Agent::UNKNOWN_METRIC
       end
 
-      def name_set?
-        (@overridden_name || @default_name) ? true : false
-      end
+      # For common interface with Trace
+      alias_method :transaction_name, :best_name
+      # End common interface
 
       def promoted_transaction_name(name)
         if name.start_with?(MIDDLEWARE_PREFIX)
@@ -431,27 +413,75 @@ module NewRelic
         @frozen_name ? true : false
       end
 
-      def start(state)
+      def start
         return if !state.is_execution_traced?
 
-        transaction_sampler.on_start_transaction(state, start_time)
         sql_sampler.on_start_transaction(state, start_time, request_path)
         NewRelic::Agent.instance.events.notify(:start_transaction)
-        NewRelic::Agent::BusyCalculator.dispatcher_start(start_time)
+        NewRelic::Agent::TransactionTimeAggregator.transaction_start(start_time)
+
+        ignore! if user_defined_rules_ignore?
+
+        create_initial_segment
+        Segment.merge_untrusted_agent_attributes \
+          @filtered_params,
+          :'request.parameters',
+          AttributeFilter::DST_SPAN_EVENTS
+      end
+
+      def initial_segment
+        segments.first
+      end
+
+      def create_initial_segment
+        segment = create_segment @default_name
+        segment.record_scoped_metric = false
+      end
+
+      def create_segment(name)
+        summary_metrics = nil
+
+        if name.start_with?(MIDDLEWARE_PREFIX)
+          summary_metrics = MIDDLEWARE_SUMMARY_METRICS
+        end
+
+        @nesting_max_depth += 1
+
+        segment = Tracer.start_segment(
+          name: name,
+          unscoped_metrics: summary_metrics
+        )
 
-        frame_stack.push NewRelic::Agent::MethodTracerHelpers.trace_execution_scoped_header(state, start_time.to_f)
-        name_last_frame @default_name
+        segment
+      end
+
+      def create_nested_segment(category, options)
+        if options[:filtered_params] && !options[:filtered_params].empty?
+          @filtered_params = options[:filtered_params]
+          merge_request_parameters(options[:filtered_params])
+        end
+
+        @ignore_apdex = options[:ignore_apdex] if options.key? :ignore_apdex
+        @ignore_enduser = options[:ignore_enduser] if options.key? :ignore_enduser
+
+        nest_initial_segment if nesting_max_depth == 1
+        nested_name = self.class.nested_transaction_name options[:transaction_name]
+        segment = create_segment nested_name
+        set_default_transaction_name(options[:transaction_name], category)
+        segment
+      end
+
+      def nest_initial_segment
+        self.initial_segment.name = self.class.nested_transaction_name initial_segment.name
+        initial_segment.record_scoped_metric = true
       end
 
       # Call this to ensure that the current transaction trace is not saved
       # To fully ignore all metrics and errors, use ignore! instead.
-      def abort_transaction!(state)
+      def abort_transaction!
         @ignore_trace = true
       end
 
-      WEB_SUMMARY_METRIC   = 'HttpDispatcher'.freeze
-      OTHER_SUMMARY_METRIC = 'OtherTransaction/all'.freeze
-
       def summary_metrics
         if @frozen_name.start_with?(CONTROLLER_PREFIX)
           [WEB_SUMMARY_METRIC]
@@ -473,40 +503,29 @@ module NewRelic
         name.start_with?(MIDDLEWARE_PREFIX)
       end
 
-      def stop(state, end_time, outermost_frame)
-        return if !state.is_execution_traced?
+      def finish
+        return unless state.is_execution_traced?
+        @end_time = Time.now
+        @duration = @end_time.to_f - @start_time.to_f
         freeze_name_and_execute_if_not_ignored
-        ignore! if user_defined_rules_ignore?
 
-        if @has_children
-          name = Transaction.nested_transaction_name(outermost_frame.name)
-          trace_options = TRACE_OPTIONS_SCOPED
-        else
-          name = @frozen_name
-          trace_options = TRACE_OPTIONS_UNSCOPED
+        if nesting_max_depth == 1
+          initial_segment.name = @frozen_name
         end
 
-        # These metrics are recorded here instead of in record_summary_metrics
-        # in order to capture the exclusive time associated with the outer-most
-        # TT node.
-        if needs_middleware_summary_metrics?(name)
-          summary_metrics_with_exclusive_time = MIDDLEWARE_SUMMARY_METRICS
-        else
-          summary_metrics_with_exclusive_time = EMPTY_SUMMARY_METRICS
-        end
-
-        NewRelic::Agent::MethodTracerHelpers.trace_execution_scoped_footer(
-          state,
-          start_time.to_f,
-          name,
-          summary_metrics_with_exclusive_time,
-          outermost_frame,
-          trace_options,
-          end_time.to_f)
+        initial_segment.transaction_name = @frozen_name
+        assign_segment_dt_attributes
+        assign_agent_attributes
+        initial_segment.finish
 
-        NewRelic::Agent::BusyCalculator.dispatcher_finish(end_time)
+        NewRelic::Agent::TransactionTimeAggregator.transaction_stop(@end_time, @starting_thread_id)
 
-        commit!(state, end_time, name) unless @ignore_this_transaction
+        commit!(initial_segment.name) unless @ignore_this_transaction
+      rescue => e
+        NewRelic::Agent.logger.error("Exception during Transaction#finish", e)
+        nil
+      ensure
+        state.reset
       end
 
       def user_defined_rules_ignore?
@@ -518,26 +537,34 @@ module NewRelic
         end
       end
 
-      def commit!(state, end_time, outermost_node_name)
-        assign_agent_attributes
-        assign_intrinsics(state)
+      def commit!(outermost_node_name)
+        generate_payload
+        assign_intrinsics
 
-        @transaction_trace = transaction_sampler.on_finishing_transaction(state, self, end_time)
+        finalize_segments
+
+        @transaction_trace = transaction_sampler.on_finishing_transaction(self)
         sql_sampler.on_finishing_transaction(state, @frozen_name)
 
-        record_summary_metrics(outermost_node_name, end_time)
-        record_apdex(state, end_time) unless ignore_apdex?
+        record_summary_metrics(outermost_node_name)
+        record_total_time_metrics
+        record_apdex unless ignore_apdex?
         record_queue_time
-
-        generate_payload(state, start_time, end_time)
+        distributed_tracer.record_metrics
 
         record_exceptions
         record_transaction_event
-
         merge_metrics
         send_transaction_finished_event
       end
 
+      def assign_segment_dt_attributes
+        dt_payload = distributed_tracer.trace_state_payload || distributed_tracer.distributed_trace_payload
+        parent_attributes = {}
+        DistributedTraceAttributes.copy_parent_attributes self, dt_payload, parent_attributes
+        parent_attributes.each { |k, v| initial_segment.add_agent_attribute k, v }
+      end
+
       def assign_agent_attributes
         default_destinations = AttributeFilter::DST_TRANSACTION_TRACER |
                                AttributeFilter::DST_TRANSACTION_EVENTS |
@@ -545,6 +572,9 @@ module NewRelic
 
         if http_response_code
           add_agent_attribute(:httpResponseCode, http_response_code.to_s, default_destinations)
+          # Sending status code as an int with http.statusCode key is correct
+          # The above attribute is deprecated and should be removed in agent version 7.0.0
+          add_agent_attribute(:'http.statusCode', http_response_code, default_destinations)
         end
 
         if response_content_length
@@ -565,7 +595,9 @@ module NewRelic
         end
       end
 
-      def assign_intrinsics(state)
+      def assign_intrinsics
+        attributes.add_intrinsic_attribute(:priority, priority)
+
         if gc_time = calculate_gc_time
           attributes.add_intrinsic_attribute(:gc_time, gc_time)
         end
@@ -580,10 +612,7 @@ module NewRelic
           attributes.add_intrinsic_attribute(:synthetics_monitor_id, synthetics_monitor_id)
         end
 
-        if state.is_cross_app?
-          attributes.add_intrinsic_attribute(:trip_id, cat_trip_id(state))
-          attributes.add_intrinsic_attribute(:path_hash, cat_path_hash(state))
-        end
+        distributed_tracer.assign_intrinsics
       end
 
       def calculate_gc_time
@@ -591,12 +620,22 @@ module NewRelic
         NewRelic::Agent::StatsEngine::GCProfiler.record_delta(gc_start_snapshot, gc_stop_snapshot)
       end
 
+      # This method returns transport_duration in seconds. Transport duration
+      # is stored in milliseconds on the payload, but it's needed in seconds
+      # for metrics and intrinsics.
+      def calculate_transport_duration distributed_trace_payload
+        return unless distributed_trace_payload
+
+        duration = (start_time.to_f * 1000 - distributed_trace_payload.timestamp) / 1000
+        duration < 0 ? 0 : duration
+      end
+
       # The summary metrics recorded by this method all end up with a duration
       # equal to the transaction itself, and an exclusive time of zero.
-      def record_summary_metrics(outermost_node_name, end_time)
+      def record_summary_metrics(outermost_node_name)
         metrics = summary_metrics
         metrics << @frozen_name unless @frozen_name == outermost_node_name
-        @metrics.record_unscoped(metrics, end_time.to_f - start_time.to_f, 0)
+        @metrics.record_unscoped(metrics, duration, 0)
       end
 
       # This event is fired when the transaction is fully completed. The metric
@@ -605,8 +644,7 @@ module NewRelic
         agent.events.notify(:transaction_finished, payload)
       end
 
-      def generate_payload(state, start_time, end_time)
-        duration = end_time.to_f - start_time.to_f
+      def generate_payload
         @payload = {
           :name                 => @frozen_name,
           :bucket               => recording_web_transaction? ? :request : :background,
@@ -614,39 +652,17 @@ module NewRelic
           :duration             => duration,
           :metrics              => @metrics,
           :attributes           => @attributes,
-          :error                => false
+          :error                => false,
+          :priority             => priority
         }
-        append_cat_info(state, duration, @payload)
-        append_apdex_perf_zone(duration, @payload)
-        append_synthetics_to(state, @payload)
-        append_referring_transaction_guid_to(state, @payload)
-      end
-
-      def include_guid?(state, duration)
-        state.is_cross_app? || is_synthetics_request?
-      end
-
-      def cat_trip_id(state)
-        NewRelic::Agent.instance.cross_app_monitor.client_referring_transaction_trip_id(state) || guid
-      end
 
-      def cat_path_hash(state)
-        referring_path_hash = cat_referring_path_hash(state) || '0'
-        seed = referring_path_hash.to_i(16)
-        result = NewRelic::Agent.instance.cross_app_monitor.path_hash(best_name, seed)
-        record_cat_path_hash(result)
-        result
+        distributed_tracer.append_payload(@payload)
+        append_apdex_perf_zone(@payload)
+        append_synthetics_to(@payload)
       end
 
-      def record_cat_path_hash(hash)
-        @cat_path_hashes ||= []
-        if @cat_path_hashes.size < 10 && !@cat_path_hashes.include?(hash)
-          @cat_path_hashes << hash
-        end
-      end
-
-      def cat_referring_path_hash(state)
-        NewRelic::Agent.instance.cross_app_monitor.client_referring_transaction_path_hash(state)
+      def include_guid?
+        distributed_tracer.is_cross_app? || is_synthetics_request?
       end
 
       def is_synthetics_request?
@@ -678,11 +694,7 @@ module NewRelic
         info[4]
       end
 
-      APDEX_S = 'S'.freeze
-      APDEX_T = 'T'.freeze
-      APDEX_F = 'F'.freeze
-
-      def append_apdex_perf_zone(duration, payload)
+      def append_apdex_perf_zone(payload)
         if recording_web_transaction?
           bucket = apdex_bucket(duration, apdex_t)
         elsif background_apdex_t = transaction_specific_apdex_t
@@ -700,29 +712,7 @@ module NewRelic
         payload[:apdex_perf_zone] = bucket_str if bucket_str
       end
 
-      def append_cat_info(state, duration, payload)
-        return unless include_guid?(state, duration)
-        payload[:guid] = guid
-
-        return unless state.is_cross_app?
-        trip_id             = cat_trip_id(state)
-        path_hash           = cat_path_hash(state)
-        referring_path_hash = cat_referring_path_hash(state)
-
-        payload[:cat_trip_id]             = trip_id             if trip_id
-        payload[:cat_referring_path_hash] = referring_path_hash if referring_path_hash
-
-        if path_hash
-          payload[:cat_path_hash] = path_hash
-
-          alternate_path_hashes = cat_path_hashes - [path_hash]
-          unless alternate_path_hashes.empty?
-            payload[:cat_alternate_path_hashes] = alternate_path_hashes
-          end
-        end
-      end
-
-      def append_synthetics_to(state, payload)
+      def append_synthetics_to(payload)
         return unless is_synthetics_request?
 
         payload[:synthetics_resource_id] = synthetics_resource_id
@@ -730,13 +720,6 @@ module NewRelic
         payload[:synthetics_monitor_id]  = synthetics_monitor_id
       end
 
-      def append_referring_transaction_guid_to(state, payload)
-        referring_guid = NewRelic::Agent.instance.cross_app_monitor.client_referring_transaction_guid(state)
-        if referring_guid
-          payload[:referring_transaction_guid] = referring_guid
-        end
-      end
-
       def merge_metrics
         NewRelic::Agent.instance.stats_engine.merge_transaction_metrics!(@metrics, best_name)
       end
@@ -749,13 +732,21 @@ module NewRelic
           options[:metric]     = best_name
           options[:attributes] = @attributes
 
-          error_recorded = !!agent.error_collector.notice_error(exception, options) || error_recorded
+          span_id = options.delete :span_id
+          error_recorded = !!agent.error_collector.notice_error(exception, options, span_id) || error_recorded
         end
         payload[:error] = error_recorded if payload
       end
 
       # Do not call this.  Invoke the class method instead.
       def notice_error(error, options={}) # :nodoc:
+
+        # Only the last error is kept
+        if @current_segment
+          @current_segment.notice_error error, expected: options[:expected]
+          options[:span_id] = @current_segment.guid
+        end
+
         if @exceptions[error]
           @exceptions[error].merge! options
         else
@@ -767,8 +758,6 @@ module NewRelic
         agent.transaction_event_recorder.record payload
       end
 
-      QUEUE_TIME_METRIC = 'WebFrontend/QueueTime'.freeze
-
       def queue_time
         @apdex_start ? @start_time - @apdex_start : 0
       end
@@ -784,20 +773,12 @@ module NewRelic
         end
       end
 
-      APDEX_ALL_METRIC   = 'ApdexAll'.freeze
-
-      APDEX_METRIC       = 'Apdex'.freeze
-      APDEX_OTHER_METRIC = 'ApdexOther'.freeze
-
-      APDEX_TXN_METRIC_PREFIX       = 'Apdex/'.freeze
-      APDEX_OTHER_TXN_METRIC_PREFIX = 'ApdexOther/Transaction/'.freeze
-
       def had_error_affecting_apdex?
         @exceptions.each do |exception, options|
-          ignored    = NewRelic::Agent.instance.error_collector.error_is_ignored?(exception)
-          trace_only = options[:trace_only]
+          ignored = NewRelic::Agent.instance.error_collector.error_is_ignored?(exception)
+          expected = options[:expected]
 
-          return true unless ignored || trace_only
+          return true unless ignored || expected
         end
         false
       end
@@ -806,28 +787,26 @@ module NewRelic
         self.class.apdex_bucket(duration, had_error_affecting_apdex?, current_apdex_t)
       end
 
-      def record_apdex(state, end_time=Time.now)
+      def record_apdex
         return unless state.is_execution_traced?
 
         freeze_name_and_execute_if_not_ignored do
-          total_duration  = end_time - apdex_start
-          action_duration = end_time - start_time
-
           if recording_web_transaction?
-            record_apdex_metrics(APDEX_METRIC, APDEX_TXN_METRIC_PREFIX,
-                                 total_duration, action_duration, apdex_t)
+            record_apdex_metrics(APDEX_METRIC, APDEX_TXN_METRIC_PREFIX, apdex_t)
           else
-            record_apdex_metrics(APDEX_OTHER_METRIC, APDEX_OTHER_TXN_METRIC_PREFIX,
-                                 total_duration, action_duration, transaction_specific_apdex_t)
+            record_apdex_metrics(APDEX_OTHER_METRIC,
+                                 APDEX_OTHER_TXN_METRIC_PREFIX,
+                                 transaction_specific_apdex_t)
           end
         end
       end
 
-      def record_apdex_metrics(rollup_metric, transaction_prefix, total_duration, action_duration, current_apdex_t)
+      def record_apdex_metrics(rollup_metric, transaction_prefix, current_apdex_t)
         return unless current_apdex_t
 
+        total_duration      = end_time - apdex_start
         apdex_bucket_global = apdex_bucket(total_duration, current_apdex_t)
-        apdex_bucket_txn    = apdex_bucket(action_duration, current_apdex_t)
+        apdex_bucket_txn    = apdex_bucket(duration, current_apdex_t)
 
         @metrics.record_unscoped(rollup_metric, apdex_bucket_global, current_apdex_t)
         @metrics.record_unscoped(APDEX_ALL_METRIC, apdex_bucket_global, current_apdex_t)
@@ -844,6 +823,15 @@ module NewRelic
         Agent.config[key] && Agent.config[key][best_name]
       end
 
+      def threshold
+         source_class = Agent.config.source(:'transaction_tracer.transaction_threshold').class
+        if source_class == Configuration::DefaultSource
+          apdex_t * 4
+        else
+          Agent.config[:'transaction_tracer.transaction_threshold']
+        end
+      end
+
       def with_database_metric_name(model, method, product=nil)
         previous = self.instrumentation_state[:datastore_override]
         model_name = case model
@@ -926,7 +914,6 @@ module NewRelic
         p.stime + p.utime
       end
 
-      JRUBY_CPU_TIME_ERROR = "Error calculating JRuby CPU Time".freeze
       def jruby_cpu_time
         return nil unless @@java_classes_loaded
         threadMBean = Java::JavaLangManagement::ManagementFactory.getThreadMXBean()
@@ -952,18 +939,6 @@ module NewRelic
       def sql_sampler
         agent.sql_sampler
       end
-
-      HEX_DIGITS = (0..15).map{|i| i.to_s(16)}
-      GUID_LENGTH = 16
-
-      # generate a random 64 bit uuid
-      def generate_guid
-        guid = ''
-        GUID_LENGTH.times do |a|
-          guid << HEX_DIGITS[rand(16)]
-        end
-        guid
-      end
     end
   end
 end