newrelic_rpm 9.0.0 → 9.2.0

data/lib/new_relic/agent/commands/thread_profiler_session.rb

@@ -25,12 +25,12 @@ module NewRelic
         end
 
         def handle_stop_command(agent_command)
-          report_data = agent_command.arguments.fetch("report_data", true)
+          report_data = agent_command.arguments.fetch('report_data', true)
           stop(report_data)
         end
 
         def start(agent_command)
-          NewRelic::Agent.logger.debug("Starting Thread Profiler.")
+          NewRelic::Agent.logger.debug('Starting Thread Profiler.')
           profile = @backtrace_service.subscribe(
             NewRelic::Agent::Threading::BacktraceService::ALL_TRANSACTIONS,
             agent_command.arguments
@@ -43,7 +43,7 @@ module NewRelic
         def stop(report_data)
           return unless running?
 
-          NewRelic::Agent.logger.debug("Stopping Thread Profiler.")
+          NewRelic::Agent.logger.debug('Stopping Thread Profiler.')
           @finished_profile = @backtrace_service.harvest(NewRelic::Agent::Threading::BacktraceService::ALL_TRANSACTIONS)
           @backtrace_service.unsubscribe(NewRelic::Agent::Threading::BacktraceService::ALL_TRANSACTIONS)
           @finished_profile = nil if !report_data
@@ -51,7 +51,7 @@ module NewRelic
 
         def harvest
           NewRelic::Agent.logger.debug(
-            "Harvesting from Thread Profiler #{@finished_profile.to_log_description unless @finished_profile.nil?}"
+            "Harvesting from Thread Profiler #{@finished_profile&.to_log_description}"
           )
           profile = @finished_profile
           @backtrace_service.profile_agent_code = false
@@ -102,7 +102,7 @@ module NewRelic
         end
 
         def raise_already_started_error
-          msg = "Profile already in progress. Ignoring agent command to start another."
+          msg = 'Profile already in progress. Ignoring agent command to start another.'
           raise_command_error(msg)
         end
       end

data/lib/new_relic/agent/configuration/default_source.rb

@@ -14,30 +14,6 @@ module NewRelic
         end
       end
 
-      # Combines potentially two properties into one.
-      # Given the example:
-      #    :disable_net_http and :prepend_net_instrumentation
-      #    if :disable_net_http is true, then returned value is "disabled"
-      #    if :prepend_net_instrumentation is false, then returned value is "chain"
-      #    otherwise, "auto" is returned.
-      #
-      # Intent is:
-      #     - if user sets disable_xxx property, then don't instrument
-      #     - if user set prepend to `false` then we use method_alias chaining
-      #     - auto, when returned means, try to use prepend unless conflicting gems discovered
-      #
-      def self.instrumentation_value_of(disable_key, prepend_key = nil)
-        proc do
-          if NewRelic::Agent.config[disable_key]
-            "disabled"
-          elsif prepend_key && !NewRelic::Agent.config[prepend_key]
-            "chain"
-          else
-            "auto"
-          end
-        end
-      end
-
       def self.instrumentation_value_from_boolean(key)
         proc do
           NewRelic::Agent.config[key] ? 'auto' : 'disabled'
@@ -47,7 +23,7 @@ module NewRelic
       # Marks the config option as deprecated in the documentation once generated.
       # Does not appear in logs.
       def self.deprecated_description(new_setting, description)
-        link_ref = new_setting.to_s.tr(".", "-")
+        link_ref = new_setting.to_s.tr('.', '-')
         %{Please see: [#{new_setting}](docs/agents/ruby-agent/configuration/ruby-agent-configuration##{link_ref}). \n\n#{description}}
       end
 
@@ -80,34 +56,35 @@ module NewRelic
           default_settings[:transform] if default_settings
         end
 
-        def self.config_search_paths
+        def self.config_search_paths # rubocop:disable Metrics/AbcSize
           proc {
-            paths = [
-              File.join("config", "newrelic.yml"),
-              File.join("newrelic.yml"),
-              File.join("config", "newrelic.yml.erb"),
-              File.join("newrelic.yml.erb")
-            ]
+            yaml = 'newrelic.yml'
+            config_yaml = File.join('config', yaml)
+            erb = 'newrelic.yml.erb'
+            config_erb = File.join('config', erb)
+
+            paths = [config_yaml, yaml, config_erb, erb]
 
             if NewRelic::Control.instance.root
-              paths << File.join(NewRelic::Control.instance.root, "config", "newrelic.yml")
-              paths << File.join(NewRelic::Control.instance.root, "newrelic.yml")
-              paths << File.join(NewRelic::Control.instance.root, "config", "newrelic.yml.erb")
-              paths << File.join(NewRelic::Control.instance.root, "newrelic.yml.erb")
+              paths << File.join(NewRelic::Control.instance.root, config_yaml)
+              paths << File.join(NewRelic::Control.instance.root, yaml)
+              paths << File.join(NewRelic::Control.instance.root, config_erb)
+              paths << File.join(NewRelic::Control.instance.root, erb)
             end
 
             if ENV['HOME']
-              paths << File.join(ENV['HOME'], ".newrelic", "newrelic.yml")
-              paths << File.join(ENV['HOME'], "newrelic.yml")
-              paths << File.join(ENV['HOME'], ".newrelic", "newrelic.yml.erb")
-              paths << File.join(ENV['HOME'], "newrelic.yml.erb")
+              paths << File.join(ENV['HOME'], '.newrelic', yaml)
+              paths << File.join(ENV['HOME'], yaml)
+              paths << File.join(ENV['HOME'], '.newrelic', erb)
+              paths << File.join(ENV['HOME'], erb)
             end
 
             # If we're packaged for warbler, we can tell from GEM_HOME
-            if ENV["GEM_HOME"] && ENV["GEM_HOME"].end_with?(".jar!")
-              app_name = File.basename(ENV["GEM_HOME"], ".jar!")
-              paths << File.join(ENV["GEM_HOME"], app_name, "config", "newrelic.yml")
-              paths << File.join(ENV["GEM_HOME"], app_name, "config", "newrelic.yml.erb")
+            # the following line needs else branch coverage
+            if ENV['GEM_HOME'] && ENV['GEM_HOME'].end_with?('.jar!') # rubocop:disable Style/SafeNavigation
+              app_name = File.basename(ENV['GEM_HOME'], '.jar!')
+              paths << File.join(ENV['GEM_HOME'], app_name, config_yaml)
+              paths << File.join(ENV['GEM_HOME'], app_name, config_erb)
             end
 
             paths
@@ -206,11 +183,11 @@ module NewRelic
           # only used for deployment task
           proc do
             api_version = if NewRelic::Agent.config[:api_key].nil? || NewRelic::Agent.config[:api_key].empty?
-              "rpm"
+              'rpm'
             else
-              "api"
+              'api'
             end
-            api_region = "eu." if String(NewRelic::Agent.config[:license_key]).start_with?('eu')
+            api_region = 'eu.' if String(NewRelic::Agent.config[:license_key]).start_with?('eu')
 
             "#{api_version}.#{api_region}newrelic.com"
           end
@@ -432,7 +409,7 @@ module NewRelic
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => "Allows newrelic distributed tracing headers to be suppressed on outbound requests."
+          :description => 'Allows newrelic distributed tracing headers to be suppressed on outbound requests.'
         },
         :force_install_exit_handler => {
           :default => false,
@@ -959,7 +936,7 @@ module NewRelic
           :description => 'If `true`, enables an audit log which logs communications with the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector).'
         },
         :'audit_log.endpoints' => {
-          :default => [".*"],
+          :default => ['.*'],
           :public => true,
           :type => Array,
           :allowed_from_server => false,
@@ -1281,10 +1258,10 @@ module NewRelic
           :type => String,
           :allowed_from_server => false,
           :external => :infinite_tracing,
-          :description => "Configures the hostname for the trace observer Host. " \
-            "When configured, enables tail-based sampling by sending all recorded spans " \
-            "to a trace observer for further sampling decisions, irrespective of any usual " \
-            "agent sampling decision."
+          :description => 'Configures the hostname for the trace observer Host. ' \
+            'When configured, enables tail-based sampling by sending all recorded spans ' \
+            'to a trace observer for further sampling decisions, irrespective of any usual ' \
+            'agent sampling decision.'
         },
         :'infinite_tracing.trace_observer.port' => {
           :default => 443,
@@ -1292,7 +1269,7 @@ module NewRelic
           :type => Integer,
           :allowed_from_server => false,
           :external => :infinite_tracing,
-          :description => "Configures the TCP/IP port for the trace observer Host"
+          :description => 'Configures the TCP/IP port for the trace observer Host'
         },
         # Instrumentation
         :'instrumentation.active_support_logger' => {
@@ -1361,7 +1338,7 @@ module NewRelic
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Excon at start up.  May be one of [enabled|disabled]."
+          :description => 'Controls auto-instrumentation of Excon at start up.  May be one of [enabled|disabled].'
         },
         :'instrumentation.grape' => {
           :default => 'auto',
@@ -1369,10 +1346,10 @@ module NewRelic
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Grape at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Grape at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.grpc_client' => {
-          :default => instrumentation_value_of(:disable_grpc_client),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
@@ -1389,7 +1366,7 @@ module NewRelic
           :description => %Q(Specifies a list of hostname patterns separated by commas that will match gRPC hostnames that traffic is to be ignored by New Relic for. New Relic's gRPC client instrumentation will ignore traffic streamed to a host matching any of these patterns, and New Relic's gRPC server instrumentation will ignore traffic for a server running on a host whose hostname matches any of these patterns. By default, no traffic is ignored when gRPC instrumentation is itself enabled. For example, "private.com$,exception.*")
         },
         :'instrumentation.grpc_server' => {
-          :default => instrumentation_value_of(:disable_grpc_server),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
@@ -1404,7 +1381,7 @@ module NewRelic
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of HTTPClient at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of HTTPClient at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.httprb' => {
           :default => 'auto',
@@ -1442,7 +1419,7 @@ module NewRelic
           :description => 'Controls auto-instrumentation of memcached gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.memcache_client' => {
-          :default => instrumentation_value_of(:disable_memcache_client),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
@@ -1457,7 +1434,7 @@ module NewRelic
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Mongo at start up.  May be one of [enabled|disabled]."
+          :description => 'Controls auto-instrumentation of Mongo at start up.  May be one of [enabled|disabled].'
         },
         :'instrumentation.net_http' => {
           :default => 'auto',
@@ -1466,7 +1443,7 @@ module NewRelic
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Net::HTTP at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Net::HTTP at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.puma_rack' => {
           :default => value_of(:'instrumentation.rack'),
@@ -1475,9 +1452,9 @@ module NewRelic
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Puma::Rack. When enabled, the agent hooks into the " \
-                           "`to_app` method in Puma::Rack::Builder to find gems to instrument during " \
-                           "application startup.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Puma::Rack. When enabled, the agent hooks into the ' \
+                           '`to_app` method in Puma::Rack::Builder to find gems to instrument during ' \
+                           'application startup.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.puma_rack_urlmap' => {
           :default => value_of(:'instrumentation.rack_urlmap'),
@@ -1495,9 +1472,9 @@ module NewRelic
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Rack. When enabled, the agent hooks into the " \
-                           "`to_app` method in Rack::Builder to find gems to instrument during " \
-                           "application startup.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Rack. When enabled, the agent hooks into the ' \
+                           '`to_app` method in Rack::Builder to find gems to instrument during ' \
+                           'application startup.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.rack_urlmap' => {
           :default => 'auto',
@@ -1514,7 +1491,7 @@ module NewRelic
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of rake at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of rake at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.redis' => {
           :default => 'auto',
@@ -1522,7 +1499,7 @@ module NewRelic
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Redis at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Redis at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.resque' => {
           :default => 'auto',
@@ -1531,7 +1508,7 @@ module NewRelic
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of resque at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of resque at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.sinatra' => {
           :default => 'auto',
@@ -1539,7 +1516,7 @@ module NewRelic
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Sinatra at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Sinatra at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.thread' => {
           :default => 'auto',
@@ -1547,24 +1524,24 @@ module NewRelic
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of the Thread class at start up to allow the agent to correctly nest spans inside of an asynchronous transaction. This does not enable the agent to automatically trace all threads created (see `instrumentation.thread.tracing`). May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of the Thread class at start up to allow the agent to correctly nest spans inside of an asynchronous transaction. This does not enable the agent to automatically trace all threads created (see `instrumentation.thread.tracing`). May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.thread.tracing' => {
           :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of the Thread class at start up to automatically add tracing to all Threads created in the application."
+          :description => 'Controls auto-instrumentation of the Thread class at start up to automatically add tracing to all Threads created in the application.'
         },
         :'thread_ids_enabled' => {
           :default => false,
           :public => false,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => "If enabled, will append the current Thread and Fiber object ids onto the segment names of segments created in Threads and concurrent-ruby"
+          :description => 'If enabled, will append the current Thread and Fiber object ids onto the segment names of segments created in Threads and concurrent-ruby'
         },
         :'instrumentation.tilt' => {
-          :default => "auto",
+          :default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
@@ -1578,7 +1555,7 @@ module NewRelic
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Typhoeus at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Typhoeus at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         # Message tracer
         :'message_tracer.segment_parameters.enabled' => {
@@ -1709,7 +1686,7 @@ module NewRelic
           :type => Integer,
           :allowed_from_server => false,
           :external => :infinite_tracing,
-          :description => "Sets the maximum number of span events to buffer when streaming to the trace observer."
+          :description => 'Sets the maximum number of span events to buffer when streaming to the trace observer.'
         },
         :'span_events.max_samples_stored' => {
           :default => 2000,
@@ -2016,7 +1993,7 @@ module NewRelic
           :public => false,
           :type => String,
           :allowed_from_server => false,
-          :description => "URI for the New Relic data collection service."
+          :description => 'URI for the New Relic data collection service.'
         },
         :'infinite_tracing.batching' => {
           :default => true,
@@ -2025,7 +2002,7 @@ module NewRelic
           :allowed_from_server => false,
           :external => :infinite_tracing,
           :description => "If `true` (the default), data sent to the trace observer is batched\ninstead of sending " \
-                          "each span individually."
+                          'each span individually.'
         },
         :'infinite_tracing.compression_level' => {
           :default => :high,

data/lib/new_relic/agent/configuration/environment_source.rb

@@ -94,14 +94,14 @@ module NewRelic
           elsif type == Array
             self[config_key] = value.split(/\s*,\s*/)
           elsif type == NewRelic::Agent::Configuration::Boolean
-            if value =~ /false|off|no/i
+            if /false|off|no/i.match?(value)
               self[config_key] = false
             elsif !value.nil?
               self[config_key] = true
             end
           else
             ::NewRelic::Agent.logger.info("#{environment_key} does not have a corresponding configuration setting (#{config_key} does not exist).")
-            ::NewRelic::Agent.logger.info("Run `rake newrelic:config:docs` or visit https://newrelic.com/docs/ruby/ruby-agent-configuration to see a list of available configuration settings.")
+            ::NewRelic::Agent.logger.info('Run `rake newrelic:config:docs` or visit https://newrelic.com/docs/ruby/ruby-agent-configuration to see a list of available configuration settings.')
             self[config_key] = value
           end
         end

data/lib/new_relic/agent/configuration/high_security_source.rb

@@ -24,9 +24,9 @@ module NewRelic
           })
         end
 
-        OFF = "off".freeze
-        RAW = "raw".freeze
-        OBFUSCATED = "obfuscated".freeze
+        OFF = 'off'.freeze
+        RAW = 'raw'.freeze
+        OBFUSCATED = 'obfuscated'.freeze
 
         SET_TO_OBFUSCATED = [RAW, OBFUSCATED]
 

data/lib/new_relic/agent/configuration/manager.rb

@@ -241,8 +241,8 @@ module NewRelic
           end
         end
 
-        MALFORMED_LABELS_WARNING = "Skipping malformed labels configuration"
-        PARSING_LABELS_FAILURE = "Failure during parsing labels. Ignoring and carrying on with connect."
+        MALFORMED_LABELS_WARNING = 'Skipping malformed labels configuration'
+        PARSING_LABELS_FAILURE = 'Failure during parsing labels. Ignoring and carrying on with connect.'
 
         MAX_LABEL_COUNT = 64
         MAX_LABEL_LENGTH = 255

data/lib/new_relic/agent/configuration/security_policy_source.rb

@@ -51,7 +51,7 @@ module NewRelic
         #   permitted by the security policy and is also enabled by the config
 
         SECURITY_SETTINGS_MAP = {
-          "record_sql" => [
+          'record_sql' => [
             {
               option: :'transaction_tracer.record_sql',
               supported: true,
@@ -96,7 +96,7 @@ module NewRelic
               permitted_fn: nil
             }
           ],
-          "attributes_include" => [
+          'attributes_include' => [
             {
               option: :'attributes.include',
               supported: true,
@@ -147,7 +147,7 @@ module NewRelic
               permitted_fn: nil
             }
           ],
-          "allow_raw_exception_messages" => [
+          'allow_raw_exception_messages' => [
             {
               option: :'strip_exception_messages.enabled',
               supported: true,
@@ -156,7 +156,7 @@ module NewRelic
               permitted_fn: nil
             }
           ],
-          "custom_events" => [
+          'custom_events' => [
             {
               option: :'custom_insights_events.enabled',
               supported: true,
@@ -165,7 +165,7 @@ module NewRelic
               permitted_fn: nil
             }
           ],
-          "custom_parameters" => [
+          'custom_parameters' => [
             {
               option: :'custom_attributes.enabled',
               supported: true,
@@ -174,7 +174,7 @@ module NewRelic
               permitted_fn: nil
             }
           ],
-          "custom_instrumentation_editor" => [
+          'custom_instrumentation_editor' => [
             {
               option: nil,
               supported: false,
@@ -183,7 +183,7 @@ module NewRelic
               permitted_fn: nil
             }
           ],
-          "message_parameters" => [
+          'message_parameters' => [
             {
               option: :'message_tracer.segment_parameters.enabled',
               supported: true,
@@ -198,8 +198,8 @@ module NewRelic
           super(build_overrides(security_policies))
         end
 
-        ENABLED = "enabled".freeze
-        COLON_COLON = "::".freeze
+        ENABLED = 'enabled'.freeze
+        COLON_COLON = '::'.freeze
 
         def build_overrides(security_policies)
           security_policies.inject({}) do |settings, (policy_name, policy_settings)|
@@ -222,7 +222,7 @@ module NewRelic
                 settings[policy[:option]] = policy[:disabled_value]
                 NewRelic::Agent.logger.info( \
                   "Setting applied: {#{policy[:option]}: #{policy[:disabled_value]}}. " \
-                  "Source: SecurityPolicySource"
+                  'Source: SecurityPolicySource'
                 )
               end
             end

data/lib/new_relic/agent/configuration/server_source.rb

@@ -10,27 +10,27 @@ module NewRelic
         # response, but should still be merged in as config settings to the
         # main agent configuration.
         TOP_LEVEL_KEYS = [
-          "account_id",
-          "apdex_t",
-          "application_id",
-          "beacon",
-          "browser_key",
-          "browser_monitoring.debug",
-          "browser_monitoring.loader",
-          "browser_monitoring.loader_version",
-          "cross_process_id",
-          "data_report_period",
-          "encoding_key",
-          "entity_guid",
-          "error_beacon",
-          "js_agent_file",
-          "js_agent_loader",
-          "max_payload_size_in_bytes",
-          "primary_application_id",
-          "sampling_target",
-          "sampling_target_period_in_seconds",
-          "trusted_account_ids",
-          "trusted_account_key"
+          'account_id',
+          'apdex_t',
+          'application_id',
+          'beacon',
+          'browser_key',
+          'browser_monitoring.debug',
+          'browser_monitoring.loader',
+          'browser_monitoring.loader_version',
+          'cross_process_id',
+          'data_report_period',
+          'encoding_key',
+          'entity_guid',
+          'error_beacon',
+          'js_agent_file',
+          'js_agent_loader',
+          'max_payload_size_in_bytes',
+          'primary_application_id',
+          'sampling_target',
+          'sampling_target_period_in_seconds',
+          'trusted_account_ids',
+          'trusted_account_key'
         ]
 
         def initialize(connect_reply, existing_config = {})
@@ -70,7 +70,7 @@ module NewRelic
 
         def fix_transaction_threshold(merged_settings)
           # when value is "apdex_f" remove the config and defer to default
-          if merged_settings['transaction_tracer.transaction_threshold'].to_s =~ /apdex_f/i
+          if /apdex_f/i.match?(merged_settings['transaction_tracer.transaction_threshold'].to_s)
             merged_settings.delete('transaction_tracer.transaction_threshold')
           end
         end
@@ -102,8 +102,8 @@ module NewRelic
           if event_harvest_config.nil? \
               || event_harvest_config['harvest_limits'].values.min < 0 \
               || (event_harvest_config['report_period_ms'] / 1000) <= 0
-            NewRelic::Agent.logger.warn("Invalid event harvest config found " \
-                "in connect response; using default event report period.")
+            NewRelic::Agent.logger.warn('Invalid event harvest config found ' \
+                'in connect response; using default event report period.')
             false
           else
             true

data/lib/new_relic/agent/configuration/yaml_source.rb

@@ -84,7 +84,7 @@ module NewRelic
           # so warn about it since it's very likely to be unintended.
           NewRelic::Agent.logger.warn(
             "No configuration file found. Working directory = #{Dir.pwd}",
-            "Looked in these locations (based on #{based_on}): #{candidate_paths.join(", ")}"
+            "Looked in these locations (based on #{based_on}): #{candidate_paths.join(', ')}"
           )
         end
 
@@ -96,7 +96,7 @@ module NewRelic
             file.gsub!(/^\s*#.*$/, '#')
             ERB.new(file).result(binding)
           rescue ScriptError, StandardError => e
-            log_failure("Failed ERB processing configuration file. This is typically caused by a Ruby error in <% %> templating blocks in your newrelic.yml file.", e)
+            log_failure('Failed ERB processing configuration file. This is typically caused by a Ruby error in <% %> templating blocks in your newrelic.yml file.', e)
             nil
           end
         end
@@ -124,7 +124,7 @@ module NewRelic
               config['transaction_tracer']['transaction_threshold'].to_s =~ /apdex_f/i
             # when value is "apdex_f" remove the config and defer to default
             config['transaction_tracer'].delete('transaction_threshold')
-          elsif config['transaction_tracer.transaction_threshold'].to_s =~ /apdex_f/i
+          elsif /apdex_f/i.match?(config['transaction_tracer.transaction_threshold'].to_s)
             config.delete('transaction_tracer.transaction_threshold')
           end
         end
@@ -135,7 +135,7 @@ module NewRelic
             if 'auto' == config[option]
               config.delete(option)
             elsif !config[option].nil? && !is_boolean?(config[option])
-              coerced_value = !!(config[option].to_s =~ /yes|on|true/i)
+              coerced_value = config[option].to_s.match?(/yes|on|true/i)
               if !coerced_value
                 log_failure("Unexpected value (#{config[option]}) for '#{option}' in #{@path}")
               end

data/lib/new_relic/agent/connect/request_builder.rb

@@ -48,7 +48,7 @@ module NewRelic
 
         def environment_metadata
           env_copy = {}
-          ENV.keys.each { |k| env_copy[k] = ENV[k] if k =~ /^NEW_RELIC_METADATA_/ }
+          ENV.keys.each { |k| env_copy[k] = ENV[k] if /^NEW_RELIC_METADATA_/.match?(k) }
           env_copy
         end
 

data/lib/new_relic/agent/connect/response_handler.rb

@@ -37,7 +37,7 @@ module NewRelic
 
         def add_server_side_config(config_data)
           if config_data['agent_config']
-            ::NewRelic::Agent.logger.debug("Using config from server")
+            ::NewRelic::Agent.logger.debug('Using config from server')
           end
 
           ::NewRelic::Agent.logger.debug("Server provided config: #{config_data.inspect}")