newrelic_rpm 5.7.0.350 → 9.0.0

data/lib/new_relic/agent/transaction.rb

@@ -1,16 +1,17 @@
-# 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/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_tracing'
-require 'new_relic/agent/cross_app_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,29 +21,37 @@ module NewRelic
     # @api public
     class Transaction
       include Tracing
-      include DistributedTracing
-      include CrossAppTracing
 
       # 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
-      MESSAGE_PREFIX               = 'OtherTransaction/Message/'.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
-
-      WEB_TRANSACTION_CATEGORIES   = [:controller, :uri, :rack, :sinatra, :grape, :middleware, :action_cable].freeze
-      TRANSACTION_NAMING_SOURCES   = [:child, :api].freeze
-
-      MIDDLEWARE_SUMMARY_METRICS   = ['Middleware/all'.freeze].freeze
-
-      # reference to the transaction state managing this transaction
-      attr_accessor :state
+      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
+
+      MIDDLEWARE_SUMMARY_METRICS = ["Middleware/all"].freeze
+      WEB_SUMMARY_METRIC = "HttpDispatcher"
+      OTHER_SUMMARY_METRIC = "#{OTHER_TRANSACTION_PREFIX}all"
+      QUEUE_TIME_METRIC = "WebFrontend/QueueTime"
+
+      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"
 
       # A Time instance for the start time, never nil
       attr_accessor :start_time
@@ -53,27 +62,28 @@ module NewRelic
       attr_accessor :apdex_start
 
       attr_accessor :exceptions,
-                    :filtered_params,
-                    :jruby_cpu_start,
-                    :process_cpu_start,
-                    :http_response_code,
-                    :response_content_length,
-                    :response_content_type
+        :filtered_params,
+        :jruby_cpu_start,
+        :process_cpu_start,
+        :http_response_code,
+        :response_content_length,
+        :response_content_type,
+        :parent_span_id
 
       attr_reader :guid,
-                  :metrics,
-                  :gc_start_snapshot,
-                  :category,
-                  :frame_stack,
-                  :attributes,
-                  :payload,
-                  :nesting_max_depth,
-                  :segments,
-                  :end_time,
-                  :duration
+        :metrics,
+        :logs,
+        :gc_start_snapshot,
+        :category,
+        :attributes,
+        :payload,
+        :nesting_max_depth,
+        :segments,
+        :end_time,
+        :duration
 
       attr_writer :sampled,
-                  :priority
+        :priority
 
       # Populated with the trace sample once this transaction is completed.
       attr_reader :transaction_trace
@@ -83,112 +93,53 @@ 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
-        txn  = tl_current
-        name = txn.make_transaction_name(name, category)
-        txn.name_last_frame(node_name || name)
+      def self.set_default_transaction_name(partial_name, category = nil) # THREAD_LOCAL_ACCESS
+        txn = tl_current
+        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.wrap(state, name, category, options = {})
-        Transaction.start(state, category, options.merge(:transaction_name => name))
-
-        begin
-          # We shouldn't raise from Transaction.start, but only wrap the yield
-          # to be absolutely sure we don't report agent problems as app errors
-          yield
-        rescue => e
-          Transaction.notice_error(e)
-          raise e
-        ensure
-          Transaction.stop(state)
-        end
-      end
-
-      def self.start(state, category, options)
-        category ||= :controller
-        txn = state.current_transaction
-
-        if txn
-          txn.create_nested_frame(category, options)
-        else
-          txn = start_new_transaction(state, category, options)
-        end
-
-        txn
-      rescue => e
-        NewRelic::Agent.logger.error("Exception during Transaction.start", e)
-        nil
+      def self.name_from_partial(partial_name, category)
+        namer = Instrumentation::ControllerInstrumentation::TransactionNamer
+        "#{namer.prefix_for_category(self, category)}#{partial_name}"
       end
 
       def self.start_new_transaction(state, category, options)
         txn = Transaction.new(category, options)
         state.reset(txn)
-        txn.state = state
-        txn.start
+        txn.start(options)
         txn
       end
 
-      FAILED_TO_STOP_MESSAGE = "Failed during Transaction.stop because there is no current transaction"
-
-      def self.stop(state)
-        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(nested_frame) if nested_frame
-          state.reset
-        else
-          nested_frame.finish
-        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}"
+        if name.start_with?(CONTROLLER_PREFIX, OTHER_TRANSACTION_PREFIX)
+          "#{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! 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)
@@ -200,7 +151,7 @@ module NewRelic
       #
       # @api public
       #
-      def self.recording_web_transaction? #THREAD_LOCAL_ACCESS
+      def self.recording_web_transaction? # THREAD_LOCAL_ACCESS
         NewRelic::Agent.record_api_supportability_metric(:recording_web_transaction?)
 
         txn = tl_current
@@ -213,7 +164,7 @@ module NewRelic
           :apdex_f
         when duration <= apdex_t
           :apdex_s
-        when duration <= 4 * apdex_t
+        when duration <= apdex_t * 4
           :apdex_t
         else
           :apdex_f
@@ -224,24 +175,26 @@ module NewRelic
         if txn = tl_current
           txn.add_agent_attribute(key, value, default_destinations)
         else
-          NewRelic::Agent.logger.debug "Attempted to add agent attribute: #{key} without transaction"
+          NewRelic::Agent.logger.debug("Attempted to add agent attribute: #{key} without transaction")
         end
       end
 
       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)
         if txn = tl_current
           txn.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
         else
-          NewRelic::Agent.logger.debug "Attempted to merge untrusted attributes without transaction"
+          NewRelic::Agent.logger.debug("Attempted to merge untrusted attributes without transaction")
         end
       end
 
       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
@@ -249,8 +202,8 @@ module NewRelic
       if defined? JRuby
         begin
           require 'java'
-          java_import 'java.lang.management.ManagementFactory'
-          java_import 'com.sun.management.OperatingSystemMXBean'
+          java_import('java.lang.management.ManagementFactory')
+          java_import('com.sun.management.OperatingSystemMXBean')
           @@java_classes_loaded = true
         rescue
         end
@@ -258,18 +211,19 @@ module NewRelic
 
       def initialize(category, options)
         @nesting_max_depth = 0
-        @current_segment = nil
+        @current_segment_by_thread = {}
+        @current_segment_lock = Mutex.new
         @segments = []
-        @frame_stack = []
 
         self.default_name = options[:transaction_name]
-        @overridden_name    = nil
-        @frozen_name      = nil
+        @overridden_name = nil
+        @frozen_name = nil
 
         @category = category
-        @start_time = Time.now
+        @start_time = Process.clock_gettime(Process::CLOCK_REALTIME)
         @end_time = nil
         @duration = nil
+
         @apdex_start = options[:apdex_start_time] || @start_time
         @jruby_cpu_start = jruby_cpu_time
         @process_cpu_start = process_cpu
@@ -278,7 +232,8 @@ module NewRelic
 
         @exceptions = {}
         @metrics = TransactionMetrics.new
-        @guid = generate_guid
+        @logs = PrioritySampledBuffer.new(NewRelic::Agent.instance.log_event_aggregator.capacity)
+        @guid = NewRelic::Agent::GuidGenerator.generate_guid
 
         @ignore_this_transaction = false
         @ignore_apdex = options.fetch(:ignore_apdex, false)
@@ -289,32 +244,68 @@ module NewRelic
         @priority = nil
 
         @starting_thread_id = Thread.current.object_id
+        @starting_segment_key = current_segment_key
 
         @attributes = Attributes.new(NewRelic::Agent.instance.attribute_filter)
 
         merge_request_parameters(@filtered_params)
 
         if request = options[:request]
-          @request_attributes = RequestAttributes.new request
+          @request_attributes = RequestAttributes.new(request)
         else
           @request_attributes = nil
         end
       end
 
+      def state
+        NewRelic::Agent::Tracer.state
+      end
+
+      def current_segment_key
+        Tracer.current_segment_key
+      end
+
+      def parent_segment_key
+        (::Fiber.current.nr_parent_key if ::Fiber.current.respond_to?(:nr_parent_key)) || (::Thread.current.nr_parent_key if ::Thread.current.respond_to?(:nr_parent_key))
+      end
+
+      def current_segment
+        current_segment_by_thread[current_segment_key] ||
+          current_segment_by_thread[parent_segment_key] ||
+          current_segment_by_thread[@starting_segment_key]
+      end
+
+      def set_current_segment(new_segment)
+        @current_segment_lock.synchronize { current_segment_by_thread[current_segment_key] = new_segment }
+      end
+
+      def remove_current_segment_by_thread_id(id)
+        @current_segment_lock.synchronize { current_segment_by_thread.delete(id) }
+      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
-        if @priority.nil?
-          @priority = rand.round(6)
-          @priority += 1 if sampled?
-        end
-        @priority
+        @priority ||= (sampled? ? rand + 1.0 : rand).round(NewRelic::PRIORITY_PRECISION)
       end
 
       def referer
@@ -329,7 +320,7 @@ module NewRelic
         @request_attributes && @request_attributes.port
       end
 
-      # This transaction-local hash may be used as temprory storage by
+      # This transaction-local hash may be used as temporary storage by
       # instrumentation that needs to pass data from one instrumentation point
       # to another.
       #
@@ -359,13 +350,9 @@ module NewRelic
         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)
           self.default_name = name
           @category = category if category
@@ -374,15 +361,9 @@ module NewRelic
 
       def set_overriding_transaction_name(name, category)
         return log_frozen_name(name) if name_frozen?
-        if influences_transaction_name?(category)
-          self.overridden_name = name
-          @category = category if category
-        end
-      end
 
-      def name_last_frame(name)
-        name = self.class.nested_transaction_name(name) if nesting_max_depth > 1
-        frame_stack.last.name = name
+        self.overridden_name = name
+        @category = category if category
       end
 
       def log_frozen_name(name)
@@ -391,24 +372,20 @@ module NewRelic
       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
 
       # For common interface with Trace
       alias_method :transaction_name, :best_name
-
-      attr_accessor :xray_session_id
       # End common interface
 
-      def name_set?
-        (@overridden_name || @default_name) ? true : false
-      end
-
       def promoted_transaction_name(name)
         if name.start_with?(MIDDLEWARE_PREFIX)
           "#{CONTROLLER_PREFIX}#{name}"
@@ -440,28 +417,33 @@ module NewRelic
         @frozen_name ? true : false
       end
 
-      def start
+      def start(options = {})
         return if !state.is_execution_traced?
 
-        sql_sampler.on_start_transaction(state, start_time, request_path)
+        sql_sampler.on_start_transaction(state, request_path)
         NewRelic::Agent.instance.events.notify(:start_transaction)
         NewRelic::Agent::TransactionTimeAggregator.transaction_start(start_time)
 
         ignore! if user_defined_rules_ignore?
 
-        create_initial_segment @default_name
+        create_initial_segment(options)
+        Segment.merge_untrusted_agent_attributes( \
+          @filtered_params,
+          :'request.parameters',
+          AttributeFilter::DST_SPAN_EVENTS
+        )
       end
 
       def initial_segment
         segments.first
       end
 
-      def create_initial_segment name
-        segment = create_segment @default_name
+      def create_initial_segment(options = {})
+        segment = create_segment(@default_name, options)
         segment.record_scoped_metric = false
       end
 
-      def create_segment(name)
+      def create_segment(name, options = {})
         summary_metrics = nil
 
         if name.start_with?(MIDDLEWARE_PREFIX)
@@ -470,32 +452,37 @@ module NewRelic
 
         @nesting_max_depth += 1
 
-        segment = self.class.start_segment(
+        segment = Tracer.start_segment(
           name: name,
           unscoped_metrics: summary_metrics
         )
 
-        frame_stack.push segment
+        # #code_information will glean the code info out of the options hash
+        # if it exists or noop otherwise
+        segment.code_information = options
+
         segment
       end
 
-      def create_nested_frame(category, options)
+      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
+        @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]
-        create_segment nested_name
+        nest_initial_segment if segments.length == 1
+        nested_name = self.class.nested_transaction_name(options[:transaction_name])
+
+        segment = create_segment(nested_name, options)
         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
+        self.initial_segment.name = self.class.nested_transaction_name(initial_segment.name)
         initial_segment.record_scoped_metric = true
       end
 
@@ -505,9 +492,6 @@ module NewRelic
         @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]
@@ -529,23 +513,30 @@ module NewRelic
         name.start_with?(MIDDLEWARE_PREFIX)
       end
 
-      def stop(outermost_frame = nil)
-        return if !state.is_execution_traced?
-        return self.class.stop(state) unless outermost_frame
+      def finish
+        return unless state.is_execution_traced?
 
-        @end_time = Time.now
-        @duration = @end_time.to_f - @start_time.to_f
+        @end_time = Process.clock_gettime(Process::CLOCK_REALTIME)
+        @duration = @end_time - @start_time
         freeze_name_and_execute_if_not_ignored
 
         if nesting_max_depth == 1
-          outermost_frame.name = @frozen_name
+          initial_segment.name = @frozen_name
         end
 
-        outermost_frame.finish
+        initial_segment.transaction_name = @frozen_name
+        assign_segment_dt_attributes
+        assign_agent_attributes
+        initial_segment.finish
 
         NewRelic::Agent::TransactionTimeAggregator.transaction_stop(@end_time, @starting_thread_id)
 
-        commit!(outermost_frame.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?
@@ -559,8 +550,6 @@ module NewRelic
 
       def commit!(outermost_node_name)
         generate_payload
-
-        assign_agent_attributes
         assign_intrinsics
 
         finalize_segments
@@ -572,22 +561,29 @@ module NewRelic
         record_total_time_metrics
         record_apdex unless ignore_apdex?
         record_queue_time
-        record_cross_app_metrics
-        record_distributed_tracing_metrics
+        distributed_tracer.record_metrics
 
         record_exceptions
         record_transaction_event
+        record_log_events
         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 |
-                               AttributeFilter::DST_ERROR_COLLECTOR
+          AttributeFilter::DST_TRANSACTION_EVENTS |
+          AttributeFilter::DST_ERROR_COLLECTOR
 
         if http_response_code
-          add_agent_attribute(:httpResponseCode, http_response_code.to_s, default_destinations)
+          add_agent_attribute(:'http.statusCode', http_response_code, default_destinations)
         end
 
         if response_content_length
@@ -599,7 +595,7 @@ module NewRelic
         end
 
         if @request_attributes
-          @request_attributes.assign_agent_attributes self
+          @request_attributes.assign_agent_attributes(self)
         end
 
         display_host = Agent.config[:'process_host.display_name']
@@ -625,11 +621,7 @@ module NewRelic
           attributes.add_intrinsic_attribute(:synthetics_monitor_id, synthetics_monitor_id)
         end
 
-        if Agent.config[:'distributed_tracing.enabled']
-          assign_distributed_trace_intrinsics
-        elsif is_cross_app?
-          assign_cross_app_intrinsics
-        end
+        distributed_tracer.assign_intrinsics
       end
 
       def calculate_gc_time
@@ -637,6 +629,16 @@ 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 - (distributed_trace_payload.timestamp / 1000.0)
+        [duration, 0].max
+      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)
@@ -653,28 +655,27 @@ module NewRelic
 
       def generate_payload
         @payload = {
-          :name                 => @frozen_name,
-          :bucket               => recording_web_transaction? ? :request : :background,
-          :start_timestamp      => start_time.to_f,
-          :duration             => duration,
-          :metrics              => @metrics,
-          :attributes           => @attributes,
-          :error                => false,
-          :priority             => priority
+          :name => @frozen_name,
+          :bucket => recording_web_transaction? ? :request : :background,
+          :start_timestamp => start_time,
+          :duration => duration,
+          :metrics => @metrics,
+          :attributes => @attributes,
+          :error => false,
+          :priority => priority
         }
 
-        append_cat_info(@payload)
-        append_distributed_trace_info(@payload)
+        distributed_tracer.append_payload(@payload)
         append_apdex_perf_zone(@payload)
         append_synthetics_to(@payload)
       end
 
       def include_guid?
-        is_cross_app? || is_synthetics_request?
+        distributed_tracer.is_cross_app? || is_synthetics_request?
       end
 
       def is_synthetics_request?
-        synthetics_payload != nil && raw_synthetics_header != nil
+        !synthetics_payload.nil? && !raw_synthetics_header.nil?
       end
 
       def synthetics_version
@@ -702,10 +703,6 @@ module NewRelic
         info[4]
       end
 
-      APDEX_S = 'S'.freeze
-      APDEX_T = 'T'.freeze
-      APDEX_F = 'F'.freeze
-
       def append_apdex_perf_zone(payload)
         if recording_web_transaction?
           bucket = apdex_bucket(duration, apdex_t)
@@ -719,7 +716,6 @@ module NewRelic
         when :apdex_s then APDEX_S
         when :apdex_t then APDEX_T
         when :apdex_f then APDEX_F
-        else nil
         end
         payload[:apdex_perf_zone] = bucket_str if bucket_str
       end
@@ -728,8 +724,8 @@ module NewRelic
         return unless is_synthetics_request?
 
         payload[:synthetics_resource_id] = synthetics_resource_id
-        payload[:synthetics_job_id]      = synthetics_job_id
-        payload[:synthetics_monitor_id]  = synthetics_monitor_id
+        payload[:synthetics_job_id] = synthetics_job_id
+        payload[:synthetics_monitor_id] = synthetics_monitor_id
       end
 
       def merge_metrics
@@ -739,30 +735,39 @@ module NewRelic
       def record_exceptions
         error_recorded = false
         @exceptions.each do |exception, options|
-          options[:uri]      ||= request_path if request_path
-          options[:port]       = request_port if request_port
-          options[:metric]     = best_name
+          options[:uri] ||= request_path if request_path
+          options[:port] = request_port if request_port
+          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:
+      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
+          @exceptions[error].merge!(options)
         else
           @exceptions[error] = options
         end
       end
 
       def record_transaction_event
-        agent.transaction_event_recorder.record payload
+        agent.transaction_event_recorder.record(payload)
       end
 
-      QUEUE_TIME_METRIC = 'WebFrontend/QueueTime'.freeze
+      def record_log_events
+        agent.log_event_aggregator.record_batch(self, @logs.to_a)
+      end
 
       def queue_time
         @apdex_start ? @start_time - @apdex_start : 0
@@ -779,17 +784,9 @@ 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)
+          ignored = NewRelic::Agent.instance.error_collector.error_is_ignored?(exception)
           expected = options[:expected]
 
           return true unless ignored || expected
@@ -809,8 +806,8 @@ module NewRelic
             record_apdex_metrics(APDEX_METRIC, APDEX_TXN_METRIC_PREFIX, apdex_t)
           else
             record_apdex_metrics(APDEX_OTHER_METRIC,
-                                 APDEX_OTHER_TXN_METRIC_PREFIX,
-                                 transaction_specific_apdex_t)
+              APDEX_OTHER_TXN_METRIC_PREFIX,
+              transaction_specific_apdex_t)
           end
         end
       end
@@ -818,9 +815,9 @@ module NewRelic
       def record_apdex_metrics(rollup_metric, transaction_prefix, current_apdex_t)
         return unless current_apdex_t
 
-        total_duration      = end_time - apdex_start
+        total_duration = end_time - apdex_start
         apdex_bucket_global = apdex_bucket(total_duration, current_apdex_t)
-        apdex_bucket_txn    = apdex_bucket(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)
@@ -838,7 +835,7 @@ module NewRelic
       end
 
       def threshold
-         source_class = Agent.config.source(:'transaction_tracer.transaction_threshold').class
+        source_class = Agent.config.source(:'transaction_tracer.transaction_threshold').class
         if source_class == Configuration::DefaultSource
           apdex_t * 4
         else
@@ -846,7 +843,7 @@ module NewRelic
         end
       end
 
-      def with_database_metric_name(model, method, product=nil)
+      def with_database_metric_name(model, method, product = nil)
         previous = self.instrumentation_state[:datastore_override]
         model_name = case model
                      when Class
@@ -855,7 +852,7 @@ module NewRelic
                        model
                      else
                        model.to_s
-                     end
+        end
         self.instrumentation_state[:datastore_override] = [method, model_name, product]
         yield
       ensure
@@ -866,6 +863,10 @@ module NewRelic
         attributes.merge_custom_attributes(p)
       end
 
+      def add_log_event(event)
+        logs.append(event: event)
+      end
+
       def recording_web_transaction?
         web_category?(@category)
       end
@@ -884,11 +885,13 @@ module NewRelic
 
       def normal_cpu_burn
         return unless @process_cpu_start
+
         process_cpu - @process_cpu_start
       end
 
       def jruby_cpu_burn
         return unless @jruby_cpu_start
+
         jruby_cpu_time - @jruby_cpu_start
       end
 
@@ -924,19 +927,21 @@ module NewRelic
 
       def process_cpu
         return nil if defined? JRuby
+
         p = Process.times
         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()
 
         return nil unless threadMBean.isCurrentThreadCpuTimeSupported
-        java_utime = threadMBean.getCurrentThreadUserTime()  # ns
 
-        -1 == java_utime ? 0.0 : java_utime/1e9
+        java_utime = threadMBean.getCurrentThreadUserTime() # ns
+
+        -1 == java_utime ? 0.0 : java_utime / 1e9
       rescue => e
         ::NewRelic::Agent.logger.log_once(:warn, :jruby_cpu_time, JRUBY_CPU_TIME_ERROR, e)
         ::NewRelic::Agent.logger.debug(JRUBY_CPU_TIME_ERROR, e)
@@ -954,18 +959,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