newrelic_rpm 8.11.0 → 8.13.0

data/lib/new_relic/agent/local_log_decorator.rb

@@ -29,6 +29,7 @@ module NewRelic
 
       def escape_entity_name(entity_name)
         return unless entity_name
+
         URI::DEFAULT_PARSER.escape(entity_name)
       end
     end

data/lib/new_relic/agent/log_event_aggregator.rb

@@ -227,6 +227,7 @@ module NewRelic
 
       def truncate_message(message)
         return message if message.bytesize <= MAX_BYTES
+
         message.byteslice(0...MAX_BYTES)
       end
     end

data/lib/new_relic/agent/messaging.rb

@@ -121,6 +121,7 @@ module NewRelic
 
         state = Tracer.state
         return yield if state.current_transaction
+
         txn = nil
 
         begin

data/lib/new_relic/agent/method_tracer.rb

@@ -86,6 +86,7 @@ module NewRelic
       def trace_execution_unscoped(metric_names, options = NewRelic::EMPTY_HASH) # THREAD_LOCAL_ACCESS
         NewRelic::Agent.record_api_supportability_metric(:trace_execution_unscoped) unless options[:internal]
         return yield unless NewRelic::Agent.tl_is_execution_traced?
+
         t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         begin
           yield
@@ -251,6 +252,7 @@ module NewRelic
         # may get removed as well.
         def remove_method_tracer(method_name) # :nodoc:
           return unless Agent.config[:agent_enabled]
+
           if _nr_traced_method_module.method_defined?(method_name)
             _nr_traced_method_module.send(:remove_method, method_name)
             ::NewRelic::Agent.logger.debug("removed method tracer #{method_name}\n")
@@ -264,6 +266,7 @@ module NewRelic
         def _nr_add_method_tracer_now(method_name, metric_name, options)
           NewRelic::Agent.record_api_supportability_metric(:add_method_tracer)
           return unless newrelic_method_exists?(method_name)
+
           remove_method_tracer(method_name) if method_traced?(method_name)
 
           options = _nr_validate_method_tracer_options(method_name, options)
@@ -304,6 +307,7 @@ module NewRelic
           _nr_traced_method_module.module_eval do
             define_method(method_name) do |*args, &block|
               return super(*args, &block) unless NewRelic::Agent.tl_is_execution_traced?
+
               scoped_metric_eval, unscoped_metrics_eval = nil, []
 
               scoped_metric_eval = case scoped_metric

data/lib/new_relic/agent/method_tracer_helpers.rb

@@ -106,7 +106,7 @@ module NewRelic
         klass = object.singleton_class? ? klassify_singleton(object) : object
         name = klass.name || '(Anonymous)'
         is_class_method = false
-        method = if klass.instance_methods.include?(method_name)
+        method = if (klass.instance_methods + klass.private_instance_methods).include?(method_name)
           klass.instance_method(method_name)
         else
           is_class_method = true

data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb

@@ -8,6 +8,7 @@ module NewRelic
       class Monitor < InboundRequestMonitor
         def on_finished_configuring(events)
           return unless NewRelic::Agent.config[:'distributed_tracing.enabled']
+
           events.subscribe(:before_call, &method(:on_before_call))
         end
 

data/lib/new_relic/agent/new_relic_service.rb

@@ -524,6 +524,7 @@ module NewRelic
         uri = String.new('/agent_listener/invoke_raw_method?')
         uri << params.map do |k, v|
           next unless v
+
           "#{k}=#{v}"
         end.compact.join('&')
         uri
@@ -592,6 +593,7 @@ module NewRelic
       # than the limit configured in the control object
       def check_post_size(post_string, endpoint)
         return if post_string.size < Agent.config[:max_payload_size_in_bytes]
+
         ::NewRelic::Agent.logger.debug("Tried to send too much data: #{post_string.size} bytes")
         NewRelic::Agent.increment_metric("Supportability/Agent/Collector/#{endpoint}/MaxPayloadSizeLimit")
         raise UnrecoverableServerException.new('413 Request Entity Too Large')

data/lib/new_relic/agent/parameter_filtering.rb

@@ -34,7 +34,7 @@ module NewRelic
       end
 
       def filter_using_rails(params, filters)
-        return params if RAILS_FILTER_CLASS.nil?
+        return params unless rails_filter_class?
 
         pre_filtered_params = filter_rails_request_parameters(params)
         RAILS_FILTER_CLASS.new(filters).filter(pre_filtered_params)
@@ -60,6 +60,12 @@ module NewRelic
         result.delete("action")
         result
       end
+
+      private
+
+      def rails_filter_class?
+        defined?(RAILS_FILTER_CLASS) && !RAILS_FILTER_CLASS.nil?
+      end
     end
   end
 end

data/lib/new_relic/agent/pipe_channel_manager.rb

@@ -160,6 +160,7 @@ module NewRelic
 
         def start
           return if @started == true
+
           @started = true
           @thread = NewRelic::Agent::Threading::AgentThread.create('Pipe Channel Manager') do
             now = nil
@@ -207,6 +208,7 @@ module NewRelic
 
         def stop
           return unless @started == true
+
           stop_listener_thread
           close_all_pipes
           @wake.close

data/lib/new_relic/agent/rules_engine.rb

@@ -72,6 +72,7 @@ module NewRelic
       def rename(original_string)
         renamed = apply_rules(@rules, original_string)
         return nil unless renamed
+
         renamed = apply_rules(@segment_term_rules, renamed)
         renamed
       end

data/lib/new_relic/agent/samplers/cpu_sampler.rb

@@ -44,6 +44,7 @@ module NewRelic
           if defined?(JRuby)
             return JRUBY_VERSION >= '1.7.0'
           end
+
           true
         end
 

data/lib/new_relic/agent/samplers/memory_sampler.rb

@@ -75,12 +75,14 @@ module NewRelic
 
           def can_run?
             return false if @broken
+
             m = get_memory rescue nil
             m && m > 0
           end
 
           def get_sample
             return nil if @broken
+
             begin
               m = get_memory
               if m.nil?
@@ -99,6 +101,7 @@ module NewRelic
         class JavaHeapSampler < Base
           def get_memory
             raise "Can't sample Java heap unless running in JRuby" unless defined? JRuby
+
             java.lang.Runtime.getRuntime.totalMemory / (1024 * 1024).to_f rescue nil
           end
 
@@ -121,6 +124,7 @@ module NewRelic
             # if for some reason the ps command doesn't work on the resident os,
             # then don't execute it any more.
             raise "Faulty command: `#{@command} #{process}`" if memory.nil? || memory <= 0
+
             memory
           end
 
@@ -140,6 +144,7 @@ module NewRelic
             if proc_status =~ /RSS:\s*(\d+) kB/i
               return $1.to_f / 1024.0
             end
+
             raise "Unable to find RSS in #{proc_status_file}"
           end
 

data/lib/new_relic/agent/span_event_primitive.rb

@@ -52,6 +52,7 @@ module NewRelic
       # an error is present.  Otherwise, returns nil when no error present.
       def error_attributes(segment)
         return if Agent.config[:high_security] || !segment.noticed_error
+
         segment.noticed_error.build_error_attributes
         segment.noticed_error_attributes
       end

data/lib/new_relic/agent/stats.rb

@@ -159,6 +159,7 @@ module NewRelic
       def marshal_dump
         instance_variables.each_with_object({}) do |name, instance_copy|
           next if SKIP_MARSHALLING.include?(name)
+
           instance_copy[name] = instance_variable_get(name)
         end
       end

data/lib/new_relic/agent/stats_engine/gc_profiler.rb

@@ -11,6 +11,7 @@ module NewRelic
         def self.init
           @initialized ||= nil
           return @profiler if @initialized
+
           @profiler = if RailsBenchProfiler.enabled?
             RailsBenchProfiler.new
           elsif CoreGCProfiler.enabled?

data/lib/new_relic/agent/system_info.rb

@@ -224,6 +224,7 @@ module NewRelic
         cgroup_info.split("\n").each do |line|
           parts = line.split(':')
           next unless parts.size == 3
+
           _, subsystems, cgroup_id = parts
           subsystems = subsystems.split(',')
           subsystems.each do |subsystem|
@@ -240,6 +241,7 @@ module NewRelic
       # for details on why we do it this way.
       def self.proc_try_read(path)
         return nil unless File.exist?(path)
+
         content = String.new('')
         File.open(path) do |f|
           loop do
@@ -281,6 +283,7 @@ module NewRelic
 
       def self.boot_id
         return nil unless linux?
+
         if bid = proc_try_read('/proc/sys/kernel/random/boot_id')
           bid.chomp!
 

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

@@ -60,6 +60,7 @@ module NewRelic
             ::NewRelic::Agent.logger.debug("Failed to backtrace #{thread.inspect}: #{e.class.name}: #{e.to_s}")
           end
           return nil unless bt
+
           bt.reject! { |t| t.include?('/newrelic_rpm-') } unless profile_agent_code
           bt
         end

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

@@ -151,6 +151,7 @@ module NewRelic
         # This method is expected to be called with @lock held
         def stop
           return unless @running
+
           @running = false
           self.worker_loop.stop
 

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

@@ -54,6 +54,7 @@ module NewRelic
 
         def unique_thread_count
           return 0 if @unique_threads.nil?
+
           @unique_threads.length
         end
 
@@ -84,10 +85,12 @@ module NewRelic
 
           all_nodes.each_with_index do |n, i|
             break if i >= count_to_keep
+
             n.mark_for_array_conversion
           end
           all_nodes.each_with_index do |n, i|
             break if i >= count_to_keep
+
             n.complete_array_conversion
           end
         end

data/lib/new_relic/agent/tracer.rb

@@ -87,7 +87,7 @@ module NewRelic
         # @api public
         def in_transaction(name: nil,
           partial_name: nil,
-          category: nil,
+          category:,
           options: {})
 
           finishable = start_transaction_or_segment(
@@ -187,11 +187,13 @@ module NewRelic
 
         def create_distributed_trace_payload
           return unless txn = current_transaction
+
           txn.distributed_tracer.create_distributed_trace_payload
         end
 
         def accept_distributed_trace_payload(payload)
           return unless txn = current_transaction
+
           txn.distributed_tracer.accept_distributed_trace_payload(payload)
         end
 
@@ -202,6 +204,7 @@ module NewRelic
         # @api public
         def current_segment
           return unless txn = current_transaction
+
           txn.current_segment
         end
 
@@ -348,6 +351,7 @@ module NewRelic
         # is effectively just a yield to the given &block
         def capture_segment_error(segment)
           return unless block_given?
+
           yield
         rescue => exception
           if segment && segment.is_a?(Transaction::AbstractSegment)

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

@@ -55,6 +55,7 @@ module NewRelic
         def start
           @start_time ||= Process.clock_gettime(Process::CLOCK_REALTIME)
           return unless transaction
+
           parent.child_start(self) if parent
         end
 
@@ -63,6 +64,7 @@ module NewRelic
           @duration = end_time - start_time
 
           return unless transaction
+
           run_complete_callbacks
           finalize if record_on_finish?
         rescue => e
@@ -201,6 +203,7 @@ module NewRelic
 
         def noticed_error_attributes
           return unless @noticed_error
+
           @noticed_error.attributes_from_notice_error
         end
 

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

@@ -63,6 +63,7 @@ module NewRelic
         # @api private
         def _notice_sql(sql, config = nil, explainer = nil, binds = nil, name = nil)
           return unless record_sql?
+
           @sql_statement = Database::Statement.new(sql, config, explainer, binds, name, host, port_path_or_id, database_name)
         end
 
@@ -85,6 +86,7 @@ module NewRelic
 
         def notice_nosql_statement(nosql_statement)
           return unless record_sql?
+
           @nosql_statement = Database.truncate_query(nosql_statement)
           nil
         end
@@ -119,6 +121,7 @@ module NewRelic
 
         def add_backtrace_parameter
           return unless duration >= Agent.config[:'transaction_tracer.stack_trace_threshold']
+
           params[:backtrace] = caller.join(NEWLINE)
         end
 

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

@@ -74,6 +74,7 @@ module NewRelic
 
         def insert_headers(headers)
           return unless NewRelic::Agent.agent.connected?
+
           insert_trace_context_header(headers)
           insert_distributed_trace_header(headers)
           insert_cross_app_header(headers)
@@ -100,12 +101,14 @@ module NewRelic
         def insert_distributed_trace_header(headers)
           return unless dt_enabled?
           return if Agent.config[:'exclude_newrelic_header']
+
           payload = create_distributed_trace_payload
           headers[NewRelic::NEWRELIC_KEY] = payload.http_safe if payload
         end
 
         def insert_cat_headers(headers)
           return unless CrossAppTracing.cross_app_enabled?
+
           @is_cross_app_caller = true
           insert_message_headers(headers,
             transaction.guid,
@@ -161,6 +164,7 @@ module NewRelic
           decoded_id = encoded_id.nil? ? EMPTY_STRING : deobfuscate(encoded_id)
 
           return unless CrossAppTracing.trusted_valid_cross_app_id?(decoded_id)
+
           txn_header = headers[CrossAppTracing::NR_MESSAGE_BROKER_TXN_HEADER]
           txn_info = ::JSON.load(deobfuscate(txn_header))
           payload = CrossAppPayload.new(decoded_id, transaction, txn_info)

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

@@ -156,6 +156,7 @@ module NewRelic
         def assign_payload_and_sampling_params(payload)
           @distributed_trace_payload = payload
           return if transaction.distributed_tracer.trace_context_header_data
+
           transaction.trace_id = payload.trace_id
           transaction.distributed_tracer.parent_transaction_id = payload.transaction_id
           transaction.parent_span_id = payload.id

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

@@ -82,6 +82,7 @@ module NewRelic
         def read_response_headers(response)
           return unless record_metrics? && CrossAppTracing.cross_app_enabled?
           return unless CrossAppTracing.response_has_crossapp_header?(response)
+
           unless data = CrossAppTracing.extract_appdata(response)
             NewRelic::Agent.logger.debug("Couldn't extract_appdata from external segment response")
             return

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

@@ -71,6 +71,7 @@ module NewRelic
 
         def name
           return @name if @name
+
           @name = METRIC_PREFIX + library
           @name << SLASH << TYPES[destination_type] << SLASH << ACTIONS[action] << SLASH
 

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

@@ -38,6 +38,7 @@ module NewRelic
 
         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
 

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

@@ -31,6 +31,7 @@ module NewRelic
           node_count = 0
           each_node do |node|
             next if node == root_node
+
             node_count += 1
           end
           node_count
@@ -51,6 +52,7 @@ module NewRelic
 
         def create_node(time_since_start, metric_name = nil)
           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

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

@@ -28,6 +28,7 @@ module NewRelic
 
         def select_allowed_params(params)
           return unless params
+
           params.select do |p|
             NewRelic::Agent.instance.attribute_filter.allows_key?(p, AttributeFilter::DST_TRANSACTION_SEGMENTS)
           end

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

@@ -34,6 +34,7 @@ module NewRelic
 
         def store(sample)
           return unless enabled?
+
           if allow_sample?(sample)
             add_sample(sample)
             truncate_samples_if_needed
@@ -42,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

data/lib/new_relic/agent/transaction.rb

@@ -268,6 +268,7 @@ module NewRelic
         current_thread_id = ::Thread.current.object_id
         return current_segment_by_thread[current_thread_id] if current_segment_by_thread[current_thread_id]
         return current_segment_by_thread[parent_thread_id] if current_segment_by_thread[parent_thread_id]
+
         current_segment_by_thread[@starting_thread_id]
       end
 
@@ -285,6 +286,7 @@ module NewRelic
 
       def sampled?
         return unless Agent.config[:'distributed_tracing.enabled']
+
         if @sampled.nil?
           @sampled = NewRelic::Agent.instance.adaptive_sampler.sampled?
         end
@@ -347,6 +349,7 @@ module NewRelic
 
       def set_default_transaction_name(name, category)
         return log_frozen_name(name) if name_frozen?
+
         if influences_transaction_name?(category)
           self.default_name = name
           @category = category if category
@@ -355,6 +358,7 @@ module NewRelic
 
       def set_overriding_transaction_name(name, category)
         return log_frozen_name(name) if name_frozen?
+
         if influences_transaction_name?(category)
           self.overridden_name = name
           @category = category if category
@@ -510,6 +514,7 @@ module NewRelic
 
       def finish
         return unless state.is_execution_traced?
+
         @end_time = Process.clock_gettime(Process::CLOCK_REALTIME)
         @duration = @end_time - @start_time
         freeze_name_and_execute_if_not_ignored
@@ -879,11 +884,13 @@ module NewRelic
 
       def normal_cpu_burn
         return unless @process_cpu_start
+
         process_cpu - @process_cpu_start
       end
 
       def jruby_cpu_burn
         return unless @jruby_cpu_start
+
         jruby_cpu_time - @jruby_cpu_start
       end
 
@@ -919,15 +926,18 @@ module NewRelic
 
       def process_cpu
         return nil if defined? JRuby
+
         p = Process.times
         p.stime + p.utime
       end
 
       def jruby_cpu_time
         return nil unless @@java_classes_loaded
+
         threadMBean = Java::JavaLangManagement::ManagementFactory.getThreadMXBean()
 
         return nil unless threadMBean.isCurrentThreadCpuTimeSupported
+
         java_utime = threadMBean.getCurrentThreadUserTime() # ns
 
         -1 == java_utime ? 0.0 : java_utime / 1e9

data/lib/new_relic/agent/transaction_event_aggregator.rb

@@ -33,6 +33,7 @@ module NewRelic
 
       def after_harvest(metadata)
         return unless enabled?
+
         record_sampling_rate(metadata)
       end
 

data/lib/new_relic/agent/transaction_time_aggregator.rb

@@ -127,6 +127,7 @@ module NewRelic
 
         def split_transaction_at_harvest(timestamp, thread_id = nil)
           raise ArgumentError, 'thread_id required' unless thread_id
+
           @stats[thread_id].transaction_started_at = timestamp
           @stats[thread_id].elapsed_transaction_time = 0.0
         end

data/lib/new_relic/agent/utilization/pcf.rb

@@ -15,6 +15,7 @@ module NewRelic
         def detect
           begin
             return false unless pcf_keys_present?
+
             process_response(ENV)
           rescue
             NewRelic::Agent.logger.error("Error occurred detecting: #{vendor_name}", e)

data/lib/new_relic/agent/utilization/vendor.rb

@@ -134,6 +134,7 @@ module NewRelic
         def valid_chars?(value)
           value.each_char do |ch|
             next if ch =~ VALID_CHARS
+
             code_point = ch[0].ord # this works in Ruby 1.8.7 - 2.1.2
             next if code_point >= 0x80
 
@@ -145,6 +146,7 @@ module NewRelic
 
         def transform_key(key)
           return key unless key_transforms
+
           key_transforms.inject(key) { |memo, transform| memo.send(transform) }
         end
 

data/lib/new_relic/agent/utilization_data.rb

@@ -87,6 +87,7 @@ module NewRelic
       def append_vendor_info(collector_hash)
         VENDORS.each_pair do |klass, config_option|
           next unless Agent.config[config_option]
+
           vendor = klass.new
 
           if vendor.detect
@@ -125,6 +126,7 @@ module NewRelic
 
       def append_kubernetes_info(collector_hash)
         return unless Agent.config[:'utilization.detect_kubernetes']
+
         if host = ENV[KUBERNETES_SERVICE_HOST]
           collector_hash[:vendors] ||= {}
           collector_hash[:vendors][:kubernetes] = {
@@ -136,6 +138,7 @@ module NewRelic
       def append_full_hostname(collector_hash)
         full_hostname = fqdn
         return if full_hostname.nil? || full_hostname.empty?
+
         collector_hash[:full_hostname] = full_hostname
       end