newrelic_rpm 8.16.0 → 9.1.0

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)
@@ -371,7 +415,7 @@ module NewRelic
     # jobs or other work.  If you are doing this with a web dispatcher
     # that forks worker processes then you will need to force the
     # agent to reconnect, which it won't do by default.  Passenger and
-    # Rainbows and Unicorn are already handled, nothing special needed for them.
+    # Unicorn are already handled, nothing special needed for them.
     #
     # Options:
     # * <tt>:force_reconnect => true</tt> to force the spawned process to
@@ -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
@@ -511,18 +554,6 @@ module NewRelic
       end
     end
 
-    # This method disables the recording of transaction traces in the given
-    # block.  See also #disable_all_tracing
-    #
-    # @api public
-    #
-    def disable_transaction_tracing
-      Deprecator.deprecate(:disable_transaction_tracing,
-        'disable_all_tracing or ignore_transaction')
-      record_api_supportability_metric(:disable_transaction_tracing)
-      yield
-    end
-
     # This method sets the state of sql recording in the transaction
     # sampler feature. Within the given block, no sql will be recorded
     #
@@ -554,12 +585,6 @@ module NewRelic
       NewRelic::Agent::Tracer.state.is_execution_traced?
     end
 
-    # helper method to check the thread local to determine whether sql
-    # is being recorded or not
-    def tl_is_sql_recorded?
-      NewRelic::Agent::Tracer.state.is_sql_recorded?
-    end
-
     # @!group Adding custom attributes to traces
 
     # Add attributes to the transaction trace, Insights Transaction event, and
@@ -582,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
@@ -625,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
@@ -704,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

data/lib/new_relic/cli/commands/deployments.rb

@@ -16,7 +16,7 @@ require 'new_relic/control' unless defined? NewRelic::Control
 
 class NewRelic::Cli::Deployments < NewRelic::Cli::Command
   attr_reader :control
-  def self.command; "deployments"; end
+  def self.command; 'deployments'; end
 
   # Initialize the deployment uploader with command line args.
   # Use -h to see options.
@@ -33,7 +33,8 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
     @changelog = nil
     @user = nil
     super(command_line_args)
-    @description ||= @leftover && @leftover.join(" ")
+    # needs else branch coverage
+    @description ||= @leftover && @leftover.join(' ') # rubocop:disable Style/SafeNavigation
     @user ||= ENV['USER']
     control.env = @environment if @environment
 
@@ -71,17 +72,17 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
       end
 
       if !api_v1? && (@revision.nil? || @revision.empty?)
-        raise "revision required when using New Relic REST API v2 with api_key. Pass in revision using: -r, --revision=REV"
+        raise 'revision required when using New Relic REST API v2 with api_key. Pass in revision using: -r, --revision=REV'
       end
 
       request = if api_v1?
-        uri = "/deployments.xml"
-        create_request(uri, {'x-license-key' => @license_key}, "application/octet-stream").tap do |req|
+        uri = '/deployments.xml'
+        create_request(uri, {'x-license-key' => @license_key}, 'application/octet-stream').tap do |req|
           set_params_v1(req)
         end
       else
         uri = "/v2/applications/#{application_id}/deployments.json"
-        create_request(uri, {"Api-Key" => @api_key}, "application/json").tap do |req|
+        create_request(uri, {'Api-Key' => @api_key}, 'application/json').tap do |req|
           set_params_v2(req)
         end
       end
@@ -92,7 +93,7 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
       if response.is_a?(Net::HTTPSuccess)
         info("Recorded deployment to '#{@appname}' (#{@description || Time.now})")
       else
-        err_string = REXML::Document.new(response.body).elements['errors/error'].map(&:to_s).join("; ") rescue response.message
+        err_string = REXML::Document.new(response.body).elements['errors/error'].map(&:to_s).join('; ') rescue response.message
         raise NewRelic::Cli::Command::CommandFailure, "Deployment not recorded: #{err_string}"
       end
     rescue SystemCallError, SocketError => e
@@ -150,7 +151,7 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
 
   def set_params_v2(request)
     request.body = {
-      "deployment" => {
+      'deployment' => {
         :description => @description,
         :user => @user,
         :revision => @revision,
@@ -161,25 +162,25 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
 
   def options
     OptionParser.new(%Q(Usage: #{$0} #{self.class.command} [OPTIONS] ["description"] ), 40) do |o|
-      o.separator("OPTIONS:")
-      o.on("-a", "--appname=NAME", String,
-        "Set the application name.",
-        "Default is app_name setting in newrelic.yml. Available only when using API v1.") { |e| @appname = e }
-      o.on("-i", "--appid=ID", String,
-        "Set the application ID",
-        "If not provided, will connect to the New Relic collector to get it") { |i| @application_id = i }
-      o.on("-e", "--environment=name", String,
-        "Override the (RAILS|RUBY|RACK)_ENV setting",
+      o.separator('OPTIONS:')
+      o.on('-a', '--appname=NAME', String,
+        'Set the application name.',
+        'Default is app_name setting in newrelic.yml. Available only when using API v1.') { |e| @appname = e }
+      o.on('-i', '--appid=ID', String,
+        'Set the application ID',
+        'If not provided, will connect to the New Relic collector to get it') { |i| @application_id = i }
+      o.on('-e', '--environment=name', String,
+        'Override the (RAILS|RUBY|RACK)_ENV setting',
         "currently: #{control.env}") { |e| @environment = e }
-      o.on("-u", "--user=USER", String,
-        "Specify the user deploying, for information only",
+      o.on('-u', '--user=USER', String,
+        'Specify the user deploying, for information only',
         "Default: #{@user || '<none>'}") { |u| @user = u }
-      o.on("-r", "--revision=REV", String,
-        "Specify the revision being deployed. Required when using New Relic REST API v2") { |r| @revision = r }
-      o.on("-l", "--license-key=KEY", String,
-        "Specify the license key of the account for the app being deployed") { |l| @license_key = l }
-      o.on("-c", "--changes",
-        "Read in a change log from the standard input") { @changelog = STDIN.read }
+      o.on('-r', '--revision=REV', String,
+        'Specify the revision being deployed. Required when using New Relic REST API v2') { |r| @revision = r }
+      o.on('-l', '--license-key=KEY', String,
+        'Specify the license key of the account for the app being deployed') { |l| @license_key = l }
+      o.on('-c', '--changes',
+        'Read in a change log from the standard input') { @changelog = STDIN.read }
       yield(o) if block_given?
     end
   end

data/lib/new_relic/cli/commands/install.rb

@@ -7,9 +7,9 @@ require 'new_relic/version'
 require 'erb'
 
 class NewRelic::Cli::Install < NewRelic::Cli::Command
-  NO_LICENSE_KEY = "<PASTE LICENSE KEY HERE>"
+  NO_LICENSE_KEY = '<PASTE LICENSE KEY HERE>'
 
-  def self.command; "install"; end
+  def self.command; 'install'; end
 
   # Use -h to see options.
   # When command_line_args is a hash, we are invoking directly and
@@ -25,45 +25,45 @@ class NewRelic::Cli::Install < NewRelic::Cli::Command
     super(command_line_args)
     if @dest_dir.nil?
       # Install a newrelic.yml file into the local config directory.
-      if File.directory?("config")
-        @dest_dir = "config"
+      if File.directory?('config')
+        @dest_dir = 'config'
       else
-        @dest_dir = "."
+        @dest_dir = '.'
       end
     end
     @license_key ||= NO_LICENSE_KEY
-    @app_name ||= @leftover.join(" ")
+    @app_name ||= @leftover.join(' ')
     @agent_version = NewRelic::VERSION::STRING
-    raise CommandFailure.new("Application name required.", @options) unless @app_name && @app_name.size > 0
+    raise CommandFailure.new('Application name required.', @options) unless @app_name && @app_name.size > 0
   end
 
   def run
-    dest_file = File.expand_path(@dest_dir + "/newrelic.yml")
+    dest_file = File.expand_path(@dest_dir + '/newrelic.yml')
     if File.exist?(dest_file) && !@force
-      raise NewRelic::Cli::Command::CommandFailure, "newrelic.yml file already exists.  Use --force flag to overwrite."
+      raise NewRelic::Cli::Command::CommandFailure, 'newrelic.yml file already exists.  Use --force flag to overwrite.'
     end
 
     File.open(dest_file, 'w') { |out| out.puts(content) }
 
-    puts <<-EOF unless quiet
+    puts <<~EOF unless quiet
 
-Installed a default configuration file at
-#{dest_file}.
+      Installed a default configuration file at
+      #{dest_file}.
     EOF
-    puts <<-EOF unless quiet || @license_key != NO_LICENSE_KEY
+    puts <<~EOF unless quiet || @license_key != NO_LICENSE_KEY
 
-To monitor your application in production mode, sign up for an account
-at www.newrelic.com, and replace the newrelic.yml file with the one
-you receive upon registration.
+      To monitor your application in production mode, sign up for an account
+      at www.newrelic.com, and replace the newrelic.yml file with the one
+      you receive upon registration.
     EOF
-    puts <<-EOF unless quiet
+    puts <<~EOF unless quiet
 
-Visit support.newrelic.com if you are experiencing installation issues.
+      Visit support.newrelic.com if you are experiencing installation issues.
     EOF
   end
 
   def content
-    @src_file ||= File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "newrelic.yml"))
+    @src_file ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'newrelic.yml'))
     template = File.read(@src_file)
     ERB.new(template).result(binding)
   end
@@ -72,10 +72,10 @@ Visit support.newrelic.com if you are experiencing installation issues.
 
   def options
     OptionParser.new("Usage: #{$0} #{self.class.command} [ OPTIONS] 'application name'", 40) do |o|
-      o.on("-f", "--force", "Overwrite newrelic.yml if it exists") { |e| @force = true }
-      o.on("-l", "--license_key=NAME", String,
-        "Use the given license key") { |e| @license_key = e }
-      o.on("-d", "--destdir=name", String,
+      o.on('-f', '--force', 'Overwrite newrelic.yml if it exists') { |e| @force = true }
+      o.on('-l', '--license_key=NAME', String,
+        'Use the given license key') { |e| @license_key = e }
+      o.on('-d', '--destdir=name', String,
         "Write the newrelic.yml to the given directory, default is '.'") { |e| @dest_dir = e }
       yield(o) if block_given?
     end

data/lib/new_relic/collection_helper.rb

@@ -40,7 +40,7 @@ module NewRelic
         when nil then ''
         when object.instance_of?(String) then object
         when String then String.new(object) # convert string subclasses to strings
-        else String.new("#<#{object.class}>")
+        else +"#<#{object.class}>"
       end
     end
 
@@ -52,7 +52,7 @@ module NewRelic
         real_string = flatten(string)
         if real_string.size > len
           real_string = real_string.slice(0...len)
-          real_string << "..."
+          real_string << '...'
         end
         real_string
       else

data/lib/new_relic/constants.rb

@@ -7,16 +7,16 @@ module NewRelic
 
   EMPTY_ARRAY = [].freeze
   EMPTY_HASH = {}.freeze
-  EMPTY_STR = ""
+  EMPTY_STR = ''
 
-  HTTP = "HTTP"
-  HTTPS = "HTTPS"
-  UNKNOWN = "Unknown"
+  HTTP = 'HTTP'
+  HTTPS = 'HTTPS'
+  UNKNOWN = 'Unknown'
 
   FORMAT_NON_RACK = 0
   FORMAT_RACK = 1
 
-  NEWRELIC_KEY = "newrelic"
+  NEWRELIC_KEY = 'newrelic'
   CANDIDATE_NEWRELIC_KEYS = [
     NEWRELIC_KEY,
     'NEWRELIC',
@@ -24,8 +24,8 @@ module NewRelic
     'Newrelic'
   ].freeze
 
-  TRACEPARENT_KEY = "traceparent"
-  TRACESTATE_KEY = "tracestate"
+  TRACEPARENT_KEY = 'traceparent'
+  TRACESTATE_KEY = 'tracestate'
 
   STANDARD_OUT = 'STDOUT'
 
@@ -34,6 +34,5 @@ module NewRelic
   HTTP_NEWRELIC_KEY = "HTTP_#{NEWRELIC_KEY.upcase}"
 
   CONNECT_RETRY_PERIODS = [15, 15, 30, 60, 120, 300]
-  MIN_RETRY_PERIOD = 15
   MAX_RETRY_PERIOD = 300
 end

data/lib/new_relic/control/class_methods.rb

@@ -35,8 +35,8 @@ module NewRelic
 
       # nb this does not 'load test' the framework, it loads the 'test framework'
       def load_test_framework
-        config = File.expand_path(File.join('..', '..', '..', '..', "test", "config", "newrelic.yml"), __FILE__)
-        require "config/test_control"
+        config = File.expand_path(File.join('..', '..', '..', '..', 'test', 'config', 'newrelic.yml'), __FILE__)
+        require 'config/test_control'
         NewRelic::Control::Frameworks::Test.new(local_env, config)
       end
 
@@ -54,7 +54,7 @@ module NewRelic
 
       # The root directory for the plugin or gem
       def newrelic_root
-        File.expand_path(File.join("..", "..", "..", ".."), __FILE__)
+        File.expand_path(File.join('..', '..', '..', '..'), __FILE__)
       end
 
       def camelize(snake_case_name)

data/lib/new_relic/control/frameworks/rails.rb

@@ -44,26 +44,38 @@ module NewRelic
         # find a config and use that.
         def init_config(options = {})
           @config = options[:config]
-          # Install the dependency detection,
-          if rails_config && ::Rails.configuration.respond_to?(:after_initialize)
-            rails_config.after_initialize do
-              # This will insure we load all the instrumentation as late as possible.  If the agent
-              # is not enabled, it will load a limited amount of instrumentation.
-              DependencyDetection.detect!
-            end
+          install_dependency_detection
+          install_browser_monitoring_and_agent_hooks
+        rescue => e
+          ::NewRelic::Agent.logger.error('Failure during init_config for Rails. Is Rails required in a non-Rails ' \
+                                         'app? Set NEW_RELIC_FRAMEWORK=ruby to avoid this message. The Ruby agent ' \
+                                         'will continue running, but Rails-specific features may be missing. ' \
+                                         "#{e.class} - #{e.message}")
+        end
+
+        def install_dependency_detection
+          return unless rails_config && ::Rails.configuration.respond_to?(:after_initialize)
+
+          rails_config.after_initialize do
+            # This will insure we load all the instrumentation as late as
+            # possible. If the agent is not enabled, it will load a limited
+            # amount of instrumentation.
+            DependencyDetection.detect!
           end
+        end
+
+        def install_browser_monitoring_and_agent_hooks
+          return unless rails_config
+
           if !Agent.config[:agent_enabled]
-            # Might not be running if it does not think mongrel, thin, passenger, etc
-            # is running, if it thinks it's a rake task, or if the agent_enabled is false.
-            ::NewRelic::Agent.logger.info("New Relic Agent not running.")
+            # Might not be running if it does not think mongrel, thin,
+            # passenger, etc. is running, if it thinks it's a rake task, or
+            # if the agent_enabled is false.
+            ::NewRelic::Agent.logger.info('New Relic Agent not running. Skipping browser monitoring and agent hooks.')
           else
             install_browser_monitoring(rails_config)
             install_agent_hooks(rails_config)
           end
-        rescue => e
-          ::NewRelic::Agent.logger.error("Failure during init_config for Rails. Is Rails required in a non-Rails app? Set NEW_RELIC_FRAMEWORK=ruby to avoid this message.",
-            "The Ruby agent will continue running, but Rails-specific features may be missing.",
-            e)
         end
 
         def install_agent_hooks(config)
@@ -77,9 +89,9 @@ module NewRelic
             return unless NewRelic::Rack::AgentHooks.needed?
 
             config.middleware.use(NewRelic::Rack::AgentHooks)
-            ::NewRelic::Agent.logger.debug("Installed New Relic Agent Hooks middleware")
+            ::NewRelic::Agent.logger.debug('Installed New Relic Agent Hooks middleware')
           rescue => e
-            ::NewRelic::Agent.logger.warn("Error installing New Relic Agent Hooks middleware", e)
+            ::NewRelic::Agent.logger.warn('Error installing New Relic Agent Hooks middleware', e)
           end
         end
 
@@ -93,9 +105,9 @@ module NewRelic
             begin
               require 'new_relic/rack/browser_monitoring'
               config.middleware.use(NewRelic::Rack::BrowserMonitoring)
-              ::NewRelic::Agent.logger.debug("Installed New Relic Browser Monitoring middleware")
+              ::NewRelic::Agent.logger.debug('Installed New Relic Browser Monitoring middleware')
             rescue => e
-              ::NewRelic::Agent.logger.warn("Error installing New Relic Browser Monitoring middleware", e)
+              ::NewRelic::Agent.logger.warn('Error installing New Relic Browser Monitoring middleware', e)
             end
           end
         end

data/lib/new_relic/control/instance_methods.rb

@@ -65,7 +65,7 @@ module NewRelic
         # An artifact of earlier implementation, we put both #add_method_tracer and #trace_execution
         # methods in the module methods.
         # Rails applications load the next two lines before any other initializers are run
-        unless defined?(Rails::VERSION) && NewRelic::Agent.config[:defer_rails_initialization]
+        unless defined?(Rails::VERSION) && ENV['NEW_RELIC_DEFER_RAILS_INITIALIZATION']
           Module.send(:include, NewRelic::Agent::MethodTracer::ClassMethods)
           Module.send(:include, NewRelic::Agent::MethodTracer)
         end
@@ -82,10 +82,10 @@ module NewRelic
         if @started_in_env && @started_in_env != env
           Agent.logger.error("Attempted to start agent in #{env.inspect} environment, but agent was already running " \
             "in #{@started_in_env.inspect}", "The agent will continue running in #{@started_in_env.inspect}. To " \
-            "alter this, ensure the desired environment is set before the agent starts.")
+            'alter this, ensure the desired environment is set before the agent starts.')
         else
           Agent.logger.info("Starting the New Relic agent version #{NewRelic::VERSION::STRING} in #{env.inspect} " \
-            "environment.", "To prevent agent startup add a NEW_RELIC_AGENT_ENABLED=false environment variable or " \
+            'environment.', 'To prevent agent startup add a NEW_RELIC_AGENT_ENABLED=false environment variable or ' \
             "modify the #{env.inspect} section of your newrelic.yml.")
         end
 
@@ -106,9 +106,9 @@ module NewRelic
       end
 
       def handle_invalid_security_settings
-        NewRelic::Agent.logger.error("Security Policies and High Security Mode cannot both be present in the agent " \
-          "configuration. If Security Policies have been set for your account, please ensure the " \
-          "security_policies_token is set but high_security is disabled (default).")
+        NewRelic::Agent.logger.error('Security Policies and High Security Mode cannot both be present in the agent ' \
+          'configuration. If Security Policies have been set for your account, please ensure the ' \
+          'security_policies_token is set but high_security is disabled (default).')
         install_shim
       end
 

data/lib/new_relic/control/instrumentation.rb

@@ -64,7 +64,7 @@ module NewRelic
         DependencyDetection.detect!
         ruby_deprecation
         rails_32_deprecation
-        ::NewRelic::Agent.logger.info("Finished instrumentation")
+        ::NewRelic::Agent.logger.info('Finished instrumentation')
       end
     end
 

data/lib/new_relic/control/private_instance_methods.rb

@@ -12,7 +12,7 @@ module NewRelic
 
       def configure_high_security
         if security_settings_valid? && Agent.config[:high_security]
-          Agent.logger.info("Installing high security configuration based on local configuration")
+          Agent.logger.info('Installing high security configuration based on local configuration')
           Agent.config.replace_or_add_config(Agent::Configuration::HighSecuritySource.new(Agent.config))
         end
       end