newrelic_rpm 9.0.0 → 9.2.2

data/lib/new_relic/agent/javascript_instrumentor.rb

@@ -23,7 +23,7 @@ module NewRelic
           "JS agent loader version: #{NewRelic::Agent.config[:'browser_monitoring.loader_version']}")
 
         if !NewRelic::Agent.config[:'rum.enabled']
-          NewRelic::Agent.logger.debug("Real User Monitoring is disabled for this agent. Edit your configuration to change this.")
+          NewRelic::Agent.logger.debug('Real User Monitoring is disabled for this agent. Edit your configuration to change this.')
         end
       end
 
@@ -38,19 +38,19 @@ module NewRelic
       def js_enabled_and_ready?
         if !enabled?
           ::NewRelic::Agent.logger.log_once(:debug, :js_agent_disabled,
-            "JS agent instrumentation is disabled.")
+            'JS agent instrumentation is disabled.')
           false
         elsif missing_config?(:js_agent_loader)
           ::NewRelic::Agent.logger.log_once(:debug, :missing_js_agent_loader,
-            "Missing :js_agent_loader. Skipping browser instrumentation.")
+            'Missing :js_agent_loader. Skipping browser instrumentation.')
           false
         elsif missing_config?(:beacon)
           ::NewRelic::Agent.logger.log_once(:debug, :missing_beacon,
-            "Beacon configuration not received (yet?). Skipping browser instrumentation.")
+            'Beacon configuration not received (yet?). Skipping browser instrumentation.')
           false
         elsif missing_config?(:browser_key)
           ::NewRelic::Agent.logger.log_once(:debug, :missing_browser_key,
-            "Browser key is not set. Skipping browser instrumentation.")
+            'Browser key is not set. Skipping browser instrumentation.')
           false
         else
           true
@@ -62,19 +62,19 @@ module NewRelic
 
       def insert_js?(state)
         if !state.current_transaction
-          ::NewRelic::Agent.logger.debug("Not in transaction. Skipping browser instrumentation.")
+          ::NewRelic::Agent.logger.debug('Not in transaction. Skipping browser instrumentation.')
           false
         elsif !state.is_execution_traced?
-          ::NewRelic::Agent.logger.debug("Execution is not traced. Skipping browser instrumentation.")
+          ::NewRelic::Agent.logger.debug('Execution is not traced. Skipping browser instrumentation.')
           false
         elsif state.current_transaction.ignore_enduser?
-          ::NewRelic::Agent.logger.debug("Ignore end user for this transaction is set. Skipping browser instrumentation.")
+          ::NewRelic::Agent.logger.debug('Ignore end user for this transaction is set. Skipping browser instrumentation.')
           false
         else
           true
         end
       rescue => e
-        ::NewRelic::Agent.logger.debug("Failure during insert_js", e)
+        ::NewRelic::Agent.logger.debug('Failure during insert_js', e)
         false
       end
 
@@ -95,7 +95,7 @@ module NewRelic
 
         bt_config + browser_timing_loader(nonce)
       rescue => e
-        ::NewRelic::Agent.logger.debug("Failure during RUM browser_timing_header construction", e)
+        ::NewRelic::Agent.logger.debug('Failure during RUM browser_timing_header construction', e)
         ''
       end
 
@@ -122,18 +122,18 @@ module NewRelic
         " nonce=\"#{nonce.to_s}\""
       end
 
-      BEACON_KEY = "beacon".freeze
-      ERROR_BEACON_KEY = "errorBeacon".freeze
-      LICENSE_KEY_KEY = "licenseKey".freeze
-      APPLICATIONID_KEY = "applicationID".freeze
-      TRANSACTION_NAME_KEY = "transactionName".freeze
-      QUEUE_TIME_KEY = "queueTime".freeze
-      APPLICATION_TIME_KEY = "applicationTime".freeze
-      AGENT_KEY = "agent".freeze
-      SSL_FOR_HTTP_KEY = "sslForHttp".freeze
-      ATTS_KEY = "atts".freeze
-      ATTS_USER_SUBKEY = "u".freeze
-      ATTS_AGENT_SUBKEY = "a".freeze
+      BEACON_KEY = 'beacon'.freeze
+      ERROR_BEACON_KEY = 'errorBeacon'.freeze
+      LICENSE_KEY_KEY = 'licenseKey'.freeze
+      APPLICATIONID_KEY = 'applicationID'.freeze
+      TRANSACTION_NAME_KEY = 'transactionName'.freeze
+      QUEUE_TIME_KEY = 'queueTime'.freeze
+      APPLICATION_TIME_KEY = 'applicationTime'.freeze
+      AGENT_KEY = 'agent'.freeze
+      SSL_FOR_HTTP_KEY = 'sslForHttp'.freeze
+      ATTS_KEY = 'atts'.freeze
+      ATTS_USER_SUBKEY = 'u'.freeze
+      ATTS_AGENT_SUBKEY = 'a'.freeze
 
       # NOTE: Internal prototyping may override this, so leave name stable!
       def data_for_js_agent(transaction)
@@ -185,9 +185,14 @@ module NewRelic
 
       def append_custom_attributes!(txn, atts)
         custom_attributes = txn.attributes.custom_attributes_for(NewRelic::Agent::AttributeFilter::DST_BROWSER_MONITORING)
-        unless custom_attributes.empty?
-          atts[ATTS_USER_SUBKEY] = custom_attributes
+        if custom_attributes.empty?
+          NewRelic::Agent.logger.debug("#{self.class}: No custom attributes found to append.")
+          return
         end
+
+        NewRelic::Agent.logger.debug("#{self.class}: Appending the following custom attribute keys for browser " \
+          "monitoring: #{custom_attributes.keys}")
+        atts[ATTS_USER_SUBKEY] = custom_attributes
       end
 
       def append_agent_attributes!(txn, atts)

data/lib/new_relic/agent/linking_metadata.rb

@@ -11,7 +11,7 @@ module NewRelic
       extend self
 
       def append_service_linking_metadata(metadata)
-        raise ArgumentError, "Missing argument `metadata`" if metadata.nil?
+        raise ArgumentError, 'Missing argument `metadata`' if metadata.nil?
 
         config = ::NewRelic::Agent.config
 
@@ -27,7 +27,7 @@ module NewRelic
       end
 
       def append_trace_linking_metadata(metadata)
-        raise ArgumentError, "Missing argument `metadata`" if metadata.nil?
+        raise ArgumentError, 'Missing argument `metadata`' if metadata.nil?
 
         if trace_id = Tracer.current_trace_id
           metadata[TRACE_ID_KEY] = trace_id

data/lib/new_relic/agent/log_event_aggregator.rb

@@ -9,20 +9,20 @@ module NewRelic
   module Agent
     class LogEventAggregator < EventAggregator
       # Per-message keys
-      LEVEL_KEY = "level".freeze
-      MESSAGE_KEY = "message".freeze
-      TIMESTAMP_KEY = "timestamp".freeze
-      PRIORITY_KEY = "priority".freeze
+      LEVEL_KEY = 'level'.freeze
+      MESSAGE_KEY = 'message'.freeze
+      TIMESTAMP_KEY = 'timestamp'.freeze
+      PRIORITY_KEY = 'priority'.freeze
 
       # Metric keys
-      LINES = "Logging/lines".freeze
-      DROPPED_METRIC = "Logging/Forwarding/Dropped".freeze
-      SEEN_METRIC = "Supportability/Logging/Forwarding/Seen".freeze
-      SENT_METRIC = "Supportability/Logging/Forwarding/Sent".freeze
-      OVERALL_SUPPORTABILITY_FORMAT = "Supportability/Logging/Ruby/Logger/%s".freeze
-      METRICS_SUPPORTABILITY_FORMAT = "Supportability/Logging/Metrics/Ruby/%s".freeze
-      FORWARDING_SUPPORTABILITY_FORMAT = "Supportability/Logging/Forwarding/Ruby/%s".freeze
-      DECORATING_SUPPORTABILITY_FORMAT = "Supportability/Logging/LocalDecorating/Ruby/%s".freeze
+      LINES = 'Logging/lines'.freeze
+      DROPPED_METRIC = 'Logging/Forwarding/Dropped'.freeze
+      SEEN_METRIC = 'Supportability/Logging/Forwarding/Seen'.freeze
+      SENT_METRIC = 'Supportability/Logging/Forwarding/Sent'.freeze
+      OVERALL_SUPPORTABILITY_FORMAT = 'Supportability/Logging/Ruby/Logger/%s'.freeze
+      METRICS_SUPPORTABILITY_FORMAT = 'Supportability/Logging/Metrics/Ruby/%s'.freeze
+      FORWARDING_SUPPORTABILITY_FORMAT = 'Supportability/Logging/Forwarding/Ruby/%s'.freeze
+      DECORATING_SUPPORTABILITY_FORMAT = 'Supportability/Logging/LocalDecorating/Ruby/%s'.freeze
       MAX_BYTES = 32768 # 32 * 1024 bytes (32 kibibytes)
 
       named :LogEventAggregator
@@ -54,7 +54,7 @@ module NewRelic
       def record(formatted_message, severity)
         return unless enabled?
 
-        severity = "UNKNOWN" if severity.nil? || severity.empty?
+        severity = 'UNKNOWN' if severity.nil? || severity.empty?
 
         if NewRelic::Agent.config[METRICS_ENABLED_KEY]
           @counter_lock.synchronize do
@@ -174,9 +174,9 @@ module NewRelic
       def record_configuration_metric(format, key)
         state = NewRelic::Agent.config[key]
         label = if !enabled?
-          "disabled"
+          'disabled'
         else
-          state ? "enabled" : "disabled"
+          state ? 'enabled' : 'disabled'
         end
         NewRelic::Agent.increment_metric(format % label)
       end

data/lib/new_relic/agent/logging.rb

@@ -22,16 +22,21 @@ module NewRelic
       #
       # @api public
       class DecoratingFormatter < ::Logger::Formatter
-        TIMESTAMP_KEY = 'timestamp'.freeze
-        MESSAGE_KEY = 'message'.freeze
-        LOG_LEVEL_KEY = 'log.level'.freeze
-        LOG_NAME_KEY = 'logger.name'.freeze
-        NEWLINE = "\n".freeze
-
-        QUOTE = '"'.freeze
-        COLON = ':'.freeze
-        COMMA = ','.freeze
-        CLOSING_BRACE = '}'.freeze
+        MESSAGE_ELEMENT = 'message'
+        LOG_LEVEL_ELEMENT = 'log_level'
+        PROG_NAME_ELEMENT = 'prog_name'
+        ELEMENTS = ['app_name', 'entity_type', 'hostname', 'entity_guid', 'trace_id', 'span_id', MESSAGE_ELEMENT,
+          LOG_LEVEL_ELEMENT, PROG_NAME_ELEMENT].freeze
+        TIMESTAMP_KEY = 'timestamp'
+        MESSAGE_KEY = 'message'
+        LOG_LEVEL_KEY = 'log.level'
+        LOG_NAME_KEY = 'logger.name'
+        NEWLINE = "\n"
+
+        QUOTE = '"'
+        COLON = ':'
+        COMMA = ','
+        CLOSING_BRACE = '}'
         REPLACEMENT_CHAR = '�'
 
         def initialize
@@ -41,41 +46,76 @@ module NewRelic
         end
 
         def call(severity, time, progname, msg)
-          message = String.new('{')
-          if app_name
-            add_key_value(message, ENTITY_NAME_KEY, app_name)
-            message << COMMA
+          message = +'{'
+          ELEMENTS.each do |element|
+            args = case element
+                   when MESSAGE_ELEMENT then [message, msg]
+                   when LOG_LEVEL_ELEMENT then [message, severity]
+                   when PROG_NAME_ELEMENT then [message, progname]
+                   else [message]
+            end
+
+            send("add_#{element}", *args)
           end
+          message << COMMA
+          message << QUOTE << TIMESTAMP_KEY << QUOTE << COLON << (time.to_f * 1000).round.to_s
+          message << CLOSING_BRACE << NEWLINE
+        end
+
+        private
+
+        def add_app_name(message)
+          return unless app_name
+
+          add_key_value(message, ENTITY_NAME_KEY, app_name)
+          message << COMMA
+        end
+
+        def add_entity_type(message)
           add_key_value(message, ENTITY_TYPE_KEY, ENTITY_TYPE)
           message << COMMA
+        end
+
+        def add_hostname(message)
           add_key_value(message, HOSTNAME_KEY, Hostname.get)
+        end
 
-          if entity_guid = Agent.config[:entity_guid]
-            message << COMMA
-            add_key_value(message, ENTITY_GUID_KEY, entity_guid)
-          end
+        def add_entity_guid(message)
+          return unless entity_guid = Agent.config[:entity_guid]
 
-          if trace_id = Tracer.trace_id
-            message << COMMA
-            add_key_value(message, TRACE_ID_KEY, trace_id)
-          end
-          if span_id = Tracer.span_id
-            message << COMMA
-            add_key_value(message, SPAN_ID_KEY, span_id)
-          end
+          message << COMMA
+          add_key_value(message, ENTITY_GUID_KEY, entity_guid)
+        end
+
+        def add_trace_id(message)
+          return unless trace_id = Tracer.trace_id
 
+          message << COMMA
+          add_key_value(message, TRACE_ID_KEY, trace_id)
+        end
+
+        def add_span_id(message)
+          return unless span_id = Tracer.span_id
+
+          message << COMMA
+          add_key_value(message, SPAN_ID_KEY, span_id)
+        end
+
+        def add_message(message, msg)
           message << COMMA
           message << QUOTE << MESSAGE_KEY << QUOTE << COLON << escape(msg)
           message << COMMA
+        end
+
+        def add_log_level(message, severity)
           add_key_value(message, LOG_LEVEL_KEY, severity)
-          if progname
-            message << COMMA
-            add_key_value(message, LOG_NAME_KEY, progname)
-          end
+        end
+
+        def add_prog_name(message, progname)
+          return unless progname
 
           message << COMMA
-          message << QUOTE << TIMESTAMP_KEY << QUOTE << COLON << (time.to_f * 1000).round.to_s
-          message << CLOSING_BRACE << NEWLINE
+          add_key_value(message, LOG_NAME_KEY, progname)
         end
 
         def app_name
@@ -125,7 +165,7 @@ module NewRelic
         # Positional and Keyword arguments are separated beginning with Ruby 2.7
         # Signature of ::Logger constructor changes in Ruby 2.4 to have both positional and keyword args
         # We pivot on Ruby 2.7 for widest supportability with least amount of hassle.
-        if RUBY_VERSION < "2.7.0"
+        if RUBY_VERSION < '2.7.0'
           def initialize(*args)
             super(*args)
             self.formatter = DecoratingFormatter.new

data/lib/new_relic/agent/messaging.rb

@@ -14,7 +14,7 @@ module NewRelic
     module Messaging
       extend self
 
-      RABBITMQ_TRANSPORT_TYPE = "RabbitMQ"
+      RABBITMQ_TRANSPORT_TYPE = 'RabbitMQ'
 
       ATTR_DESTINATION = AttributeFilter::DST_TRANSACTION_EVENTS |
         AttributeFilter::DST_TRANSACTION_TRACER |
@@ -142,15 +142,16 @@ module NewRelic
           txn.add_agent_attribute(:'message.queueName', queue_name, ATTR_DESTINATION) if queue_name
           txn.add_agent_attribute(:'message.replyTo', reply_to, AttributeFilter::DST_NONE) if reply_to
         rescue => e
-          NewRelic::Agent.logger.error("Error starting Message Broker consume transaction", e)
+          NewRelic::Agent.logger.error('Error starting Message Broker consume transaction', e)
         end
 
         yield
       ensure
         begin
-          txn.finish if txn
+          # the following line needs else branch coverage
+          txn.finish if txn # rubocop:disable Style/SafeNavigation
         rescue => e
-          NewRelic::Agent.logger.error("Error stopping Message Broker consume transaction", e)
+          NewRelic::Agent.logger.error('Error stopping Message Broker consume transaction', e)
         end
       end
 
@@ -190,7 +191,8 @@ module NewRelic
 
         raise ArgumentError, 'missing required argument: headers' if headers.nil? && CrossAppTracing.cross_app_enabled?
 
-        original_headers = headers.nil? ? nil : headers.dup
+        # The following line needs else branch coverage
+        original_headers = headers.nil? ? nil : headers.dup # rubocop:disable Style/SafeNavigation
 
         segment = Tracer.start_message_broker_segment(
           action: :produce,

data/lib/new_relic/agent/method_tracer.rb

@@ -103,7 +103,7 @@ module NewRelic
         module AddMethodTracer
           ALLOWED_KEYS = [:metric, :push_scope, :code_header, :code_information, :code_footer].freeze
 
-          DEFAULT_SETTINGS = {:push_scope => true, :metric => true, :code_header => "", :code_footer => ""}.freeze
+          DEFAULT_SETTINGS = {:push_scope => true, :metric => true, :code_header => '', :code_footer => ''}.freeze
 
           # Checks the provided options to make sure that they make
           # sense. Raises an error if the options are incorrect to
@@ -134,7 +134,7 @@ module NewRelic
           #  Foo._nr_default_metric_name_code('bar') #=> "Custom/#{Foo.name}/bar"
           def _nr_default_metric_name(method_name)
             class_name = _nr_derived_class_name
-            -> (*) { "Custom/#{class_name}/#{method_name}" }
+            ->(*) { "Custom/#{class_name}/#{method_name}" }
           end
 
           # Checks to see if the method we are attempting to trace
@@ -170,14 +170,14 @@ module NewRelic
 
           def _nr_derived_class_name
             return self.name if self.name && !self.name.empty?
-            return "AnonymousModule" if self.to_s.start_with?("#<Module:")
+            return 'AnonymousModule' if self.to_s.start_with?('#<Module:')
 
             # trying to get the "MyClass" portion of "#<Class:MyClass>"
             name = self.to_s[/^#<Class:(.+)>$/, 1]
-            if name.start_with?("0x")
-              "AnonymousClass"
-            elsif name.start_with?("#<Class:")
-              "AnonymousClass/Class"
+            if name.start_with?('0x')
+              'AnonymousClass'
+            elsif name.start_with?('#<Class:')
+              'AnonymousClass/Class'
             else
               "#{name}/Class"
             end

data/lib/new_relic/agent/method_tracer_helpers.rb

@@ -11,7 +11,7 @@ module NewRelic
       #   function: the name of the Ruby method
       #   namespace: the Ruby class' namespace as a string, ex: 'MyModule::MyClass'
       SOURCE_CODE_INFORMATION_PARAMETERS = %i[filepath lineno function namespace].freeze
-      SOURCE_CODE_INFORMATION_FAILURE_METRIC = "Supportability/CodeLevelMetrics/Ruby/Failure".freeze
+      SOURCE_CODE_INFORMATION_FAILURE_METRIC = 'Supportability/CodeLevelMetrics/Ruby/Failure'.freeze
       MAX_ALLOWED_METRIC_DURATION = 1_000_000_000 # roughly 31 years
 
       extend self

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

@@ -23,7 +23,7 @@ module NewRelic
           if CrossAppTracing.cross_app_enabled?
             Deprecator.deprecate('cross_application_tracer')
             ::NewRelic::Agent.logger.warn(
-              "[DEPRECATED] Cross application tracing is enabled. Distributed tracing is replacing cross application tracing as the default means of tracing between services. To continue using cross application tracing, enable it with `cross_application_tracer.enabled: true` and `distributed_tracing.enabled: false`"
+              '[DEPRECATED] Cross application tracing is enabled. Distributed tracing is replacing cross application tracing as the default means of tracing between services. To continue using cross application tracing, enable it with `cross_application_tracer.enabled: true` and `distributed_tracing.enabled: false`'
             )
           end
 
@@ -34,7 +34,7 @@ module NewRelic
           rotated = ((seed << 1) | (seed >> 31)) & 0xffffffff
           app_name = NewRelic::Agent.config[:app_name].first
           identifier = "#{app_name};#{txn_name}"
-          sprintf("%08x", rotated ^ hash_transaction_name(identifier))
+          sprintf('%08x', rotated ^ hash_transaction_name(identifier))
         end
 
         private
@@ -44,7 +44,7 @@ module NewRelic
         #   :after_call will write our response headers/metrics and clean up the thread
         def register_event_listeners(events)
           NewRelic::Agent.logger
-            .debug("Wiring up Cross Application Tracing to events after finished configuring")
+            .debug('Wiring up Cross Application Tracing to events after finished configuring')
 
           events.subscribe(:before_call) do |env| # THREAD_LOCAL_ACCESS
             if id = decoded_id(env) and should_process_request?(id)
@@ -109,7 +109,7 @@ module NewRelic
         end
 
         def hash_transaction_name(identifier)
-          Digest::MD5.digest(identifier).unpack("@12N").first & 0xffffffff
+          Digest::MD5.digest(identifier).unpack('@12N').first & 0xffffffff
         end
       end
     end

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

@@ -14,7 +14,7 @@ module NewRelic
 
         def on_before_call(request)
           unless NewRelic::Agent.config[:'distributed_tracing.enabled']
-            NewRelic::Agent.logger.warn("Not configured to accept distributed trace headers")
+            NewRelic::Agent.logger.warn('Not configured to accept distributed trace headers')
             return
           end
 

data/lib/new_relic/agent/new_relic_service/encoders.rb

@@ -25,7 +25,7 @@ module NewRelic
           end
 
           module Gzip
-            BINARY = "BINARY".freeze
+            BINARY = 'BINARY'.freeze
 
             def self.encode(data, opts = nil)
               output = StringIO.new

data/lib/new_relic/agent/new_relic_service/json_marshaller.rb

@@ -14,7 +14,7 @@ module NewRelic
           warn_for_yajl
         end
 
-        OK_YAJL_VERSION = Gem::Version.new("1.2.1")
+        OK_YAJL_VERSION = Gem::Version.new('1.2.1')
 
         def warn_for_yajl
           if defined?(::Yajl)
@@ -24,7 +24,7 @@ module NewRelic
             end
           end
         rescue => err
-          ::NewRelic::Agent.logger.warn("Failed trying to watch for problematic yajl-ruby version.", err)
+          ::NewRelic::Agent.logger.warn('Failed trying to watch for problematic yajl-ruby version.', err)
         end
 
         def dump(ruby, opts = {})

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
@@ -462,7 +462,6 @@ module NewRelic
              Net::HTTPRequestURITooLong,
              Net::HTTPUnsupportedMediaType,
              Net::HTTPExpectationFailed,
-             Net::HTTPUnsupportedMediaType,
              Net::HTTPRequestHeaderFieldsTooLarge
           handle_unrecoverable_server_exception(response, endpoint)
         when Net::HTTPConflict,
@@ -521,7 +520,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 +550,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 +565,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 +580,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

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