newrelic_rpm 8.11.0 → 8.12.0

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

@@ -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
 

data/lib/new_relic/agent.rb

@@ -102,8 +102,6 @@ module NewRelic
     # An error while serializing data for the collector
     class SerializationError < StandardError; end
 
-    class BackgroundLoadingError < StandardError; end
-
     # placeholder name used when we cannot determine a transaction's name
     UNKNOWN_METRIC = '(unknown)'.freeze
 
@@ -115,6 +113,7 @@ module NewRelic
     # The singleton Agent instance.  Used internally.
     def agent # :nodoc:
       return @agent if @agent
+
       NewRelic::Agent.logger.warn("Agent unavailable as it hasn't been started.")
       NewRelic::Agent.logger.warn(caller.join("\n"))
       nil
@@ -217,6 +216,7 @@ module NewRelic
 
     def increment_metric(metric_name, amount = 1) # THREAD_LOCAL_ACCESS
       return unless agent
+
       if amount == 1
         metrics = [metric_name, SUPPORTABILITY_INCREMENT_METRIC]
         agent.stats_engine.tl_record_unscoped_metrics(metrics) { |stats| stats.increment_count }
@@ -347,6 +347,7 @@ module NewRelic
     #
     def manual_start(options = {})
       raise "Options must be a hash" unless Hash === options
+
       NewRelic::Control.instance.init_plugin({:agent_enabled => true, :sync_startup => true}.merge(options))
       record_api_supportability_metric(:manual_start)
     end
@@ -757,6 +758,7 @@ module NewRelic
       record_api_supportability_metric(:browser_timing_header)
 
       return EMPTY_STR unless agent
+
       agent.javascript_instrumentor.browser_timing_header(nonce)
     end
 

data/lib/new_relic/cli/commands/install.rb

@@ -42,6 +42,7 @@ class NewRelic::Cli::Install < NewRelic::Cli::Command
     if File.exist?(dest_file) && !@force
       raise NewRelic::Cli::Command::CommandFailure, "newrelic.yml file already exists.  Use --force flag to overwrite."
     end
+
     File.open(dest_file, 'w') { |out| out.puts(content) }
 
     puts <<-EOF unless quiet

data/lib/new_relic/coerce.rb

@@ -22,6 +22,7 @@ module NewRelic
 
     def int_or_nil(value, context = nil)
       return nil if value.nil?
+
       Integer(value)
     rescue => error
       log_failure(value, Integer, context, error)
@@ -31,6 +32,7 @@ module NewRelic
     def float(value, context = nil)
       result = Float(value)
       raise "Value #{result.inspect} is not finite." unless result.finite?
+
       result
     rescue => error
       log_failure(value, Float, context, error)
@@ -39,6 +41,7 @@ module NewRelic
 
     def string(value, context = nil)
       return value if value.nil?
+
       String(value)
     rescue => error
       log_failure(value.class, String, context, error)
@@ -62,6 +65,7 @@ module NewRelic
 
     def int!(value)
       return nil unless value_or_nil(value)
+
       Integer(value)
     end
 
@@ -74,11 +78,13 @@ module NewRelic
 
     def float!(value, precision = NewRelic::PRIORITY_PRECISION)
       return nil unless value_or_nil(value)
+
       value.to_f.round(precision)
     end
 
     def value_or_nil(value)
       return nil if value.nil? || (value.respond_to?(:empty?) && value.empty?)
+
       value
     end
 

data/lib/new_relic/collection_helper.rb

@@ -13,6 +13,7 @@ module NewRelic
         when Hash
           # Optimize for empty hash since that is often what this is called with.
           return params if params.empty?
+
           new_params = {}
           params.each do |key, value|
             new_params[truncate(normalize_params(key), 64)] = normalize_params(value)

data/lib/new_relic/control/frameworks/rails.rb

@@ -68,11 +68,14 @@ module NewRelic
 
         def install_agent_hooks(config)
           return if defined?(@agent_hooks_installed) && @agent_hooks_installed
+
           @agent_hooks_installed = true
           return if config.nil? || !config.respond_to?(:middleware)
+
           begin
             require 'new_relic/rack/agent_hooks'
             return unless NewRelic::Rack::AgentHooks.needed?
+
             config.middleware.use(NewRelic::Rack::AgentHooks)
             ::NewRelic::Agent.logger.debug("Installed New Relic Agent Hooks middleware")
           rescue => e
@@ -83,8 +86,10 @@ module NewRelic
         def install_browser_monitoring(config)
           @install_lock.synchronize do
             return if defined?(@browser_monitoring_installed) && @browser_monitoring_installed
+
             @browser_monitoring_installed = true
             return if config.nil? || !config.respond_to?(:middleware) || !Agent.config[:'browser_monitoring.auto_instrument']
+
             begin
               require 'new_relic/rack/browser_monitoring'
               config.middleware.use(NewRelic::Rack::BrowserMonitoring)

data/lib/new_relic/control/instrumentation.rb

@@ -70,6 +70,7 @@ module NewRelic
 
     def rails_32_deprecation
       return unless defined?(Rails::VERSION) && Gem::Version.new(Rails::VERSION::STRING) <= Gem::Version.new('3.2')
+
       deprecation_msg = 'The Ruby Agent is dropping support for Rails 3.2 ' \
         'in a future major release. Please upgrade your Rails version to continue receiving support. ' \
 
@@ -84,6 +85,7 @@ module NewRelic
 
     def ruby_22_deprecation
       return unless RUBY_VERSION <= '2.2.0'
+
       deprecation_msg = 'The Ruby Agent is dropping support for Ruby 2.2 ' \
         'in version 9.0.0. Please upgrade your Ruby version to continue receiving support. ' \
 

data/lib/new_relic/dependency_detection.rb

@@ -165,6 +165,7 @@ module DependencyDetection
 
     def config_key
       return nil if self.config_name.nil?
+
       @config_key ||= "instrumentation.#{self.config_name}".to_sym
     end
 
@@ -193,6 +194,7 @@ module DependencyDetection
 
     def config_value
       return AUTO_CONFIG_VALUE unless config_key
+
       fetch_config_value(config_key)
     end
 

data/lib/new_relic/helper.rb

@@ -17,6 +17,7 @@ module NewRelic
     # If not force the encoding to ASCII-8BIT (binary)
     def correctly_encoded(string)
       return string unless string.is_a?(String)
+
       # The .dup here is intentional, since force_encoding mutates the target,
       # and we don't know who is going to use this string downstream of us.
       string.valid_encoding? ? string : string.dup.force_encoding(Encoding::ASCII_8BIT)

data/lib/new_relic/language_support.rb

@@ -10,6 +10,7 @@ module NewRelic
     def can_fork?
       # this is expensive to check, so we should only check once
       return @@forkable if !@@forkable.nil?
+
       @@forkable = Process.respond_to?(:fork)
     end
 

data/lib/new_relic/latest_changes.rb

@@ -56,6 +56,7 @@ EOS
           version_count += 1
         end
         break if version_count >= 2
+
         changes << line.sub(/^  \* /, "* ").chomp
       end
       changes

data/lib/new_relic/local_environment.rb

@@ -85,6 +85,7 @@ module NewRelic
     def check_for_torquebox
       return unless defined?(::JRuby) &&
         (org.torquebox::TorqueBox rescue nil)
+
       @discovered_dispatcher = :torquebox
     end
 
@@ -93,11 +94,13 @@ module NewRelic
         (((com.sun.grizzly.jruby.rack.DefaultRackApplicationFactory rescue nil) &&
           defined?(com::sun::grizzly::jruby::rack::DefaultRackApplicationFactory)) ||
          (jruby_rack? && defined?(::GlassFish::Server)))
+
       @discovered_dispatcher = :glassfish
     end
 
     def check_for_trinidad
       return unless defined?(::JRuby) && jruby_rack? && defined?(::Trinidad::Server)
+
       @discovered_dispatcher = :trinidad
     end
 
@@ -107,17 +110,20 @@ module NewRelic
 
     def check_for_webrick
       return unless defined?(::WEBrick) && defined?(::WEBrick::VERSION)
+
       @discovered_dispatcher = :webrick
     end
 
     def check_for_fastcgi
       return unless defined?(::FCGI)
+
       @discovered_dispatcher = :fastcgi
     end
 
     # this case covers starting by mongrel_rails
     def check_for_mongrel
       return unless defined?(::Mongrel) && defined?(::Mongrel::HttpServer)
+
       @discovered_dispatcher = :mongrel
     end
 

data/lib/new_relic/metric_spec.rb

@@ -44,6 +44,7 @@ class NewRelic::MetricSpec
 
   def to_s
     return name if scope.empty?
+
     "#{name}:#{scope}"
   end
 
@@ -59,6 +60,7 @@ class NewRelic::MetricSpec
   def <=>(o)
     namecmp = self.name <=> o.name
     return namecmp if namecmp != 0
+
     return (self.scope || '') <=> (o.scope || '')
   end
 end

data/lib/new_relic/rack/agent_middleware.rb

@@ -33,11 +33,13 @@ module NewRelic
       # response code before it goes back to the client.
       def capture_http_response_code(state, result)
         return if NewRelic::Agent.config[:disable_middleware_instrumentation]
+
         super
       end
 
       def capture_response_content_type(state, result)
         return if NewRelic::Agent.config[:disable_middleware_instrumentation]
+
         super
       end
     end

data/lib/new_relic/traced_thread.rb

@@ -28,6 +28,7 @@ module NewRelic
 
     def create_traced_block(*args, &block)
       return block if NewRelic::Agent.config[:'instrumentation.thread.tracing'] # if this is on, don't double trace
+
       NewRelic::Agent::Tracer.thread_block_with_current_transaction(*args, &block)
     end
   end

data/lib/new_relic/version.rb

@@ -6,7 +6,7 @@
 module NewRelic
   module VERSION # :nodoc:
     MAJOR = 8
-    MINOR = 11
+    MINOR = 12
     TINY = 0
 
     STRING = "#{MAJOR}.#{MINOR}.#{TINY}"