newrelic_rpm 8.15.0 → 9.6.0

data/lib/new_relic/agent/transaction.rb

@@ -23,38 +23,36 @@ module NewRelic
       include Tracing
 
       # for nested transactions
-      NESTED_TRANSACTION_PREFIX = "Nested/"
-      CONTROLLER_PREFIX = "Controller/"
-      MIDDLEWARE_PREFIX = "Middleware/Rack/"
-      OTHER_TRANSACTION_PREFIX = "OtherTransaction/"
+      NESTED_TRANSACTION_PREFIX = 'Nested/'
+      CONTROLLER_PREFIX = 'Controller/'
+      MIDDLEWARE_PREFIX = 'Middleware/Rack/'
+      OTHER_TRANSACTION_PREFIX = 'OtherTransaction/'
       TASK_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Background/"
       RAKE_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Rake/"
       MESSAGE_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Message/"
       RACK_PREFIX = "#{CONTROLLER_PREFIX}Rack/"
+      RODA_PREFIX = "#{CONTROLLER_PREFIX}Roda/"
       SINATRA_PREFIX = "#{CONTROLLER_PREFIX}Sinatra/"
       GRAPE_PREFIX = "#{CONTROLLER_PREFIX}Grape/"
       ACTION_CABLE_PREFIX = "#{CONTROLLER_PREFIX}ActionCable/"
 
-      WEB_TRANSACTION_CATEGORIES = [:web, :controller, :uri, :rack, :sinatra, :grape, :middleware, :action_cable].freeze
+      WEB_TRANSACTION_CATEGORIES = %i[action_cable controller grape middleware rack roda sinatra web uri].freeze
 
-      MIDDLEWARE_SUMMARY_METRICS = ["Middleware/all"].freeze
-      WEB_SUMMARY_METRIC = "HttpDispatcher"
+      MIDDLEWARE_SUMMARY_METRICS = ['Middleware/all'].freeze
+      WEB_SUMMARY_METRIC = 'HttpDispatcher'
       OTHER_SUMMARY_METRIC = "#{OTHER_TRANSACTION_PREFIX}all"
-      QUEUE_TIME_METRIC = "WebFrontend/QueueTime"
+      QUEUE_TIME_METRIC = 'WebFrontend/QueueTime'
 
-      APDEX_S = "S"
-      APDEX_T = "T"
-      APDEX_F = "F"
-      APDEX_ALL_METRIC = "ApdexAll"
-      APDEX_METRIC = "Apdex"
-      APDEX_OTHER_METRIC = "ApdexOther"
-      APDEX_TXN_METRIC_PREFIX = "Apdex/"
-      APDEX_OTHER_TXN_METRIC_PREFIX = "ApdexOther/Transaction/"
+      APDEX_S = 'S'
+      APDEX_T = 'T'
+      APDEX_F = 'F'
+      APDEX_ALL_METRIC = 'ApdexAll'
+      APDEX_METRIC = 'Apdex'
+      APDEX_OTHER_METRIC = 'ApdexOther'
+      APDEX_TXN_METRIC_PREFIX = 'Apdex/'
+      APDEX_OTHER_TXN_METRIC_PREFIX = 'ApdexOther/Transaction/'
 
-      JRUBY_CPU_TIME_ERROR = "Error calculating JRuby CPU Time"
-
-      # reference to the transaction state managing this transaction
-      attr_accessor :state
+      JRUBY_CPU_TIME_ERROR = 'Error calculating JRuby CPU Time'
 
       # A Time instance for the start time, never nil
       attr_accessor :start_time
@@ -92,7 +90,7 @@ module NewRelic
       attr_reader :transaction_trace
 
       # Fields for tracking synthetics requests
-      attr_accessor :raw_synthetics_header, :synthetics_payload
+      attr_accessor :raw_synthetics_header, :synthetics_payload, :synthetics_info_payload, :raw_synthetics_info_header
 
       # Return the currently active transaction, or nil.
       def self.tl_current
@@ -121,7 +119,6 @@ module NewRelic
       def self.start_new_transaction(state, category, options)
         txn = Transaction.new(category, options)
         state.reset(txn)
-        txn.state = state
         txn.start(options)
         txn
       end
@@ -159,7 +156,7 @@ module NewRelic
         NewRelic::Agent.record_api_supportability_metric(:recording_web_transaction?)
 
         txn = tl_current
-        txn && txn.recording_web_transaction?
+        txn&.recording_web_transaction?
       end
 
       def self.apdex_bucket(duration, failed, apdex_t)
@@ -185,20 +182,21 @@ module NewRelic
 
       def add_agent_attribute(key, value, default_destinations)
         @attributes.add_agent_attribute(key, value, default_destinations)
-        current_segment.add_agent_attribute(key, value) if current_segment
+        # the following line needs else branch coverage
+        current_segment.add_agent_attribute(key, value) if current_segment # rubocop:disable Style/SafeNavigation
       end
 
       def self.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
         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
 
       def merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
         @attributes.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
-        current_segment.merge_untrusted_agent_attributes(attributes, prefix, default_destinations) if current_segment
+        current_segment&.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
       end
 
       @@java_classes_loaded = false
@@ -213,7 +211,7 @@ module NewRelic
         end
       end
 
-      def initialize(category, options)
+      def initialize(category, options) # rubocop:disable Metrics/AbcSize
         @nesting_max_depth = 0
         @current_segment_by_thread = {}
         @current_segment_lock = Mutex.new
@@ -248,6 +246,7 @@ module NewRelic
         @priority = nil
 
         @starting_thread_id = Thread.current.object_id
+        @starting_segment_key = current_segment_key
 
         @attributes = Attributes.new(NewRelic::Agent.instance.attribute_filter)
 
@@ -260,20 +259,26 @@ module NewRelic
         end
       end
 
-      def parent_thread_id
-        ::Thread.current.nr_parent_thread_id if ::Thread.current.respond_to?(:nr_parent_thread_id)
+      def state
+        NewRelic::Agent::Tracer.state
       end
 
-      def current_segment
-        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]
+      def current_segment_key
+        Tracer.current_segment_key
+      end
 
-        current_segment_by_thread[@starting_thread_id]
+      def parent_segment_key
+        (::Fiber.current.nr_parent_key if ::Fiber.current.respond_to?(:nr_parent_key)) || (::Thread.current.nr_parent_key if ::Thread.current.respond_to?(:nr_parent_key))
+      end
+
+      def current_segment
+        current_segment_by_thread[current_segment_key] ||
+          current_segment_by_thread[parent_segment_key] ||
+          current_segment_by_thread[@starting_segment_key]
       end
 
       def set_current_segment(new_segment)
-        @current_segment_lock.synchronize { current_segment_by_thread[::Thread.current.object_id] = new_segment }
+        @current_segment_lock.synchronize { current_segment_by_thread[current_segment_key] = new_segment }
       end
 
       def remove_current_segment_by_thread_id(id)
@@ -285,7 +290,7 @@ module NewRelic
       end
 
       def sampled?
-        return unless Agent.config[:'distributed_tracing.enabled']
+        return false unless Agent.config[:'distributed_tracing.enabled']
 
         if @sampled.nil?
           @sampled = NewRelic::Agent.instance.adaptive_sampler.sampled?
@@ -306,15 +311,15 @@ module NewRelic
       end
 
       def referer
-        @request_attributes && @request_attributes.referer
+        @request_attributes&.referer
       end
 
       def request_path
-        @request_attributes && @request_attributes.request_path
+        @request_attributes&.request_path
       end
 
       def request_port
-        @request_attributes && @request_attributes.port
+        @request_attributes&.port
       end
 
       # This transaction-local hash may be used as temporary storage by
@@ -359,10 +364,8 @@ 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
-        end
+        self.overridden_name = name
+        @category = category if category
       end
 
       def log_frozen_name(name)
@@ -437,6 +440,10 @@ module NewRelic
         segments.first
       end
 
+      def finished?
+        initial_segment&.finished?
+      end
+
       def create_initial_segment(options = {})
         segment = create_segment(@default_name, options)
         segment.record_scoped_metric = false
@@ -513,7 +520,7 @@ module NewRelic
       end
 
       def finish
-        return unless state.is_execution_traced?
+        return unless state.is_execution_traced? && initial_segment
 
         @end_time = Process.clock_gettime(Process::CLOCK_REALTIME)
         @duration = @end_time - @start_time
@@ -532,15 +539,15 @@ module NewRelic
 
         commit!(initial_segment.name) unless @ignore_this_transaction
       rescue => e
-        NewRelic::Agent.logger.error("Exception during Transaction#finish", e)
+        NewRelic::Agent.logger.error('Exception during Transaction#finish', e)
         nil
       ensure
         state.reset
       end
 
       def user_defined_rules_ignore?
-        return unless request_path
-        return if (rules = NewRelic::Agent.config[:"rules.ignore_url_regexes"]).empty?
+        return false unless request_path
+        return false if (rules = NewRelic::Agent.config[:"rules.ignore_url_regexes"]).empty?
 
         rules.any? do |rule|
           request_path.match(rule)
@@ -593,9 +600,7 @@ module NewRelic
           add_agent_attribute(:'response.headers.contentType', response_content_type, default_destinations)
         end
 
-        if @request_attributes
-          @request_attributes.assign_agent_attributes(self)
-        end
+        @request_attributes&.assign_agent_attributes(self)
 
         display_host = Agent.config[:'process_host.display_name']
         unless display_host == NewRelic::Agent::Hostname.get
@@ -618,11 +623,24 @@ module NewRelic
           attributes.add_intrinsic_attribute(:synthetics_resource_id, synthetics_resource_id)
           attributes.add_intrinsic_attribute(:synthetics_job_id, synthetics_job_id)
           attributes.add_intrinsic_attribute(:synthetics_monitor_id, synthetics_monitor_id)
+          attributes.add_intrinsic_attribute(:synthetics_type, synthetics_info('type'))
+          attributes.add_intrinsic_attribute(:synthetics_initiator, synthetics_info('initiator'))
+
+          synthetics_additional_attributes do |key, value|
+            attributes.add_intrinsic_attribute(key, value)
+          end
         end
 
         distributed_tracer.assign_intrinsics
       end
 
+      def synthetics_additional_attributes(&block)
+        synthetics_info('attributes')&.each do |k, v|
+          new_key = "synthetics_#{NewRelic::LanguageSupport.snakeize(k.to_s)}".to_sym
+          yield(new_key, v.to_s)
+        end
+      end
+
       def calculate_gc_time
         gc_stop_snapshot = NewRelic::Agent::StatsEngine::GCProfiler.take_snapshot
         NewRelic::Agent::StatsEngine::GCProfiler.record_delta(gc_start_snapshot, gc_stop_snapshot)
@@ -702,6 +720,10 @@ module NewRelic
         info[4]
       end
 
+      def synthetics_info(key)
+        synthetics_info_payload[key] if synthetics_info_payload
+      end
+
       def append_apdex_perf_zone(payload)
         if recording_web_transaction?
           bucket = apdex_bucket(duration, apdex_t)
@@ -725,6 +747,12 @@ module NewRelic
         payload[:synthetics_resource_id] = synthetics_resource_id
         payload[:synthetics_job_id] = synthetics_job_id
         payload[:synthetics_monitor_id] = synthetics_monitor_id
+        payload[:synthetics_type] = synthetics_info('type')
+        payload[:synthetics_initiator] = synthetics_info('initiator')
+
+        synthetics_additional_attributes do |key, value|
+          payload[key] = value
+        end
       end
 
       def merge_metrics
@@ -734,15 +762,19 @@ module NewRelic
       def record_exceptions
         error_recorded = false
         @exceptions.each do |exception, options|
-          options[:uri] ||= request_path if request_path
-          options[:port] = request_port if request_port
-          options[:metric] = best_name
-          options[:attributes] = @attributes
-
-          span_id = options.delete(:span_id)
-          error_recorded = !!agent.error_collector.notice_error(exception, options, span_id) || error_recorded
+          error_recorded = record_exception(exception, options, error_recorded)
         end
-        payload[:error] = error_recorded if payload
+        payload&.[]=(:error, error_recorded)
+      end
+
+      def record_exception(exception, options, error_recorded)
+        options[:uri] ||= request_path if request_path
+        options[:port] = request_port if request_port
+        options[:metric] = best_name
+        options[:attributes] = @attributes
+
+        span_id = options.delete(:span_id)
+        !!agent.error_collector.notice_error(exception, options, span_id) || error_recorded
       end
 
       # Do not call this.  Invoke the class method instead.

data/lib/new_relic/agent/transaction_error_primitive.rb

@@ -28,11 +28,16 @@ module NewRelic
       SAMPLED_KEY = 'sampled'.freeze
       GUID_KEY = 'nr.transactionGuid'.freeze
       REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
-      SYNTHETICS_RESOURCE_ID_KEY = "nr.syntheticsResourceId".freeze
-      SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId".freeze
-      SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId".freeze
-      PRIORITY_KEY = "priority".freeze
-      SPAN_ID_KEY = "spanId".freeze
+      SYNTHETICS_RESOURCE_ID_KEY = 'nr.syntheticsResourceId'.freeze
+      SYNTHETICS_JOB_ID_KEY = 'nr.syntheticsJobId'.freeze
+      SYNTHETICS_MONITOR_ID_KEY = 'nr.syntheticsMonitorId'.freeze
+      SYNTHETICS_TYPE_KEY = 'nr.syntheticsType'
+      SYNTHETICS_INITIATOR_KEY = 'nr.syntheticsInitiator'
+      SYNTHETICS_KEY_PREFIX = 'nr.synthetics'
+      PRIORITY_KEY = 'priority'.freeze
+      SPAN_ID_KEY = 'spanId'.freeze
+
+      SYNTHETICS_PAYLOAD_EXPECTED = [:synthetics_resource_id, :synthetics_job_id, :synthetics_monitor_id, :synthetics_type, :synthetics_initiator]
 
       def create(noticed_error, payload, span_id)
         [
@@ -71,9 +76,20 @@ module NewRelic
       end
 
       def append_synthetics(payload, sample)
+        return unless payload[:synthetics_job_id]
+
         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]
+        sample[SYNTHETICS_TYPE_KEY] = payload[:synthetics_type] if payload[:synthetics_type]
+        sample[SYNTHETICS_INITIATOR_KEY] = payload[:synthetics_initiator] if payload[:synthetics_initiator]
+
+        payload.each do |k, v|
+          next unless k.to_s.start_with?('synthetics_') && !SYNTHETICS_PAYLOAD_EXPECTED.include?(k)
+
+          new_key = SYNTHETICS_KEY_PREFIX + NewRelic::LanguageSupport.camelize(k.to_s.gsub('synthetics_', ''))
+          sample[new_key] = v
+        end
       end
 
       def append_cat(payload, sample)

data/lib/new_relic/agent/transaction_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?
@@ -38,7 +38,7 @@ module NewRelic
       end
 
       def record_sampling_rate(metadata) # THREAD_LOCAL_ACCESS
-        NewRelic::Agent.logger.debug("Sampled %d / %d (%.1f %%) requests this cycle, %d / %d (%.1f %%) since startup" % [
+        NewRelic::Agent.logger.debug('Sampled %d / %d (%.1f %%) requests this cycle, %d / %d (%.1f %%) since startup' % [
           metadata[:captured],
           metadata[:seen],
           (metadata[:captured].to_f / metadata[:seen] * 100.0),
@@ -48,8 +48,8 @@ module NewRelic
         ])
 
         engine = NewRelic::Agent.instance.stats_engine
-        engine.tl_record_supportability_metric_count("TransactionEventAggregator/requests", metadata[:seen])
-        engine.tl_record_supportability_metric_count("TransactionEventAggregator/samples", metadata[:captured])
+        engine.tl_record_supportability_metric_count('TransactionEventAggregator/requests', metadata[:seen])
+        engine.tl_record_supportability_metric_count('TransactionEventAggregator/samples', metadata[:captured])
       end
     end
   end

data/lib/new_relic/agent/transaction_event_primitive.rb

@@ -35,9 +35,14 @@ module NewRelic
       CAT_REFERRING_PATH_HASH_KEY = 'nr.referringPathHash'
       CAT_ALTERNATE_PATH_HASHES_KEY = 'nr.alternatePathHashes'
       APDEX_PERF_ZONE_KEY = 'nr.apdexPerfZone'
-      SYNTHETICS_RESOURCE_ID_KEY = "nr.syntheticsResourceId"
-      SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId"
-      SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId"
+      SYNTHETICS_RESOURCE_ID_KEY = 'nr.syntheticsResourceId'
+      SYNTHETICS_JOB_ID_KEY = 'nr.syntheticsJobId'
+      SYNTHETICS_MONITOR_ID_KEY = 'nr.syntheticsMonitorId'
+      SYNTHETICS_TYPE_KEY = 'nr.syntheticsType'
+      SYNTHETICS_INITIATOR_KEY = 'nr.syntheticsInitiator'
+      SYNTHETICS_KEY_PREFIX = 'nr.synthetics'
+
+      SYNTHETICS_PAYLOAD_EXPECTED = [:synthetics_resource_id, :synthetics_job_id, :synthetics_monitor_id, :synthetics_type, :synthetics_initiator]
 
       def create(payload)
         intrinsics = {
@@ -71,9 +76,23 @@ module NewRelic
         optionally_append(SYNTHETICS_RESOURCE_ID_KEY, :synthetics_resource_id, sample, payload)
         optionally_append(SYNTHETICS_JOB_ID_KEY, :synthetics_job_id, sample, payload)
         optionally_append(SYNTHETICS_MONITOR_ID_KEY, :synthetics_monitor_id, sample, payload)
+        optionally_append(SYNTHETICS_TYPE_KEY, :synthetics_type, sample, payload)
+        optionally_append(SYNTHETICS_INITIATOR_KEY, :synthetics_initiator, sample, payload)
+        append_synthetics_info_attributes(sample, payload)
         append_cat_alternate_path_hashes(sample, payload)
       end
 
+      def append_synthetics_info_attributes(sample, payload)
+        return unless payload.include?(:synthetics_job_id)
+
+        payload.each do |k, v|
+          next unless k.to_s.start_with?('synthetics_') && !SYNTHETICS_PAYLOAD_EXPECTED.include?(k)
+
+          new_key = SYNTHETICS_KEY_PREFIX + NewRelic::LanguageSupport.camelize(k.to_s.gsub('synthetics_', ''))
+          sample[new_key] = v.to_s
+        end
+      end
+
       def append_cat_alternate_path_hashes(sample, payload)
         if payload.include?(:cat_alternate_path_hashes)
           sample[CAT_ALTERNATE_PATH_HASHES_KEY] = payload[:cat_alternate_path_hashes].sort.join(COMMA)

data/lib/new_relic/agent/transaction_sampler.rb

@@ -34,13 +34,13 @@ module NewRelic
             threshold = Agent.config[:'transaction_tracer.transaction_threshold']
             ::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
 
         Agent.config.register_callback(:'transaction_tracer.record_sql') do |config|
           if config == 'raw'
-            ::NewRelic::Agent.logger.warn("Agent is configured to send raw SQL to the service")
+            ::NewRelic::Agent.logger.warn('Agent is configured to send raw SQL to the service')
           end
         end
       end
@@ -81,7 +81,7 @@ module NewRelic
           begin
             sample.prepare_to_send!
           rescue => e
-            NewRelic::Agent.logger.error("Failed to prepare transaction trace. Error: ", e)
+            NewRelic::Agent.logger.error('Failed to prepare transaction trace. Error: ', e)
             false
           else
             true

data/lib/new_relic/agent/transaction_time_aggregator.rb

@@ -101,7 +101,8 @@ module NewRelic
 
         def thread_is_alive?(thread_id)
           thread = thread_by_id(thread_id)
-          thread && thread.alive?
+          # needs else branch coverage
+          thread && thread.alive? # rubocop:disable Style/SafeNavigation
         rescue StandardError
           false
         end
@@ -144,10 +145,13 @@ module NewRelic
           elapsed
         end
 
+        # this method has no test coverage
         def log_missing_elapsed_transaction_time
-          transaction_name = Tracer.current_transaction &&
+          # rubocop:disable Style/SafeNavigation
+          transaction_name = transaction_name = Tracer.current_transaction &&
             Tracer.current_transaction.best_name ||
-            "unknown"
+            'unknown'
+          # rubocop:enable Style/SafeNavigation
           NewRelic::Agent.logger.warn("Unable to calculate elapsed transaction time for #{transaction_name}")
         end
       end

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

@@ -37,7 +37,7 @@ module NewRelic
           end
         end
 
-        vendor_name "aws"
+        vendor_name 'aws'
         endpoint "#{IMDS_BASE_URL}/dynamic/instance-identity/document"
         keys IMDS_KEYS
         headers 'X-aws-ec2-metadata-token' => -> { imds_token }

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

@@ -6,9 +6,9 @@ module NewRelic
   module Agent
     module Utilization
       class Azure < Vendor
-        vendor_name "azure"
-        endpoint "http://169.254.169.254/metadata/instance/compute?api-version=2017-03-01"
-        headers "Metadata" => "true"
+        vendor_name 'azure'
+        endpoint 'http://169.254.169.254/metadata/instance/compute?api-version=2017-03-01'
+        headers 'Metadata' => 'true'
         keys %w[vmId name vmSize location]
         key_transforms :to_sym
       end

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

@@ -8,9 +8,9 @@ module NewRelic
   module Agent
     module Utilization
       class GCP < Vendor
-        vendor_name "gcp"
-        endpoint "http://metadata.google.internal/computeMetadata/v1/instance/?recursive=true"
-        headers "Metadata-Flavor" => "Google"
+        vendor_name 'gcp'
+        endpoint 'http://metadata.google.internal/computeMetadata/v1/instance/?recursive=true'
+        headers 'Metadata-Flavor' => 'Google'
         keys %w[id machineType name zone]
         key_transforms :to_sym
 
@@ -24,10 +24,8 @@ module NewRelic
           body
         end
 
-        SLASH = '/'.freeze
-
         def trim_leading(value)
-          value.split(SLASH).last
+          value.split(NewRelic::SLASH).last
         end
       end
     end

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

@@ -8,7 +8,7 @@ module NewRelic
   module Agent
     module Utilization
       class PCF < Vendor
-        vendor_name "pcf"
+        vendor_name 'pcf'
         keys %w[CF_INSTANCE_GUID CF_INSTANCE_IP MEMORY_LIMIT]
         key_transforms [:downcase, :to_sym]
 

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

@@ -75,14 +75,12 @@ module NewRelic
           processed_headers = headers
           raise if processed_headers.value?(:error)
 
-          Timeout.timeout(1) do
-            response = nil
-            Net::HTTP.start(endpoint.host, endpoint.port) do |http|
-              req = Net::HTTP::Get.new(endpoint, processed_headers)
-              response = http.request(req)
-            end
-            response
+          response = nil
+          Net::HTTP.start(endpoint.host, endpoint.port, open_timeout: 1, read_timeout: 1) do |http|
+            req = Net::HTTP::Get.new(endpoint, processed_headers)
+            response = http.request(req)
           end
+          response
         rescue
           NewRelic::Agent.logger.debug("#{vendor_name} environment not detected")
         end
@@ -133,7 +131,7 @@ module NewRelic
 
         def valid_chars?(value)
           value.each_char do |ch|
-            next if ch =~ VALID_CHARS
+            next if VALID_CHARS.match?(ch)
 
             code_point = ch[0].ord # this works in Ruby 1.8.7 - 2.1.2
             next if code_point >= 0x80

data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb

@@ -34,7 +34,7 @@ module NewRelic
             end
           else
             NewRelic::Agent.logger.log_once(:warn, :gc_profiler_disabled,
-              "Tried to measure GC time, but GC::Profiler was not enabled.")
+              'Tried to measure GC time, but GC::Profiler was not enabled.')
           end
 
           @total_time_s

data/lib/new_relic/agent/vm/mri_vm.rb

@@ -82,18 +82,19 @@ module NewRelic
 
         def supports?(key)
           case key
-          when :gc_runs, :total_allocated_object, :heap_live, :heap_free, :thread_count
+          when :gc_runs,
+            :total_allocated_object,
+            :heap_live,
+            :heap_free,
+            :thread_count,
+            :major_gc_count,
+            :minor_gc_count,
+            :constant_cache_invalidations
             true
           when :gc_total_time
             NewRelic::LanguageSupport.gc_profiler_enabled?
-          when :major_gc_count
-            RUBY_VERSION >= '2.1.0'
-          when :minor_gc_count
-            RUBY_VERSION >= '2.1.0'
           when :method_cache_invalidations
-            RUBY_VERSION >= '2.1.0' && RUBY_VERSION < '3.0.0'
-          when :constant_cache_invalidations
-            RUBY_VERSION >= '2.1.0'
+            RUBY_VERSION < '3.0.0'
           when :constant_cache_misses
             RUBY_VERSION >= '3.2.0'
           else

data/lib/new_relic/agent/worker_loop.rb

@@ -88,7 +88,7 @@ module NewRelic
             raise
           rescue => e
             # Don't blow out the stack for anything that hasn't already propagated
-            ::NewRelic::Agent.logger.error("Error running task in Agent Worker Loop:", e)
+            ::NewRelic::Agent.logger.error('Error running task in Agent Worker Loop:', e)
           end
         end
       end