newrelic_rpm 6.8.0.360 → 6.9.0.363

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

@@ -1,43 +1,68 @@
 # 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.
+# frozen_string_literal: true
 
-require 'new_relic/agent/distributed_trace_payload'
-require 'new_relic/agent/distributed_trace_intrinsics'
-require 'new_relic/agent/distributed_trace_metrics'
+require 'new_relic/agent/distributed_tracing/distributed_trace_payload'
+require 'new_relic/agent/distributed_tracing/distributed_trace_intrinsics'
+require 'new_relic/agent/distributed_tracing/distributed_trace_metrics'
 
 module NewRelic
   module Agent
     class Transaction
       module DistributedTracing
         attr_accessor :distributed_trace_payload
+        attr_writer :distributed_trace_payload_created
+
+        SUPPORTABILITY_DISTRIBUTED_TRACE       = "Supportability/DistributedTrace"
+        CREATE_PREFIX                          = "#{SUPPORTABILITY_DISTRIBUTED_TRACE}/CreatePayload"
+        ACCEPT_PREFIX                          = "#{SUPPORTABILITY_DISTRIBUTED_TRACE}/AcceptPayload"
+        IGNORE_PREFIX                          = "#{ACCEPT_PREFIX}/Ignored"
+
+        CREATE_SUCCESS_METRIC                  = "#{CREATE_PREFIX}/Success"
+        CREATE_EXCEPTION_METRIC                = "#{CREATE_PREFIX}/Exception"
+        ACCEPT_SUCCESS_METRIC                  = "#{ACCEPT_PREFIX}/Success"
+        ACCEPT_EXCEPTION_METRIC                = "#{ACCEPT_PREFIX}/Exception"
+        ACCEPT_PARSE_EXCEPTION_METRIC          = "#{ACCEPT_PREFIX}/ParseException"
+
+        IGNORE_ACCEPT_AFTER_CREATE_METRIC      = "#{IGNORE_PREFIX}/CreateBeforeAccept"
+        IGNORE_MULTIPLE_ACCEPT_METRIC          = "#{IGNORE_PREFIX}/Multiple"
+        IGNORE_ACCEPT_NULL_METRIC              = "#{IGNORE_PREFIX}/Null"
+        IGNORE_ACCEPT_MAJOR_VERSION_METRIC     = "#{IGNORE_PREFIX}/MajorVersion"
+        IGNORE_ACCEPT_UNTRUSTED_ACCOUNT_METRIC = "#{IGNORE_PREFIX}/UntrustedAccount"
+
+        LBRACE = "{"
+        NULL_PAYLOAD = 'null'
+
+        NEWRELIC_TRACE_KEY = "HTTP_NEWRELIC"
+
+        def accept_distributed_tracing_incoming_request request
+          return unless Agent.config[:'distributed_tracing.enabled']
+          return unless payload = request[NEWRELIC_TRACE_KEY]
+
+          accept_distributed_trace_payload payload
+        end
 
-        SUPPORTABILITY_CREATE_PAYLOAD_SUCCESS   = "Supportability/DistributedTrace/CreatePayload/Success".freeze
-        SUPPORTABILITY_CREATE_PAYLOAD_EXCEPTION = "Supportability/DistributedTrace/CreatePayload/Exception".freeze
+        def distributed_trace_payload_created?
+          @distributed_trace_payload_created ||= false
+        end
 
         def create_distributed_trace_payload
-          unless Agent.config[:'distributed_tracing.enabled'] && (Agent.config[:'distributed_tracing.format'] == NR_FORMAT)
-            NewRelic::Agent.logger.warn "Not configured to create New Relic distributed trace payload"
-            return
-          end
-          self.distributed_trace_payload_created = true
-          payload = DistributedTracePayload.for_transaction self
-          NewRelic::Agent.increment_metric SUPPORTABILITY_CREATE_PAYLOAD_SUCCESS
+          return unless Agent.config[:'distributed_tracing.enabled']
+
+          @distributed_trace_payload_created = true
+          payload = DistributedTracePayload.for_transaction transaction
+          NewRelic::Agent.increment_metric CREATE_SUCCESS_METRIC
           payload
         rescue => e
-          NewRelic::Agent.increment_metric SUPPORTABILITY_CREATE_PAYLOAD_EXCEPTION
+          NewRelic::Agent.increment_metric CREATE_EXCEPTION_METRIC
           NewRelic::Agent.logger.warn "Failed to create distributed trace payload", e
           nil
         end
 
-        SUPPORTABILITY_ACCEPT_PAYLOAD_SUCCESS   = "Supportability/DistributedTrace/AcceptPayload/Success".freeze
-        SUPPORTABILITY_ACCEPT_PAYLOAD_EXCEPTION = "Supportability/DistributedTrace/AcceptPayload/Exception".freeze
-
         def accept_distributed_trace_payload payload
-          unless Agent.config[:'distributed_tracing.enabled'] && (Agent.config[:'distributed_tracing.format'] == NR_FORMAT)
-            NewRelic::Agent.logger.warn "Not configured to accept New Relic distributed trace payload"
-            return
-          end
+          return unless Agent.config[:'distributed_tracing.enabled']
+
           return false if check_payload_ignored(payload)
           return false unless check_payload_present(payload)
           return false unless payload = decode_payload(payload)
@@ -47,67 +72,37 @@ module NewRelic
 
           assign_payload_and_sampling_params(payload)
 
-          NewRelic::Agent.increment_metric SUPPORTABILITY_ACCEPT_PAYLOAD_SUCCESS
+          NewRelic::Agent.increment_metric ACCEPT_SUCCESS_METRIC
           true
         rescue => e
-          NewRelic::Agent.increment_metric SUPPORTABILITY_ACCEPT_PAYLOAD_EXCEPTION
+          NewRelic::Agent.increment_metric ACCEPT_EXCEPTION_METRIC
           NewRelic::Agent.logger.warn "Failed to accept distributed trace payload", e
           false
         end
 
-        def distributed_trace_payload_created?
-          @distributed_trace_payload_created ||=  false
-        end
-
-        attr_writer :distributed_trace_payload_created
-
-        def append_distributed_trace_info transaction_payload
-          return unless Agent.config[:'distributed_tracing.enabled']
-          DistributedTraceIntrinsics.copy_from_transaction \
-            self,
-            distributed_trace_payload,
-            transaction_payload
-        end
-
-        NR_FORMAT = "newrelic".freeze
-
-        def nr_distributed_tracing_enabled?
-          Agent.config[:'distributed_tracing.enabled'] && (Agent.config[:'distributed_tracing.format'] == NR_FORMAT) && Agent.instance.connected?
-        end
-
         private
 
-        SUPPORTABILITY_CREATE_BEFORE_ACCEPT_PAYLOAD   = "Supportability/DistributedTrace/AcceptPayload/Ignored/CreateBeforeAccept".freeze
-        SUPPORTABILITY_MULTIPLE_ACCEPT_PAYLOAD        = "Supportability/DistributedTrace/AcceptPayload/Ignored/Multiple".freeze
-        SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_NULL    = "Supportability/DistributedTrace/AcceptPayload/Ignored/Null".freeze
-        SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_BROWSER = "Supportability/DistributedTrace/AcceptPayload/Ignored/BrowserAgentInjected".freeze
-
         def check_payload_ignored(payload)
           if distributed_trace_payload
-            NewRelic::Agent.increment_metric SUPPORTABILITY_MULTIPLE_ACCEPT_PAYLOAD
+            NewRelic::Agent.increment_metric IGNORE_MULTIPLE_ACCEPT_METRIC
             return true
           elsif distributed_trace_payload_created?
-            NewRelic::Agent.increment_metric SUPPORTABILITY_CREATE_BEFORE_ACCEPT_PAYLOAD
+            NewRelic::Agent.increment_metric IGNORE_ACCEPT_AFTER_CREATE_METRIC
             return true
           end
           false
         end
 
-        NULL_PAYLOAD = 'null'.freeze
-
         def check_payload_present(payload)
           # We might be passed a Ruby `nil` object _or_ the JSON "null"
           if payload.nil? || payload == NULL_PAYLOAD
-            NewRelic::Agent.increment_metric SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_NULL
+            NewRelic::Agent.increment_metric IGNORE_ACCEPT_NULL_METRIC
             return nil
           end
 
           payload
         end
 
-        SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_PARSE_EXCEPTION = "Supportability/DistributedTrace/AcceptPayload/ParseException".freeze
-        LBRACE = "{".freeze
-
         def decode_payload(payload)
           decoded = if payload.start_with? LBRACE
             DistributedTracePayload.from_json payload
@@ -119,7 +114,7 @@ module NewRelic
 
           decoded
         rescue => e
-          NewRelic::Agent.increment_metric SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_PARSE_EXCEPTION
+          NewRelic::Agent.increment_metric ACCEPT_PARSE_EXCEPTION_METRIC
           NewRelic::Agent.logger.warn "Error parsing distributed trace payload", e
           nil
         end
@@ -136,42 +131,39 @@ module NewRelic
 
             true
           else
-            NewRelic::Agent.increment_metric SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_PARSE_EXCEPTION
+            NewRelic::Agent.increment_metric ACCEPT_PARSE_EXCEPTION_METRIC
             false
           end
         end
 
-        SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_MAJOR_VERSION = "Supportability/DistributedTrace/AcceptPayload/Ignored/MajorVersion".freeze
-
         def check_valid_version(payload)
           if DistributedTracePayload.major_version_matches?(payload)
             true
           else
-            NewRelic::Agent.increment_metric SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_MAJOR_VERSION
+            NewRelic::Agent.increment_metric IGNORE_ACCEPT_MAJOR_VERSION_METRIC
             false
           end
         end
 
-        SUPPORTABILITY_PAYLOAD_ACCEPT_UNTRUSTED_ACCOUNT = "Supportability/DistributedTrace/AcceptPayload/Ignored/UntrustedAccount".freeze
-
         def check_trusted_account(payload)
           compare_key = payload.trusted_account_key || payload.parent_account_id
           unless compare_key == NewRelic::Agent.config[:trusted_account_key]
-            NewRelic::Agent.increment_metric SUPPORTABILITY_PAYLOAD_ACCEPT_UNTRUSTED_ACCOUNT
+            NewRelic::Agent.increment_metric IGNORE_ACCEPT_UNTRUSTED_ACCOUNT_METRIC
             return false
           end
           true
         end
 
         def assign_payload_and_sampling_params(payload)
-          self.distributed_trace_payload = payload
-          @trace_id = payload.trace_id
-          @parent_transaction_id = payload.transaction_id
-          @parent_span_id = payload.id
+          @distributed_trace_payload = payload
+          return if transaction.distributed_tracer.trace_context_header_data
+          transaction.trace_id = payload.trace_id
+          transaction.distributed_tracer.parent_transaction_id = payload.transaction_id
+          transaction.parent_span_id = payload.id
 
           unless payload.sampled.nil?
-            self.sampled = payload.sampled
-            self.priority = payload.priority if payload.priority
+            transaction.sampled = payload.sampled
+            transaction.priority = payload.priority if payload.priority
           end
         end
       end

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

@@ -14,10 +14,12 @@ module NewRelic
       #
       # @api public
       class ExternalRequestSegment < Segment
-        attr_reader :library, :uri, :procedure
-
         NR_SYNTHETICS_HEADER = 'X-NewRelic-Synthetics'.freeze
+        EXTERNAL_TRANSACTION_PREFIX = 'ExternalTransaction/'.freeze
+        SLASH = '/'.freeze
+        APP_DATA_KEY = 'NewRelicAppData'.freeze
 
+        attr_reader :library, :uri, :procedure
 
         def initialize library, uri, procedure, start_time = nil # :nodoc:
           @library = library
@@ -52,7 +54,7 @@ module NewRelic
 
           return unless record_metrics?
 
-          insert_context_propagation_headers request
+          transaction.distributed_tracer.insert_headers request
         rescue => e
           NewRelic::Agent.logger.error "Error in add_request_headers", e
         end
@@ -98,10 +100,6 @@ module NewRelic
           @app_data && @app_data[1]
         end
 
-        EXTERNAL_TRANSACTION_PREFIX = 'ExternalTransaction/'.freeze
-        SLASH = '/'.freeze
-        APP_DATA_KEY = 'NewRelicAppData'.freeze
-
         # Obtain an obfuscated +String+ suitable for delivery across public networks that identifies this application
         # and transaction to another application which is also running a New Relic agent. This +String+ can be processed
         # by +process_request_metadata+ on the receiving application.
@@ -123,14 +121,14 @@ module NewRelic
               NewRelicTransaction: [
                 transaction.guid,
                 false,
-                transaction.cat_trip_id,
-                transaction.cat_path_hash
+                transaction.distributed_tracer.cat_trip_id,
+                transaction.distributed_tracer.cat_path_hash
               ]
             }
 
             # flag cross app in the state so transaction knows to add bits to paylaod
             #
-            transaction.is_cross_app_caller = true
+            transaction.distributed_tracer.is_cross_app_caller = true
 
             # add Synthetics header if we have it
             #
@@ -199,39 +197,6 @@ module NewRelic
           end
         end
 
-        def insert_context_propagation_headers request
-          return unless transaction
-
-          if transaction.trace_context_enabled?
-            insert_trace_context_headers request
-          elsif transaction.nr_distributed_tracing_enabled?
-            insert_distributed_trace_header request
-          elsif CrossAppTracing.cross_app_enabled?
-            insert_cross_app_header request
-          end
-        end
-
-
-        def insert_cross_app_header request
-          transaction.is_cross_app_caller = true
-          txn_guid = transaction.guid
-          trip_id   = transaction && transaction.cat_trip_id
-          path_hash = transaction && transaction.cat_path_hash
-
-          CrossAppTracing.insert_request_headers request, txn_guid, trip_id, path_hash
-        end
-
-        NEWRELIC_TRACE_HEADER = "newrelic".freeze
-
-        def insert_distributed_trace_header request
-          payload = transaction.create_distributed_trace_payload
-          request[NEWRELIC_TRACE_HEADER] = payload.http_safe if payload
-        end
-
-        def insert_trace_context_headers request
-          transaction.insert_trace_context carrier: request
-        end
-
         EXTERNAL_ALL = "External/all".freeze
 
         def add_unscoped_metrics
@@ -271,7 +236,6 @@ module NewRelic
         def record_span_event
           aggregator = ::NewRelic::Agent.agent.span_event_aggregator
           priority   = transaction.priority
-
           aggregator.record(priority: priority) do
             SpanEventPrimitive.for_external_request_segment(self)
           end

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

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'new_relic/agent/transaction/segment'
-require 'new_relic/agent/cross_app_tracing'
+require 'new_relic/agent/distributed_tracing/cross_app_tracing'
 
 module NewRelic
   module Agent
@@ -89,18 +89,10 @@ module NewRelic
           @name
         end
 
-        NEWRELIC_TRACE_KEY = "newrelic".freeze
-
-        def insert_distributed_trace_header
-          return unless Agent.config[:'distributed_tracing.enabled']
-          payload = transaction.create_distributed_trace_payload
-          headers[NEWRELIC_TRACE_KEY] = payload.http_safe if payload
-        end
-
         def transaction_assigned
           if headers && transaction && action == :produce && record_metrics?
-            insert_distributed_trace_header
-            transaction.add_message_cat_headers headers if CrossAppTracing.cross_app_enabled?
+            transaction.distributed_tracer.insert_distributed_trace_header headers
+            transaction.distributed_tracer.insert_cat_headers headers
           end
         rescue => e
           NewRelic::Agent.logger.error "Error during message header processing", e

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

@@ -121,13 +121,11 @@ module NewRelic
           }
         end
 
-        EMPTY_HASH = {}.freeze
-
         def trace_tree attributes_hash
           [
             NewRelic::Coerce.float(self.start_time),
-            EMPTY_HASH,
-            EMPTY_HASH,
+            NewRelic::EMPTY_HASH,
+            NewRelic::EMPTY_HASH,
             self.root_node.to_array,
             attributes_hash
           ]

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

@@ -1,48 +1,74 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
-require 'new_relic/agent/trace_context'
-require 'new_relic/agent/distributed_trace_payload'
-require 'new_relic/agent/distributed_trace_intrinsics'
-require 'new_relic/agent/distributed_trace_metrics'
+# frozen_string_literal: true
 
 module NewRelic
   module Agent
     class Transaction
-      attr_accessor :trace_context_header_data
-      attr_reader   :trace_state_payload
-
       module TraceContext
-        EMPTY_STRING                      = ''.freeze
-        SUPPORTABILITY_PREFIX             = "Supportability/TraceContext".freeze
-        CREATE_PREFIX                     = "#{SUPPORTABILITY_PREFIX}/Create".freeze
-        ACCEPT_PREFIX                     = "#{SUPPORTABILITY_PREFIX}/Accept".freeze
-        TRACESTATE_PREFIX                 = "#{SUPPORTABILITY_PREFIX}/TraceState".freeze
-        
-        CREATE_SUCCESS_METRIC             = "#{CREATE_PREFIX}/Success".freeze
-        CREATE_EXCEPTION_METRIC           = "#{CREATE_PREFIX}/Exception".freeze
-        
-        ACCEPT_SUCCESS_METRIC             = "#{ACCEPT_PREFIX}/Success".freeze
-        ACCEPT_EXCEPTION_METRIC           = "#{ACCEPT_PREFIX}/Exception".freeze
-        IGNORE_MULTIPLE_ACCEPT_METRIC     = "#{ACCEPT_PREFIX}/Ignored/Multiple".freeze
-        IGNORE_ACCEPT_AFTER_CREATE_METRIC = "#{ACCEPT_PREFIX}/Ignored/CreateBeforeAccept".freeze
-        
-        NO_NR_ENTRY_TRACESTATE_METRIC     = "#{TRACESTATE_PREFIX}/NoNrEntry".freeze
-        INVALID_TRACESTATE_PAYLOAD_METRIC = "#{TRACESTATE_PREFIX}/InvalidPayload".freeze
-
-        def insert_trace_context \
-            format: NewRelic::Agent::TraceContext::FORMAT_HTTP,
-            carrier: nil
-          
-          return unless trace_context_enabled?
-          NewRelic::Agent::TraceContext.insert \
+        include NewRelic::Coerce
+
+        module AccountHelpers
+          extend self
+
+          def trace_state_entry_key
+            @trace_state_entry_key ||= if Agent.config[:trusted_account_key]
+              "#{Agent.config[:trusted_account_key]}@nr".freeze
+            elsif Agent.config[:account_id]
+              "#{Agent.config[:account_id]}@nr".freeze
+            end
+          end
+        end
+
+        SUPPORTABILITY_PREFIX             = "Supportability/TraceContext"
+        CREATE_PREFIX                     = "#{SUPPORTABILITY_PREFIX}/Create"
+        ACCEPT_PREFIX                     = "#{SUPPORTABILITY_PREFIX}/Accept"
+        TRACESTATE_PREFIX                 = "#{SUPPORTABILITY_PREFIX}/TraceState"
+
+        CREATE_SUCCESS_METRIC             = "#{CREATE_PREFIX}/Success"
+        CREATE_EXCEPTION_METRIC           = "#{CREATE_PREFIX}/Exception"
+
+        ACCEPT_SUCCESS_METRIC             = "#{ACCEPT_PREFIX}/Success"
+        ACCEPT_EXCEPTION_METRIC           = "#{ACCEPT_PREFIX}/Exception"
+        IGNORE_MULTIPLE_ACCEPT_METRIC     = "#{ACCEPT_PREFIX}/Ignored/Multiple"
+        IGNORE_ACCEPT_AFTER_CREATE_METRIC = "#{ACCEPT_PREFIX}/Ignored/CreateBeforeAccept"
+
+        NO_NR_ENTRY_TRACESTATE_METRIC     = "#{TRACESTATE_PREFIX}/NoNrEntry"
+        INVALID_TRACESTATE_PAYLOAD_METRIC = "#{TRACESTATE_PREFIX}/InvalidNrEntry"
+
+        attr_accessor :trace_context_header_data
+        attr_reader   :trace_state_payload
+
+        def trace_parent_header_present? request
+          request[NewRelic::HTTP_TRACEPARENT_KEY]
+        end
+
+        def accept_trace_context_incoming_request request
+          header_data = NewRelic::Agent::DistributedTracing::TraceContext.parse(
+            format: NewRelic::FORMAT_RACK,
+            carrier: request,
+            trace_state_entry_key: AccountHelpers.trace_state_entry_key,
+          )
+          return if header_data.nil?
+
+          accept_trace_context header_data
+        end
+        private :accept_trace_context_incoming_request
+
+        def insert_trace_context_header header, format=NewRelic::FORMAT_NON_RACK
+          return unless Agent.config[:'distributed_tracing.enabled']
+
+          NewRelic::Agent::DistributedTracing::TraceContext.insert \
             format: format,
-            carrier: carrier,
-            trace_id: trace_id,
-            parent_id: current_segment.guid,
-            trace_flags: sampled? ? 0x1 : 0x0,
+            carrier: header,
+            trace_id: transaction.trace_id.rjust(32, '0').downcase,
+            parent_id: transaction.current_segment.guid,
+            trace_flags: transaction.sampled? ? 0x1 : 0x0,
             trace_state: create_trace_state
+
           @trace_context_inserted = true
+
           NewRelic::Agent.increment_metric CREATE_SUCCESS_METRIC
           true
         rescue Exception => e
@@ -52,37 +78,37 @@ module NewRelic
         end
 
         def create_trace_state
-          entry_key = NewRelic::Agent::TraceContext::AccountHelpers.trace_state_entry_key
+          entry_key = AccountHelpers.trace_state_entry_key.dup
           payload = create_trace_state_payload
 
           if payload
-            entry = NewRelic::Agent::TraceContext.create_trace_state_entry \
+            entry = NewRelic::Agent::DistributedTracing::TraceContext.create_trace_state_entry \
               entry_key,
               payload.to_s
           else
-            entry = EMPTY_STRING
+            entry = NewRelic::EMPTY_STR
           end
 
           trace_context_header_data ? trace_context_header_data.trace_state(entry) : entry
         end
 
         def create_trace_state_payload
-          unless trace_context_enabled?
+          unless Agent.config[:'distributed_tracing.enabled']
             NewRelic::Agent.logger.warn "Not configured to create WC3 trace context payload"
             return
           end
 
-          if Agent.config[:'span_events.enabled']
-            TraceContextPayload.create \
-              parent_account_id: Agent.config[:account_id],
-              parent_app_id: Agent.config[:primary_application_id],
-              transaction_id: guid,
-              sampled: sampled?,
-              priority: priority,
-              id: current_segment.guid
-          elsif trace_context_header_data
-            trace_context_header_data.trace_state_payload
-          end
+
+          span_guid = Agent.config[:'span_events.enabled'] ? transaction.current_segment.guid : nil
+          transaction_guid = Agent.config[:'analytics_events.enabled'] ? transaction.guid : nil
+
+          TraceContextPayload.create \
+            parent_account_id: Agent.config[:account_id],
+            parent_app_id: Agent.config[:primary_application_id],
+            transaction_id: transaction_guid,
+            sampled: transaction.sampled?,
+            priority: float!(transaction.priority, NewRelic::PRIORITY_PRECISION),
+            id: span_guid
         end
 
         def assign_trace_state_payload
@@ -94,28 +120,24 @@ module NewRelic
           unless payload.valid?
             NewRelic::Agent.increment_metric INVALID_TRACESTATE_PAYLOAD_METRIC
             return false
-          end            
+          end
           @trace_state_payload = payload
         end
 
-        def accept_trace_context trace_context_header_data
-          unless trace_context_enabled?
-            NewRelic::Agent.logger.warn "Not configured to accept WC3 trace context payload"
-            return false
-          end
-          return false if ignore_trace_context?
-          
-          @trace_context_header_data = trace_context_header_data
-          @trace_id = @trace_context_header_data.trace_id
-          @parent_span_id = @trace_context_header_data.parent_id
+        def accept_trace_context header_data
+          return if ignore_trace_context?
+
+          @trace_context_header_data = header_data
+          transaction.trace_id = header_data.trace_id
+          transaction.parent_span_id = header_data.parent_id
 
           return false unless payload = assign_trace_state_payload
 
-          @parent_transaction_id = payload.transaction_id
+          transaction.distributed_tracer.parent_transaction_id = payload.transaction_id
 
           unless payload.sampled.nil?
-            self.sampled = payload.sampled
-            self.priority = payload.priority if payload.priority
+            transaction.sampled = payload.sampled
+            transaction.priority = payload.priority if payload.priority
           end
           NewRelic::Agent.increment_metric ACCEPT_SUCCESS_METRIC
           true
@@ -125,14 +147,6 @@ module NewRelic
           false
         end
 
-        def append_trace_context_info transaction_payload
-          return unless trace_context_enabled?
-          DistributedTraceIntrinsics.copy_from_transaction \
-              self,
-              trace_state_payload,
-              transaction_payload
-        end
-
         def ignore_trace_context?
           if trace_context_header_data
             NewRelic::Agent.increment_metric IGNORE_MULTIPLE_ACCEPT_METRIC
@@ -143,16 +157,11 @@ module NewRelic
           end
           false
         end
-      end
-
-      def trace_context_inserted?
-        @trace_context_inserted ||= false
-      end
 
-      W3C_FORMAT = "w3c".freeze
+        def trace_context_inserted?
+          @trace_context_inserted ||= false
+        end
 
-      def trace_context_enabled?
-        Agent.config[:'distributed_tracing.enabled'] && (Agent.config[:'distributed_tracing.format'] == W3C_FORMAT) && Agent.instance.connected?
       end
     end
   end