newrelic_rpm 7.0.0 → 9.0.0

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/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require 'new_relic/agent/transaction/trace_node'
 
@@ -12,7 +12,7 @@ module NewRelic
 
         attr_reader :start_time, :root_node
         attr_accessor :transaction_name, :guid, :attributes,
-                      :node_count, :finished, :threshold, :profile
+          :node_count, :finished, :threshold, :profile
 
         ROOT = "ROOT".freeze
 
@@ -31,7 +31,8 @@ module NewRelic
           node_count = 0
           each_node do |node|
             next if node == root_node
-            node_count +=1
+
+            node_count += 1
           end
           node_count
         end
@@ -50,7 +51,8 @@ module NewRelic
         end
 
         def create_node(time_since_start, metric_name = nil)
-          raise FinishedTraceError.new "Can't create additional node for finished trace." if self.finished
+          raise FinishedTraceError.new("Can't create additional node for finished trace.") if self.finished
+
           self.node_count += 1
           NewRelic::Agent::Transaction::TraceNode.new(metric_name, time_since_start)
         end
@@ -75,6 +77,7 @@ module NewRelic
 
         def collect_explain_plans!
           return unless NewRelic::Agent::Database.should_collect_explain_plans?
+
           threshold = NewRelic::Agent.config[:'transaction_tracer.explain_threshold']
 
           each_node do |node|
@@ -87,6 +90,7 @@ module NewRelic
         def prepare_sql_for_transmission!
           each_node do |node|
             next unless node[:sql]
+
             node[:sql] = node[:sql].safe_sql
           end
         end
@@ -103,25 +107,25 @@ module NewRelic
           @root_node.each_node_with_nest_tracking(&block)
         end
 
-        AGENT_ATTRIBUTES_KEY     = 'agentAttributes'.freeze
-        USER_ATTRIBUTES_KEY      = 'userAttributes'.freeze
+        AGENT_ATTRIBUTES_KEY = 'agentAttributes'.freeze
+        USER_ATTRIBUTES_KEY = 'userAttributes'.freeze
         INTRINSIC_ATTRIBUTES_KEY = 'intrinsics'.freeze
 
         def attributes_for_tracer_destination
           destination = NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER
 
-          agent_attributes     = self.attributes.agent_attributes_for(destination)
-          custom_attributes    = self.attributes.custom_attributes_for(destination)
+          agent_attributes = self.attributes.agent_attributes_for(destination)
+          custom_attributes = self.attributes.custom_attributes_for(destination)
           intrinsic_attributes = self.attributes.intrinsic_attributes_for(destination)
 
           {
-            AGENT_ATTRIBUTES_KEY     => agent_attributes,
-            USER_ATTRIBUTES_KEY      => custom_attributes,
+            AGENT_ATTRIBUTES_KEY => agent_attributes,
+            USER_ATTRIBUTES_KEY => custom_attributes,
             INTRINSIC_ATTRIBUTES_KEY => intrinsic_attributes
           }
         end
 
-        def trace_tree attributes_hash
+        def trace_tree(attributes_hash)
           [
             NewRelic::Coerce.float(self.start_time),
             NewRelic::EMPTY_HASH,

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/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require 'new_relic/helper'
 require 'new_relic/agent/transaction/trace'
@@ -12,10 +12,10 @@ module NewRelic
       module TraceBuilder
         extend self
 
-        def build_trace transaction
-          trace = Trace.new transaction.start_time
+        def build_trace(transaction)
+          trace = Trace.new(transaction.start_time)
           trace.root_node.exit_timestamp = transaction.end_time - transaction.start_time
-          copy_attributes transaction, trace
+          copy_attributes(transaction, trace)
           first, *rest = transaction.segments
           relationship_map = rest.group_by { |s| s.parent }
           trace.root_node.children << process_segments(transaction, first, trace.root_node, relationship_map)
@@ -25,25 +25,25 @@ module NewRelic
         private
 
         # recursively builds a transaction trace from the flat list of segments
-        def process_segments transaction, segment, parent, relationship_map
-          current = create_trace_node transaction, segment, parent
+        def process_segments(transaction, segment, parent, relationship_map)
+          current = create_trace_node(transaction, segment, parent)
 
           if children = relationship_map[segment]
             current.children = children.map! do |child|
-              process_segments transaction, child, current, relationship_map
+              process_segments(transaction, child, current, relationship_map)
             end
           end
 
           current
         end
 
-        def create_trace_node transaction, segment, parent
+        def create_trace_node(transaction, segment, parent)
           relative_start = segment.start_time - transaction.start_time
           relative_end = segment.end_time - transaction.start_time
-          TraceNode.new segment.name, relative_start, relative_end, segment.params, parent
+          TraceNode.new(segment.name, relative_start, relative_end, segment.params, parent)
         end
 
-        def copy_attributes transaction, trace
+        def copy_attributes(transaction, trace)
           trace.transaction_name = transaction.best_name
           trace.guid = transaction.guid
           trace.attributes = transaction.attributes

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

@@ -1,4 +1,3 @@
-# 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
@@ -21,59 +20,60 @@ module NewRelic
           end
         end
 
-        SUPPORTABILITY_PREFIX             = "Supportability/TraceContext"
-        CREATE_PREFIX                     = "#{SUPPORTABILITY_PREFIX}/Create"
-        ACCEPT_PREFIX                     = "#{SUPPORTABILITY_PREFIX}/Accept"
-        TRACESTATE_PREFIX                 = "#{SUPPORTABILITY_PREFIX}/TraceState"
+        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"
+        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"
+        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"
+        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
+        attr_reader :trace_state_payload
 
-        def trace_parent_header_present? request
+        def trace_parent_header_present?(request)
           request[NewRelic::HTTP_TRACEPARENT_KEY]
         end
 
-        def accept_trace_context_incoming_request request
+        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,
+            trace_state_entry_key: AccountHelpers.trace_state_entry_key
           )
           return if header_data.nil?
 
-          accept_trace_context header_data
+          accept_trace_context(header_data)
         end
         private :accept_trace_context_incoming_request
 
-        def insert_trace_context_header header, format=NewRelic::FORMAT_NON_RACK
+        def insert_trace_context_header(header, format = NewRelic::FORMAT_NON_RACK)
           return unless Agent.config[:'distributed_tracing.enabled']
 
-          NewRelic::Agent::DistributedTracing::TraceContext.insert \
+          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
+          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
+          NewRelic::Agent.increment_metric(CREATE_EXCEPTION_METRIC)
+          NewRelic::Agent.logger.warn("Failed to create trace context payload", e)
           false
         end
 
@@ -82,9 +82,10 @@ module NewRelic
           payload = create_trace_state_payload
 
           if payload
-            entry = NewRelic::Agent::DistributedTracing::TraceContext.create_trace_state_entry \
+            entry = NewRelic::Agent::DistributedTracing::TraceContext.create_trace_state_entry( \
               entry_key,
               payload.to_s
+            )
           else
             entry = NewRelic::EMPTY_STR
           end
@@ -94,37 +95,37 @@ 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
 
-
           span_guid = Agent.config[:'span_events.enabled'] ? transaction.current_segment.guid : nil
-          transaction_guid = Agent.config[:'analytics_events.enabled'] ? transaction.guid : nil
+          transaction_guid = Agent.config[:'transaction_events.enabled'] ? transaction.guid : nil
 
-          TraceContextPayload.create \
+          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
+            NewRelic::Agent.increment_metric(NO_NR_ENTRY_TRACESTATE_METRIC)
             return false
           end
           unless payload.valid?
-            NewRelic::Agent.increment_metric INVALID_TRACESTATE_PAYLOAD_METRIC
+            NewRelic::Agent.increment_metric(INVALID_TRACESTATE_PAYLOAD_METRIC)
             return false
           end
           @trace_state_payload = payload
         end
 
-        def accept_trace_context header_data
+        def accept_trace_context(header_data)
           return if ignore_trace_context?
 
           @trace_context_header_data = header_data
@@ -139,20 +140,20 @@ module NewRelic
             transaction.sampled = payload.sampled
             transaction.priority = payload.priority if payload.priority
           end
-          NewRelic::Agent.increment_metric ACCEPT_SUCCESS_METRIC
+          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
+          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
+            NewRelic::Agent.increment_metric(IGNORE_MULTIPLE_ACCEPT_METRIC)
             return true
           elsif trace_context_inserted?
-            NewRelic::Agent.increment_metric IGNORE_ACCEPT_AFTER_CREATE_METRIC
+            NewRelic::Agent.increment_metric(IGNORE_ACCEPT_AFTER_CREATE_METRIC)
             return true
           end
           false
@@ -161,7 +162,6 @@ module NewRelic
         def trace_context_inserted?
           @trace_context_inserted ||= false
         end
-
       end
     end
   end

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

@@ -1,6 +1,6 @@
-# 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
@@ -17,19 +17,20 @@ module NewRelic
 
         UNKNOWN_NODE_NAME = '<unknown>'.freeze
 
-        def initialize(metric_name, relative_start, relative_end=nil, params=nil, parent=nil)
+        def initialize(metric_name, relative_start, relative_end = nil, params = nil, parent = nil)
           @entry_timestamp = relative_start
-          @metric_name     = metric_name || UNKNOWN_NODE_NAME
-          @exit_timestamp  = relative_end
-          @children        = nil
-          @params          = select_allowed_params(params)
-          @parent_node     = parent
+          @metric_name = metric_name || UNKNOWN_NODE_NAME
+          @exit_timestamp = relative_end
+          @children = nil
+          @params = select_allowed_params(params)
+          @parent_node = parent
         end
 
-        def select_allowed_params params
+        def select_allowed_params(params)
           return unless params
+
           params.select do |p|
-            NewRelic::Agent.instance.attribute_filter.allows_key? p, AttributeFilter::DST_TRANSACTION_SEGMENTS
+            NewRelic::Agent.instance.attribute_filter.allows_key?(p, AttributeFilter::DST_TRANSACTION_SEGMENTS)
           end
         end
 
@@ -44,43 +45,43 @@ module NewRelic
         end
 
         def to_array
-          params = @params ? @params : NewRelic::EMPTY_HASH
-          [ NewRelic::Helper.time_to_millis(@entry_timestamp),
+          params = @params || NewRelic::EMPTY_HASH
+          [NewRelic::Helper.time_to_millis(@entry_timestamp),
             NewRelic::Helper.time_to_millis(@exit_timestamp),
             NewRelic::Coerce.string(@metric_name),
-            params ] +
-            [ (@children ? @children.map{|s| s.to_array} : NewRelic::EMPTY_ARRAY) ]
+            params] +
+            [(@children ? @children.map { |s| s.to_array } : NewRelic::EMPTY_ARRAY)]
         end
 
         def path_string
-          "#{metric_name}[#{children.collect {|node| node.path_string }.join('')}]"
+          "#{metric_name}[#{children.collect { |node| node.path_string }.join('')}]"
         end
 
         def to_s_compact
-          str = ""
+          str = String.new('')
           str << metric_name
           if children.any?
-            str << "{#{children.map { | cs | cs.to_s_compact }.join(",")}}"
+            str << "{#{children.map { |cs| cs.to_s_compact }.join(',')}}"
           end
           str
         end
 
         def to_debug_str(depth)
-          tab = "  " * depth
+          tab = String.new('  ') * 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|
+            params.each do |k, v|
               s << "#{tab}    -#{'%-16s' % k}: #{v.to_s[0..80]}\n"
             end
           end
           children.each do |cs|
             s << cs.to_debug_str(depth + 1)
           end
-          s << tab + "<< "
+          s << tab + '<< '
           s << case @exit_timestamp
           when nil then ' n/a'
-          when Numeric then '%3i ms' % (@exit_timestamp*1000)
+          when Numeric then '%3i ms' % (@exit_timestamp * 1000)
           else @exit_timestamp.to_s
           end
           s << " #{metric_name}\n"
@@ -110,7 +111,7 @@ module NewRelic
 
         def count_nodes
           count = 1
-          children.each { | node | count  += node.count_nodes }
+          children.each { |node| count += node.count_nodes }
           count
         end
 
@@ -133,7 +134,7 @@ module NewRelic
         # call the provided block for this node and each
         # of the called nodes
         def each_node(&block)
-          block.call self
+          yield(self)
 
           if @children
             @children.each do |node|
@@ -145,7 +146,7 @@ module NewRelic
         # call the provided block for this node and each
         # of the called nodes while keeping track of nested nodes
         def each_node_with_nest_tracking(&block)
-          summary = block.call self
+          summary = yield(self)
           summary.current_nest_count += 1 if summary
 
           if @children

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

@@ -1,13 +1,12 @@
-# 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 Tracing
-
-        attr_reader :current_segment
+        attr_reader :current_segment_by_thread
 
         def async?
           @async ||= false
@@ -21,10 +20,10 @@ module NewRelic
 
         attr_writer :total_time
 
-        def add_segment segment, parent = nil
+        def add_segment(segment, parent = nil)
           segment.transaction = self
           segment.parent = parent || current_segment
-          @current_segment = segment
+          set_current_segment(segment)
           if @segments.length < segment_limit
             @segments << segment
           else
@@ -34,8 +33,13 @@ module NewRelic
           segment.transaction_assigned
         end
 
-        def segment_complete segment
-          @current_segment = segment.parent
+        def segment_complete(segment)
+          # if parent was in another thread, remove the current_segment entry for this thread
+          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
         end
 
         def segment_limit
@@ -48,8 +52,7 @@ module NewRelic
           segments.each { |s| s.finalize }
         end
 
-
-        WEB_TRANSACTION_TOTAL_TIME   = "WebTransactionTotalTime".freeze
+        WEB_TRANSACTION_TOTAL_TIME = "WebTransactionTotalTime".freeze
         OTHER_TRANSACTION_TOTAL_TIME = "OtherTransactionTotalTime".freeze
 
         def record_total_time_metrics
@@ -59,8 +62,8 @@ module NewRelic
             OTHER_TRANSACTION_TOTAL_TIME
           end
 
-          @metrics.record_unscoped total_time_metric, total_time
-          @metrics.record_unscoped "#{total_time_metric}/#{@frozen_name}", total_time
+          @metrics.record_unscoped(total_time_metric, total_time)
+          @metrics.record_unscoped("#{total_time_metric}/#{@frozen_name}", total_time)
         end
       end
     end

data/lib/new_relic/agent/transaction/transaction_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/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic
   module Agent
@@ -9,7 +9,6 @@ module NewRelic
         attr_reader :samples
 
         SINGLE_BUFFER_MAX = 20
-        NO_SAMPLES = [].freeze
 
         def initialize
           @samples = []
@@ -35,6 +34,7 @@ module NewRelic
 
         def store(sample)
           return unless enabled?
+
           if allow_sample?(sample)
             add_sample(sample)
             truncate_samples_if_needed
@@ -43,6 +43,7 @@ module NewRelic
 
         def store_previous(previous_samples)
           return unless enabled?
+
           previous_samples.each do |sample|
             add_sample(sample) if allow_sample?(sample)
           end
@@ -71,7 +72,7 @@ module NewRelic
         # A typical buffer should NOT override this method (although we do for
         # odd things like dev-mode)
         def max_capacity
-          capacity > SINGLE_BUFFER_MAX ? SINGLE_BUFFER_MAX : capacity
+          [capacity, SINGLE_BUFFER_MAX].min
         end
 
         # Our default truncation strategy is to keep max_capacity
@@ -81,7 +82,7 @@ module NewRelic
         # This doesn't use the more convenient #last and #sort_by to avoid
         # additional array allocations (and abundant alliteration)
         def truncate_samples
-          @samples.sort!{|a,b| a.duration <=> b.duration}
+          @samples.sort! { |a, b| a.duration <=> b.duration }
           @samples.slice!(0..-(max_capacity + 1))
         end
 
@@ -98,7 +99,6 @@ module NewRelic
         def add_sample(sample)
           @samples << sample
         end
-
       end
     end
   end