newrelic_rpm 8.16.0 → 9.2.2

data/lib/tasks/coverage_report.rake

@@ -1,10 +1,10 @@
-# frozen_string_literal: true
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 if ENV['CI']
   namespace :coverage do
-    desc "Collates all result sets generated by the different test runners"
+    desc 'Collates all result sets generated by the different test runners'
     task :report do
       require 'simplecov'
       require 'fileutils'
@@ -19,10 +19,10 @@ if ENV['CI']
       Dir['lib/coverage_{[!r][!e][!s][!u][!l][!t][!s]}*'].each { |dir| FileUtils.rm_rf(dir) }
     end
 
-    desc "Removes all coverage_* directories"
+    desc 'Removes all coverage_* directories'
     task :clear do
       require 'fileutils'
-      Dir["lib/coverage_*"].each { |dir| FileUtils.rm_rf(dir) }
+      Dir['lib/coverage_*'].each { |dir| FileUtils.rm_rf(dir) }
     end
   end
 end

data/lib/tasks/helpers/format.rb

@@ -43,7 +43,7 @@ module Format
   def flatten_config_hash(config_hash)
     sections = []
     config = [GENERAL, 'transaction_tracer', 'error_collector',
-      'browser_monitoring', 'analytics_events', 'transaction_events',
+      'browser_monitoring', 'transaction_events',
       'application_logging']
 
     config.each { |config| sections << pluck(config, config_hash) }
@@ -66,24 +66,24 @@ module Format
 
   def format_description(value)
     description = ''
-    description += "<b>DEPRECATED</b> " if value[:deprecated]
+    description += '<b>DEPRECATED</b> ' if value[:deprecated]
     description += value[:description]
     description
   end
 
   def format_env_var(key)
-    return "None" if NON_ENV_CONFIGS.include?(key)
+    return 'None' if NON_ENV_CONFIGS.include?(key)
 
-    "NEW_RELIC_#{key.tr(".", "_").upcase}"
+    "NEW_RELIC_#{key.tr('.', '_').upcase}"
   end
 
   def format_name(key)
     name = NAME_OVERRIDES[key]
     return name if name
 
-    key.split("_")
+    key.split('_')
       .each { |fragment| fragment[0] = fragment[0].upcase }
-      .join(" ")
+      .join(' ')
   end
 
   def format_sections(key, value)
@@ -98,7 +98,7 @@ module Format
 
   def format_type(type)
     if type == NewRelic::Agent::Configuration::Boolean
-      "Boolean"
+      'Boolean'
     else
       type
     end
@@ -110,11 +110,11 @@ module Format
   end
 
   def section_key(key, components)
-    if key =~ /^disable_/ # "disable_httpclient"
+    if /^disable_/.match?(key) # "disable_httpclient"
       DISABLING
-    elsif components.length >= 2 && !(components[1] == "attributes") # "analytics_events.enabled"
+    elsif components.length >= 2 && !(components[1] == 'attributes') # "analytics_events.enabled"
       components.first
-    elsif components[1] == "attributes" # "transaction_tracer.attributes.enabled"
+    elsif components[1] == 'attributes' # "transaction_tracer.attributes.enabled"
       ATTRIBUTES
     else
       GENERAL

data/lib/tasks/helpers/removers.rb

@@ -11,21 +11,21 @@ module Removers
       `echo "drop database #{database}" | mysql -u root`
     end
   rescue => error
-    puts "ERROR: Cannot get MySQL databases..."
+    puts 'ERROR: Cannot get MySQL databases...'
     puts error.message
   end
 
   def remove_generated_gemfiles
-    file_path = File.expand_path("test/multiverse/suites")
-    Dir.glob(File.join(file_path, "**", "Gemfile*")).each do |fn|
+    file_path = File.expand_path('test/multiverse/suites')
+    Dir.glob(File.join(file_path, '**', 'Gemfile*')).each do |fn|
       puts "Removing #{fn.gsub(file_path, '.../suites')}"
       FileUtils.rm(fn)
     end
   end
 
   def remove_generated_gemfile_lockfiles
-    file_path = File.expand_path("test/environments")
-    Dir.glob(File.join(file_path, "**", "Gemfile.lock")).each do |fn|
+    file_path = File.expand_path('test/environments')
+    Dir.glob(File.join(file_path, '**', 'Gemfile.lock')).each do |fn|
       puts "Removing #{fn.gsub(file_path, '.../environments')}"
       FileUtils.rm(fn)
     end

data/lib/tasks/install.rake

@@ -3,13 +3,13 @@
 # frozen_string_literal: true
 
 namespace :newrelic do
-  desc "Install a default config/newrelic.yml file"
+  desc 'Install a default config/newrelic.yml file'
   task :install do
-    load File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "install.rb"))
+    load File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'install.rb'))
   end
 
-  desc "Gratefulness is always appreciated"
+  desc 'Gratefulness is always appreciated'
   task :thanks do
-    puts "The Ruby agent team is grateful to Jim Weirich for his kindness and his code. He will be missed."
+    puts 'The Ruby agent team is grateful to Jim Weirich for his kindness and his code. He will be missed.'
   end
 end

data/lib/tasks/instrumentation_generator/instrumentation.thor

@@ -14,7 +14,7 @@ class Instrumentation < Thor
   NEWRELIC_YML_LOCATION = 'newrelic.yml'
 
   desc('scaffold NAME', 'Scaffold the required files for adding new instrumentation')
-  long_desc <<-LONGDESC
+  long_desc <<~LONGDESC
     `instrumentation scaffold` requires one parameter by default: the name of the
     library or class you are instrumenting. This task generates the basic
     file structure needed to add new instrumentation to the Ruby agent.
@@ -96,28 +96,25 @@ class Instrumentation < Thor
   end
 
   def config_block(name)
-    <<-CONFIG
-        :'instrumentation.#{name.downcase}' => {
-          :default => 'auto',
-          :public => true,
-          :type => String,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of the #{name} library at start up. May be one of [auto|prepend|chain|disabled].'
-        },
+    <<~CONFIG
+      :'instrumentation.#{name.downcase}' => {
+        :default => 'auto',
+        :public => true,
+        :type => String,
+        :dynamic_name => true,
+        :allowed_from_server => false,
+        :description => 'Controls auto-instrumentation of the #{name} library at start up. May be one of [auto|prepend|chain|disabled].'
+      },
     CONFIG
   end
 
-  # TODO: OLD RUBIES - RUBY_VERSION 2.2
-  # When we only support 2.3+ this can be changed to a sqiggle heredoc (<<~)
-  # and use standard indentation
   def yaml_block(name)
-<<HEREDOC # rubocop:disable Layout/IndentationWidth
+    <<~HEREDOC
 
-  # Controls auto-instrumentation of #{name} at start up.
-  # May be one of [auto|prepend|chain|disabled]
-  # instrumentation.#{name.downcase}: auto
-HEREDOC
+      # Controls auto-instrumentation of #{name} at start up.
+      # May be one of [auto|prepend|chain|disabled]
+      # instrumentation.#{name.downcase}: auto
+    HEREDOC
   end
 end
 

data/lib/tasks/instrumentation_generator/templates/Envfile.tt

@@ -4,6 +4,6 @@
 
 instrumentation_methods :chain, :prepend
 
-gemfile <<-RB
+gemfile <<~RB
   gem '<%= @name.downcase %>'
 RB

data/lib/tasks/instrumentation_generator/templates/chain.tt

@@ -3,7 +3,7 @@
 # frozen_string_literal: true
 
 module NewRelic::Agent::Instrumentation
-  module <%= @class_name %>
+  module <%= @class_name %>::Chain
     def self.instrument!
       ::<%= @class_name %>.class_eval do
         include NewRelic::Agent::Instrumentation::<%= @class_name %>

data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt

@@ -23,7 +23,7 @@ DependencyDetection.defer do
     if use_prepend?
       prepend_instrument ::<%= @class_name %>, NewRelic::Agent::Instrumentation::<%= @class_name %>::Prepend
     else
-      chain_instrument NewRelic::Agent::Instrumentation::<%= @class_name %>
+      chain_instrument NewRelic::Agent::Instrumentation::<%= @class_name %>::Chain
     end
   end
 end

data/lib/tasks/multiverse.rb

@@ -1,6 +1,7 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
+
 #
 # Rake task for running Ruby agent multiverse tests. This file may be required
 # from third party gems. It is also used by the agent itself to run multiverse.
@@ -39,12 +40,14 @@ require_relative 'helpers/removers'
 include Removers
 
 namespace :test do
-  desc "Run functional test suite for New Relic"
+  desc 'Run functional test suite for New Relic'
   task :multiverse, [:suite, :param1, :param2, :param3, :param4] => ['multiverse:env'] do |_, args|
     Multiverse::Runner.run(args.suite, Multiverse::Runner.parse_args(args))
   end
 
   namespace :multiverse do
+    # task :prerequisites
+
     task :env do
       # ENV['SUITES_DIRECTORY'] = File.expand_path('../../test/multiverse/suites', __FILE__)
       require File.expand_path('../../../test/multiverse/lib/multiverse', __FILE__)
@@ -56,22 +59,26 @@ namespace :test do
       remove_generated_gemfile_lockfiles
     end
 
-    desc "Clean cached gemfiles from Bundler.bundle_path"
+    desc 'Clean cached gemfiles from Bundler.bundle_path'
     task :clean_gemfile_cache do
       glob = File.expand_path('multiverse-cache/Gemfile.*.lock', Bundler.bundle_path)
       File.delete(*Dir[glob])
     end
 
-    desc "Test the multiverse testing framework by executing tests in test/multiverse/test. Get meta with it."
+    desc 'Test the multiverse testing framework by executing tests in test/multiverse/test. Get meta with it.'
     task :self, [:suite, :mode] do |_, args|
-      args.with_defaults(:suite => "", :mode => "")
-      puts ("Testing the multiverse testing framework...")
+      args.with_defaults(:suite => '', :mode => '')
+      puts ('Testing the multiverse testing framework...')
       test_files = FileList['test/multiverse/test/*_test.rb']
-      ruby test_files.join(" ")
+      ruby test_files.join(' ')
     end
 
     task :prime, [:suite] => [:env] do |_, args|
       Multiverse::Runner.prime(args.suite, Multiverse::Runner.parse_args(args))
     end
+
+    task :gem_manifest => :env do
+      Multiverse::GemManifest.new.report
+    end
   end
 end

data/lib/tasks/newrelic.rb

@@ -1,6 +1,7 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
+
 #
 # If you are looking to instrument rake tasks in a Rails environment, but the
 # task doesn't depend on :environment, this task may be included to ensure that

data/lib/tasks/tests.rake

@@ -13,19 +13,19 @@ end
 if defined? Rake::TestTask
   namespace :test do
     tasks = Rake.application.top_level_tasks
-    ENV["TESTOPTS"] ||= ""
-    if tasks.any? { |t| t.include?("verbose") }
-      ENV["TESTOPTS"] += " -v"
+    ENV['TESTOPTS'] ||= ''
+    if tasks.any? { |t| t.include?('verbose') }
+      ENV['TESTOPTS'] += ' -v'
     end
     if seed = look_for_seed(tasks)
-      ENV["TESTOPTS"] += " --" + seed
+      ENV['TESTOPTS'] += ' --' + seed
     end
 
     agent_home = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 
     Rake::TestTask.new(:newrelic) do |t|
-      file_pattern = ENV["file"]
-      file_pattern = file_pattern.split(",").map { |f| "#{agent_home}/#{f}".gsub("//", "/") } if file_pattern
+      file_pattern = ENV['file']
+      file_pattern = file_pattern.split(',').map { |f| "#{agent_home}/#{f}".gsub('//', '/') } if file_pattern
       file_pattern ||= "#{agent_home}/test/new_relic/**/*_test.rb"
 
       t.libs << "#{agent_home}/test"

data/newrelic.yml

@@ -162,10 +162,6 @@ common: &default_settings
   # or  port_path_or_id parameters to transaction or slow SQL traces.
   # datastore_tracer.instance_reporting.enabled: true
 
-  # If true, when the agent is in an application using Ruby on Rails, it will start after
-  # config/initializers have run.
-  # defer_rails_initialization: false
-
   # If true, disables Action Cable instrumentation.
   # disable_action_cable_instrumentation: false
 
@@ -196,9 +192,6 @@ common: &default_settings
   # If true, disables ActiveSupport custom events instrumentation.
   # disable_custom_events_instrumentation: false
 
-  # If true, disables DataMapper instrumentation.
-  # disable_data_mapper: false
-
   # If true, the agent won't measure the depth of Delayed Job queues.
   # disable_delayed_job_sampler: false
 
@@ -337,6 +330,10 @@ common: &default_settings
   # May be one of [auto|prepend|chain|disabled].
   # instrumentation.bunny: auto
 
+  # Controls auto-instrumentation of Fiber at start up.
+  # May be one of [auto|prepend|chain|disabled]
+  # instrumentation.fiber: auto
+
   # Controls auto-instrumentation of concurrent_ruby at start up.
   # May be one of [auto|prepend|chain|disabled]
   # instrumentation.concurrent_ruby: auto
@@ -355,7 +352,7 @@ common: &default_settings
 
   # Controls auto-instrumentation of Excon at start up.
   # May be one of [enabled|disabled].
-  # instrumentation.excon: auto
+  # instrumentation.excon: enabled
 
   # Controls auto-instrumentation of Grape at start up.
   # May be one of [auto|prepend|chain|disabled].
@@ -391,7 +388,7 @@ common: &default_settings
 
   # Controls auto-instrumentation of Mongo at start up.
   # May be one of [enabled|disabled].
-  # instrumentation.mongo: auto
+  # instrumentation.mongo: enabled
 
   # Controls auto-instrumentation of Net::HTTP at start up.
   # May be one of [auto|prepend|chain|disabled].
@@ -444,7 +441,7 @@ common: &default_settings
   # instrumentation.thread: auto
 
   # Controls auto-instrumentation of the Thread class at start up to automatically add tracing to all Threads created in the application.
-  # instrumentation.thread.tracing: false
+  # instrumentation.thread.tracing: true
 
   # Controls auto-instrumentation of gRPC clients at start up.
   # May be one of [auto|prepend|chain|disabled].
@@ -548,7 +545,7 @@ common: &default_settings
   # slow_sql.enabled: false
 
   # If true, the agent collects explain plans in slow SQL queries. If this setting
-  # is omitted, the transaction_tracer.explain.enabled setting will be applied as
+  # is omitted, the transaction_tracer.explain_enabled setting will be applied as
   # the default setting for explain plans in slow SQL as well.
   # slow_sql.explain_enabled: false
 
@@ -642,13 +639,13 @@ common: &default_settings
   # transaction_tracer.enabled: true
 
   # Threshold (in seconds) above which the agent will collect explain plans.
-  # Relevant only when explain.enabled is true.
+  # Relevant only when explain_enabled is true.
   # transaction_tracer.explain_threshold: 0.5
 
   # If true, enables the collection of explain plans in transaction traces.
   # This setting will also apply to explain plans in slow SQL traces if
   # slow_sql.explain enabled is not set separately.
-  # transaction_tracer.explain.enabled:  true
+  # transaction_tracer.explain_enabled:  true
 
   # Maximum number of transaction trace nodes to record in a single transaction
   # trace.

data/newrelic_rpm.gemspec

@@ -6,28 +6,28 @@ require 'new_relic/version'
 require 'new_relic/latest_changes'
 
 Gem::Specification.new do |s|
-  s.name = "newrelic_rpm"
+  s.name = 'newrelic_rpm'
   s.version = NewRelic::VERSION::STRING
-  s.required_ruby_version = '>= 2.2.0'
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to?(:required_rubygems_version=)
-  s.authors = ["Tanna McClure", "Kayla Reopelle", "James Bunch", "Hannah Ramadan"]
+  s.required_ruby_version = '>= 2.4.0'
+  s.required_rubygems_version = Gem::Requirement.new('> 1.3.1') if s.respond_to?(:required_rubygems_version=)
+  s.authors = ['Tanna McClure', 'Kayla Reopelle', 'James Bunch', 'Hannah Ramadan']
   s.licenses = ['Apache-2.0']
-  s.description = <<-EOS
-New Relic is a performance management system, developed by New Relic,
-Inc (http://www.newrelic.com).  New Relic provides you with deep
-information about the performance of your web application as it runs
-in production. The New Relic Ruby agent is dual-purposed as a either a
-Gem or plugin, hosted on
-https://github.com/newrelic/newrelic-ruby-agent/
+  s.description = <<~EOS
+    New Relic is a performance management system, developed by New Relic,
+    Inc (http://www.newrelic.com).  New Relic provides you with deep
+    information about the performance of your web application as it runs
+    in production. The New Relic Ruby agent is dual-purposed as a either a
+    Gem or plugin, hosted on
+    https://github.com/newrelic/newrelic-ruby-agent/
   EOS
-  s.email = "support@newrelic.com"
+  s.email = 'support@newrelic.com'
   s.executables = %w[newrelic_cmd newrelic nrdebug]
   s.extra_rdoc_files = [
-    "CHANGELOG.md",
-    "LICENSE",
-    "README.md",
-    "CONTRIBUTING.md",
-    "newrelic.yml"
+    'CHANGELOG.md',
+    'LICENSE',
+    'README.md',
+    'CONTRIBUTING.md',
+    'newrelic.yml'
   ]
 
   s.metadata = {
@@ -35,7 +35,7 @@ https://github.com/newrelic/newrelic-ruby-agent/
     'changelog_uri' => 'https://github.com/newrelic/newrelic-ruby-agent/blob/main/CHANGELOG.md',
     'documentation_uri' => 'https://docs.newrelic.com/docs/agents/ruby-agent',
     'source_code_uri' => 'https://github.com/newrelic/newrelic-ruby-agent',
-    "homepage_uri" => "https://newrelic.com/ruby"
+    'homepage_uri' => 'https://newrelic.com/ruby'
   }
 
   file_list = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|infinite_tracing|\.github)/(?!agent_helper.rb)}) }
@@ -43,9 +43,9 @@ https://github.com/newrelic/newrelic-ruby-agent/
   file_list << build_file_path if File.exist?(build_file_path)
   s.files = file_list
 
-  s.homepage = "https://github.com/newrelic/rpm"
-  s.require_paths = ["lib"]
-  s.summary = "New Relic Ruby Agent"
+  s.homepage = 'https://github.com/newrelic/rpm'
+  s.require_paths = ['lib']
+  s.summary = 'New Relic Ruby Agent'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'feedjira', '3.2.1' unless ENV['CI'] || RUBY_VERSION < '2.5' # for Gabby
   s.add_development_dependency 'httparty' unless ENV['CI'] # for perf tests and Gabby
@@ -54,12 +54,15 @@ https://github.com/newrelic/newrelic-ruby-agent/
   s.add_development_dependency 'mocha', '~> 1.16'
   s.add_development_dependency 'pry' unless ENV['CI']
   s.add_development_dependency 'rake', '12.3.3'
-  s.add_development_dependency 'rubocop' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
-  s.add_development_dependency 'rubocop-minitest' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
-  s.add_development_dependency 'rubocop-performance' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
-  s.add_development_dependency 'rubocop-rake' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+
+  s.add_development_dependency 'rubocop', '1.44.1' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop-ast', '1.24.1' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop-minitest', '0.27.0' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop-performance', '1.16.0' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop-rake', '0.6.0' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+
   s.add_development_dependency 'simplecov' if RUBY_VERSION >= '2.7.0'
   s.add_development_dependency 'thor' unless ENV['CI']
   s.add_development_dependency 'warning' if RUBY_VERSION >= '2.4.0'
-  s.add_development_dependency 'yard', "#{RUBY_VERSION < '2.3.0' ? '0.9.26' : '> 0.9.26'}"
+  s.add_development_dependency 'yard'
 end

data/test/agent_helper.rb

@@ -111,7 +111,8 @@ end
 def assert_log_contains(log, message)
   lines = log.array
 
-  assert (lines.any? { |line| line.match(message) })
+  assert (lines.any? { |line| line.match(message) }),
+    "Could not find message. Log contained: #{lines.join("\n")}"
 end
 
 def assert_audit_log_contains(audit_log_contents, needle)
@@ -147,7 +148,7 @@ def assert_audit_log_contains_object(audit_log_contents, o, format = :json)
     end
   when NilClass
 
-    assert_audit_log_contains(audit_log_contents, format == :json ? "null" : "nil")
+    assert_audit_log_contains(audit_log_contents, format == :json ? 'null' : 'nil')
   else
     assert_audit_log_contains(audit_log_contents, o.inspect)
   end
@@ -182,7 +183,7 @@ def _normalize_metric_expectations(expectations)
 end
 
 def dump_stats(stats)
-  str = String.new("  Call count:           #{stats.call_count}\n")
+  str = +"  Call count:           #{stats.call_count}\n"
   str << "  Total call time:      #{stats.total_call_time}\n"
   str << "  Total exclusive time: #{stats.total_exclusive_time}\n"
   str << "  Min call time:        #{stats.min_call_time}\n"
@@ -379,8 +380,8 @@ end
 #   in_transaction('foobar', :category => :controller) { ... }
 #
 def in_transaction(*args, &blk)
-  opts = args.last && args.last.is_a?(Hash) ? args.pop : {}
-  category = (opts && opts.delete(:category)) || :other
+  opts = args.last&.is_a?(Hash) ? args.pop : {}
+  category = (opts&.delete(:category)) || :other
 
   # At least one test passes `:transaction_name => nil`, so handle it gently
   name = opts.key?(:transaction_name) ? opts.delete(:transaction_name) : args.first || 'dummy'
@@ -434,10 +435,10 @@ def capture_segment_with_error
     segment_with_error = nil
     with_segment do |segment|
       segment_with_error = segment
-      raise "oops!"
+      raise 'oops!'
     end
   rescue Exception => exception
-    assert segment_with_error, "expected to have a segment_with_error"
+    assert segment_with_error, 'expected to have a segment_with_error'
     build_deferred_error_attributes(segment_with_error)
     return segment_with_error, exception
   end
@@ -476,7 +477,7 @@ end
 def last_transaction_trace_request_params
   agent_attributes = attributes_for(last_transaction_trace, :agent)
   agent_attributes.inject({}) do |memo, (key, value)|
-    memo[key] = value if key.to_s.start_with?("request.parameters.")
+    memo[key] = value if key.to_s.start_with?('request.parameters.')
     memo
   end
 end
@@ -671,7 +672,7 @@ def undefine_constant(constant_symbol)
   const_str = constant_symbol.to_s
   parent = get_parent(const_str)
   const_name = const_str.gsub(/.*::/, '')
-  return yield unless parent && parent.constants.include?(const_name.to_sym)
+  return yield unless parent&.constants&.include?(const_name.to_sym)
 
   removed_constant = parent.send(:remove_const, const_name)
   yield
@@ -693,13 +694,13 @@ ensure
 end
 
 def create_agent_command(args = {})
-  NewRelic::Agent::Commands::AgentCommand.new([-1, {"name" => "command_name", "arguments" => args}])
+  NewRelic::Agent::Commands::AgentCommand.new([-1, {'name' => 'command_name', 'arguments' => args}])
 end
 
 def wait_for_backtrace_service_poll(opts = {})
   defaults = {
     :timeout => 10.0,
-    :service => NewRelic::Agent.agent.agent_command_router.backtrace_service,
+    :service => NewRelic::Agent.agent.instance_variable_get(:@agent_command_router).backtrace_service,
     :iterations => 1
   }
   opts = defaults.merge(opts)
@@ -729,7 +730,7 @@ def with_array_logger(level = :info)
   override_logger = Logger.new(logdev)
 
   with_config(config) do
-    NewRelic::Agent.logger = NewRelic::Agent::AgentLogger.new("", override_logger)
+    NewRelic::Agent.logger = NewRelic::Agent::AgentLogger.new('', override_logger)
     yield
   end
 
@@ -876,7 +877,7 @@ def load_cross_agent_test(name)
 end
 
 def each_cross_agent_test(options)
-  options = {:dir => nil, :pattern => "*"}.update(options)
+  options = {:dir => nil, :pattern => '*'}.update(options)
   path = File.join([cross_agent_tests_dir, options[:dir], options[:pattern]].compact)
   Dir.glob(path).each { |file| yield(file) }
 end
@@ -891,7 +892,7 @@ def assert_event_attributes(event, test_name, expected_attributes, non_expected_
     incorrect_attributes << name unless actual_value == expected_value
   end
 
-  msg = String.new("Found missing or incorrect attribute values in #{test_name}:\n")
+  msg = +"Found missing or incorrect attribute values in #{test_name}:\n"
 
   incorrect_attributes.each do |name|
     msg << "  #{name}: expected = #{expected_attributes[name].inspect}, actual = #{event_attrs[name].inspect}\n"
@@ -930,10 +931,10 @@ def message_for_status_code(code)
   end
 
   case code
-  when 200 then "OK"
-  when 404 then "Not Found"
-  when 403 then "Forbidden"
-  else "Unknown"
+  when 200 then 'OK'
+  when 404 then 'Not Found'
+  when 403 then 'Forbidden'
+  else 'Unknown'
   end
 end
 
@@ -942,7 +943,7 @@ end
 # a "status_code" may be passed in the headers to alter the HTTP Status Code
 # that is wrapped in the response.
 def mock_http_response(headers, wrap_it = true)
-  status_code = (headers.delete("status_code") || 200).to_i
+  status_code = (headers.delete('status_code') || 200).to_i
   net_http_resp = Net::HTTPResponse.new(1.0, status_code, message_for_status_code(status_code))
   headers.each do |key, value|
     net_http_resp.add_field(key.to_s, value)
@@ -966,7 +967,7 @@ end
 def assert_segment_noticed_error(txn, segment_name, error_classes, error_message)
   error_segment = txn.segments.reverse.detect { |s| s.noticed_error }
 
-  assert error_segment, "Expected at least one segment with a noticed_error"
+  assert error_segment, 'Expected at least one segment with a noticed_error'
 
   assert_match_or_equal segment_name, error_segment.name
 
@@ -977,15 +978,15 @@ def assert_segment_noticed_error(txn, segment_name, error_classes, error_message
 end
 
 def assert_transaction_noticed_error(txn, error_classes)
-  refute_empty txn.exceptions, "Expected transaction to notice the error"
+  refute_empty txn.exceptions, 'Expected transaction to notice the error'
   assert_match_or_equal error_classes, txn.exceptions.keys.first.class.name
 end
 
 def refute_transaction_noticed_error(txn, error_class)
   error_segment = txn.segments.reverse.detect { |s| s.noticed_error }
 
-  assert error_segment, "Expected at least one segment with a noticed_error"
-  assert_empty txn.exceptions, "Expected transaction to NOT notice any segment errors"
+  assert error_segment, 'Expected at least one segment with a noticed_error'
+  assert_empty txn.exceptions, 'Expected transaction to NOT notice any segment errors'
 end
 
 def refute_raises(*exp)
@@ -1021,6 +1022,6 @@ def defer_testing_to_min_supported_rails(test_file, min_rails_version, supports_
 
     yield
   else
-    puts "Skipping tests in #{File.basename(test_file)} because Rails >= #{min_rails_version} is unavailable" if ENV["VERBOSE_TEST_OUTPUT"]
+    puts "Skipping tests in #{File.basename(test_file)} because Rails >= #{min_rails_version} is unavailable" if ENV['VERBOSE_TEST_OUTPUT']
   end
 end