newrelic_rpm 8.2.0 → 8.3.0

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v8.3.0
+
+  * **Updated the agent to support Ruby 3.1.0**
+
+    Most of the changes involved updating the multiverse suite to exclude runs for older versions of instrumented gems that are not compatible with Ruby 3.1.0. In addition, Infinite Tracing testing was updated to accommodate `YAML::unsafe_load` for Psych 4 support.
+
+  * **Bugfix: Update AdaptiveSampler#sampled? algorithm**
+
+    One of the clauses in `AdaptiveSampler#sampled?` would always return false due to Integer division returning a result of zero. This method has been updated to use Float division instead, to exponentially back off the number of samples required. This may increase the number of traces collected for transactions. A huge thank you to @romul for bringing this to our attention and breaking down the problem!
+
+  * **Bugfix: Correctly encode ASCII-8BIT log messages**
+
+    The encoding update for the DecoratingLogger in v8.2.0 did not account for ASCII-8BIT encoded characters qualifying as `valid_encoding?`. Now, ASCII-8BIT characters will be encoded as UTF-8 and include replacement characters as needed. We're very grateful for @nikajukic's collaboration and submission of a test case to resolve this issue.
+
+
   ## v8.2.0
 
   * **New Instrumentation for Tilt gem**
@@ -21,7 +36,7 @@
   * **Bugfix: Span Events recorded when using newrelic_ignore**
 
     Previously, the agent was incorrectly recording span events only on transactions that should be ignored. This fix will prevent any span events from being created for transactions using newrelic_ignore, or ignored through the `rules.ignore_url_regexes` configuration option.
-  
+
   * **Bugfix: Print deprecation warning for Cross-Application Tracing if enabled**
 
     Prior to this change, the deprecation warning would log whenever the agent started up, regardless of configuration. Thank you @alpha-san for bringing this to our attention!
@@ -29,7 +44,7 @@
   * **Bugfix: Scrub non-unicode characters from DecoratingLogger**
 
     To prevent `JSON::GeneratorErrors`, the DecoratingLogger replaces non-unicode characters with the replacement character: �. Thank you @jdelStrother for bringing this to our attention!
-    
+
   * **Bugfix: Distributed tracing headers emitted errors when agent was not connected**
 
     Previously, when the agent had not yet connected it would fail to create a trace context payload and emit an error, "TypeError: no implicit conversion of nil into String," to the agent logs. The correct behavior in this situation is to not create these headers due to the lack of required information. Now, the agent will not attempt to create trace context payloads until it has connected. Thank you @Izzette for bringing this to our attention!

data/CONTRIBUTING.md

@@ -66,7 +66,8 @@ issues](../../issues?q=is%3Aissue+is%3Aclosed).
 ### Pull Requests
 
 We can only accept PRs for version v6.12.0 or greater due to open source
-licensing restrictions.
+licensing restrictions. Please set the merge branch to `dev` unless the issue
+states otherwise.
 
 ### Code of Conduct
 
@@ -84,18 +85,29 @@ release from this repo, use the appropriate tag. New Relic usually pushes beta
 versions of a release to a working branch before tagging them for General
 Availability.
 
+The `main` branch houses the code from the latest release. The `dev` branch
+includes unreleased work. Please create all new branches off of `dev`.
+
 ## Development Environment Setup
 
 1. Fork and clone the repo locally
     - Fork the repository inside GitHub
     - `git clone git@github.com:<gh username>/newrelic-ruby-agent.git`
 1. Pick a Ruby version
-    - Use rbenv or rvm to install any version of Ruby between 2.2 up to 3.0.1
+    - Use rbenv or rvm to install any version of Ruby between 2.2 up to 3.1
 1. Install development dependencies
     - `bundle install`
 1. Check that your env is setup correctly
     - `bundle exec rake`
 
+**Optional:** Install [lefthook](https://github.com/evilmartians/lefthook) to
+integrate our team's git hooks, such as [rubocop](https://github.com/rubocop/rubocop)
+linting into your workflow.
+
+**Note:** These setup instructions will not allow you to run the entire test
+suite. Some of our suites require services such as MySQL, Postgres, Redis, and
+others to run.
+
 ## Testing
 
 The agent includes a suite of unit and functional tests which should be used to

data/Guardfile

@@ -1,24 +1,24 @@
 require './test/multiverse/lib/multiverse/bundler_patch'
 
-test_folders = Dir.glob("test/new_relic/*").select{|f| File.directory?(f)}
-test_folders += Dir.glob("test/new_relic/**/*").select{|f| File.directory?(f)}
+test_folders = Dir.glob("test/new_relic/*").select { |f| File.directory?(f) }
+test_folders += Dir.glob("test/new_relic/**/*").select { |f| File.directory?(f) }
 
-rake_lib_path = Bundler.with_unbundled_env{ `bundle exec gem which rake`.chomp.gsub("lib/rake.rb", "lib") }
-ruby_options = %{-w -I"#{rake_lib_path}" "#{rake_lib_path}/rake/rake_test_loader.rb"}
+rake_lib_path = Bundler.with_unbundled_env { `bundle exec gem which rake`.chomp.gsub("lib/rake.rb", "lib") }
+ruby_options = %(-w -I"#{rake_lib_path}" "#{rake_lib_path}/rake/rake_test_loader.rb")
 
 guard_options = {
   spring: "bundle exec ruby #{ruby_options} ",
-  test_folders: ['test/new_relic'] + test_folders, 
+  test_folders: ['test/new_relic'] + test_folders,
   all_after_pass: false,
   all_on_start: false
 }
 
 guard :minitest, guard_options do
-  watch(%r{^lib/(.+)\.rb$})     { |m| "test/#{m[1]}_test.rb" }
+  watch(%r{^lib/(.+)\.rb$}) { |m| "test/#{m[1]}_test.rb" }
   watch(%r{^test/.+_test\.rb$})
-  watch(%r{^test/rum/.*})       { "test/new_relic/rack/browser_monitoring_test.rb" }
+  watch(%r{^test/rum/.*}) { "test/new_relic/rack/browser_monitoring_test.rb" }
   watch(%r{^test/fixtures/cross_agent_tests/distributed_tracing/(.+).json}) { |m| "test/new_relic/agent/distributed_tracing/#{m[1]}_cross_agent_test.rb" }
-  watch('test/test_helper.rb')  { "test/new_relic" }
+  watch('test/test_helper.rb') { "test/new_relic" }
   watch('test/agent_helper.rb') { "test/new_relic" }
   watch('lib/new_relic/agent/configuration/default_source.rb') { "test/new_relic/agent/configuration/orphan_configuration_test.rb" }
   watch(%r{^lib/new_relic/agent/transaction/(.+).rb}) { |m| "test/new_relic/agent/distributed_tracing/#{m[1]}_cross_agent_test.rb" }

data/Rakefile

@@ -10,7 +10,7 @@ task :test => ['test:newrelic']
 
 namespace :test do
   desc "Run all tests"
-  task :all => %w{newrelic multiverse}
+  task :all => %w[newrelic multiverse]
 
   begin
     require 'test_bisect'
@@ -27,14 +27,14 @@ namespace :test do
     require File.expand_path(File.join(File.dirname(__FILE__), 'test', 'performance', 'lib', 'performance'))
     options = {}
     options[:suite] = args[:suite] if args[:suite]
-    options[:name]  = args[:name]  if args[:name]
+    options[:name] = args[:name] if args[:name]
     Performance::Runner.new(options).run_and_report
   end
 
   desc "Run agent within existing mini environments"
   task :env, [:env1, :env2, :env3, :env4, :env5, :env6] => [] do |t, args|
     require File.expand_path(File.join(File.dirname(__FILE__), 'test', 'environments', 'lib', 'environments', 'runner'))
-    Environments::Runner.new(args.map{|_,v| v}).run_and_report
+    Environments::Runner.new(args.map { |_, v| v }).run_and_report
   end
 
   Rake::TestTask.new(:intentional_fail) do |t|
@@ -51,11 +51,10 @@ namespace :test do
 
   # Note unit testing task is defined in lib/tasks/tests.rake to facilitate
   # running them in a rails application environment.
-
 end
 
 desc 'Record build number and stage'
-task :record_build, [ :build_number, :stage ] do |t, args|
+task :record_build, [:build_number, :stage] do |t, args|
   build_string = args.build_number
   build_string << ".#{args.stage}" unless args.stage.nil? || args.stage.empty?
 
@@ -111,7 +110,7 @@ end
 
 namespace :cross_agent_tests do
   cross_agent_tests_upstream_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'cross_agent_tests'))
-  cross_agent_tests_local_path    = File.expand_path(File.join(File.dirname(__FILE__), 'test', 'fixtures', 'cross_agent_tests'))
+  cross_agent_tests_local_path = File.expand_path(File.join(File.dirname(__FILE__), 'test', 'fixtures', 'cross_agent_tests'))
 
   # Note: before you pull, make sure your local repo is on the correct, synced branch!
   desc 'Pull latest changes from cross_agent_tests repo'
@@ -137,4 +136,3 @@ task :console do
   ARGV.clear
   Pry.start
 end
-

data/bin/mongrel_rpm

@@ -5,14 +5,14 @@ require 'rack/handler/mongrel'
 require 'optparse'
 
 port = 3000
-options = { }
+options = {}
 appname = nil
 OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename($0)} [options] [app_name]"
-  opts.on("-p", "--port=port", Integer, "default: #{port}") { | port | }
-  opts.on("--[no-]logging", "turn off request logging" ) { | l | options[:logging] = l }
-  opts.on("--license=license_key", "override license key" ) { | l | options[:license_key] = l }
-  opts.on("--install", "install a newrelic.yml template" ) { | l | options[:install] = true }
+  opts.on("-p", "--port=port", Integer, "default: #{port}") { |port| }
+  opts.on("--[no-]logging", "turn off request logging") { |l| options[:logging] = l }
+  opts.on("--license=license_key", "override license key") { |l| options[:license_key] = l }
+  opts.on("--install", "install a newrelic.yml template") { |l| options[:install] = true }
   opts.separator ""
   opts.separator "app_name is the name of the application where the metrics will be stored"
   opts.separator ""
@@ -26,8 +26,7 @@ ru_file = File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "new_r
 rackup_code = File.read ru_file
 builder = Rack::Builder.new { eval rackup_code, binding, ru_file }
 
-options = { :Host => '127.0.0.1', :Port => port }
-Rack::Handler::Mongrel.run(builder.to_app, options) do | server |
-  NewRelic::Agent.logger.info "Started Mongrel listening for '#{NewRelic::Control.instance.app_names.join(" and ")}' data at #{server.host}:#{server.port}" 
+options = {:Host => '127.0.0.1', :Port => port}
+Rack::Handler::Mongrel.run(builder.to_app, options) do |server|
+  NewRelic::Agent.logger.info "Started Mongrel listening for '#{NewRelic::Control.instance.app_names.join(" and ")}' data at #{server.host}:#{server.port}"
 end
-

data/bin/newrelic

@@ -2,7 +2,7 @@
 # executes one of the commands in the new_relic/commands directory
 # pass the name of the command as an argument
 
-$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..','lib'))
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'new_relic/cli/command'
 begin
   NewRelic::Cli::Command.run

data/bin/nrdebug

@@ -7,7 +7,7 @@
 require 'tempfile'
 require 'rbconfig'
 
-def fail(msg, opts={})
+def fail(msg, opts = {})
   $stderr.puts(msg)
   usage() if opts[:usage]
   exit(-1)
@@ -84,7 +84,7 @@ class ProcessDataProvider
 
   def self.for_process(pid)
     case RbConfig::CONFIG['target_os']
-    when /linux/  then LinuxProcessDataProvider.new(pid)
+    when /linux/ then LinuxProcessDataProvider.new(pid)
     when /darwin/ then DarwinProcessDataProvider.new(pid)
     end
   end
@@ -170,7 +170,7 @@ end
 class ProcessReport
   attr_reader :target, :path
 
-  def initialize(target, path=nil)
+  def initialize(target, path = nil)
     @target = target
     @path = path
   end
@@ -185,7 +185,7 @@ class ProcessReport
     end
   end
 
-  def section(f, name=nil)
+  def section(f, name = nil)
     content = begin
       yield
     rescue StandardError => e
@@ -200,13 +200,13 @@ class ProcessReport
 
   def generate
     open do |f|
-      section(f, "Time")        { Time.now }
-      section(f, "PID")         { @target.pid }
-      section(f, "Command")     { @target.procline }
-      section(f, "RSS")         { @target.rss }
-      section(f, "CPU")         { @target.cpu }
-      section(f, "Parent PID")  { @target.ppid }
-      section(f, "OS")          { ShellWrapper.execute('uname -a') }
+      section(f, "Time") { Time.now }
+      section(f, "PID") { @target.pid }
+      section(f, "Command") { @target.procline }
+      section(f, "RSS") { @target.rss }
+      section(f, "CPU") { @target.cpu }
+      section(f, "Parent PID") { @target.ppid }
+      section(f, "OS") { ShellWrapper.execute('uname -a') }
       section(f, "Environment") { @target.environment }
 
       section(f) do
@@ -214,13 +214,13 @@ class ProcessReport
         if c_backtraces.match(/could not attach/i)
           fail("Failed to attach to target process. Please try again with sudo.")
         end
-        section(f, "C Backtraces")   { c_backtraces }
+        section(f, "C Backtraces") { c_backtraces }
         section(f, "Ruby Backtrace(s)") { ruby_backtraces }
       end
 
       section(f, "Open files") { @target.open_files }
       section(f, "Log") do
-        commands = Logger.messages.map { |(_,msg)| msg }
+        commands = Logger.messages.map { |(_, msg)| msg }
         commands.join("\n")
       end
     end
@@ -243,7 +243,7 @@ def prompt_for_confirmation(target_pid, target_cmd)
   puts ''
   puts "To continue, type 'continue':"
 
-  until ($stdin.gets.strip == 'continue') do
+  until $stdin.gets.strip == 'continue'
     puts "Please type 'continue' to continue, or ctrl-c to abort."
   end
 end

data/init.rb

@@ -18,7 +18,6 @@ require 'new_relic/control'
 # We need it to add dev mode routes after initialization finished.
 
 begin
-
   current_config = if defined?(config)
     config
   elsif defined?(Rails.configuration)
@@ -26,7 +25,6 @@ begin
   end
 
   NewRelic::Control.instance.init_plugin :config => current_config
-
 rescue => e
   ::NewRelic::Agent.logger.error "Error initializing New Relic plugin. Agent is disabled.", e
 end

data/lefthook.yml

@@ -0,0 +1,9 @@
+# Lefthook (https://github.com/evilmartians/lefthook) is a git hooks manager
+# Install it on your machine by running `gem install lefthook`
+pre-commit:
+  parallel: true
+  commands:
+    rubocop:
+      files: git diff --name-only --staged
+      glob: "*.rb"
+      run: rubocop --force-exclusion {files}

data/lib/new_relic/agent/adaptive_sampler.rb

@@ -5,7 +5,6 @@
 module NewRelic
   module Agent
     class AdaptiveSampler
-
       def initialize target_samples = 10, period_duration = 60
         @target = target_samples
         @seen = 0
@@ -29,7 +28,8 @@ module NewRelic
           elsif @sampled_count < @target
             rand(@seen_last) < @target
           else
-            rand(@seen) < (@target ** (@target / @sampled_count) - @target ** 0.5)
+            # you've met the target and need to exponentially back off
+            rand(@seen) < exponential_backoff
           end
 
           @sampled_count += 1 if sampled
@@ -39,6 +39,10 @@ module NewRelic
         end
       end
 
+      def exponential_backoff
+        @target**(@target.to_f / @sampled_count) - @target**0.5
+      end
+
       def stats
         @lock.synchronize do
           {
@@ -57,7 +61,7 @@ module NewRelic
         return unless @period_start + @period_duration <= now
 
         elapsed_periods = Integer((now - @period_start) / @period_duration)
-        @period_start = @period_start + elapsed_periods * @period_duration
+        @period_start += elapsed_periods * @period_duration
 
         @first_period = false
         @seen_last = elapsed_periods > 1 ? 0 : @seen

data/lib/new_relic/agent/agent.rb

@@ -37,7 +37,6 @@ require 'new_relic/agent/connect/response_handler'
 
 module NewRelic
   module Agent
-
     # The Agent is a singleton that is instantiated when the plugin is
     # activated.  It collects performance data from ruby applications
     # in realtime as the application runs, and periodically sends that
@@ -54,31 +53,31 @@ module NewRelic
 
         @service = NewRelicService.new
 
-        @events                    = EventListener.new
-        @stats_engine              = StatsEngine.new
-        @transaction_sampler       = TransactionSampler.new
-        @sql_sampler               = SqlSampler.new
-        @agent_command_router      = Commands::AgentCommandRouter.new @events
-        @monitors                  = Monitors.new @events
-        @error_collector           = ErrorCollector.new @events
-        @transaction_rules         = RulesEngine.new
-        @harvest_samplers          = SamplerCollection.new @events
-        @monotonic_gc_profiler     = VM::MonotonicGCProfiler.new
-        @javascript_instrumentor   = JavascriptInstrumentor.new @events
-        @adaptive_sampler          = AdaptiveSampler.new(Agent.config[:sampling_target],
-                                                         Agent.config[:sampling_target_period_in_seconds])
-
-        @harvester       = Harvester.new @events
+        @events = EventListener.new
+        @stats_engine = StatsEngine.new
+        @transaction_sampler = TransactionSampler.new
+        @sql_sampler = SqlSampler.new
+        @agent_command_router = Commands::AgentCommandRouter.new @events
+        @monitors = Monitors.new @events
+        @error_collector = ErrorCollector.new @events
+        @transaction_rules = RulesEngine.new
+        @harvest_samplers = SamplerCollection.new @events
+        @monotonic_gc_profiler = VM::MonotonicGCProfiler.new
+        @javascript_instrumentor = JavascriptInstrumentor.new @events
+        @adaptive_sampler = AdaptiveSampler.new(Agent.config[:sampling_target],
+          Agent.config[:sampling_target_period_in_seconds])
+
+        @harvester = Harvester.new @events
         @after_fork_lock = Mutex.new
 
         @transaction_event_recorder = TransactionEventRecorder.new @events
-        @custom_event_aggregator    = CustomEventAggregator.new @events
-        @span_event_aggregator      = SpanEventAggregator.new @events
+        @custom_event_aggregator = CustomEventAggregator.new @events
+        @span_event_aggregator = SpanEventAggregator.new @events
 
-        @connect_state      = :pending
-        @connect_attempts   = 0
-        @waited_on_connect  = nil
-        @connected_pid      = nil
+        @connect_state = :pending
+        @connect_attempts = 0
+        @waited_on_connect = nil
+        @connected_pid = nil
 
         @wait_on_connect_mutex = Mutex.new
         @wait_on_connect_condition = ConditionVariable.new
@@ -110,7 +109,6 @@ module NewRelic
       # Holds all the methods defined on NewRelic::Agent::Agent
       # instances
       module InstanceMethods
-
         # the statistics engine that holds all the timeslice data
         attr_reader :stats_engine
         # the transaction sampler that handles recording transactions
@@ -184,7 +182,7 @@ module NewRelic
         # * <tt>:keep_retrying => false</tt> if we try to initiate a new
         #   connection, this tells me to only try it once so this method returns
         #   quickly if there is some kind of latency with the server.
-        def after_fork(options={})
+        def after_fork(options = {})
           needs_restart = false
           @after_fork_lock.synchronize do
             needs_restart = @harvester.needs_restart?
@@ -284,7 +282,7 @@ module NewRelic
         # Sets a thread local variable as to whether we should or
         # should not record sql in the current thread. Returns the
         # previous value, if there is one
-        def set_record_sql(should_record) #THREAD_LOCAL_ACCESS
+        def set_record_sql(should_record) # THREAD_LOCAL_ACCESS
           state = Tracer.state
           prev = state.record_sql
           state.record_sql = should_record
@@ -295,13 +293,13 @@ module NewRelic
         # thread. This uses a stack which allows us to disable tracing
         # children of a transaction without affecting the tracing of
         # the whole transaction
-        def push_trace_execution_flag(should_trace=false) #THREAD_LOCAL_ACCESS
+        def push_trace_execution_flag(should_trace = false) # THREAD_LOCAL_ACCESS
           Tracer.state.push_traced(should_trace)
         end
 
         # Pop the current trace execution status.  Restore trace execution status
         # to what it was before we pushed the current flag.
-        def pop_trace_execution_flag #THREAD_LOCAL_ACCESS
+        def pop_trace_execution_flag # THREAD_LOCAL_ACCESS
           Tracer.state.pop_traced
         end
 
@@ -492,7 +490,7 @@ module NewRelic
           # after_fork call restarting the thread in deferred dispatchers.
           #
           # Treatment of @started and env report is important to get right.
-          def setup_and_start_agent(options={})
+          def setup_and_start_agent(options = {})
             @started = true
             @harvester.mark_started
 
@@ -755,7 +753,7 @@ module NewRelic
           # Don't connect if we're already connected, or if we tried to connect
           # and were rejected with prejudice because of a license issue, unless
           # we're forced to by force_reconnect.
-          def should_connect?(force=false)
+          def should_connect?(force = false)
             force || (!connected? && !disconnected?)
           end
 
@@ -788,7 +786,8 @@ module NewRelic
           def handle_license_error(error)
             ::NewRelic::Agent.logger.error( \
               error.message, \
-              "Visit NewRelic.com to obtain a valid license key, or to upgrade your account.")
+              "Visit NewRelic.com to obtain a valid license key, or to upgrade your account."
+            )
             disconnect
           end
 
@@ -881,20 +880,19 @@ module NewRelic
               raise WaitOnConnectTimeout, "Agent was unable to connect in #{timeout} seconds."
             end
           end
-
         end
         include Connect
 
         def container_for_endpoint(endpoint)
           case endpoint
-          when :metric_data             then @stats_engine
+          when :metric_data then @stats_engine
           when :transaction_sample_data then @transaction_sampler
-          when :error_data              then @error_collector.error_trace_aggregator
-          when :error_event_data        then @error_collector.error_event_aggregator
-          when :analytic_event_data     then transaction_event_aggregator
-          when :custom_event_data       then @custom_event_aggregator
-          when :span_event_data         then span_event_aggregator
-          when :sql_trace_data          then @sql_sampler
+          when :error_data then @error_collector.error_trace_aggregator
+          when :error_event_data then @error_collector.error_event_aggregator
+          when :analytic_event_data then transaction_event_aggregator
+          when :custom_event_data then @custom_event_aggregator
+          when :span_event_data then span_event_aggregator
+          when :sql_trace_data then @sql_sampler
           end
         end
 
@@ -931,7 +929,7 @@ module NewRelic
         #   This is useful primarily when re-establishing a new connection after
         #   forking off from a parent process.
         #
-        def connect(options={})
+        def connect(options = {})
           defaults = {
             :keep_retrying => Agent.config[:keep_retrying],
             :force_reconnect => Agent.config[:force_reconnect]
@@ -1067,7 +1065,7 @@ module NewRelic
 
         def harvest_and_send_analytic_event_data
           harvest_and_send_from_container(transaction_event_aggregator, :analytic_event_data)
-          harvest_and_send_from_container(synthetics_event_aggregator,  :analytic_event_data)
+          harvest_and_send_from_container(synthetics_event_aggregator, :analytic_event_data)
         end
 
         def harvest_and_send_custom_event_data

data/lib/new_relic/agent/agent_logger.rb

@@ -12,7 +12,7 @@ module NewRelic
     class AgentLogger
       include LogOnce
 
-      def initialize(root = "", override_logger=nil)
+      def initialize(root = "", override_logger = nil)
         @already_logged_lock = Mutex.new
         clear_already_logged
         create_log(root, override_logger)
@@ -50,8 +50,8 @@ module NewRelic
       # the log level that the backtrace is logged at. If you just want the
       # default behavior of backtraces logged at debug, use one of the methods
       # above and pass an Exception as one of the args.
-      def log_exception(level, e, backtrace_level=level)
-        @log.send(level, "%p: %s" % [ e.class, e.message ])
+      def log_exception(level, e, backtrace_level = level)
+        @log.send(level, "%p: %s" % [e.class, e.message])
         @log.send(backtrace_level) do
           backtrace = backtrace_from_exception(e)
           if backtrace
@@ -136,8 +136,8 @@ module NewRelic
       end
 
       def find_or_create_file_path(path_setting, root)
-        for abs_path in [ File.expand_path(path_setting),
-                          File.expand_path(File.join(root, path_setting)) ] do
+        for abs_path in [File.expand_path(path_setting),
+          File.expand_path(File.join(root, path_setting))] do
           if File.directory?(abs_path) || (Dir.mkdir(abs_path) rescue nil)
             return abs_path[%r{^(.*?)/?$}]
           end
@@ -151,10 +151,10 @@ module NewRelic
 
       LOG_LEVELS = {
         "debug" => ::Logger::DEBUG,
-        "info"  => ::Logger::INFO,
-        "warn"  => ::Logger::WARN,
+        "info" => ::Logger::INFO,
+        "warn" => ::Logger::WARN,
         "error" => ::Logger::ERROR,
-        "fatal" => ::Logger::FATAL,
+        "fatal" => ::Logger::FATAL
       }
 
       def self.log_level_for(level)
@@ -176,7 +176,6 @@ module NewRelic
       def self.format_fatal_error message
         "** [NewRelic] FATAL : #{message}\n"
       end
-
     end
 
     # In an effort to not lose messages during startup, we trap them in memory