newrelic_rpm 8.16.0 → 9.1.0

data/lib/new_relic/agent/threading/thread_profile.rb

@@ -72,7 +72,7 @@ module NewRelic
           all_nodes = @traces.values.map { |n| n.flattened }.flatten
 
           NewRelic::Agent.instance.stats_engine
-            .tl_record_supportability_metric_count("ThreadProfiler/NodeCount", all_nodes.size)
+            .tl_record_supportability_metric_count('ThreadProfiler/NodeCount', all_nodes.size)
 
           all_nodes.sort! do |a, b|
             # we primarily prefer higher runnable_count
@@ -103,10 +103,10 @@ module NewRelic
           convert_N_trace_nodes_to_arrays(THREAD_PROFILER_NODES)
 
           {
-            "OTHER" => @traces[:other].as_array,
-            "REQUEST" => @traces[:request].as_array,
-            "AGENT" => @traces[:agent].as_array,
-            "BACKGROUND" => @traces[:background].as_array
+            'OTHER' => @traces[:other].as_array,
+            'REQUEST' => @traces[:request].as_array,
+            'AGENT' => @traces[:agent].as_array,
+            'BACKGROUND' => @traces[:background].as_array
           }
         end
 

data/lib/new_relic/agent/timestamp_sampled_buffer.rb

@@ -7,7 +7,7 @@ require 'new_relic/agent/heap'
 module NewRelic
   module Agent
     class TimestampSampledBuffer < PrioritySampledBuffer
-      TIMESTAMP_KEY = "timestamp".freeze
+      TIMESTAMP_KEY = 'timestamp'.freeze
 
       private
 

data/lib/new_relic/agent/tracer.rb

@@ -107,7 +107,7 @@ module NewRelic
             current_transaction.notice_error(exception)
             raise
           ensure
-            finishable.finish if finishable
+            finishable&.finish
           end
         end
 
@@ -246,8 +246,8 @@ module NewRelic
           log_error('start_segment', exception)
         end
 
-        UNKNOWN = "Unknown".freeze
-        OTHER = "other".freeze
+        UNKNOWN = 'Unknown'.freeze
+        OTHER = 'other'.freeze
 
         # Creates and starts a datastore segment used to time
         # datastore operations.
@@ -355,7 +355,8 @@ module NewRelic
 
           yield
         rescue => exception
-          if segment && segment.is_a?(Transaction::AbstractSegment)
+          # needs else branch coverage
+          if segment && segment.is_a?(Transaction::AbstractSegment) # rubocop:disable Style/SafeNavigation
             segment.notice_error(exception)
           end
           raise
@@ -410,12 +411,22 @@ module NewRelic
 
         alias_method :tl_clear, :clear_state
 
+        def current_segment_key
+          ::Fiber.current.object_id
+        end
+
+        def thread_tracing_enabled?
+          NewRelic::Agent.config[:'instrumentation.thread.tracing']
+        end
+
         def thread_block_with_current_transaction(*args, segment_name:, parent: nil, &block)
-          current_txn = ::Thread.current[:newrelic_tracer_state].current_transaction if ::Thread.current[:newrelic_tracer_state] && ::Thread.current[:newrelic_tracer_state].is_execution_traced?
+          parent ||= current_segment
+          current_txn = ::Thread.current[:newrelic_tracer_state]&.current_transaction if ::Thread.current[:newrelic_tracer_state]&.is_execution_traced?
           proc do
             begin
               if current_txn
                 NewRelic::Agent::Tracer.state.current_transaction = current_txn
+                current_txn.async = true
                 segment_name += "/Thread#{::Thread.current.object_id}/Fiber#{::Fiber.current.object_id}" if NewRelic::Agent.config[:'thread_ids_enabled']
                 segment = NewRelic::Agent::Tracer.start_segment(name: segment_name, parent: parent)
               end
@@ -478,7 +489,8 @@ module NewRelic
         end
 
         def pop_traced
-          @untraced.pop if @untraced
+          # needs else branch coverage
+          @untraced.pop if @untraced # rubocop:disable Style/SafeNavigation
         end
 
         def is_execution_traced?
@@ -498,7 +510,5 @@ module NewRelic
         attr_accessor :sql_sampler_transaction_data
       end
     end
-
-    TransactionState = Tracer
   end
 end

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

@@ -20,14 +20,14 @@ module NewRelic
         # after its parent. We will use the optimized exclusive duration
         # calculation in all other cases.
         #
-        attr_reader :start_time, :end_time, :duration, :exclusive_duration, :guid, :starting_thread_id
+        attr_reader :start_time, :end_time, :duration, :exclusive_duration, :guid, :starting_segment_key
         attr_accessor :name, :parent, :children_time, :transaction, :transaction_name
         attr_writer :record_metrics, :record_scoped_metric, :record_on_finish
         attr_reader :noticed_error
 
         def initialize(name = nil, start_time = nil)
           @name = name
-          @starting_thread_id = ::Thread.current.object_id
+          @starting_segment_key = NewRelic::Agent::Tracer.current_segment_key
           @transaction_name = nil
           @transaction = nil
           @guid = NewRelic::Agent::GuidGenerator.generate_guid
@@ -56,7 +56,7 @@ module NewRelic
           @start_time ||= Process.clock_gettime(Process::CLOCK_REALTIME)
           return unless transaction
 
-          parent.child_start(self) if parent
+          parent&.child_start(self)
         end
 
         def finish
@@ -228,7 +228,7 @@ module NewRelic
 
           if finished?
             transaction.async = true
-            parent.descendant_complete(self, segment) if parent
+            parent&.descendant_complete(self, segment)
           end
         end
 
@@ -262,19 +262,19 @@ module NewRelic
 
         def force_finish
           finish
-          NewRelic::Agent.logger.warn("Segment: #{name} was unfinished at " \
-            "the end of transaction. Timing information for this segment's" \
-            "parent #{parent.name} in #{transaction.best_name} may be inaccurate.")
+          NewRelic::Agent.logger.send(transaction.async? ? :debug : :warn, "Segment: #{name} was unfinished at " \
+            "the end of transaction. Timing information for this segment's " \
+            "parent #{parent&.name} in #{transaction.best_name} may be inaccurate.")
         end
 
         def run_complete_callbacks
           segment_complete
-          parent.child_complete(self) if parent
+          parent&.child_complete(self)
           transaction.segment_complete(self)
         end
 
         def record_metrics
-          raise NotImplementedError, "Subclasses must implement record_metrics"
+          raise NotImplementedError, 'Subclasses must implement record_metrics'
         end
 
         # callback for subclasses to override

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

@@ -24,7 +24,7 @@ module NewRelic
           @nosql_statement = nil
           @record_sql = true
           set_instance_info(host, port_path_or_id)
-          @database_name = database_name ? database_name.to_s : nil
+          @database_name = database_name&.to_s
           super(Datastores::MetricHelper.scoped_metric_for(product, operation, collection),
                 nil,
                 start_time)

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

@@ -35,7 +35,7 @@ module NewRelic
         end
 
         def caller_transport_type
-          @caller_transport_type ||= "Unknown"
+          @caller_transport_type ||= 'Unknown'
         end
 
         def accept_transport_type_from_api(value)
@@ -68,8 +68,9 @@ module NewRelic
           )
         end
 
-        def log_request_headers(headers, direction = "OUTGOING")
-          NewRelic::Agent.logger.debug("#{direction} REQUEST HEADERS: #{headers}")
+        def log_request_headers(headers, direction = 'OUTGOING')
+          printed_headers = headers.is_a?(NewRelic::Agent::HTTPClients::AbstractRequest) ? headers.headers : headers
+          NewRelic::Agent.logger.debug("#{direction} REQUEST HEADERS: #{printed_headers}")
         end
 
         def insert_headers(headers)
@@ -82,12 +83,12 @@ module NewRelic
         end
 
         def consume_message_headers(headers, tracer_state, transport_type)
-          log_request_headers(headers, "INCOMING")
+          log_request_headers(headers, 'INCOMING')
           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)
+          NewRelic::Agent.logger.error('Error in consume_message_headers', e)
         end
 
         def assign_intrinsics
@@ -135,7 +136,7 @@ module NewRelic
             transaction.synthetics_payload = incoming_payload
           end
         rescue => e
-          NewRelic::Agent.logger.error("Error in consume_message_synthetics_header", e)
+          NewRelic::Agent.logger.error('Error in consume_message_synthetics_header', e)
         end
 
         def consume_message_distributed_tracing_headers(headers, transport_type)

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,7 +114,7 @@ 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
 

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

@@ -16,10 +16,10 @@ module NewRelic
         NR_SYNTHETICS_HEADER = 'X-NewRelic-Synthetics'
         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 +62,14 @@ module NewRelic
         # @api public
         def add_request_headers(request)
           process_host_header(request)
-          synthetics_header = transaction && transaction.raw_synthetics_header
+          synthetics_header = transaction&.raw_synthetics_header
           insert_synthetics_header(request, synthetics_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 +92,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 +154,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 +176,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

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

@@ -91,7 +91,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

@@ -11,7 +11,7 @@ module NewRelic
         attr_reader :request_path, :referer, :accept, :content_length, :content_type,
           :host, :port, :user_agent, :request_method
 
-        HTTP_ACCEPT_HEADER_KEY = "HTTP_ACCEPT".freeze
+        HTTP_ACCEPT_HEADER_KEY = 'HTTP_ACCEPT'.freeze
 
         def initialize(request)
           @request_path = path_from_request(request)
@@ -85,7 +85,7 @@ module NewRelic
         # rails construct the PATH_INFO enviroment variable improperly and we're generally
         # being defensive.
 
-        ROOT_PATH = "/".freeze
+        ROOT_PATH = '/'.freeze
 
         def path_from_request(request)
           path = attribute_from_request(request, :path) || ''

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

@@ -35,8 +35,8 @@ module NewRelic
 
         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 +52,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