newrelic_rpm 6.8.0.360 → 6.9.0.363

data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb

@@ -0,0 +1,27 @@
+# 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.
+
+module NewRelic
+  module Agent
+    module DistributedTracing
+      class Monitor < InboundRequestMonitor
+        def on_finished_configuring(events)
+          return unless NewRelic::Agent.config[:'distributed_tracing.enabled']
+          events.subscribe(:before_call, &method(:on_before_call))
+        end
+
+        def on_before_call(request)
+          unless NewRelic::Agent.config[:'distributed_tracing.enabled']
+            NewRelic::Agent.logger.warn "Not configured to accept distributed trace headers" 
+            return
+          end
+
+          return unless txn = Tracer.current_transaction
+
+          txn.distributed_tracer.accept_incoming_request request
+        end
+      end
+    end
+  end
+end

data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb}

@@ -28,7 +28,7 @@ module NewRelic
       end
 
       def setup_obfuscator
-        @obfuscator = NewRelic::Agent::Obfuscator.new(NewRelic::Agent.config[:encoding_key])
+        @obfuscator = Obfuscator.new(Agent.config[:encoding_key])
       end
 
       def deserialize_header(encoded_header, key)

data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb}

@@ -2,8 +2,6 @@
 # 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/inbound_request_monitor'
-
 module NewRelic
   module Agent
     class SyntheticsMonitor < InboundRequestMonitor
@@ -40,7 +38,7 @@ module NewRelic
 
         def is_trusted?(incoming_payload)
           account_id = incoming_payload[1]
-          NewRelic::Agent.config[:trusted_account_ids].include?(account_id)
+          Agent.config[:trusted_account_ids].include?(account_id)
         end
 
         def is_valid_payload?(incoming_payload)
@@ -48,7 +46,7 @@ module NewRelic
         end
 
         def reject_messaging_synthetics_header headers
-          headers.reject {|k,_| k == NewRelic::Agent::CrossAppTracing::NR_MESSAGE_BROKER_SYNTHETICS_HEADER}
+          headers.reject {|k,_| k == CrossAppTracing::NR_MESSAGE_BROKER_SYNTHETICS_HEADER}
         end
 
       end

data/lib/new_relic/agent/span_event_primitive.rb

@@ -6,7 +6,7 @@
 # event for a segment.
 
 require 'new_relic/agent/payload_metric_mapping'
-require 'new_relic/agent/distributed_trace_payload'
+require 'new_relic/agent/distributed_tracing/distributed_trace_payload'
 
 module NewRelic
   module Agent
@@ -15,6 +15,7 @@ module NewRelic
       extend self
 
       # Strings for static keys of the event structure
+      ELLIPSIS             = '...'.freeze
       TYPE_KEY             = 'type'.freeze
       TRACE_ID_KEY         = 'traceId'.freeze
       GUID_KEY             = 'guid'.freeze
@@ -46,17 +47,14 @@ module NewRelic
       DATASTORE_CATEGORY = 'datastore'.freeze
       CLIENT             = 'client'.freeze
 
-      # To avoid allocations when we have empty custom or agent attributes
-      EMPTY_HASH = {}.freeze
-
-      def for_segment(segment)
+      def for_segment segment
         intrinsics = intrinsics_for(segment)
         intrinsics[CATEGORY_KEY] = GENERIC_CATEGORY
 
-        [intrinsics, custom_attributes(segment.attributes), EMPTY_HASH]
+        [intrinsics, custom_attributes(segment.attributes), NewRelic::EMPTY_HASH]
       end
 
-      def for_external_request_segment(segment)
+      def for_external_request_segment segment
         intrinsics = intrinsics_for(segment)
 
         intrinsics[COMPONENT_KEY]   = segment.library
@@ -73,7 +71,7 @@ module NewRelic
         [intrinsics, custom_attributes(segment.attributes), agent_attributes]
       end
 
-      def for_datastore_segment(segment)
+      def for_datastore_segment segment
         intrinsics = intrinsics_for(segment)
 
         intrinsics[COMPONENT_KEY] = segment.product
@@ -103,9 +101,8 @@ module NewRelic
 
       private
 
-      def intrinsics_for(segment)
-        intrinsics =
-        {
+      def intrinsics_for segment
+        intrinsics = {
           TYPE_KEY           => EVENT_TYPE,
           TRACE_ID_KEY       => segment.transaction.trace_id,
           GUID_KEY           => segment.guid,
@@ -119,18 +116,21 @@ module NewRelic
 
         if segment.parent.nil?
           intrinsics[ENTRY_POINT_KEY] = true
-          if segment.transaction
-            if segment.transaction.trace_context_header_data
-              intrinsics[TRACING_VENDORS_KEY] = segment.transaction.trace_context_header_data.trace_state_vendors
+          if txn = segment.transaction
+            if header_data = txn.distributed_tracer.trace_context_header_data
+              if trace_state_vendors = header_data.trace_state_vendors
+                intrinsics[TRACING_VENDORS_KEY] = trace_state_vendors unless trace_state_vendors == NewRelic::EMPTY_STR
+              end
             end
-            if segment.transaction.trace_state_payload
-              intrinsics[TRUSTED_PARENT_KEY] = segment.transaction.trace_state_payload.id
+            if trace_state_payload = txn.distributed_tracer.trace_state_payload
+              intrinsics[TRUSTED_PARENT_KEY] = trace_state_payload.id if trace_state_payload.id
             end
           end
         end
 
-        parent_id = parent_guid(segment)
-        intrinsics[PARENT_ID_KEY] = parent_id if parent_id
+        if parent_id = parent_guid(segment)
+          intrinsics[PARENT_ID_KEY] = parent_id
+        end
         intrinsics
       end
 
@@ -139,27 +139,23 @@ module NewRelic
           result = attributes.custom_attributes_for(NewRelic::Agent::AttributeFilter::DST_SPAN_EVENTS)
           result.freeze
         else
-          EMPTY_HASH
+          NewRelic::EMPTY_HASH
         end
       end
 
-      def parent_guid(segment)
+      def parent_guid segment
         if segment.parent
           segment.parent.guid
-        elsif segment.transaction && segment.transaction.distributed_trace_payload
-          segment.transaction.distributed_trace_payload.id
-        elsif segment.transaction && segment.transaction.trace_context_header_data
-          segment.transaction.trace_context_header_data.parent_id
+        elsif txn = segment.transaction
+          txn.distributed_tracer.parent_guid
         end
       end
 
-      def milliseconds_since_epoch(segment)
+      def milliseconds_since_epoch segment
         Integer(segment.start_time.to_f * 1000.0)
       end
 
-      ELLIPSIS = '...'.freeze
-
-      def truncate(value, max_size=255)
+      def truncate value, max_size=255
         value = value.to_s
         if value.bytesize > max_size
           value.byteslice(0, max_size - 2).chop! << ELLIPSIS
@@ -168,7 +164,7 @@ module NewRelic
         end
       end
 
-      def allowed?(key)
+      def allowed? key
         NewRelic::Agent.instance.attribute_filter.allows_key?(key, AttributeFilter::DST_SPAN_EVENTS)
       end
     end

data/lib/new_relic/agent/sql_sampler.rb

@@ -159,9 +159,9 @@ module NewRelic
       def distributed_trace_intrinsics(state)
         transaction = state.current_transaction
         params = nil
-        if transaction && transaction.distributed_trace_payload
+        if transaction && transaction.distributed_tracer.distributed_trace_payload
           params = {}
-          payload = transaction.distributed_trace_payload
+          payload = transaction.distributed_tracer.distributed_trace_payload
           DistributedTraceIntrinsics.copy_from_transaction transaction, payload, params
           params[PRIORITY] = transaction.priority
         end

data/lib/new_relic/agent/supported_versions.rb

@@ -11,7 +11,7 @@ module NewRelic
       {
         :type        => :ruby,
         :name        => "MRI",
-        :supported   => ["2.0.0", "~>2.1.0", "~>2.2.0", "~>2.3.0", "~>2.4.0", "~>2.5.0"],
+        :supported   => ["2.0.0", "~>2.1.0", "~>2.2.0", "~>2.3.0", "~>2.4.0", "~>2.5.0", "~>2.6.0", "~>2.7.0"],
         :deprecated  => ["1.8.6", "1.8.7", "1.9.2", "1.9.3"],
         :url         => "https://www.ruby-lang.org",
         :feed        => "https://www.ruby-lang.org/en/feeds/news.rss",
@@ -119,7 +119,7 @@ module NewRelic
       :activerecord =>
       {
         :type        => :database,
-        :supported   => ["~>3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0", "~>4.2.0", "~>5.0.0", "~>5.1.0"],
+        :supported   => ["~>3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0", "~>4.2.0", "~>5.0.0", "~>5.1.0", "~>6.0.0"],
         :deprecated  => ["~>2.0.0", "~>2.1.0", "~>2.2.0", "~>2.3.0",],
         :url         => "https://rubygems.org/gems/activerecord",
         :feed        => "https://rubygems.org/gems/activerecord/versions.atom",

data/lib/new_relic/agent/tracer.rb

@@ -120,7 +120,7 @@ module NewRelic
         #   New-Relic-specific prefix
         #
         # @param [Symbol] category +:web+ for web transactions or
-        #   +:background+ for background transactions
+        #   +:task+ for background transactions
         #
         # @param [Hash] options reserved for New Relic internal use
         #
@@ -196,12 +196,12 @@ module NewRelic
 
         def create_distributed_trace_payload
           return unless txn = current_transaction
-          txn.create_distributed_trace_payload
+          txn.distributed_tracer.create_distributed_trace_payload
         end
 
         def accept_distributed_trace_payload(payload)
           return unless txn = current_transaction
-          txn.accept_distributed_trace_payload(payload)
+          txn.distributed_tracer.accept_distributed_trace_payload(payload)
         end
 
         # Returns the currently active segment in the transaction in

data/lib/new_relic/agent/transaction.rb

@@ -8,9 +8,7 @@ require 'new_relic/agent/method_tracer_helpers'
 require 'new_relic/agent/attributes'
 require 'new_relic/agent/transaction/request_attributes'
 require 'new_relic/agent/transaction/tracing'
-require 'new_relic/agent/transaction/trace_context'
-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'
@@ -23,9 +21,6 @@ module NewRelic
     # @api public
     class Transaction
       include Tracing
-      include TraceContext
-      include DistributedTracing
-      include CrossAppTracing
 
       # for nested transactions
       SUBTRANSACTION_PREFIX        = 'Nested/'.freeze
@@ -62,7 +57,8 @@ module NewRelic
                     :process_cpu_start,
                     :http_response_code,
                     :response_content_length,
-                    :response_content_type
+                    :response_content_type,
+                    :parent_span_id
 
       attr_reader :guid,
                   :metrics,
@@ -73,9 +69,7 @@ module NewRelic
                   :nesting_max_depth,
                   :segments,
                   :end_time,
-                  :duration,
-                  :parent_transaction_id,
-                  :parent_span_id
+                  :duration
 
       attr_writer :sampled,
                   :priority
@@ -270,6 +264,10 @@ 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?
@@ -282,12 +280,12 @@ module NewRelic
         @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? ? 1.0 + rand : rand).round(NewRelic::PRIORITY_PRECISION)
       end
 
       def referer
@@ -358,8 +356,10 @@ module NewRelic
       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
@@ -532,8 +532,7 @@ module NewRelic
         record_total_time_metrics
         record_apdex unless ignore_apdex?
         record_queue_time
-        record_cross_app_metrics
-        DistributedTraceMetrics.record_metrics_for_transaction self
+        distributed_tracer.record_metrics
 
         record_exceptions
         record_transaction_event
@@ -585,11 +584,7 @@ module NewRelic
           attributes.add_intrinsic_attribute(:synthetics_monitor_id, synthetics_monitor_id)
         end
 
-        if Agent.config[:'distributed_tracing.enabled'] || trace_context_enabled?
-          DistributedTraceIntrinsics.copy_to_attributes @payload, attributes
-        elsif is_cross_app?
-          assign_cross_app_intrinsics
-        end
+        distributed_tracer.assign_intrinsics
       end
 
       def calculate_gc_time
@@ -633,15 +628,13 @@ module NewRelic
           :priority             => priority
         }
 
-        append_cat_info(@payload)
-        append_distributed_trace_info(@payload)
-        append_trace_context_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?

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

@@ -0,0 +1,171 @@
+# 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/transaction/trace_context'
+require 'new_relic/agent/transaction/distributed_tracing'
+require 'new_relic/agent/distributed_tracing/cross_app_tracing'
+
+module NewRelic
+  module Agent
+    class Transaction
+      class DistributedTracer
+        include NewRelic::Agent::CrossAppTracing
+        include DistributedTracing
+        include TraceContext
+
+        attr_reader :transaction
+        attr_accessor :parent_transaction_id
+
+        def parent_guid
+          if trace_context_header_data
+            trace_context_header_data.parent_id
+          elsif distributed_trace_payload
+            distributed_trace_payload.id
+          end
+        end
+
+        def accept_incoming_request request, transport_type=nil
+          accept_incoming_transport_type request, transport_type
+          if trace_parent_header_present? request
+            accept_trace_context_incoming_request request
+          else
+            accept_distributed_tracing_incoming_request request
+          end
+        end
+
+        def caller_transport_type
+          @caller_transport_type ||= "Unknown"
+        end
+
+        def accept_transport_type_from_api value
+          @caller_transport_type = DistributedTraceTransportType.from value
+        end
+
+        def accept_incoming_transport_type request, transport_type
+          if transport_type.to_s == NewRelic::EMPTY_STR
+            @caller_transport_type = DistributedTraceTransportType.for_rack_request request
+          else
+            @caller_transport_type = DistributedTraceTransportType.from transport_type
+          end
+        end
+
+        def initialize transaction
+          @transaction = transaction
+        end
+
+        def record_metrics
+          record_cross_app_metrics
+          DistributedTraceMetrics.record_metrics_for_transaction transaction
+        end
+
+        def append_payload payload
+          append_cat_info payload
+          DistributedTraceIntrinsics.copy_from_transaction \
+            transaction,
+            trace_state_payload || distributed_trace_payload,
+            payload
+        end
+
+        def insert_headers request
+          insert_trace_context_header request
+          insert_distributed_trace_header request
+          insert_cross_app_header request
+        end
+
+        def consume_message_headers headers, tracer_state, transport_type
+          consume_message_distributed_tracing_headers headers, transport_type
+          consume_message_cross_app_tracing_headers headers, tracer_state
+          consume_message_synthetics_headers headers
+        rescue => e
+          NewRelic::Agent.logger.error "Error in consume_message_headers", e
+        end
+
+        def assign_intrinsics
+          if Agent.config[:'distributed_tracing.enabled']
+            DistributedTraceIntrinsics.copy_to_attributes transaction.payload, transaction.attributes
+          elsif is_cross_app?
+            assign_cross_app_intrinsics
+          end
+        end
+
+        def insert_distributed_trace_header request
+          return unless Agent.config[:'distributed_tracing.enabled']
+          return if Agent.config[:'exclude_newrelic_header']
+          payload = create_distributed_trace_payload
+          request[NewRelic::NEWRELIC_KEY] = payload.http_safe if payload
+        end
+
+        def insert_cat_headers headers
+          return unless CrossAppTracing.cross_app_enabled?
+          @is_cross_app_caller = true
+          insert_message_headers headers,
+            transaction.guid,
+            cat_trip_id,
+            cat_path_hash,
+            transaction.raw_synthetics_header
+        end
+
+        private
+
+        def consume_message_synthetics_headers headers
+          synthetics_header = headers[CrossAppTracing::NR_MESSAGE_BROKER_SYNTHETICS_HEADER]
+          if synthetics_header and
+             incoming_payload = ::JSON.load(deobfuscate(synthetics_header)) and
+             SyntheticsMonitor.is_valid_payload?(incoming_payload) and
+             SyntheticsMonitor.is_supported_version?(incoming_payload) and
+             SyntheticsMonitor.is_trusted?(incoming_payload)
+
+            transaction.raw_synthetics_header = synthetics_header
+            transaction.synthetics_payload = incoming_payload
+          end
+        rescue => e
+          NewRelic::Agent.logger.error "Error in consume_message_synthetics_header", e
+        end
+
+        def consume_message_distributed_tracing_headers headers, transport_type
+          return unless Agent.config[:'distributed_tracing.enabled']
+
+          accept_incoming_transport_type headers, transport_type
+
+          newrelic_trace_key = NewRelic::CANDIDATE_NEWRELIC_KEYS.detect do |key|
+            headers.has_key?(key)
+          end
+          return unless newrelic_trace_key && (payload = headers[newrelic_trace_key])
+
+          accept_distributed_trace_payload payload
+        end
+
+        def consume_message_cross_app_tracing_headers headers, tracer_state
+          return unless CrossAppTracing.cross_app_enabled?
+          return unless CrossAppTracing.message_has_crossapp_request_header?(headers)
+
+          accept_cross_app_payload headers, tracer_state
+          CrossAppTracing.assign_intrinsic_transaction_attributes tracer_state
+        end
+
+        def accept_cross_app_payload headers, tracer_state
+          encoded_id = headers[CrossAppTracing::NR_MESSAGE_BROKER_ID_HEADER]
+          decoded_id = encoded_id.nil? ? EMPTY_STRING : deobfuscate(encoded_id)
+
+          return unless CrossAppTracing.trusted_valid_cross_app_id?(decoded_id)
+          txn_header = headers[CrossAppTracing::NR_MESSAGE_BROKER_TXN_HEADER]
+          txn_info   = ::JSON.load(deobfuscate(txn_header))
+          payload    = CrossAppPayload.new(decoded_id, transaction, txn_info)
+
+          @cross_app_payload = payload
+        rescue => e
+          NewRelic::Agent.logger.debug("Failure deserializing encoded header in #{self.class}, #{e.class}, #{e.message}")
+          nil
+        end
+
+        def deobfuscate message
+          CrossAppTracing.obfuscator.deobfuscate message
+        end
+
+      end
+    end
+  end
+end
+