newrelic_rpm 8.16.0 → 9.1.0

data/lib/new_relic/agent/new_relic_service.rb

@@ -65,7 +65,7 @@ module NewRelic
         Agent.config.register_callback(:marshaller) do |marshaller|
           if marshaller != 'json'
             ::NewRelic::Agent.logger.warn("Non-JSON marshaller '#{marshaller}' requested but not supported, using " \
-              "JSON marshaller instead. pruby marshalling has been removed as of version 3.14.0.")
+              'JSON marshaller instead. pruby marshalling has been removed as of version 3.14.0.')
           end
 
           @marshaller = JsonMarshaller.new
@@ -195,16 +195,16 @@ module NewRelic
       def error_event_data(data)
         metadata, items = data
         response = invoke_remote(:error_event_data, [@agent_id, *data], :item_count => items.size)
-        NewRelic::Agent.record_metric("Supportability/Events/TransactionError/Sent", :count => items.size)
-        NewRelic::Agent.record_metric("Supportability/Events/TransactionError/Seen", :count => metadata[:events_seen])
+        NewRelic::Agent.record_metric('Supportability/Events/TransactionError/Sent', :count => items.size)
+        NewRelic::Agent.record_metric('Supportability/Events/TransactionError/Seen', :count => metadata[:events_seen])
         response
       end
 
       def span_event_data(data)
         metadata, items = data
         response = invoke_remote(:span_event_data, [@agent_id, *data], :item_count => items.size)
-        NewRelic::Agent.record_metric("Supportability/Events/SpanEvents/Sent", :count => items.size)
-        NewRelic::Agent.record_metric("Supportability/Events/SpanEvents/Seen", :count => metadata[:events_seen])
+        NewRelic::Agent.record_metric('Supportability/Events/SpanEvents/Sent', :count => items.size)
+        NewRelic::Agent.record_metric('Supportability/Events/SpanEvents/Seen', :count => metadata[:events_seen])
         response
       end
 
@@ -305,7 +305,7 @@ module NewRelic
         conn.verify_mode = OpenSSL::SSL::VERIFY_PEER
         set_cert_store(conn)
       rescue StandardError, LoadError
-        msg = "SSL is not available in the environment; please install SSL support."
+        msg = 'SSL is not available in the environment; please install SSL support.'
         raise UnrecoverableAgentException.new(msg)
       end
 
@@ -313,7 +313,7 @@ module NewRelic
         if NewRelic::Agent.config[:ca_bundle_path]
           conn.cert_store = ssl_cert_store
         else
-          ::NewRelic::Agent.logger.debug("Using default security certificates")
+          ::NewRelic::Agent.logger.debug('Using default security certificates')
         end
       end
 
@@ -363,7 +363,7 @@ module NewRelic
         start_connection(conn)
         conn
       rescue Timeout::Error
-        ::NewRelic::Agent.logger.info("Timeout while attempting to connect. You may need to install system-level CA Certificates, as the ruby agent no longer includes these.")
+        ::NewRelic::Agent.logger.info('Timeout while attempting to connect. You may need to install system-level CA Certificates, as the ruby agent no longer includes these.')
         raise
       end
 
@@ -380,7 +380,7 @@ module NewRelic
         @marshaller.dump(data)
         true
       rescue StandardError, SystemStackError => e
-        NewRelic::Agent.logger.warn("Unable to marshal environment report on connect.", e)
+        NewRelic::Agent.logger.warn('Unable to marshal environment report on connect.', e)
         false
       end
 
@@ -409,7 +409,7 @@ module NewRelic
         end
         @audit_logger.log_request_headers(opts[:uri], headers)
         request['user-agent'] = user_agent
-        request.content_type = "application/octet-stream"
+        request.content_type = 'application/octet-stream'
         request.body = opts[:data]
         request
       end
@@ -521,7 +521,7 @@ module NewRelic
           # ruled out; see the initializer
         }
 
-        uri = String.new('/agent_listener/invoke_raw_method?')
+        uri = +'/agent_listener/invoke_raw_method?'
         uri << params.map do |k, v|
           next unless v
 
@@ -551,7 +551,7 @@ module NewRelic
       end
 
       def handle_serialization_error(method, e)
-        NewRelic::Agent.increment_metric("Supportability/serialization_failure")
+        NewRelic::Agent.increment_metric('Supportability/serialization_failure')
         NewRelic::Agent.increment_metric("Supportability/serialization_failure/#{method}")
         msg = "Failed to serialize #{method} data using #{@marshaller.class}: #{e.inspect}"
         error = SerializationError.new(msg)
@@ -566,7 +566,7 @@ module NewRelic
           NewRelic::Agent.record_metric("Supportability/Agent/Collector/#{method}/Duration", request_duration)
         end
         if serialize_time
-          NewRelic::Agent.record_metric("Supportability/invoke_remote_serialize", serialize_time)
+          NewRelic::Agent.record_metric('Supportability/invoke_remote_serialize', serialize_time)
           NewRelic::Agent.record_metric("Supportability/invoke_remote_serialize/#{method}", serialize_time)
         end
       end
@@ -581,7 +581,7 @@ module NewRelic
       # of items as arguments.
       def record_size_supportability_metrics(method, size_bytes, item_count)
         metrics = [
-          "Supportability/Ruby/Collector/Output/Bytes",
+          'Supportability/Ruby/Collector/Output/Bytes',
           "Supportability/Ruby/Collector/#{method}/Output/Bytes"
         ]
         # we may not have an item count, in which case, just record 0 for the exclusive time
@@ -595,7 +595,7 @@ module NewRelic
         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")
+        NewRelic::Agent.increment_metric("Supportability/Ruby/Collector/#{endpoint}/MaxPayloadSizeLimit")
         raise UnrecoverableServerException.new('413 Request Entity Too Large')
       end
 

data/lib/new_relic/agent/obfuscator.rb

@@ -33,7 +33,7 @@ module NewRelic
       def encode(text)
         return text unless key_bytes
 
-        encoded = String.new('')
+        encoded = +''
         encoded.force_encoding('binary') if encoded.respond_to?(:force_encoding)
         index = 0
         text.each_byte do |byte|

data/lib/new_relic/agent/parameter_filtering.rb

@@ -7,7 +7,7 @@ module NewRelic
     module ParameterFiltering
       extend self
 
-      ACTION_DISPATCH_PARAMETER_FILTER ||= "action_dispatch.parameter_filter".freeze
+      ACTION_DISPATCH_PARAMETER_FILTER ||= 'action_dispatch.parameter_filter'.freeze
 
       if defined?(Rails) && Gem::Version.new(::Rails::VERSION::STRING) >= Gem::Version.new('5.0.0')
         Rails.application.config.to_prepare do
@@ -41,12 +41,12 @@ module NewRelic
       end
 
       def filter_rack_file_data(env, params)
-        content_type = env["CONTENT_TYPE"]
-        multipart = content_type && content_type.start_with?("multipart")
+        content_type = env['CONTENT_TYPE']
+        multipart = content_type&.start_with?('multipart')
 
         params.inject({}) do |memo, (k, v)|
           if multipart && v.is_a?(Hash) && v[:tempfile]
-            memo[k] = "[FILE]"
+            memo[k] = '[FILE]'
           else
             memo[k] = v
           end
@@ -56,8 +56,8 @@ module NewRelic
 
       def filter_rails_request_parameters(params)
         result = params.dup
-        result.delete("controller")
-        result.delete("action")
+        result.delete('controller')
+        result.delete('action')
         result
       end
 

data/lib/new_relic/agent/pipe_channel_manager.rb

@@ -55,7 +55,7 @@ module NewRelic
       # 4 GB - much larger than we'd ever need or want for this application.
       #
       class Pipe
-        READY_MARKER = "READY"
+        READY_MARKER = 'READY'
         NUM_LENGTH_BYTES = 4
 
         attr_accessor :in, :out
@@ -76,11 +76,11 @@ module NewRelic
         end
 
         def serialize_message_length(data)
-          [data.bytesize].pack("L>")
+          [data.bytesize].pack('L>')
         end
 
         def deserialize_message_length(data)
-          data.unpack("L>").first
+          data.unpack('L>').first
         end
 
         def write(data)
@@ -103,7 +103,7 @@ module NewRelic
               nil
             end
           else
-            NewRelic::Agent.logger.error("Failed to read bytes for length from pipe.")
+            NewRelic::Agent.logger.error('Failed to read bytes for length from pipe.')
             nil
           end
         end
@@ -218,7 +218,8 @@ module NewRelic
         def close_all_pipes
           @pipes_lock.synchronize do
             @pipes.each do |id, pipe|
-              pipe.close if pipe
+              # Needs else branch coverage
+              pipe.close if pipe # rubocop:disable Style/SafeNavigation
             end
             @pipes = {}
           end
@@ -255,7 +256,7 @@ module NewRelic
         def unmarshal(data)
           Marshal.load(data)
         rescue StandardError => e
-          ::NewRelic::Agent.logger.error("Failure unmarshalling message from Resque child process", e)
+          ::NewRelic::Agent.logger.error('Failure unmarshalling message from Resque child process', e)
           ::NewRelic::Agent.logger.debug(Base64.encode64(data))
           nil
         end

data/lib/new_relic/agent/pipe_service.rb

@@ -15,7 +15,7 @@ module NewRelic
         if @pipe && @pipe.parent_pid != $$
           @pipe.after_fork_in_child
         else
-          NewRelic::Agent.logger.error("No communication channel to parent process, please see https://newrelic.com/docs/ruby/resque-instrumentation for more information.")
+          NewRelic::Agent.logger.error('No communication channel to parent process, please see https://newrelic.com/docs/ruby/resque-instrumentation for more information.')
         end
       end
 
@@ -65,7 +65,8 @@ module NewRelic
       end
 
       def shutdown
-        @pipe.close if @pipe
+        # no else branch coverage
+        @pipe.close if @pipe # rubocop:disable Style/SafeNavigation
       end
 
       # Invokes the block it is passed.  This is used to implement HTTP
@@ -82,7 +83,8 @@ module NewRelic
       end
 
       def write_to_pipe(endpoint, data)
-        @pipe.write(marshal_payload([endpoint, data])) if @pipe
+        # the following line needs else branch coverage
+        @pipe.write(marshal_payload([endpoint, data])) if @pipe # rubocop:disable Style/SafeNavigation
       end
     end
   end

data/lib/new_relic/agent/priority_sampled_buffer.rb

@@ -8,7 +8,7 @@ require 'new_relic/agent/event_buffer'
 module NewRelic
   module Agent
     class PrioritySampledBuffer < EventBuffer
-      PRIORITY_KEY = "priority".freeze
+      PRIORITY_KEY = 'priority'.freeze
 
       attr_reader :seen_lifetime, :captured_lifetime
 

data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb

@@ -11,7 +11,6 @@ module NewRelic
         SEGMENT_PLACEHOLDER = '*'.freeze
         ADJACENT_PLACEHOLDERS_REGEX = %r{((?:^|/)\*)(?:/\*)*}.freeze
         ADJACENT_PLACEHOLDERS_REPLACEMENT = '\1'.freeze
-        VALID_PREFIX_SEGMENT_COUNT = 2
 
         attr_reader :prefix, :terms
 

data/lib/new_relic/agent/sampler.rb

@@ -56,7 +56,7 @@ module NewRelic
       end
 
       def poll
-        raise "Implement in the subclass"
+        raise 'Implement in the subclass'
       end
     end
   end

data/lib/new_relic/agent/sampler_collection.rb

@@ -64,7 +64,7 @@ module NewRelic
       rescue NewRelic::Agent::Sampler::Unsupported => e
         ::NewRelic::Agent.logger.info("#{sampler_class.name} not available: #{e}")
       rescue => e
-        ::NewRelic::Agent.logger.error("Error registering sampler:", e)
+        ::NewRelic::Agent.logger.error('Error registering sampler:', e)
       end
     end
   end

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

@@ -16,26 +16,26 @@ module NewRelic
           @last_time = nil
           @processor_count = NewRelic::Agent::SystemInfo.num_logical_processors
           if @processor_count.nil?
-            NewRelic::Agent.logger.warn("Failed to determine processor count, assuming 1")
+            NewRelic::Agent.logger.warn('Failed to determine processor count, assuming 1')
             @processor_count = 1
           end
           poll
         end
 
         def record_user_util(value)
-          NewRelic::Agent.record_metric("CPU/User/Utilization", value)
+          NewRelic::Agent.record_metric('CPU/User/Utilization', value)
         end
 
         def record_system_util(value)
-          NewRelic::Agent.record_metric("CPU/System/Utilization", value)
+          NewRelic::Agent.record_metric('CPU/System/Utilization', value)
         end
 
         def record_usertime(value)
-          NewRelic::Agent.record_metric("CPU/User Time", value)
+          NewRelic::Agent.record_metric('CPU/User Time', value)
         end
 
         def record_systemtime(value)
-          NewRelic::Agent.record_metric("CPU/System Time", value)
+          NewRelic::Agent.record_metric('CPU/System Time', value)
         end
 
         def self.supported_on_this_platform?

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

@@ -21,21 +21,21 @@ module NewRelic
         # DelayedJob supports multiple backends, only some of which we can
         # handle. Check whether we think we've got what we need here.
         def self.supported_backend?
-          ::Delayed::Worker.backend.to_s == "Delayed::Backend::ActiveRecord::Job"
+          ::Delayed::Worker.backend.to_s == 'Delayed::Backend::ActiveRecord::Job'
         end
 
         def initialize
-          raise Unsupported, "DJ queue sampler disabled" if Agent.config[:disable_dj]
+          raise Unsupported, 'DJ queue sampler disabled' if Agent.config[:'instrumentation.delayed_job'] == 'disabled'
           raise Unsupported, "DJ queue sampling unsupported with backend '#{::Delayed::Worker.backend}'" unless self.class.supported_backend?
-          raise Unsupported, "No DJ worker present. Skipping DJ queue sampler" unless NewRelic::DelayedJobInjection.worker_name
+          raise Unsupported, 'No DJ worker present. Skipping DJ queue sampler' unless NewRelic::DelayedJobInjection.worker_name
         end
 
         def record_failed_jobs(value)
-          NewRelic::Agent.record_metric("Workers/DelayedJob/failed_jobs", value)
+          NewRelic::Agent.record_metric('Workers/DelayedJob/failed_jobs', value)
         end
 
         def record_locked_jobs(value)
-          NewRelic::Agent.record_metric("Workers/DelayedJob/locked_jobs", value)
+          NewRelic::Agent.record_metric('Workers/DelayedJob/locked_jobs', value)
         end
 
         FAILED_QUERY = 'failed_at is not NULL'.freeze
@@ -74,10 +74,10 @@ module NewRelic
 
         def record_queue_length_metrics
           counts = []
-          counts << record_counts_by("queue", "name") if ::Delayed::Job.instance_methods.include?(:queue)
-          counts << record_counts_by("priority")
+          counts << record_counts_by('queue', 'name') if ::Delayed::Job.instance_methods.include?(:queue)
+          counts << record_counts_by('priority')
 
-          all_metric = "Workers/DelayedJob/queue_length/all"
+          all_metric = 'Workers/DelayedJob/queue_length/all'
           NewRelic::Agent.record_metric(all_metric, counts.max)
         end
 
@@ -87,7 +87,7 @@ module NewRelic
           all_count = 0
           queue_counts(column_name).each do |column_val, count|
             all_count += count
-            column_val = "default" if column_val.nil? || column_val == NewRelic::EMPTY_STR
+            column_val = 'default' if column_val.nil? || column_val == NewRelic::EMPTY_STR
             metric = "Workers/DelayedJob/queue_length/#{metric_node}/#{column_val}"
             NewRelic::Agent.record_metric(metric, count)
           end

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

@@ -23,18 +23,18 @@ module NewRelic
             @sampler = ProcStatus.new
             if !@sampler.can_run?
               ::NewRelic::Agent.logger.debug("Error attempting to use /proc/#{$$}/status file for reading memory. Using ps command instead.")
-              @sampler = ShellPS.new("ps -o rsz")
+              @sampler = ShellPS.new('ps -o rsz')
             else
               ::NewRelic::Agent.logger.debug("Using /proc/#{$$}/status for reading process memory.")
             end
           elsif platform.include?('darwin9') # 10.5
-            @sampler = ShellPS.new("ps -o rsz")
-          elsif platform =~ /darwin(1|2)\d+/ # >= 10.6
-            @sampler = ShellPS.new("ps -o rss")
+            @sampler = ShellPS.new('ps -o rsz')
+          elsif /darwin(1|2)\d+/.match?(platform) # >= 10.6
+            @sampler = ShellPS.new('ps -o rss')
           elsif platform.include?('freebsd')
-            @sampler = ShellPS.new("ps -o rss")
+            @sampler = ShellPS.new('ps -o rss')
           elsif platform.include?('solaris')
-            @sampler = ShellPS.new("/usr/bin/ps -o rss -p")
+            @sampler = ShellPS.new('/usr/bin/ps -o rss -p')
           end
 
           raise Unsupported, "Unsupported platform for getting memory: #{platform}" if @sampler.nil?
@@ -64,7 +64,7 @@ module NewRelic
         def poll
           sample = @sampler.get_sample
           if sample
-            NewRelic::Agent.record_metric("Memory/Physical", sample)
+            NewRelic::Agent.record_metric('Memory/Physical', sample)
           end
         end
 
@@ -106,7 +106,7 @@ module NewRelic
           end
 
           def to_s
-            "JRuby Java heap sampler"
+            'JRuby Java heap sampler'
           end
         end
 
@@ -140,7 +140,7 @@ module NewRelic
         class ProcStatus < Base
           # Returns the amount of resident memory this process is using in MB
           def get_memory
-            proc_status = File.open(proc_status_file, "r") { |f| f.read_nonblock(4096).strip }
+            proc_status = File.open(proc_status_file, 'r') { |f| f.read_nonblock(4096).strip }
             if proc_status =~ /RSS:\s*(\d+) kB/i
               return $1.to_f / 1024.0
             end

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

@@ -16,7 +16,7 @@ module NewRelic
 
         def poll
           live_objects = ObjectSpace.live_objects
-          NewRelic::Agent.record_metric("GC/objects", live_objects)
+          NewRelic::Agent.record_metric('GC/objects', live_objects)
         end
       end
     end

data/lib/new_relic/agent/span_event_aggregator.rb

@@ -18,7 +18,7 @@ module NewRelic
 
       def record(priority: nil, event: nil, &blk)
         unless event || priority && blk
-          raise ArgumentError, "Expected priority and block, or event"
+          raise ArgumentError, 'Expected priority and block, or event'
         end
 
         return unless enabled?
@@ -29,9 +29,9 @@ module NewRelic
         end
       end
 
-      SUPPORTABILITY_TOTAL_SEEN = "Supportability/SpanEvent/TotalEventsSeen".freeze
-      SUPPORTABILITY_TOTAL_SENT = "Supportability/SpanEvent/TotalEventsSent".freeze
-      SUPPORTABILITY_DISCARDED = "Supportability/SpanEvent/Discarded".freeze
+      SUPPORTABILITY_TOTAL_SEEN = 'Supportability/SpanEvent/TotalEventsSeen'.freeze
+      SUPPORTABILITY_TOTAL_SENT = 'Supportability/SpanEvent/TotalEventsSent'.freeze
+      SUPPORTABILITY_DISCARDED = 'Supportability/SpanEvent/Discarded'.freeze
 
       def after_harvest(metadata)
         seen = metadata[:seen]

data/lib/new_relic/agent/span_event_primitive.rb

@@ -37,8 +37,8 @@ module NewRelic
       PEER_HOSTNAME_KEY = 'peer.hostname'
       SPAN_KIND_KEY = 'span.kind'
       ENTRY_POINT_KEY = 'nr.entryPoint'
-      TRUSTED_PARENT_KEY = "trustedParentId"
-      TRACING_VENDORS_KEY = "tracingVendors"
+      TRUSTED_PARENT_KEY = 'trustedParentId'
+      TRACING_VENDORS_KEY = 'tracingVendors'
       TRANSACTION_NAME_KEY = 'transaction.name'
 
       # Strings for static values of the event structure

data/lib/new_relic/agent/sql_sampler.rb

@@ -154,12 +154,12 @@ module NewRelic
         end
       end
 
-      PRIORITY = "priority".freeze
+      PRIORITY = 'priority'.freeze
 
       def distributed_trace_attributes(state)
         transaction = state.current_transaction
         params = nil
-        if transaction && transaction.distributed_tracer.distributed_trace_payload
+        if transaction&.distributed_tracer&.distributed_trace_payload
           params = {}
           payload = transaction.distributed_tracer.distributed_trace_payload
           DistributedTraceAttributes.copy_from_transaction(transaction, payload, params)

data/lib/new_relic/agent/stats.rb

@@ -118,7 +118,7 @@ module NewRelic
       def inspect_full
         variables = instance_variables.map do |ivar|
           "#{ivar.to_s}=#{instance_variable_get(ivar).inspect}"
-        end.join(" ")
+        end.join(' ')
         "#<NewRelic::Agent::Stats #{variables}>"
       end
 

data/lib/new_relic/agent/synthetics_event_aggregator.rb

@@ -37,7 +37,7 @@ module NewRelic
         NewRelic::Agent.logger.debug("Synthetics transaction event limit (#{metadata[:capacity]}) reached. Further synthetics events this harvest period dropped.")
 
         engine = NewRelic::Agent.instance.stats_engine
-        engine.tl_record_supportability_metric_count("SyntheticsEventAggregator/synthetics_events_dropped", num_dropped)
+        engine.tl_record_supportability_metric_count('SyntheticsEventAggregator/synthetics_events_dropped', num_dropped)
       end
     end
   end

data/lib/new_relic/agent/system_info.rb

@@ -128,7 +128,7 @@ module NewRelic
 
         num_physical_packages = cores.keys.map(&:first).uniq.size
         num_physical_cores = cores.size
-        num_logical_processors = cores.values.reduce(0, :+)
+        num_logical_processors = cores.values.sum
 
         if num_physical_cores == 0
           num_logical_processors = total_processors
@@ -202,7 +202,7 @@ module NewRelic
           return
         when /docker/
           ::NewRelic::Agent.logger.debug("Cgroup indicates docker but container_id unrecognized: '#{cpu_cgroup}'")
-          ::NewRelic::Agent.increment_metric("Supportability/utilization/docker/error")
+          ::NewRelic::Agent.increment_metric('Supportability/utilization/docker/error')
           return
         else
           ::NewRelic::Agent.logger.debug("Ignoring unrecognized cgroup ID format: '#{cpu_cgroup}'")
@@ -211,7 +211,7 @@ module NewRelic
 
         if container_id && container_id.size != 64
           ::NewRelic::Agent.logger.debug("Found docker container_id with invalid length: #{container_id}")
-          ::NewRelic::Agent.increment_metric("Supportability/utilization/docker/error")
+          ::NewRelic::Agent.increment_metric('Supportability/utilization/docker/error')
           nil
         else
           container_id
@@ -242,7 +242,7 @@ module NewRelic
       def self.proc_try_read(path)
         return nil unless File.exist?(path)
 
-        content = String.new('')
+        content = +''
         File.open(path) do |f|
           loop do
             begin
@@ -289,8 +289,8 @@ module NewRelic
 
           if bid.ascii_only?
             if bid.empty?
-              ::NewRelic::Agent.logger.debug("boot_id not found in /proc/sys/kernel/random/boot_id")
-              ::NewRelic::Agent.increment_metric("Supportability/utilization/boot_id/error")
+              ::NewRelic::Agent.logger.debug('boot_id not found in /proc/sys/kernel/random/boot_id')
+              ::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
               nil
 
             elsif bid.bytesize == 36
@@ -298,19 +298,19 @@ module NewRelic
 
             else
               ::NewRelic::Agent.logger.debug("Found boot_id with invalid length: #{bid}")
-              ::NewRelic::Agent.increment_metric("Supportability/utilization/boot_id/error")
+              ::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
               bid[0, 128]
 
             end
           else
             ::NewRelic::Agent.logger.debug("Found boot_id with non-ASCII characters: #{bid}")
-            ::NewRelic::Agent.increment_metric("Supportability/utilization/boot_id/error")
+            ::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
             nil
 
           end
         else
-          ::NewRelic::Agent.logger.debug("boot_id not found in /proc/sys/kernel/random/boot_id")
-          ::NewRelic::Agent.increment_metric("Supportability/utilization/boot_id/error")
+          ::NewRelic::Agent.logger.debug('boot_id not found in /proc/sys/kernel/random/boot_id')
+          ::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
           nil
 
         end

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

@@ -45,7 +45,7 @@ module NewRelic
 
             if txn && !txn.recording_web_transaction?
               :background
-            elsif txn && txn.recording_web_transaction?
+            elsif txn&.recording_web_transaction?
               :request
             else
               :other

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

@@ -70,7 +70,7 @@ module NewRelic
         end
 
         def dump_string
-          result = String.new("#<BacktraceRoot:#{object_id}>")
+          result = +"#<BacktraceRoot:#{object_id}>"
           child_results = @children.map { |c| c.dump_string(2) }.join("\n")
           result << "\n" unless child_results.empty?
           result << child_results
@@ -116,8 +116,8 @@ module NewRelic
         def dump_string(indent = 0)
           @file, @method, @line_no = parse_backtrace_frame(@raw_line)
           indentation = ' ' * indent
-          result = String.new("#{indentation}#<BacktraceNode:#{object_id} ) + \
-                              [#{@runnable_count}] #{@file}:#{@line_no} in #{@method}>")
+          result = +"#{indentation}#<BacktraceNode:#{object_id} ) + \
+                              [#{@runnable_count}] #{@file}:#{@line_no} in #{@method}>"
           child_results = @children.map { |c| c.dump_string(indent + 2) }.join("\n")
           result << "\n" unless child_results.empty?
           result << child_results

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

@@ -6,7 +6,7 @@ module NewRelic
   module Agent
     module Threading
       class BacktraceService
-        ALL_TRANSACTIONS = "**ALL**".freeze
+        ALL_TRANSACTIONS = '**ALL**'.freeze
 
         def self.is_supported?
           !is_resque?
@@ -41,9 +41,7 @@ module NewRelic
             @overhead_percent_threshold = new_value
           end
 
-          if event_listener
-            event_listener.subscribe(:transaction_finished, &method(:on_transaction_finished))
-          end
+          event_listener&.subscribe(:transaction_finished, &method(:on_transaction_finished))
         end
 
         # Public interface
@@ -221,9 +219,7 @@ module NewRelic
 
         # This method is expected to be called with @lock held.
         def aggregate_global_backtrace(backtrace, bucket, thread)
-          if @profiles[ALL_TRANSACTIONS]
-            @profiles[ALL_TRANSACTIONS].aggregate(backtrace, bucket, thread)
-          end
+          @profiles[ALL_TRANSACTIONS]&.aggregate(backtrace, bucket, thread)
         end
 
         # This method is expected to be called with @lock held.