newrelic_rpm 8.7.0 → 8.11.0

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
@@ -26,10 +26,10 @@ module NewRelic
           @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
 
@@ -57,16 +57,16 @@ module NewRelic
         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"
           unless params.empty?
@@ -77,7 +77,7 @@ module NewRelic
           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)
@@ -133,7 +133,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 +145,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,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
@@ -20,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
-          set_current_segment segment
+          set_current_segment(segment)
           if @segments.length < segment_limit
             @segments << segment
           else
@@ -33,12 +33,12 @@ module NewRelic
           segment.transaction_assigned
         end
 
-        def segment_complete segment
+        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)
           else
-            set_current_segment segment.parent
+            set_current_segment(segment.parent)
           end
         end
 
@@ -62,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 = []

data/lib/new_relic/agent/transaction.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
@@ -37,7 +36,6 @@ module NewRelic
       ACTION_CABLE_PREFIX = "#{CONTROLLER_PREFIX}ActionCable/"
 
       WEB_TRANSACTION_CATEGORIES = [:web, :controller, :uri, :rack, :sinatra, :grape, :middleware, :action_cable].freeze
-      TRANSACTION_NAMING_SOURCES = [:child, :api].freeze
 
       MIDDLEWARE_SUMMARY_METRICS = ["Middleware/all"].freeze
       WEB_SUMMARY_METRIC = "HttpDispatcher"
@@ -124,12 +122,12 @@ module NewRelic
         txn = Transaction.new(category, options)
         state.reset(txn)
         txn.state = state
-        txn.start
+        txn.start(options)
         txn
       end
 
       def self.nested_transaction_name(name)
-        if name.start_with?(CONTROLLER_PREFIX) || name.start_with?(OTHER_TRANSACTION_PREFIX)
+        if name.start_with?(CONTROLLER_PREFIX, OTHER_TRANSACTION_PREFIX)
           "#{NESTED_TRANSACTION_PREFIX}#{name}"
         else
           name
@@ -181,7 +179,7 @@ module NewRelic
         if txn = tl_current
           txn.add_agent_attribute(key, value, default_destinations)
         else
-          NewRelic::Agent.logger.debug "Attempted to add agent attribute: #{key} without transaction"
+          NewRelic::Agent.logger.debug("Attempted to add agent attribute: #{key} without transaction")
         end
       end
 
@@ -194,7 +192,7 @@ module NewRelic
         if txn = tl_current
           txn.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
         else
-          NewRelic::Agent.logger.debug "Attempted to merge untrusted attributes without transaction"
+          NewRelic::Agent.logger.debug("Attempted to merge untrusted attributes without transaction")
         end
       end
 
@@ -208,8 +206,8 @@ module NewRelic
       if defined? JRuby
         begin
           require 'java'
-          java_import 'java.lang.management.ManagementFactory'
-          java_import 'com.sun.management.OperatingSystemMXBean'
+          java_import('java.lang.management.ManagementFactory')
+          java_import('com.sun.management.OperatingSystemMXBean')
           @@java_classes_loaded = true
         rescue
         end
@@ -256,7 +254,7 @@ module NewRelic
         merge_request_parameters(@filtered_params)
 
         if request = options[:request]
-          @request_attributes = RequestAttributes.new request
+          @request_attributes = RequestAttributes.new(request)
         else
           @request_attributes = nil
         end
@@ -294,7 +292,7 @@ module NewRelic
       end
 
       def trace_id
-        @trace_id ||= NewRelic::Agent::GuidGenerator.generate_guid 32
+        @trace_id ||= NewRelic::Agent::GuidGenerator.generate_guid(32)
       end
 
       def trace_id=(value)
@@ -317,7 +315,7 @@ module NewRelic
         @request_attributes && @request_attributes.port
       end
 
-      # This transaction-local hash may be used as temprory storage by
+      # This transaction-local hash may be used as temporary storage by
       # instrumentation that needs to pass data from one instrumentation point
       # to another.
       #
@@ -414,7 +412,7 @@ module NewRelic
         @frozen_name ? true : false
       end
 
-      def start
+      def start(options = {})
         return if !state.is_execution_traced?
 
         sql_sampler.on_start_transaction(state, request_path)
@@ -423,23 +421,24 @@ module NewRelic
 
         ignore! if user_defined_rules_ignore?
 
-        create_initial_segment
-        Segment.merge_untrusted_agent_attributes \
+        create_initial_segment(options)
+        Segment.merge_untrusted_agent_attributes( \
           @filtered_params,
           :'request.parameters',
           AttributeFilter::DST_SPAN_EVENTS
+        )
       end
 
       def initial_segment
         segments.first
       end
 
-      def create_initial_segment
-        segment = create_segment @default_name
+      def create_initial_segment(options = {})
+        segment = create_segment(@default_name, options)
         segment.record_scoped_metric = false
       end
 
-      def create_segment(name)
+      def create_segment(name, options = {})
         summary_metrics = nil
 
         if name.start_with?(MIDDLEWARE_PREFIX)
@@ -453,6 +452,10 @@ module NewRelic
           unscoped_metrics: summary_metrics
         )
 
+        # #code_information will glean the code info out of the options hash
+        # if it exists or noop otherwise
+        segment.code_information = options
+
         segment
       end
 
@@ -462,18 +465,19 @@ module NewRelic
           merge_request_parameters(options[:filtered_params])
         end
 
-        @ignore_apdex = options[:ignore_apdex] if options.key? :ignore_apdex
-        @ignore_enduser = options[:ignore_enduser] if options.key? :ignore_enduser
+        @ignore_apdex = options[:ignore_apdex] if options.key?(:ignore_apdex)
+        @ignore_enduser = options[:ignore_enduser] if options.key?(:ignore_enduser)
 
         nest_initial_segment if segments.length == 1
-        nested_name = self.class.nested_transaction_name options[:transaction_name]
-        segment = create_segment nested_name
+        nested_name = self.class.nested_transaction_name(options[:transaction_name])
+
+        segment = create_segment(nested_name, options)
         set_default_transaction_name(options[:transaction_name], category)
         segment
       end
 
       def nest_initial_segment
-        self.initial_segment.name = self.class.nested_transaction_name initial_segment.name
+        self.initial_segment.name = self.class.nested_transaction_name(initial_segment.name)
         initial_segment.record_scoped_metric = true
       end
 
@@ -563,8 +567,8 @@ module NewRelic
       def assign_segment_dt_attributes
         dt_payload = distributed_tracer.trace_state_payload || distributed_tracer.distributed_trace_payload
         parent_attributes = {}
-        DistributedTraceAttributes.copy_parent_attributes self, dt_payload, parent_attributes
-        parent_attributes.each { |k, v| initial_segment.add_agent_attribute k, v }
+        DistributedTraceAttributes.copy_parent_attributes(self, dt_payload, parent_attributes)
+        parent_attributes.each { |k, v| initial_segment.add_agent_attribute(k, v) }
       end
 
       def assign_agent_attributes
@@ -585,7 +589,7 @@ module NewRelic
         end
 
         if @request_attributes
-          @request_attributes.assign_agent_attributes self
+          @request_attributes.assign_agent_attributes(self)
         end
 
         display_host = Agent.config[:'process_host.display_name']
@@ -622,7 +626,7 @@ module NewRelic
       # This method returns transport_duration in seconds. Transport duration
       # is stored in milliseconds on the payload, but it's needed in seconds
       # for metrics and intrinsics.
-      def calculate_transport_duration distributed_trace_payload
+      def calculate_transport_duration(distributed_trace_payload)
         return unless distributed_trace_payload
 
         duration = start_time - (distributed_trace_payload.timestamp / 1000.0)
@@ -665,7 +669,7 @@ module NewRelic
       end
 
       def is_synthetics_request?
-        synthetics_payload != nil && raw_synthetics_header != nil
+        !synthetics_payload.nil? && !raw_synthetics_header.nil?
       end
 
       def synthetics_version
@@ -730,7 +734,7 @@ module NewRelic
           options[:metric] = best_name
           options[:attributes] = @attributes
 
-          span_id = options.delete :span_id
+          span_id = options.delete(:span_id)
           error_recorded = !!agent.error_collector.notice_error(exception, options, span_id) || error_recorded
         end
         payload[:error] = error_recorded if payload
@@ -745,18 +749,18 @@ module NewRelic
         end
 
         if @exceptions[error]
-          @exceptions[error].merge! options
+          @exceptions[error].merge!(options)
         else
           @exceptions[error] = options
         end
       end
 
       def record_transaction_event
-        agent.transaction_event_recorder.record payload
+        agent.transaction_event_recorder.record(payload)
       end
 
       def record_log_events
-        agent.log_event_aggregator.record_batch self, @logs.to_a
+        agent.log_event_aggregator.record_batch(self, @logs.to_a)
       end
 
       def queue_time

data/lib/new_relic/agent/transaction_error_primitive.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
 
 # This module was introduced and largely extracted from the transaction event aggregator
 # when the synthetics container was extracted from it. Its purpose is to create the data
@@ -34,7 +34,7 @@ module NewRelic
       PRIORITY_KEY = "priority".freeze
       SPAN_ID_KEY = "spanId".freeze
 
-      def create noticed_error, payload, span_id
+      def create(noticed_error, payload, span_id)
         [
           intrinsic_attributes_for(noticed_error, payload, span_id),
           noticed_error.custom_attributes,
@@ -42,7 +42,7 @@ module NewRelic
         ]
       end
 
-      def intrinsic_attributes_for noticed_error, payload, span_id
+      def intrinsic_attributes_for(noticed_error, payload, span_id)
         attrs = {
           TYPE_KEY => SAMPLE_TYPE,
           ERROR_CLASS_KEY => noticed_error.exception_class_name,
@@ -59,10 +59,10 @@ module NewRelic
           attrs[DURATION_KEY] = payload[:duration]
           attrs[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
           attrs[PRIORITY_KEY] = payload[:priority]
-          append_synthetics payload, attrs
-          append_cat payload, attrs
-          DistributedTraceAttributes.copy_to_hash payload, attrs
-          PayloadMetricMapping.append_mapped_metrics payload[:metrics], attrs
+          append_synthetics(payload, attrs)
+          append_cat(payload, attrs)
+          DistributedTraceAttributes.copy_to_hash(payload, attrs)
+          PayloadMetricMapping.append_mapped_metrics(payload[:metrics], attrs)
         else
           attrs[PRIORITY_KEY] = rand.round(NewRelic::PRIORITY_PRECISION)
         end
@@ -70,13 +70,13 @@ module NewRelic
         attrs
       end
 
-      def append_synthetics payload, sample
+      def append_synthetics(payload, sample)
         sample[SYNTHETICS_RESOURCE_ID_KEY] = payload[:synthetics_resource_id] if payload[:synthetics_resource_id]
         sample[SYNTHETICS_JOB_ID_KEY] = payload[:synthetics_job_id] if payload[:synthetics_job_id]
         sample[SYNTHETICS_MONITOR_ID_KEY] = payload[:synthetics_monitor_id] if payload[:synthetics_monitor_id]
       end
 
-      def append_cat payload, sample
+      def append_cat(payload, sample)
         sample[GUID_KEY] = payload[:guid] if payload[:guid]
         sample[REFERRING_TRANSACTION_GUID_KEY] = payload[:referring_transaction_guid] if payload[:referring_transaction_guid]
       end

data/lib/new_relic/agent/transaction_event_aggregator.rb

@@ -1,7 +1,7 @@
 # -*- ruby -*-
-# 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 'newrelic_rpm' unless defined?(NewRelic)
 require 'new_relic/agent' unless defined?(NewRelic::Agent)
@@ -16,7 +16,7 @@ module NewRelic
       enabled_key :'transaction_events.enabled'
       buffer_class PrioritySampledBuffer
 
-      def record priority: nil, event: nil, &blk
+      def record(priority: nil, event: nil, &blk)
         unless event || priority && blk
           raise ArgumentError, "Expected priority and block, or event"
         end
@@ -24,16 +24,16 @@ module NewRelic
         return unless enabled?
 
         @lock.synchronize do
-          @buffer.append priority: priority, event: event, &blk
+          @buffer.append(priority: priority, event: event, &blk)
           notify_if_full
         end
       end
 
       private
 
-      def after_harvest metadata
+      def after_harvest(metadata)
         return unless enabled?
-        record_sampling_rate metadata
+        record_sampling_rate(metadata)
       end
 
       def record_sampling_rate(metadata) # THREAD_LOCAL_ACCESS

data/lib/new_relic/agent/transaction_event_primitive.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
@@ -54,7 +53,7 @@ module NewRelic
 
         PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
         append_optional_attributes(intrinsics, payload)
-        DistributedTraceAttributes.copy_to_hash payload, intrinsics
+        DistributedTraceAttributes.copy_to_hash(payload, intrinsics)
 
         attributes = payload[:attributes]
 
@@ -87,7 +86,7 @@ module NewRelic
         end
       end
 
-      def custom_attributes attributes
+      def custom_attributes(attributes)
         if attributes
           result = attributes.custom_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
           result.freeze
@@ -96,7 +95,7 @@ module NewRelic
         end
       end
 
-      def agent_attributes attributes
+      def agent_attributes(attributes)
         if attributes
           result = attributes.agent_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
           result.freeze

data/lib/new_relic/agent/transaction_event_recorder.rb

@@ -1,42 +1,43 @@
-# 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_event_aggregator'
 require 'new_relic/agent/synthetics_event_aggregator'
 require 'new_relic/agent/transaction_event_primitive'
 
 module NewRelic
   module Agent
-    # This is responsibile for recording transaction events and managing
+    # This is responsible for recording transaction events and managing
     # the relationship between events generated from synthetics requests
     # vs normal requests.
     class TransactionEventRecorder
       attr_reader :transaction_event_aggregator
       attr_reader :synthetics_event_aggregator
 
-      def initialize events
-        @transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new events
-        @synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new events
+      def initialize(events)
+        @transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new(events)
+        @synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new(events)
       end
 
-      def record payload
+      def record(payload)
         return unless NewRelic::Agent.config[:'transaction_events.enabled']
 
-        if synthetics_event? payload
-          event = create_event payload
-          result = synthetics_event_aggregator.record event
-          transaction_event_aggregator.record event: event if result.nil?
+        if synthetics_event?(payload)
+          event = create_event(payload)
+          result = synthetics_event_aggregator.record(event)
+          transaction_event_aggregator.record(event: event) if result.nil?
         else
           transaction_event_aggregator.record(priority: payload[:priority]) { create_event(payload) }
         end
       end
 
-      def create_event payload
-        TransactionEventPrimitive.create payload
+      def create_event(payload)
+        TransactionEventPrimitive.create(payload)
       end
 
-      def synthetics_event? payload
-        payload.key? :synthetics_resource_id
+      def synthetics_event?(payload)
+        payload.key?(:synthetics_resource_id)
       end
 
       def drop_buffered_data

data/lib/new_relic/agent/transaction_metrics.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
 
 # This class represents a set of metrics that were recorded during a single
 # transaction. Since the name of the transaction is not known until its end, we
@@ -10,7 +10,7 @@
 module NewRelic
   module Agent
     class TransactionMetrics
-      DEFAULT_PROC = Proc.new { |hash, name| hash[name] = NewRelic::Agent::Stats.new }
+      DEFAULT_PROC = proc { |hash, name| hash[name] = NewRelic::Agent::Stats.new }
 
       def initialize
         @lock = Mutex.new
@@ -43,11 +43,11 @@ module NewRelic
       end
 
       def each_unscoped
-        @lock.synchronize { @unscoped.each { |name, stats| yield name, stats } }
+        @lock.synchronize { @unscoped.each { |name, stats| yield(name, stats) } }
       end
 
       def each_scoped
-        @lock.synchronize { @scoped.each { |name, stats| yield name, stats } }
+        @lock.synchronize { @scoped.each { |name, stats| yield(name, stats) } }
       end
 
       def _record_metrics(names, value, aux, target, &blk)

data/lib/new_relic/agent/transaction_sampler.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/slowest_sample_buffer'
 require 'new_relic/agent/transaction/synthetics_sample_buffer'
@@ -32,9 +32,9 @@ module NewRelic
         Agent.config.register_callback(:'transaction_tracer.enabled') do |enabled|
           if enabled
             threshold = Agent.config[:'transaction_tracer.transaction_threshold']
-            ::NewRelic::Agent.logger.debug "Transaction tracing threshold is #{threshold} seconds."
+            ::NewRelic::Agent.logger.debug("Transaction tracing threshold is #{threshold} seconds.")
           else
-            ::NewRelic::Agent.logger.debug "Transaction traces will not be sent to the New Relic service."
+            ::NewRelic::Agent.logger.debug("Transaction traces will not be sent to the New Relic service.")
           end
         end
 
@@ -67,7 +67,7 @@ module NewRelic
 
       # Gather transaction traces that we'd like to transmit to the server.
       def harvest!
-        return [] unless enabled?
+        return NewRelic::EMPTY_ARRAY unless enabled?
 
         samples = @samples_lock.synchronize do
           @last_sample = nil
@@ -113,7 +113,7 @@ module NewRelic
         result.uniq!
         result.map! do |sample|
           if Transaction === sample
-            Transaction::TraceBuilder.build_trace sample
+            Transaction::TraceBuilder.build_trace(sample)
           else
             sample
           end