newrelic_rpm 9.0.0 → 9.2.2

data/lib/new_relic/agent/transaction.rb

@@ -23,10 +23,10 @@ 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/"
@@ -37,21 +37,21 @@ module NewRelic
 
       WEB_TRANSACTION_CATEGORIES = [:web, :controller, :uri, :rack, :sinatra, :grape, :middleware, :action_cable].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"
+      JRUBY_CPU_TIME_ERROR = 'Error calculating JRuby CPU Time'
 
       # A Time instance for the start time, never nil
       attr_accessor :start_time
@@ -155,7 +155,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)
@@ -181,20 +181,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
@@ -209,7 +210,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
@@ -309,15 +310,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
@@ -438,6 +439,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
@@ -533,7 +538,7 @@ 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
@@ -594,9 +599,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
@@ -735,15 +738,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,11 @@ 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
+      PRIORITY_KEY = 'priority'.freeze
+      SPAN_ID_KEY = 'spanId'.freeze
 
       def create(noticed_error, payload, span_id)
         [

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,9 @@ 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'
 
       def create(payload)
         intrinsics = {

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
 

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

@@ -133,7 +133,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

data/lib/new_relic/agent.rb

@@ -105,7 +105,10 @@ module NewRelic
     # placeholder name used when we cannot determine a transaction's name
     UNKNOWN_METRIC = '(unknown)'.freeze
 
+    attr_reader :error_group_callback
+
     @agent = nil
+    @error_group_callback = nil
     @logger = nil
     @tracer_lock = Mutex.new
     @tracer_queue = []
@@ -210,6 +213,8 @@ module NewRelic
       record_metric(metric_name, value)
     end
 
+    SUPPORTABILITY_INCREMENT_METRIC = 'Supportability/API/increment_metric'.freeze
+
     # Increment a simple counter metric.
     #
     # +metric_name+ should follow a slash separated path convention. Application
@@ -218,9 +223,7 @@ module NewRelic
     # This method is safe to use from any thread.
     #
     # @api public
-
-    SUPPORTABILITY_INCREMENT_METRIC = 'Supportability/API/increment_metric'.freeze
-
+    #
     def increment_metric(metric_name, amount = 1) # THREAD_LOCAL_ACCESS
       return unless agent
 
@@ -293,6 +296,47 @@ module NewRelic
       nil # don't return a noticed error data structure. it can only hurt.
     end
 
+    # Set a callback proc for determining an error's error group name
+    #
+    # @param [Proc] the callback proc
+    #
+    # Typically this method should be called only once to set a callback for
+    # use with all noticed errors. If it is called multiple times, each new
+    # callback given will replace the old one.
+    #
+    # The proc will be called with a single hash as its input argument and is
+    # expected to return a string representing the desired error group.
+    #
+    # see https://docs.newrelic.com/docs/errors-inbox/errors-inbox/#groups
+    #
+    # The hash passed to the customer defined callback proc has the following
+    # keys:
+    #
+    # :error => The Ruby error class instance, likely inheriting from
+    #           StandardError. Call `#class`, `#message`, and `#backtrace` on
+    #           the error object to retrieve the error's class, message, and
+    #           backtrace.
+    # :customAttributes => Any customer defined custom attributes that have been
+    #                      associated with the current transaction.
+    # :'request.uri' => The current request URI if available
+    # :'http.statusCode' => The HTTP status code (200, 404, etc.) if available
+    # :'http.method' => The HTTP method (GET, PUT, etc.) if available
+    # :'error.expected' => Whether (true) or not (false) the error was expected
+    # :options => The options hash passed to `NewRelic::Agent.notice_error`
+    #
+    # @api public
+    #
+    def set_error_group_callback(callback_proc)
+      unless callback_proc.is_a?(Proc)
+        NewRelic::Agent.logger.error("#{self}.#{__method__}: expected an argument of type Proc, " \
+                                     "got #{callback_proc.class}")
+        return
+      end
+
+      record_api_supportability_metric(:set_error_group_callback)
+      @error_group_callback = callback_proc
+    end
+
     # @!endgroup
 
     # @!group Recording custom Insights events
@@ -353,7 +397,7 @@ module NewRelic
     # @api public
     #
     def manual_start(options = {})
-      raise "Options must be a hash" unless Hash === 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)
@@ -386,7 +430,8 @@ module NewRelic
     #
     def after_fork(options = {})
       record_api_supportability_metric(:after_fork)
-      agent.after_fork(options) if agent
+      # the following line needs else branch coverage
+      agent.after_fork(options) if agent # rubocop:disable Style/SafeNavigation
     end
 
     # Shutdown the agent.  Call this before exiting.  Sends any queued data
@@ -398,7 +443,7 @@ module NewRelic
     #
     def shutdown(options = {})
       record_api_supportability_metric(:shutdown)
-      agent.shutdown if agent
+      agent&.shutdown
     end
 
     # Clear out any data the agent has buffered but has not yet transmitted
@@ -406,7 +451,8 @@ module NewRelic
     #
     # @api public
     def drop_buffered_data
-      agent.drop_buffered_data if agent
+      # the following line needs else branch coverage
+      agent.drop_buffered_data if agent # rubocop:disable Style/SafeNavigation
       record_api_supportability_metric(:drop_buffered_data)
     end
 
@@ -465,8 +511,7 @@ module NewRelic
     #
     def ignore_transaction
       record_api_supportability_metric(:ignore_transaction)
-      txn = NewRelic::Agent::Transaction.tl_current
-      txn.ignore! if txn
+      NewRelic::Agent::Transaction.tl_current&.ignore!
     end
 
     # This method disables the recording of Apdex metrics in the current
@@ -476,8 +521,7 @@ module NewRelic
     #
     def ignore_apdex
       record_api_supportability_metric(:ignore_apdex)
-      txn = NewRelic::Agent::Transaction.tl_current
-      txn.ignore_apdex! if txn
+      NewRelic::Agent::Transaction.tl_current&.ignore_apdex!
     end
 
     # This method disables browser monitoring javascript injection in the
@@ -487,8 +531,7 @@ module NewRelic
     #
     def ignore_enduser
       record_api_supportability_metric(:ignore_enduser)
-      txn = NewRelic::Agent::Transaction.tl_current
-      txn.ignore_enduser! if txn
+      NewRelic::Agent::Transaction.tl_current&.ignore_enduser!
     end
 
     # Yield to the block without collecting any metrics or traces in
@@ -564,8 +607,7 @@ module NewRelic
       record_api_supportability_metric(:add_custom_attributes)
 
       if params.is_a?(Hash)
-        txn = Transaction.tl_current
-        txn.add_custom_attributes(params) if txn
+        Transaction.tl_current&.add_custom_attributes(params)
 
         segment = ::NewRelic::Agent::Tracer.current_segment
         if segment
@@ -607,6 +649,26 @@ module NewRelic
       end
     end
 
+    # Set the user id for the current transaction. When present, this value will be included in the agent attributes for transaction and error events as 'enduser.id'.
+    #
+    # @param [String] user_id    The user id to add to the current transaction attributes
+    #
+    # @api public
+    def set_user_id(user_id)
+      record_api_supportability_metric(:set_user_id)
+
+      if user_id.nil? || user_id.empty?
+        ::NewRelic::Agent.logger.warn('NewRelic::Agent.set_user_id called with a nil or empty user id.')
+        return
+      end
+
+      default_destinations = NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER |
+        NewRelic::Agent::AttributeFilter::DST_TRANSACTION_EVENTS |
+        NewRelic::Agent::AttributeFilter::DST_ERROR_COLLECTOR
+
+      NewRelic::Agent::Transaction.add_agent_attribute(:'enduser.id', user_id, default_destinations)
+    end
+
     # @!endgroup
 
     # @!group Transaction naming
@@ -686,7 +748,7 @@ module NewRelic
     def notify(event_type, *args)
       agent.events.notify(event_type, *args)
     rescue
-      NewRelic::Agent.logger.debug("Ignoring exception during %p event notification" % [event_type])
+      NewRelic::Agent.logger.debug('Ignoring exception during %p event notification' % [event_type])
     end
 
     # @!group Trace and Entity metadata

data/lib/new_relic/cli/command.rb

@@ -38,7 +38,7 @@ module NewRelic
         else
           # parse command line args.  Throw an exception on a bad arg.
           @options = options do |opts|
-            opts.on("-h", "Show this help") { raise CommandFailure, opts.to_s }
+            opts.on('-h', 'Show this help') { raise CommandFailure, opts.to_s }
           end
           @leftover = @options.parse(command_line_args)
         end
@@ -60,11 +60,11 @@ module NewRelic
         extra = []
         options = ARGV.options do |opts|
           script_name = File.basename($0)
-          if script_name =~ /newrelic_cmd$/
+          if /newrelic_cmd$/.match?(script_name)
             $stdout.puts "warning: the 'newrelic_cmd' script has been renamed 'newrelic'"
             script_name = 'newrelic'
           end
-          opts.banner = "Usage: #{script_name} [ #{@command_names.join(" | ")} ] [options]"
+          opts.banner = "Usage: #{script_name} [ #{@command_names.join(' | ')} ] [options]"
           opts.separator("use '#{script_name} <command> -h' to see detailed command options")
           opts
         end