newrelic_rpm 4.8.0.341 → 6.13.1

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

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require 'new_relic/agent/transaction/segment'
 require 'new_relic/agent/http_clients/uri_util'
@@ -14,17 +15,24 @@ module NewRelic
       #
       # @api public
       class ExternalRequestSegment < Segment
-        attr_reader :library, :uri, :procedure
+        NR_SYNTHETICS_HEADER = 'X-NewRelic-Synthetics'
+        APP_DATA_KEY = 'NewRelicAppData'
 
-        NR_SYNTHETICS_HEADER = 'X-NewRelic-Synthetics'.freeze
+        EXTERNAL_ALL = "External/all"
+        EXTERNAL_ALL_WEB = "External/allWeb"
+        EXTERNAL_ALL_OTHER = "External/allOther"
+        MISSING_STATUS_CODE = "MissingHTTPStatusCode"
 
+        attr_reader :library, :uri, :procedure
+        attr_reader :http_status_code
 
         def initialize library, uri, procedure, start_time = nil # :nodoc:
           @library = library
-          @uri = HTTPClients::URIUtil.parse_and_normalize_url(uri)
+          @uri = HTTPClients::URIUtil.obfuscated_uri(uri)
           @procedure = procedure
           @host_header = nil
           @app_data = nil
+          @http_status_code = nil
           super(nil, nil, start_time)
         end
 
@@ -50,15 +58,9 @@ module NewRelic
           synthetics_header = transaction && transaction.raw_synthetics_header
           insert_synthetics_header request, synthetics_header if synthetics_header
 
-          return unless record_metrics? && CrossAppTracing.cross_app_enabled?
-
-          transaction_state.is_cross_app_caller = true
-          txn_guid = transaction_state.request_guid
-          trip_id   = transaction && transaction.cat_trip_id
-          path_hash = transaction && transaction.cat_path_hash
+          return unless record_metrics?
 
-          CrossAppTracing.insert_request_headers request, txn_guid, trip_id, path_hash
-          insert_distributed_trace_header request
+          transaction.distributed_tracer.insert_headers request
         rescue => e
           NewRelic::Agent.logger.error "Error in add_request_headers", e
         end
@@ -104,10 +106,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.
@@ -129,14 +127,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.state.is_cross_app_caller = true
+            transaction.distributed_tracer.is_cross_app_caller = true
 
             # add Synthetics header if we have it
             #
@@ -181,18 +179,32 @@ module NewRelic
 
         def record_metrics
           add_unscoped_metrics
-          record_distributed_tracing_metrics if Agent.config[:'distributed_tracing.enabled']
           super
         end
 
+        def process_response_headers response # :nodoc:
+          set_http_status_code response
+          read_response_headers response
+        end
+
         private
 
+        # Only sets the http_status_code if response.status_code is non-empty value
+        def set_http_status_code response
+          if response.respond_to? :status_code
+            @http_status_code = response.status_code if response.has_status_code?
+          else
+            NewRelic::Agent.logger.warn "Cannot extract HTTP Status Code from response #{response.class.to_s}"
+            NewRelic::Agent.record_metric "#{name}/#{MISSING_STATUS_CODE}", 1
+          end
+        end
+
         def insert_synthetics_header request, header
           request[NR_SYNTHETICS_HEADER] = header
         end
 
         def segment_complete
-          params[:uri] = HTTPClients::URIUtil.filter_uri(uri)
+          params[:uri] = uri.to_s
           if cross_app_request?
             params[:transaction_guid] = transaction_guid
           end
@@ -206,16 +218,6 @@ module NewRelic
           end
         end
 
-        X_NEWRELIC_TRACE_HEADER = "X-NewRelic-Trace".freeze
-
-        def insert_distributed_trace_header request
-          return unless Agent.config[:'distributed_tracing.enabled']
-          payload = transaction.create_distributed_trace_payload uri
-          request[X_NEWRELIC_TRACE_HEADER] = payload.http_safe
-        end
-
-        EXTERNAL_ALL = "External/all".freeze
-
         def add_unscoped_metrics
           @unscoped_metrics = [ EXTERNAL_ALL,
             "External/#{host}/all",
@@ -227,9 +229,6 @@ module NewRelic
           end
         end
 
-        EXTERNAL_ALL_WEB = "External/allWeb".freeze
-        EXTERNAL_ALL_OTHER = "External/allOther".freeze
-
         def suffixed_rollup_metric
           if Transaction.recording_web_transaction?
             EXTERNAL_ALL_WEB
@@ -238,61 +237,6 @@ module NewRelic
           end
         end
 
-        ALL_SUFFIX = "all".freeze
-        ALL_WEB_SUFFIX = "allWeb".freeze
-        ALL_OTHER_SUFFIX = "allOther".freeze
-
-        def transaction_type_suffix
-          if Transaction.recording_web_transaction?
-            ALL_WEB_SUFFIX
-          else
-            ALL_OTHER_SUFFIX
-          end
-        end
-
-        def record_distributed_tracing_metrics
-          add_caller_by_duration_metrics
-          record_transport_duration_metrics
-          record_errors_by_caller_metrics
-        end
-
-        DURATION_BY_CALLER_UNKOWN_PREFIX = "DurationByCaller/Unknown/Unknown/Unknown/Unknown".freeze
-
-        def add_caller_by_duration_metrics
-          prefix = if transaction.distributed_trace?
-            payload = transaction.distributed_trace_payload
-            "DurationByCaller/#{payload.caller_type}/#{payload.caller_account_id}/#{payload.caller_app_id}/transport"
-          else
-            DURATION_BY_CALLER_UNKOWN_PREFIX
-          end
-
-          @unscoped_metrics << "#{prefix}/#{ALL_SUFFIX}"
-          @unscoped_metrics << "#{prefix}/#{transaction_type_suffix}"
-        end
-
-        def record_transport_duration_metrics
-          return unless transaction.distributed_trace?
-          payload = transaction.distributed_trace_payload
-          prefix = "TransportDuration/#{payload.caller_type}/#{payload.caller_account_id}/#{payload.caller_app_id}/transport"
-          metric_cache.record_unscoped "#{prefix}/#{ALL_SUFFIX}", transaction.transport_duration
-          metric_cache.record_unscoped "#{prefix}/#{transaction_type_suffix}", transaction.transport_duration
-        end
-
-        ERRORS_BY_CALLER_UNKOWN_PREFIX = "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown".freeze
-
-        def record_errors_by_caller_metrics
-          return unless transaction.exceptions.size > 0
-          prefix = if transaction.distributed_trace?
-            payload = transaction.distributed_trace_payload
-            "ErrorsByCaller/#{payload.caller_type}/#{payload.caller_account_id}/#{payload.caller_app_id}/transport"
-          else
-            ERRORS_BY_CALLER_UNKOWN_PREFIX
-          end
-
-          NewRelic::Agent.increment_metric "#{prefix}/#{ALL_SUFFIX}"
-          NewRelic::Agent.increment_metric "#{prefix}/#{transaction_type_suffix}"
-        end
-
         def update_segment_name
           if @app_data
             @name = "ExternalTransaction/#{host}/#{cross_process_id}/#{cross_process_transaction_name}"
@@ -304,6 +248,14 @@ module NewRelic
         def obfuscator
           CrossAppTracing.obfuscator
         end
+
+        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
+        end
       end
     end
   end

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

@@ -1,9 +1,9 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require '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
@@ -83,21 +83,20 @@ module NewRelic
           if destination_type == :temporary_queue || destination_type == :temporary_topic
             @name << TEMP
           else
-            @name << NAMED << destination_name
+            @name << NAMED << destination_name.to_s
           end
 
           @name
         end
 
-        def transaction= t
-          super
-          if headers && transaction && action == :produce && record_metrics? && CrossAppTracing.cross_app_enabled?
-            transaction.add_message_cat_headers headers
+        def transaction_assigned
+          if headers && transaction && action == :produce && record_metrics?
+            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
         end
-
       end
     end
   end

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/agent/http_clients/uri_util'
 

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

@@ -1,8 +1,10 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/agent/transaction/abstract_segment'
+require 'new_relic/agent/span_event_primitive'
+require 'new_relic/agent/attributes'
 
 module NewRelic
   module Agent
@@ -11,13 +13,38 @@ module NewRelic
         # unscoped_metrics can be nil, a string, or array. we do this to save
         # object allocations. if allocations weren't important then we would
         # initialize it as an array that would be empty, have one item, or many items.
-        attr_reader :unscoped_metrics
+        attr_reader :unscoped_metrics, :custom_transaction_attributes
 
         def initialize name=nil, unscoped_metrics=nil, start_time=nil
           @unscoped_metrics = unscoped_metrics
           super name, start_time
         end
 
+        def attributes
+          @attributes ||= Attributes.new(NewRelic::Agent.instance.attribute_filter)
+        end
+
+        def add_agent_attribute(key, value, default_destinations=AttributeFilter::DST_SPAN_EVENTS)
+          attributes.add_agent_attribute(key, value, default_destinations)
+        end
+
+        def self.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
+          if segment = NewRelic::Agent::Tracer.current_segment
+            segment.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
+          else
+            NewRelic::Agent.logger.debug "Attempted to merge untrusted attributes without segment"
+          end
+        end
+
+        def merge_untrusted_agent_attributes(agent_attributes, prefix, default_destinations)
+          return if agent_attributes.nil?
+          attributes.merge_untrusted_agent_attributes(agent_attributes, prefix, default_destinations)
+        end
+
+        def add_custom_attributes(p)
+          attributes.merge_custom_attributes(p)
+        end
+
         private
 
         def record_metrics
@@ -46,6 +73,19 @@ module NewRelic
             @unscoped_metrics = metric
           end
         end
+
+        def segment_complete
+          record_span_event if transaction.sampled?
+        end
+
+        def record_span_event
+          aggregator = ::NewRelic::Agent.agent.span_event_aggregator
+          priority   = transaction.priority
+
+          aggregator.record(priority: priority) do
+            SpanEventPrimitive.for_segment(self)
+          end
+        end
       end
     end
   end

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/agent/transaction/transaction_sample_buffer'
 

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/agent/transaction/transaction_sample_buffer'
 

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/agent/transaction/trace_node'
 
@@ -11,7 +11,7 @@ module NewRelic
         class FinishedTraceError < StandardError; end
 
         attr_reader :start_time, :root_node
-        attr_accessor :transaction_name, :guid, :xray_session_id, :attributes,
+        attr_accessor :transaction_name, :guid, :attributes,
                       :node_count, :finished, :threshold, :profile
 
         ROOT = "ROOT".freeze
@@ -40,11 +40,6 @@ module NewRelic
           self.root_node.duration
         end
 
-        def forced?
-          return true if NewRelic::Coerce.int_or_nil(xray_session_id)
-          false
-        end
-
         def synthetics_resource_id
           intrinsic_attributes = attributes.intrinsic_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER)
           intrinsic_attributes[:synthetics_resource_id]
@@ -90,18 +85,9 @@ module NewRelic
         end
 
         def prepare_sql_for_transmission!
-          strategy = NewRelic::Agent::Database.record_sql_method
           each_node do |node|
             next unless node[:sql]
-
-            case strategy
-            when :obfuscated
-              node[:sql] = NewRelic::Agent::Database.obfuscate_sql(node[:sql])
-            when :raw
-              node[:sql] = node[:sql].sql.to_s
-            else
-              node[:sql] = nil
-            end
+            node[:sql] = node[:sql].safe_sql
           end
         end
 
@@ -135,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
           ]
@@ -157,8 +141,8 @@ module NewRelic
             encoder.encode(trace_tree(attributes_hash)),
             NewRelic::Coerce.string(self.guid),
             nil,
-            forced?,
-            NewRelic::Coerce.int_or_nil(xray_session_id),
+            false, # forced?,
+            nil, # NewRelic::Coerce.int_or_nil(xray_session_id),
             NewRelic::Coerce.string(self.synthetics_resource_id)
           ]
         end

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/helper'
 require 'new_relic/agent/transaction/trace'
@@ -48,7 +48,6 @@ module NewRelic
           trace.guid = transaction.guid
           trace.attributes = transaction.attributes
           trace.threshold = transaction.threshold
-          trace.xray_session_id = transaction.xray_session_id
           trace.finished = true
         end
       end

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

@@ -0,0 +1,168 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
+
+module NewRelic
+  module Agent
+    class Transaction
+      module TraceContext
+        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: 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
+          NewRelic::Agent.increment_metric CREATE_EXCEPTION_METRIC
+          NewRelic::Agent.logger.warn "Failed to create trace context payload", e
+          false
+        end
+
+        def create_trace_state
+          entry_key = AccountHelpers.trace_state_entry_key.dup
+          payload = create_trace_state_payload
+
+          if payload
+            entry = NewRelic::Agent::DistributedTracing::TraceContext.create_trace_state_entry \
+              entry_key,
+              payload.to_s
+          else
+            entry = NewRelic::EMPTY_STR
+          end
+
+          trace_context_header_data ? trace_context_header_data.trace_state(entry) : entry
+        end
+
+        def create_trace_state_payload
+          unless Agent.config[:'distributed_tracing.enabled']
+            NewRelic::Agent.logger.warn "Not configured to create WC3 trace context payload"
+            return
+          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
+          payload = @trace_context_header_data.trace_state_payload
+          unless payload
+            NewRelic::Agent.increment_metric NO_NR_ENTRY_TRACESTATE_METRIC
+            return false
+          end
+          unless payload.valid?
+            NewRelic::Agent.increment_metric INVALID_TRACESTATE_PAYLOAD_METRIC
+            return false
+          end
+          @trace_state_payload = payload
+        end
+
+        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
+
+          transaction.distributed_tracer.parent_transaction_id = payload.transaction_id
+
+          unless payload.sampled.nil?
+            transaction.sampled = payload.sampled
+            transaction.priority = payload.priority if payload.priority
+          end
+          NewRelic::Agent.increment_metric ACCEPT_SUCCESS_METRIC
+          true
+        rescue => e
+          NewRelic::Agent.increment_metric ACCEPT_EXCEPTION_METRIC
+          NewRelic::Agent.logger.warn "Failed to accept trace context payload", e
+          false
+        end
+
+        def ignore_trace_context?
+          if trace_context_header_data
+            NewRelic::Agent.increment_metric IGNORE_MULTIPLE_ACCEPT_METRIC
+            return true
+          elsif trace_context_inserted?
+            NewRelic::Agent.increment_metric IGNORE_ACCEPT_AFTER_CREATE_METRIC
+            return true
+          end
+          false
+        end
+
+        def trace_context_inserted?
+          @trace_context_inserted ||= false
+        end
+
+      end
+    end
+  end
+end