newrelic_rpm 8.15.0 → 9.6.0

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

@@ -13,7 +13,7 @@ module NewRelic
         attr_accessor :distributed_trace_payload
         attr_writer :distributed_trace_payload_created
 
-        SUPPORTABILITY_DISTRIBUTED_TRACE = "Supportability/DistributedTrace"
+        SUPPORTABILITY_DISTRIBUTED_TRACE = 'Supportability/DistributedTrace'
         CREATE_PREFIX = "#{SUPPORTABILITY_DISTRIBUTED_TRACE}/CreatePayload"
         ACCEPT_PREFIX = "#{SUPPORTABILITY_DISTRIBUTED_TRACE}/AcceptPayload"
         IGNORE_PREFIX = "#{ACCEPT_PREFIX}/Ignored"
@@ -30,10 +30,10 @@ module NewRelic
         IGNORE_ACCEPT_MAJOR_VERSION_METRIC = "#{IGNORE_PREFIX}/MajorVersion"
         IGNORE_ACCEPT_UNTRUSTED_ACCOUNT_METRIC = "#{IGNORE_PREFIX}/UntrustedAccount"
 
-        LBRACE = "{"
+        LBRACE = '{'
         NULL_PAYLOAD = 'null'
 
-        NEWRELIC_TRACE_KEY = "HTTP_NEWRELIC"
+        NEWRELIC_TRACE_KEY = 'HTTP_NEWRELIC'
 
         def accept_distributed_tracing_incoming_request(request)
           return unless Agent.config[:'distributed_tracing.enabled']
@@ -55,7 +55,7 @@ module NewRelic
           payload
         rescue => e
           NewRelic::Agent.increment_metric(CREATE_EXCEPTION_METRIC)
-          NewRelic::Agent.logger.warn("Failed to create distributed trace payload", e)
+          NewRelic::Agent.logger.warn('Failed to create distributed trace payload', e)
           nil
         end
 
@@ -75,7 +75,7 @@ module NewRelic
           true
         rescue => e
           NewRelic::Agent.increment_metric(ACCEPT_EXCEPTION_METRIC)
-          NewRelic::Agent.logger.warn("Failed to accept distributed trace payload", e)
+          NewRelic::Agent.logger.warn('Failed to accept distributed trace payload', e)
           false
         end
 
@@ -114,19 +114,18 @@ module NewRelic
           decoded
         rescue => e
           NewRelic::Agent.increment_metric(ACCEPT_PARSE_EXCEPTION_METRIC)
-          NewRelic::Agent.logger.warn("Error parsing distributed trace payload", e)
+          NewRelic::Agent.logger.warn('Error parsing distributed trace payload', e)
           nil
         end
 
         def check_required_fields_present(payload)
-          if \
-            !payload.version.nil? &&
-                !payload.parent_account_id.nil? &&
-                !payload.parent_app_id.nil? &&
-                !payload.parent_type.nil? &&
-                (!payload.transaction_id.nil? || !payload.id.nil?) &&
-                !payload.trace_id.nil? &&
-                !payload.timestamp.nil?
+          if !payload.version.nil? &&
+              !payload.parent_account_id.nil? &&
+              !payload.parent_app_id.nil? &&
+              !payload.parent_type.nil? &&
+              (!payload.transaction_id.nil? || !payload.id.nil?) &&
+              !payload.trace_id.nil? &&
+              !payload.timestamp.nil?
 
             true
           else

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

@@ -14,12 +14,13 @@ module NewRelic
       # @api public
       class ExternalRequestSegment < Segment
         NR_SYNTHETICS_HEADER = 'X-NewRelic-Synthetics'
+        NR_SYNTHETICS_INFO_HEADER = 'X-NewRelic-Synthetics-Info'
         APP_DATA_KEY = 'NewRelicAppData'
 
-        EXTERNAL_ALL = "External/all"
-        EXTERNAL_ALL_WEB = "External/allWeb"
-        EXTERNAL_ALL_OTHER = "External/allOther"
-        MISSING_STATUS_CODE = "MissingHTTPStatusCode"
+        EXTERNAL_ALL = 'External/all'
+        EXTERNAL_ALL_WEB = 'External/allWeb'
+        EXTERNAL_ALL_OTHER = 'External/allOther'
+        MISSING_STATUS_CODE = 'MissingHTTPStatusCode'
 
         attr_reader :library, :uri, :procedure, :http_status_code
         attr_writer :record_agent_attributes
@@ -62,14 +63,15 @@ module NewRelic
         # @api public
         def add_request_headers(request)
           process_host_header(request)
-          synthetics_header = transaction && transaction.raw_synthetics_header
-          insert_synthetics_header(request, synthetics_header) if synthetics_header
+          synthetics_header = transaction&.raw_synthetics_header
+          synthetics_info_header = transaction&.raw_synthetics_info_header
+          insert_synthetics_header(request, synthetics_header, synthetics_info_header) if synthetics_header
 
           return unless record_metrics?
 
           transaction.distributed_tracer.insert_headers(request)
         rescue => e
-          NewRelic::Agent.logger.error("Error in add_request_headers", e)
+          NewRelic::Agent.logger.error('Error in add_request_headers', e)
         end
 
         # This method extracts app data from an external response if present. If
@@ -92,10 +94,10 @@ module NewRelic
             @app_data = data
             update_segment_name
           else
-            NewRelic::Agent.logger.debug("External segment response has invalid cross_app_id")
+            NewRelic::Agent.logger.debug('External segment response has invalid cross_app_id')
           end
         rescue => e
-          NewRelic::Agent.logger.error("Error in read_response_headers", e)
+          NewRelic::Agent.logger.error('Error in read_response_headers', e)
         end
 
         def cross_app_request? # :nodoc:
@@ -154,7 +156,7 @@ module NewRelic
 
           end
         rescue => e
-          NewRelic::Agent.logger.error("error during get_request_metadata", e)
+          NewRelic::Agent.logger.error('error during get_request_metadata', e)
         end
 
         # Process obfuscated +String+ sent from a called application that is also running a New Relic agent and
@@ -176,13 +178,13 @@ module NewRelic
               @app_data = app_data
               update_segment_name
             else
-              NewRelic::Agent.logger.error("error processing response metadata: invalid/non-trusted ID")
+              NewRelic::Agent.logger.error('error processing response metadata: invalid/non-trusted ID')
             end
           end
 
           nil
         rescue => e
-          NewRelic::Agent.logger.error("error during process_response_metadata", e)
+          NewRelic::Agent.logger.error('error during process_response_metadata', e)
         end
 
         def record_metrics
@@ -207,8 +209,9 @@ module NewRelic
           end
         end
 
-        def insert_synthetics_header(request, header)
+        def insert_synthetics_header(request, header, info)
           request[NR_SYNTHETICS_HEADER] = header
+          request[NR_SYNTHETICS_INFO_HEADER] = info if info
         end
 
         def segment_complete

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

@@ -15,7 +15,6 @@ module NewRelic
         PRODUCE = 'Produce'.freeze
         QUEUE = 'Queue'.freeze
         PURGE = 'Purge'.freeze
-        SLASH = '/'.freeze
         TEMP = 'Temp'.freeze
         TOPIC = 'Topic'.freeze
         UNKNOWN = 'Unknown'.freeze
@@ -73,7 +72,7 @@ module NewRelic
           return @name if @name
 
           @name = METRIC_PREFIX + library
-          @name << SLASH << TYPES[destination_type] << SLASH << ACTIONS[action] << SLASH
+          @name << NewRelic::SLASH << TYPES[destination_type] << NewRelic::SLASH << ACTIONS[action] << NewRelic::SLASH
 
           if destination_type == :temporary_queue || destination_type == :temporary_topic
             @name << TEMP
@@ -91,7 +90,7 @@ module NewRelic
             transaction.distributed_tracer.log_request_headers(headers)
           end
         rescue => e
-          NewRelic::Agent.logger.error("Error during message header processing", e)
+          NewRelic::Agent.logger.error('Error during message header processing', e)
         end
       end
     end

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

@@ -8,10 +8,16 @@ module NewRelic
   module Agent
     class Transaction
       class RequestAttributes
-        attr_reader :request_path, :referer, :accept, :content_length, :content_type,
-          :host, :port, :user_agent, :request_method
+        # the HTTP standard has "referrer" mispelled as "referer"
+        attr_reader :accept, :content_length, :content_type, :host, :other_headers, :port, :referer, :request_method,
+          :request_path, :user_agent
 
-        HTTP_ACCEPT_HEADER_KEY = "HTTP_ACCEPT".freeze
+        HTTP_ACCEPT_HEADER_KEY = 'HTTP_ACCEPT'.freeze
+
+        BASE_HEADERS = %w[CONTENT_LENGTH CONTENT_TYPE HTTP_ACCEPT HTTP_REFERER HTTP_USER_AGENT PATH_INFO REMOTE_HOST
+          REQUEST_METHOD REQUEST_URI SERVER_PORT].freeze
+
+        ATTRIBUTE_PREFIX = 'request.headers.'
 
         def initialize(request)
           @request_path = path_from_request(request)
@@ -23,6 +29,7 @@ module NewRelic
           @port = port_from_request(request)
           @user_agent = attribute_from_request(request, :user_agent)
           @request_method = attribute_from_request(request, :request_method)
+          @other_headers = other_headers_from_request(request)
         end
 
         def assign_agent_attributes(txn)
@@ -31,14 +38,17 @@ module NewRelic
             AttributeFilter::DST_ERROR_COLLECTOR
 
           if referer
-            txn.add_agent_attribute(:'request.headers.referer', referer, AttributeFilter::DST_ERROR_COLLECTOR)
+            destinations = allow_other_headers? ? default_destinations : AttributeFilter::DST_ERROR_COLLECTOR
+            txn.add_agent_attribute(:'request.headers.referer', referer, destinations)
           end
 
           if request_path
-            txn.add_agent_attribute(:'request.uri',
-              request_path,
-              AttributeFilter::DST_TRANSACTION_TRACER |
-                AttributeFilter::DST_ERROR_COLLECTOR)
+            destinations = if allow_other_headers?
+              default_destinations
+            else
+              AttributeFilter::DST_TRANSACTION_TRACER | AttributeFilter::DST_ERROR_COLLECTOR
+            end
+            txn.add_agent_attribute(:'request.uri', request_path, destinations)
           end
 
           if accept
@@ -64,6 +74,14 @@ module NewRelic
           if request_method
             txn.add_agent_attribute(:'request.method', request_method, default_destinations)
           end
+
+          if port && allow_other_headers?
+            txn.add_agent_attribute(:'request.headers.port', port, default_destinations)
+          end
+
+          other_headers.each do |header, value|
+            txn.add_agent_attribute(header, value, default_destinations)
+          end
         end
 
         private
@@ -85,12 +103,10 @@ module NewRelic
         # rails construct the PATH_INFO enviroment variable improperly and we're generally
         # being defensive.
 
-        ROOT_PATH = "/".freeze
-
         def path_from_request(request)
           path = attribute_from_request(request, :path) || ''
           path = HTTPClients::URIUtil.strip_query_string(path)
-          path.empty? ? ROOT_PATH : path
+          path.empty? ? NewRelic::ROOT : path
         end
 
         def content_length_from_request(request)
@@ -116,6 +132,26 @@ module NewRelic
             env[key]
           end
         end
+
+        def allow_other_headers?
+          NewRelic::Agent.config[:allow_all_headers] && !NewRelic::Agent.config[:high_security]
+        end
+
+        def other_headers_from_request(request)
+          # confirm that `request` is an instance of `Rack::Request` by checking
+          # for #each_header
+          return NewRelic::EMPTY_HASH unless allow_other_headers? && request.respond_to?(:each_header)
+
+          request.each_header.with_object({}) do |(header, value), hash|
+            next if BASE_HEADERS.include?(header)
+
+            hash[formatted_header(header)] = value
+          end
+        end
+
+        def formatted_header(raw_name)
+          "#{ATTRIBUTE_PREFIX}#{NewRelic::LanguageSupport.camelize_with_first_letter_downcased(raw_name)}".to_sym
+        end
       end
     end
   end

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

@@ -32,7 +32,7 @@ module NewRelic
           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")
+            NewRelic::Agent.logger.debug('Attempted to merge untrusted attributes without segment')
           end
         end
 

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

@@ -13,7 +13,7 @@ module NewRelic
         end
 
         def allow_sample?(sample)
-          sample.synthetics_resource_id != nil
+          !sample.synthetics_resource_id.nil?
         end
 
         def truncate_samples

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

@@ -14,7 +14,7 @@ module NewRelic
         attr_accessor :transaction_name, :guid, :attributes,
           :node_count, :finished, :threshold, :profile
 
-        ROOT = "ROOT".freeze
+        ROOT = 'ROOT'.freeze
 
         def initialize(start_time)
           @start_time = start_time

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

@@ -20,7 +20,7 @@ module NewRelic
           end
         end
 
-        SUPPORTABILITY_PREFIX = "Supportability/TraceContext"
+        SUPPORTABILITY_PREFIX = 'Supportability/TraceContext'
         CREATE_PREFIX = "#{SUPPORTABILITY_PREFIX}/Create"
         ACCEPT_PREFIX = "#{SUPPORTABILITY_PREFIX}/Accept"
         TRACESTATE_PREFIX = "#{SUPPORTABILITY_PREFIX}/TraceState"
@@ -73,7 +73,7 @@ module NewRelic
           true
         rescue Exception => e
           NewRelic::Agent.increment_metric(CREATE_EXCEPTION_METRIC)
-          NewRelic::Agent.logger.warn("Failed to create trace context payload", e)
+          NewRelic::Agent.logger.warn('Failed to create trace context payload', e)
           false
         end
 
@@ -95,7 +95,7 @@ module NewRelic
 
         def create_trace_state_payload
           unless Agent.config[:'distributed_tracing.enabled']
-            NewRelic::Agent.logger.warn("Not configured to create WC3 trace context payload")
+            NewRelic::Agent.logger.warn('Not configured to create WC3 trace context payload')
             return
           end
 
@@ -144,7 +144,7 @@ module NewRelic
           true
         rescue => e
           NewRelic::Agent.increment_metric(ACCEPT_EXCEPTION_METRIC)
-          NewRelic::Agent.logger.warn("Failed to accept trace context payload", e)
+          NewRelic::Agent.logger.warn('Failed to accept trace context payload', e)
           false
         end
 

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

@@ -58,7 +58,7 @@ module NewRelic
         end
 
         def to_s_compact
-          str = String.new('')
+          str = +''
           str << metric_name
           if children.any?
             str << "{#{children.map { |cs| cs.to_s_compact }.join(',')}}"
@@ -67,9 +67,9 @@ module NewRelic
         end
 
         def to_debug_str(depth)
-          tab = String.new('  ') * depth
+          tab = (+'  ') * depth
           s = tab.clone
-          s << ">> #{'%3i ms' % (@entry_timestamp * 1000)} [#{self.class.name.split("::").last}] #{metric_name} \n"
+          s << ">> #{'%3i ms' % (@entry_timestamp * 1000)} [#{self.class.name.split('::').last}] #{metric_name} \n"
           unless params.empty?
             params.each do |k, v|
               s << "#{tab}    -#{'%-16s' % k}: #{v.to_s[0..80]}\n"
@@ -136,10 +136,8 @@ module NewRelic
         def each_node(&block)
           yield(self)
 
-          if @children
-            @children.each do |node|
-              node.each_node(&block)
-            end
+          @children&.each do |node|
+            node.each_node(&block)
           end
         end
 
@@ -149,11 +147,14 @@ module NewRelic
           summary = yield(self)
           summary.current_nest_count += 1 if summary
 
+          # no then branch coverage
+          # rubocop:disable Style/SafeNavigation
           if @children
             @children.each do |node|
               node.each_node_with_nest_tracking(&block)
             end
           end
+          # rubocop:enable Style/SafeNavigation
 
           summary.current_nest_count -= 1 if summary
         end

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

@@ -29,14 +29,20 @@ module NewRelic
           else
             segment.record_on_finish = true
             ::NewRelic::Agent.logger.debug("Segment limit of #{segment_limit} reached, ceasing collection.")
+
+            if finished?
+              ::NewRelic::Agent.logger.debug("Transaction #{best_name} has finished but segments still being created, resetting state.")
+              NewRelic::Agent::Tracer.state.reset
+              NewRelic::Agent.record_metric('Supportability/Transaction/SegmentLimitReachedAfterFinished/ResetState', 1)
+            end
           end
           segment.transaction_assigned
         end
 
         def segment_complete(segment)
           # if parent was in another thread, remove the current_segment entry for this thread
-          if segment.parent && segment.parent.starting_thread_id != ::Thread.current.object_id
-            remove_current_segment_by_thread_id(::Thread.current.object_id)
+          if segment.parent && segment.parent.starting_segment_key != NewRelic::Agent::Tracer.current_segment_key
+            remove_current_segment_by_thread_id(NewRelic::Agent::Tracer.current_segment_key)
           else
             set_current_segment(segment.parent)
           end
@@ -52,8 +58,8 @@ module NewRelic
           segments.each { |s| s.finalize }
         end
 
-        WEB_TRANSACTION_TOTAL_TIME = "WebTransactionTotalTime".freeze
-        OTHER_TRANSACTION_TOTAL_TIME = "OtherTransactionTotalTime".freeze
+        WEB_TRANSACTION_TOTAL_TIME = 'WebTransactionTotalTime'.freeze
+        OTHER_TRANSACTION_TOTAL_TIME = 'OtherTransactionTotalTime'.freeze
 
         def record_total_time_metrics
           total_time_metric = if recording_web_transaction?

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

@@ -63,7 +63,7 @@ module NewRelic
         #
         # This value will be forcibly capped by the max_capacity
         def capacity
-          raise NotImplementedError.new("TransactionSampleBuffer subclasses must provide a capacity override")
+          raise NotImplementedError.new('TransactionSampleBuffer subclasses must provide a capacity override')
         end
 
         # Apply hard upper limit to the capacity to prevent users from