newrelic_rpm 8.7.0 → 8.11.0

data/test/agent_helper.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
 # 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
 
 # These helpers should not have any gem dependencies except on newrelic_rpm
 # itself, and should be usable from within any multiverse suite.
@@ -13,49 +13,28 @@ rescue LoadError
   # NOP -- Net::HTTP::STATUS_CODES was introduced in Ruby 2.5
 end
 
-module MiniTest
-  module Assertions
-    # The failure message is backwards.  This patch reverses the message
-    # Note: passing +msg+ caused two failure messages to be shown on failure
-    # and was more confusing than patching here.
-    def assert_match matcher, obj, msg = nil
-      msg = message(msg) { "Expected #{mu_pp obj} to match #{mu_pp matcher}" }
-      assert_respond_to matcher, :"=~"
-      matcher = Regexp.new Regexp.escape matcher if String === matcher
-      assert matcher =~ obj, msg
-    end
-  end
-end
-
 class ArrayLogDevice
-  def initialize array = []
+  def initialize(array = [])
     @array = array
   end
   attr_reader :array
 
-  def write message
+  def write(message)
     @array << message
   end
 
   def close; end
 end
 
-def fake_guid length = 16
-  NewRelic::Agent::GuidGenerator.generate_guid length
+def fake_guid(length = 16)
+  NewRelic::Agent::GuidGenerator.generate_guid(length)
 end
 
-def assert_match matcher, obj, msg = nil
-  msg = message(msg) { "Expected #{mu_pp matcher} to match #{mu_pp obj}" }
-  assert_respond_to matcher, :"=~"
-  matcher = Regexp.new Regexp.escape matcher if String === matcher
-  assert matcher =~ obj, msg
+def assert_between(floor, ceiling, value, message = "expected #{floor} <= #{value} <= #{ceiling}")
+  assert((floor <= value && value <= ceiling), message) # rubocop:disable Minitest/AssertWithExpectedArgument
 end
 
-def assert_between floor, ceiling, value, message = "expected #{floor} <= #{value} <= #{ceiling}"
-  assert((floor <= value && value <= ceiling), message)
-end
-
-def assert_in_delta expected, actual, delta
+def assert_in_delta(expected, actual, delta)
   assert_between((expected - delta), (expected + delta), actual)
 end
 
@@ -67,10 +46,9 @@ def reset_error_traces!
   NewRelic::Agent.instance.error_collector.error_trace_aggregator.reset!
 end
 
-def assert_has_traced_error error_class
+def assert_has_traced_error(error_class)
   errors = harvest_error_traces!
-  assert \
-    errors.find { |e| e.exception_class_name == error_class.name } != nil, \
+  refute_nil errors.find { |e| e.exception_class_name == error_class.name }, \
     "Didn't find error of class #{error_class}"
 end
 
@@ -102,51 +80,44 @@ def last_error_event
   harvest_error_events!.last.last
 end
 
-unless defined? assert_block
-  def assert_block *msgs
-    assert yield, *msgs
-  end
-end
-
 unless defined? assert_includes
-  def assert_includes collection, member, msg = nil
+  def assert_includes(collection, member, msg = nil)
     msg = "Expected #{collection.inspect} to include #{member.inspect}"
-    assert_block(msg) { collection.include?(member) }
+    assert_includes collection, member, msg
   end
 end
 
 unless defined? assert_not_includes
-  def assert_not_includes collection, member, msg = nil
+  def assert_not_includes(collection, member, msg = nil)
     msg = "Expected #{collection.inspect} not to include #{member.inspect}"
-    assert !collection.include?(member), msg
+    refute_includes collection, member, msg
   end
 end
 
 unless defined? assert_empty
-  def assert_empty collection, msg = nil
-    assert collection.empty?, msg
+  def assert_empty(collection, msg = nil)
+    assert_empty collection, msg
   end
 end
 
-def assert_equal_unordered left, right
+def assert_equal_unordered(left, right)
   assert_equal(left.length, right.length, "Lengths don't match. #{left.length} != #{right.length}")
   left.each { |element| assert_includes(right, element) }
 end
 
 def assert_log_contains(log, message)
   lines = log.array
-  failure_message = "Did not find '#{message}' in log. Log contained:\n#{lines.join('')}"
-  assert (lines.any? { |line| line.match(message) }), failure_message
+  assert (lines.any? { |line| line.match(message) })
 end
 
-def assert_audit_log_contains audit_log_contents, needle
+def assert_audit_log_contains(audit_log_contents, needle)
   # Original request bodies dumped to the log have symbol keys, but once
   # they go through a dump/load, they're strings again, so we strip
   # double-quotes and colons from the log, and the strings we searching for.
   regex = /[:"]/
   needle = needle.gsub(regex, '')
   haystack = audit_log_contents.gsub(regex, '')
-  assert(haystack.include?(needle), "Expected log to contain '#{needle}'")
+  assert_includes(haystack, needle, "Expected log to contain '#{needle}'")
 end
 
 # Because we don't generate a strictly machine-readable representation of
@@ -157,7 +128,7 @@ end
 # orderings of the key/value pairs in Hashes that were embedded in the request
 # body). So, this method traverses an object graph and only makes assertions
 # about the terminal (non-Array-or-Hash) nodes therein.
-def assert_audit_log_contains_object audit_log_contents, o, format = :json
+def assert_audit_log_contains_object(audit_log_contents, o, format = :json)
   case o
   when Hash
     o.each do |k, v|
@@ -175,12 +146,12 @@ def assert_audit_log_contains_object audit_log_contents, o, format = :json
   end
 end
 
-def compare_metrics expected, actual
+def compare_metrics(expected, actual)
   actual.delete_if { |a| a.include?('GC/Transaction/') }
   assert_equal(expected.to_a.sort, actual.to_a.sort, "extra: #{(actual - expected).to_a.inspect}; missing: #{(expected - actual).to_a.inspect}")
 end
 
-def metric_spec_from_specish specish
+def metric_spec_from_specish(specish)
   spec = case specish
   when String then NewRelic::MetricSpec.new(specish)
   when Array then NewRelic::MetricSpec.new(*specish)
@@ -188,7 +159,7 @@ def metric_spec_from_specish specish
   spec
 end
 
-def _normalize_metric_expectations expectations
+def _normalize_metric_expectations(expectations)
   case expectations
   when Array
     hash = {}
@@ -202,8 +173,8 @@ def _normalize_metric_expectations expectations
   end
 end
 
-def dump_stats stats
-  str = "  Call count:           #{stats.call_count}\n"
+def dump_stats(stats)
+  str = String.new("  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"
@@ -215,7 +186,7 @@ def dump_stats stats
   str
 end
 
-def assert_stats_has_values stats, expected_spec, expected_attrs
+def assert_stats_has_values(stats, expected_spec, expected_attrs)
   expected_attrs.each do |attr, expected_value|
     actual_value = stats.send(attr)
 
@@ -242,7 +213,7 @@ def assert_stats_has_values_with_call_count(expected_value, actual_value, msg)
   end
 end
 
-def assert_metrics_recorded expected
+def assert_metrics_recorded(expected)
   expected = _normalize_metric_expectations(expected)
   expected.each do |specish, expected_attrs|
     expected_spec = metric_spec_from_specish(specish)
@@ -256,7 +227,7 @@ def assert_metrics_recorded expected
       msg += "\nDid find specs: [\n#{matches.join(",\n")}\n]" unless matches.empty?
       msg += "\nAll specs in there were: #{format_metric_spec_list(all_specs)}"
 
-      assert(actual_stats, msg)
+      assert(actual_stats, msg) # rubocop:disable Minitest/AssertWithExpectedArgument
     end
     assert_stats_has_values(actual_stats, expected_spec, expected_attrs)
   end
@@ -273,7 +244,7 @@ end
 # the :ignore_filter option. This will allow you to specify a Regex that
 # allowlists broad swathes of metric territory (e.g. 'Supportability/').
 #
-def assert_metrics_recorded_exclusive expected, options = {}
+def assert_metrics_recorded_exclusive(expected, options = {})
   expected = _normalize_metric_expectations(expected)
   assert_metrics_recorded(expected)
 
@@ -289,11 +260,20 @@ def assert_metrics_recorded_exclusive expected, options = {}
   expected_metrics = expected.keys.map { |s| metric_spec_from_specish(s) }
 
   unexpected_metrics = recorded_metrics - expected_metrics
-  unexpected_metrics.reject! { |m| m.name =~ /GC\/Transaction/ }
+  unexpected_metrics.reject! { |m| m.name.include?('GC/Transaction') }
 
   assert_equal(0, unexpected_metrics.size, "Found unexpected metrics: #{format_metric_spec_list(unexpected_metrics)}")
 end
 
+def assert_newrelic_metadata_present(metadata)
+  assert metadata.key?('newrelic')
+  refute_nil metadata['newrelic']
+end
+
+def assert_distributed_tracing_payload_created_for_transaction(transaction)
+  assert transaction.distributed_tracer.instance_variable_get(:@distributed_trace_payload_created)
+end
+
 # The clear_metrics! method prevents metrics from "leaking" between tests by resetting
 # the @stats_hash instance variable in the current instance of NewRelic::Agent::StatsEngine.
 
@@ -311,7 +291,7 @@ def clear_metrics!
   NewRelic::Agent.instance.stats_engine.reset_for_test!
 end
 
-def assert_metrics_not_recorded not_expected
+def assert_metrics_not_recorded(not_expected)
   not_expected = _normalize_metric_expectations(not_expected)
   found_but_not_expected = []
   not_expected.each do |specish, _|
@@ -320,19 +300,18 @@ def assert_metrics_not_recorded not_expected
       found_but_not_expected << spec
     end
   end
-  assert_equal([], found_but_not_expected, "Found unexpected metrics: #{format_metric_spec_list(found_but_not_expected)}")
+  assert_empty(found_but_not_expected, "Found unexpected metrics: #{format_metric_spec_list(found_but_not_expected)}")
 end
 
 alias :refute_metrics_recorded :assert_metrics_not_recorded
 
-def assert_no_metrics_match regex
+def assert_no_metrics_match(regex)
   matching_metrics = []
   NewRelic::Agent.instance.stats_engine.to_h.keys.map(&:to_s).each do |metric|
-    matching_metrics << metric if metric.match regex
+    matching_metrics << metric if metric.match(regex)
   end
 
-  assert_equal(
-    [],
+  assert_empty(
     matching_metrics,
     "Found unexpected metrics:\n" + matching_metrics.map { |m| "  '#{m}'" }.join("\n") + "\n\n"
   )
@@ -340,26 +319,26 @@ end
 
 alias :refute_metrics_match :assert_no_metrics_match
 
-def format_metric_spec_list specs
+def format_metric_spec_list(specs)
   spec_strings = specs.map do |spec|
     "#{spec.name} (#{spec.scope.empty? ? '<unscoped>' : spec.scope})"
   end
   "[\n  #{spec_strings.join(",\n  ")}\n]"
 end
 
-def assert_truthy expected, msg = nil
+def assert_truthy(expected, msg = nil)
   msg ||= "Expected #{expected.inspect} to be truthy"
-  assert !!expected, msg
+  refute !expected, msg
 end
 
-def assert_falsy expected, msg = nil
+def assert_falsy(expected, msg = nil)
   msg ||= "Expected #{expected.inspect} to be falsy"
-  assert !expected, msg
+  refute expected, msg
 end
 
 unless defined? assert_false
-  def assert_false expected
-    assert_equal false, expected
+  def assert_false(expected)
+    refute expected
   end
 end
 
@@ -385,27 +364,26 @@ end
 # With a transaction name plus category:
 #   in_transaction('foobar', :category => :controller) { ... }
 #
-def in_transaction *args, &blk
+def in_transaction(*args, &blk)
   opts = args.last && args.last.is_a?(Hash) ? args.pop : {}
   category = (opts && 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'
+  name = opts.key?(:transaction_name) ? opts.delete(:transaction_name) : args.first || 'dummy'
 
   state = NewRelic::Agent::Tracer.state
   txn = nil
 
   NewRelic::Agent::Tracer.in_transaction(name: name, category: category, options: opts) do
     txn = state.current_transaction
-    yield state.current_transaction
+    yield(state.current_transaction)
   end
 
   txn
 end
 
 # Temporarily disables default transformer so tests with invalid inputs can be tried
-def with_disabled_defaults_transformer key
+def with_disabled_defaults_transformer(key)
   begin
     transformer = NewRelic::Agent::Configuration::DEFAULTS[key][:transform]
     NewRelic::Agent::Configuration::DEFAULTS[key][:transform] = nil
@@ -416,13 +394,13 @@ def with_disabled_defaults_transformer key
 end
 
 # Convenience wrapper to stand up a transaction and provide a segment within
-# that transaction to work with.  The same arguements as provided to in_transaction
+# that transaction to work with.  The same arguments as provided to in_transaction
 # may be supplied.
-def with_segment *args, &blk
+def with_segment(*args, &blk)
   segment = nil
-  txn = in_transaction(*args) do |txn|
-    segment = txn.current_segment
-    yield segment, txn
+  txn = in_transaction(*args) do |t|
+    segment = t.current_segment
+    yield(segment, t)
   end
   [segment, txn]
 end
@@ -430,7 +408,7 @@ end
 # building error attributes on segments are deferred until it's time
 # to publish/harvest them as spans, so for testing, we'll explicitly
 # build 'em as appropriate so we can test 'em
-def build_deferred_error_attributes segment
+def build_deferred_error_attributes(segment)
   return unless segment.noticed_error
   return if segment.noticed_error_attributes.frozen?
   segment.noticed_error.build_error_attributes
@@ -445,30 +423,30 @@ def capture_segment_with_error
     end
   rescue Exception => exception
     assert segment_with_error, "expected to have a segment_with_error"
-    build_deferred_error_attributes segment_with_error
+    build_deferred_error_attributes(segment_with_error)
     return segment_with_error, exception
   end
 end
 
-def stub_transaction_guid guid
+def stub_transaction_guid(guid)
   NewRelic::Agent::Transaction.tl_current.instance_variable_set(:@guid, guid)
 end
 
 # Convenience wrapper around in_transaction that sets the category so that it
 # looks like we are in a web transaction
-def in_web_transaction name = 'dummy'
+def in_web_transaction(name = 'dummy')
   in_transaction(name, :category => :controller, :request => stub(:path => '/')) do |txn|
-    yield txn
+    yield(txn)
   end
 end
 
-def in_background_transaction name = 'silly'
+def in_background_transaction(name = 'silly')
   in_transaction(name, :category => :task) do |txn|
-    yield txn
+    yield(txn)
   end
 end
 
-def refute_contains_request_params attributes
+def refute_contains_request_params(attributes)
   attributes.keys.each do |key|
     refute_match(/^request\.parameters\./, key.to_s)
   end
@@ -487,7 +465,7 @@ def last_transaction_trace_request_params
   end
 end
 
-def find_sql_trace metric_name
+def find_sql_trace(metric_name)
   NewRelic::Agent.agent.sql_sampler.sql_traces.values.detect do |trace|
     trace.database_metric_name == metric_name
   end
@@ -497,7 +475,7 @@ def last_sql_trace
   NewRelic::Agent.agent.sql_sampler.sql_traces.values.last
 end
 
-def find_last_transaction_node transaction_sample = nil
+def find_last_transaction_node(transaction_sample = nil)
   if transaction_sample
     root_node = transaction_sample.root_node
   else
@@ -510,7 +488,7 @@ def find_last_transaction_node transaction_sample = nil
   return last_node
 end
 
-def find_node_with_name transaction_sample, name
+def find_node_with_name(transaction_sample, name)
   transaction_sample.root_node.each_node do |node|
     if node.metric_name == name
       return node
@@ -520,9 +498,9 @@ def find_node_with_name transaction_sample, name
   nil
 end
 
-def find_node_with_name_matching transaction_sample, regex
+def find_node_with_name_matching(transaction_sample, regex)
   transaction_sample.root_node.each_node do |node|
-    if node.metric_name.match regex
+    if node.metric_name.match(regex)
       return node
     end
   end
@@ -530,13 +508,13 @@ def find_node_with_name_matching transaction_sample, regex
   nil
 end
 
-def find_all_nodes_with_name_matching transaction_sample, regexes
+def find_all_nodes_with_name_matching(transaction_sample, regexes)
   regexes = [regexes].flatten
   matching_nodes = []
 
   transaction_sample.root_node.each_node do |node|
     regexes.each do |regex|
-      if node.metric_name.match regex
+      if node.metric_name.match(regex)
         matching_nodes << node
       end
     end
@@ -545,7 +523,7 @@ def find_all_nodes_with_name_matching transaction_sample, regexes
   matching_nodes
 end
 
-def with_config config_hash, at_start = true
+def with_config(config_hash, at_start = true)
   config = NewRelic::Agent::Configuration::DottedHash.new(config_hash, true)
   NewRelic::Agent.config.add_config_for_testing(config, at_start)
   NewRelic::Agent.instance.refresh_attribute_filter
@@ -557,20 +535,20 @@ def with_config config_hash, at_start = true
   end
 end
 
-def with_server_source config_hash, at_start = true
-  with_config config_hash, at_start do
+def with_server_source(config_hash, at_start = true)
+  with_config(config_hash, at_start) do
     NewRelic::Agent.config.notify_server_source_added
     yield
   end
 end
 
-def with_config_low_priority config_hash
+def with_config_low_priority(config_hash)
   with_config(config_hash, false) do
     yield
   end
 end
 
-def with_transaction_renaming_rules rule_specs
+def with_transaction_renaming_rules(rule_specs)
   original_engine = NewRelic::Agent.agent.instance_variable_get(:@transaction_rules)
   begin
     new_engine = NewRelic::Agent::RulesEngine.create_transaction_rules('transaction_name_rules' => rule_specs)
@@ -596,7 +574,7 @@ unless Time.respond_to?(:__original_now)
   end
 end
 
-def nr_freeze_time now = Time.now
+def nr_freeze_time(now = Time.now)
   Time.__frozen_now = now
 end
 
@@ -604,7 +582,7 @@ def nr_unfreeze_time
   Time.__frozen_now = nil
 end
 
-def advance_time seconds
+def advance_time(seconds)
   Time.__frozen_now = Time.now + seconds
 end
 
@@ -633,7 +611,7 @@ def nr_unfreeze_process_time
   Process.__frozen_clock_gettime = nil
 end
 
-def with_constant_defined constant_symbol, implementation = Module.new
+def with_constant_defined(constant_symbol, implementation = Module.new)
   const_path = constant_path(constant_symbol.to_s)
 
   if const_path
@@ -653,7 +631,7 @@ def with_constant_defined constant_symbol, implementation = Module.new
   end
 end
 
-def constant_path name, opts = {}
+def constant_path(name, opts = {})
   allow_partial = opts[:allow_partial]
   path = [Object]
   parts = name.gsub(/^::/, '').split('::')
@@ -666,13 +644,13 @@ def constant_path name, opts = {}
   path
 end
 
-def get_parent constant_name
+def get_parent(constant_name)
   parent_name = constant_name.gsub(/::[^:]*$/, '')
   const_path = constant_path(parent_name)
   const_path ? const_path[-1] : nil
 end
 
-def undefine_constant constant_symbol
+def undefine_constant(constant_symbol)
   const_str = constant_symbol.to_s
   parent = get_parent(const_str)
   const_name = const_str.gsub(/.*::/, '')
@@ -696,11 +674,11 @@ ensure
   NewRelic::Agent.logger = orig_logger
 end
 
-def create_agent_command args = {}
+def create_agent_command(args = {})
   NewRelic::Agent::Commands::AgentCommand.new([-1, {"name" => "command_name", "arguments" => args}])
 end
 
-def wait_for_backtrace_service_poll opts = {}
+def wait_for_backtrace_service_poll(opts = {})
   defaults = {
     :timeout => 10.0,
     :service => NewRelic::Agent.agent.agent_command_router.backtrace_service,
@@ -726,7 +704,7 @@ def wait_for_backtrace_service_poll opts = {}
   end
 end
 
-def with_array_logger level = :info
+def with_array_logger(level = :info)
   orig_logger = NewRelic::Agent.logger
   config = {:log_level => level}
   logdev = ArrayLogDevice.new
@@ -763,7 +741,7 @@ class EnvUpdater
 
   # Will attempt the given block up to MAX_RETRIES before
   # surfacing the exception down the chain.
-  def with_retry retry_limit = MAX_RETRIES
+  def with_retry(retry_limit = MAX_RETRIES)
     retries ||= 0
     sleep(retries)
     yield
@@ -772,7 +750,7 @@ class EnvUpdater
   end
 
   # Locks and updates the ENV
-  def safe_update env
+  def safe_update(env)
     with_retry do
       @mutex.synchronize do
         env.each { |key, val| ENV[key] = val.to_s }
@@ -781,7 +759,7 @@ class EnvUpdater
   end
 
   # Locks and restores the ENV
-  def safe_restore old_env
+  def safe_restore(old_env)
     with_retry do
       @mutex.synchronize do
         old_env.each { |key, val| val ? ENV[key] = val : ENV.delete(key) }
@@ -794,17 +772,17 @@ class EnvUpdater
     @@instance ||= EnvUpdater.new
   end
 
-  def self.safe_update env
-    instance.safe_update env
+  def self.safe_update(env)
+    instance.safe_update(env)
   end
 
-  def self.safe_restore old_env
-    instance.safe_restore old_env
+  def self.safe_restore(old_env)
+    instance.safe_restore(old_env)
   end
 
   # Effectively saves current ENV settings for given env's key/values,
   # runs given block, then restores ENV to original state before returning.
-  def self.inject env, &block
+  def self.inject(env, &block)
     old_env = {}
     env.each { |key, val| old_env[key] = ENV[key] }
     begin
@@ -821,11 +799,11 @@ end
 
 # Changes ENV settings to given and runs given block and restores ENV
 # to original values before returning.
-def with_environment env, &block
+def with_environment(env, &block)
   EnvUpdater.inject(env) { yield }
 end
 
-def with_argv argv
+def with_argv(argv)
   old_argv = ARGV.dup
   ARGV.clear
   ARGV.concat(argv)
@@ -838,7 +816,7 @@ def with_argv argv
   end
 end
 
-def with_ignore_error_filter filter, &blk
+def with_ignore_error_filter(filter, &blk)
   original_filter = NewRelic::Agent.ignore_error_filter
   NewRelic::Agent.ignore_error_filter(&filter)
 
@@ -847,7 +825,7 @@ ensure
   NewRelic::Agent::ErrorCollector.ignore_error_filter = original_filter
 end
 
-def json_dump_and_encode object
+def json_dump_and_encode(object)
   Base64.encode64(::JSON.dump(object))
 end
 
@@ -855,7 +833,7 @@ def get_last_analytics_event
   NewRelic::Agent.agent.transaction_event_aggregator.harvest![1].last
 end
 
-def swap_instance_method target, method_name, new_method_implementation, &blk
+def swap_instance_method(target, method_name, new_method_implementation, &blk)
   old_method_implementation = target.instance_method(method_name)
   target.send(:define_method, method_name, new_method_implementation)
   yield
@@ -870,22 +848,22 @@ def cross_agent_tests_dir
   File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'cross_agent_tests'))
 end
 
-def load_cross_agent_test name
+def load_cross_agent_test(name)
   test_file_path = File.join(cross_agent_tests_dir, "#{name}.json")
   data = File.read(test_file_path)
   data.gsub!('callCount', 'call_count')
   data = ::JSON.load(data)
-  data.each { |testcase| testcase['testname'].gsub! ' ', '_' if String === testcase['testname'] }
+  data.each { |testcase| testcase['testname'].tr!(' ', '_') if String === testcase['testname'] }
   data
 end
 
-def each_cross_agent_test options
+def each_cross_agent_test(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 }
+  path = File.join([cross_agent_tests_dir, options[:dir], options[:pattern]].compact)
+  Dir.glob(path).each { |file| yield(file) }
 end
 
-def assert_event_attributes event, test_name, expected_attributes, non_expected_attributes
+def assert_event_attributes(event, test_name, expected_attributes, non_expected_attributes)
   incorrect_attributes = []
 
   event_attrs = event[0]
@@ -895,7 +873,7 @@ def assert_event_attributes event, test_name, expected_attributes, non_expected_
     incorrect_attributes << name unless actual_value == expected_value
   end
 
-  msg = "Found missing or incorrect attribute values in #{test_name}:\n"
+  msg = String.new("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"
@@ -906,19 +884,19 @@ def assert_event_attributes event, test_name, expected_attributes, non_expected_
   event_attrs.each do |name, actual_value|
     msg << "  #{name}: #{actual_value.inspect}\n"
   end
-  assert(incorrect_attributes.empty?, msg)
+  assert_empty(incorrect_attributes, msg)
 
   non_expected_attributes.each do |name|
     refute event_attrs[name], "Found value '#{event_attrs[name]}' for attribute '#{name}', but expected nothing in #{test_name}"
   end
 end
 
-def attributes_for sample, type
+def attributes_for(sample, type)
   sample.attributes.instance_variable_get("@#{type}_attributes")
 end
 
 def uncache_trusted_account_key
-  NewRelic::Agent::Transaction::TraceContext::AccountHelpers.instance_variable_set :@trace_state_entry_key, nil
+  NewRelic::Agent::Transaction::TraceContext::AccountHelpers.instance_variable_set(:@trace_state_entry_key, nil)
 end
 
 def reset_buffers_and_caches
@@ -926,7 +904,7 @@ def reset_buffers_and_caches
   uncache_trusted_account_key
 end
 
-def message_for_status_code code
+def message_for_status_code(code)
   # Net::HTTP::STATUS_CODES was introduced in Ruby 2.5
   if defined?(Net::HTTP::STATUS_CODES)
     return Net::HTTP::STATUS_CODES[code]
@@ -944,18 +922,18 @@ end
 # http status code associated with it.
 # 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
+def mock_http_response(headers, wrap_it = true)
   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
+    net_http_resp.add_field(key.to_s, value)
   end
   return net_http_resp unless wrap_it
   NewRelic::Agent::HTTPClients::NetHTTPResponse.new(net_http_resp)
 end
 
 # +expected+ can be a string or regular expression
-def assert_match_or_equal expected, value
+def assert_match_or_equal(expected, value)
   if expected.is_a?(Regexp)
     assert_match expected, value
   else
@@ -965,7 +943,7 @@ end
 
 # selects the last segment with a noticed_error and checks
 # the expectations against it.
-def assert_segment_noticed_error txn, segment_name, error_classes, error_message
+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"
 
@@ -977,41 +955,41 @@ def assert_segment_noticed_error txn, segment_name, error_classes, error_message
   assert_match_or_equal error_message, noticed_error.message
 end
 
-def assert_transaction_noticed_error txn, error_classes
+def assert_transaction_noticed_error(txn, error_classes)
   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
+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"
 end
 
-def refute_raises *exp
+def refute_raises(*exp)
   msg = "#{exp.pop}.\n" if String === exp.last
 
   begin
     yield
   rescue MiniTest::Skip => e
     puts "SKIP REPORTS: #{e.inspect}"
-    return e if exp.include? MiniTest::Skip
+    return e if exp.include?(MiniTest::Skip)
     raise e
   rescue Exception => e
     puts "EXCEPTION RAISED: #{e.inspect}\n#{e.backtrace}"
     exp = exp.first if exp.size == 1
-    flunk msg || "unexpected exception raised: #{e}"
+    flunk(msg || "unexpected exception raised: #{e}")
   end
 end
 
-def assert_implements instance, method, *args
+def assert_implements(instance, method, *args)
   fail_message = "expected #{instance.class}##{method} method to be implemented"
   refute_raises NotImplementedError, fail_message do
     instance.send(method, *args)
   end
 end
 
-def defer_testing_to_min_supported_rails test_file, min_rails_version, supports_jruby = true
+def defer_testing_to_min_supported_rails(test_file, min_rails_version, supports_jruby = true)
   if defined?(::Rails) &&
       defined?(::Rails::VERSION::STRING) &&
       (::Rails::VERSION::STRING.to_f >= min_rails_version) &&