newrelic_rpm 9.5.0 → 9.8.0

data/lib/tasks/helpers/config.html.erb

@@ -14,7 +14,7 @@ redirects:
 
 <CONTRIBUTOR_NOTE>
   This file is automatically generated from values defined in `lib/new_relic/agent/configuration/default_source.rb`.
-  All changes should be made directly to `default_source.rb.`
+  Make all changes directly to `default_source.rb.`
   Submit PRs or raise issues at: https://github.com/newrelic/newrelic-ruby-agent
 </CONTRIBUTOR_NOTE>
 
@@ -42,9 +42,9 @@ In other words, environment variables override all other configuration settings
 
 ## View and edit config file options [#Edit]
 
-The Ruby agent's `newrelic.yml` is a standard YAML configuration file. It typically includes a `Defaults` section at the top, plus sections below for each application environment; for example, `Development`, `Testing`, and `Production`.
+The Ruby agent's `newrelic.yml` is a standard YAML configuration file. It typically includes a `Defaults` section at the top, plus sections below for each application environment (`Development`, `Test`, `Staging`, and `Production`).
 
-The Ruby agent determines which section of the `newrelic.yml` config file to read from by looking at certain environment variables to derive the application's environment. This can be useful, for example, when you want to use `info` for the `log_level` config setting in your production environment, and you want more verbose `log_level` config settings (such as `debug` in your development environment.
+The Ruby agent determines which section of the `newrelic.yml` config file to read from by looking at certain environment variables to derive the application's environment. This can be useful when you want to use `info` for the `log_level` config setting in your production environment, and you want more verbose `log_level` config settings (such as `debug`) in your development environment.
 
 Here is an example `newrelic.yml` config file:
 
@@ -60,7 +60,7 @@ development:
   log_level: debug
 ```
 
-For non-Rails apps, the Ruby agent looks for the following environment variables, in this order, to determine the application environment:
+The Ruby agent looks for the following environment variables, in this order, to find the application environment:
 
 1. `NEW_RELIC_ENV`
 2. `RUBY_ENV`
@@ -68,9 +68,9 @@ For non-Rails apps, the Ruby agent looks for the following environment variables
 4. `APP_ENV`
 5. `RACK_ENV`
 
-If the Ruby agent does not detect values for any of those environment variables, it will default the application environment to `development` and read from the `development` section of the `newrelic.yml` config file.
+If the Ruby agent doesn't detect values for any of those environment variables, it will default the application environment to `development` and read from the `development` section of the `newrelic.yml` config file.
 
-When running the Ruby agent in a Rails app, the agent first looks for the `NEW_RELIC_ENV` environment variable to determine the application environment and which section of the `newrelic.yml` to use. If `NEW_RELIC_ENV` is not present, the agent uses the Rails environment (`RAILS_ENV` or `RAILS.env`, depending on the version of Rails) .
+When running the Ruby agent in a Rails app, the agent first looks for the `NEW_RELIC_ENV` environment variable to determine the application environment and which section of the `newrelic.yml` to use. If `NEW_RELIC_ENV` is not present, the agent uses the Rails environment (`RAILS_ENV`).
 
 When you edit the config file, be sure to:
 

data/lib/tasks/helpers/newrelicyml.rb

@@ -16,7 +16,7 @@ module NewRelicYML
 
   HEADER = <<~HEADER
     #
-    # This file configures the New Relic Agent.  New Relic monitors Ruby, Java,
+    # This file configures the New Relic agent.  New Relic monitors Ruby, Java,
     # .NET, PHP, Python, Node, and Go applications with deep visibility and low
     # overhead.  For more information, visit www.newrelic.com.
 

data/lib/tasks/instrumentation_generator/instrumentation.thor

@@ -82,7 +82,7 @@ class Instrumentation < Thor
     insert_into_file(
       DEFAULT_SOURCE_LOCATION,
       config_block(name.downcase),
-      after: ":description => 'Controls auto-instrumentation of bunny at start up.  May be one of [auto|prepend|chain|disabled].'
+      after: ":description => 'Controls auto-instrumentation of bunny at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },\n"
     )
   end
@@ -103,7 +103,7 @@ class Instrumentation < Thor
         :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].'
+        :description => 'Controls auto-instrumentation of the #{name} library at start-up. May be one of [auto|prepend|chain|disabled].'
       },
     CONFIG
   end
@@ -111,7 +111,7 @@ class Instrumentation < Thor
   def yaml_block(name)
     <<~HEREDOC
 
-      # Controls auto-instrumentation of #{name} at start up.
+      # Controls auto-instrumentation of #{name} at start-up.
       # May be one of [auto|prepend|chain|disabled]
       # instrumentation.#{name.downcase}: auto
     HEREDOC

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

@@ -9,7 +9,6 @@ module NewRelic::Agent::Instrumentation
         include NewRelic::Agent::Instrumentation::<%= @class_name %>
 
         alias_method(:<%= @method.downcase %>_without_new_relic, :<%= @method.downcase %>)
-        alias_method(:<%= @method.downcase %>, :<%= @method.downcase %>_with_new_relic)
 
         def <%= @method.downcase %><%= "(#{@args})" unless @args.empty? %>
           <%= @method.downcase %>_with_new_relic<%= "(#{@args})" unless @args.empty? %> do

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

@@ -1,5 +1,4 @@
 alias_method(:<%= @method.downcase %>_without_new_relic, :<%= @method.downcase %>)
-alias_method(:<%= @method.downcase %>, :<%= @method.downcase %>_with_new_relic)
 
 def <%= @method.downcase %><%= "(#{@args})" unless @args.empty? %>
   <%= @method.downcase %>_with_new_relic<%= "(#{@args})" unless @args.empty? %> do

data/lib/tasks/tests.rake

@@ -11,6 +11,75 @@ rescue LoadError
 end
 
 if defined? Rake::TestTask
+  def name_for_number(content, number)
+    (number - 1).downto(0).each do |i|
+      return Regexp.last_match(1) if content[i] =~ /^\s*def (test_.+)\s*$/
+    end
+  end
+
+  def info_from_test_var
+    return {} unless ENV['TEST'].to_s =~ /^(.+)((?::\d+)+)/
+
+    file = Regexp.last_match(1)
+    numbers = Regexp.last_match(2).split(':').reject(&:empty?).uniq.map(&:to_i)
+    abs = File.expand_path(File.join('../../..', file), __FILE__)
+    raise "File >>#{abs}<< does not exist!" unless File.exist?(abs)
+
+    content = File.read(abs).split("\n")
+    {file: file, numbers: numbers, content: content}
+  end
+
+  def test_names_from_test_file(info)
+    info[:numbers].each_with_object([]) do |number, names|
+      name = name_for_number(info[:content], number)
+      unless name
+        warn "Unable to determine a test name given line >>#{number}<< for file >>#{info[:file]}<<"
+        next
+      end
+      names << name
+    end
+  end
+
+  # Allow ENV['TEST'] to be set to a test file path with one or more
+  # `:<line number>` patterns on the end of it.
+  #
+  # For example:
+  #   TEST=test/new_relic/agent/autostart_test.rb:57 bundle exec rake test
+  #
+  # The `autostart_test.rb` file will be read, and starting from line 57 and
+  # working upwards in the file (downwards by line number), a test definition
+  # will be searched for that matches `def test_<rest of the test name>`.
+  #
+  # Multiple line numbers can be specified like so:
+  #   TEST=test/new_relic/agent/autostart_test.rb:57:26 bundle exec rake test
+  #
+  # For this multiple line number based example, both lines 57 and 26 will
+  # serve as separate starting points for the search for a test name.
+  #
+  # All test names that are discovered will be "ORed" into a regex pattern with
+  # pipes ('|') that is passed to Minitest via
+  #   `TESTOPTS="--name='test_name1|test_name2'"`
+  #
+  # Once a line with one or more `:<line number>` values on the end of it has
+  # been found, replace the value of ENV['TEST'] with the path leading up to
+  # the first colon before invoking Minitest.
+  #
+  # Why refer to a test by line number instead of just supplying the name
+  # directly? The primary use case is text editor integration. A text editor
+  # can be taught to "run the single unit test containing the line the cursor is
+  # on" by building a string containing the path to the file, a colon, (':'),
+  # and the line number.
+  def process_line_numbers
+    info = info_from_test_var
+    return unless info.key?(:file)
+
+    test_names = test_names_from_test_file(info)
+    raise "Could not determine any test names for file >>#{abs}<< given numbers >>#{numbers}" if test_names.empty?
+
+    ENV['TESTOPTS'] = "#{ENV['TESTOPTS']} --name='#{test_names.map { |n| Regexp.escape(n) }.join('|')}'"
+    ENV['TEST'] = info[:file]
+  end
+
   namespace :test do
     tasks = Rake.application.top_level_tasks
     ENV['TESTOPTS'] ||= ''
@@ -21,6 +90,8 @@ if defined? Rake::TestTask
       ENV['TESTOPTS'] += ' --' + seed
     end
 
+    process_line_numbers
+
     agent_home = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 
     Rake::TestTask.new(:newrelic) do |t|

data/newrelic.yml

@@ -1,5 +1,5 @@
 #
-# This file configures the New Relic Agent.  New Relic monitors Ruby, Java,
+# This file configures the New Relic agent.  New Relic monitors Ruby, Java,
 # .NET, PHP, Python, Node, and Go applications with deep visibility and low
 # overhead.  For more information, visit www.newrelic.com.
 
@@ -33,6 +33,18 @@ common: &default_settings
   # - a.third.event
   # active_support_custom_events_names: []
 
+  # If false, all LLM instrumentation (OpenAI only for now) will be disabled and no
+  # metrics, events, or spans will be sent. AI Monitoring is automatically disabled
+  # if high_security mode is enabled.
+  # ai_monitoring.enabled: false
+
+  # If false, LLM instrumentation (OpenAI only for now) will not capture input and
+  # output content on specific LLM events.
+  # The excluded attributes include:
+  # * content from LlmChatCompletionMessage events
+  # * input from LlmEmbedding events
+  # ai_monitoring.record_content.enabled: true
+
   # If true, enables capture of all HTTP request headers for all destinations.
   # allow_all_headers: false
 
@@ -102,7 +114,7 @@ common: &default_settings
   # Specify a list of constants that should prevent the agent from starting
   # automatically. Separate individual constants with a comma ,. For example,
   # "Rails::Console,UninstrumentedBackgroundJob".
-  # autostart.denylisted_constants: Rails::Console
+  # autostart.denylisted_constants: Rails::Command::ConsoleCommand,Rails::Command::CredentialsCommand,Rails::Command::Db::System::ChangeCommand,Rails::Command::DbConsoleCommand,Rails::Command::DestroyCommand,Rails::Command::DevCommand,Rails::Command::EncryptedCommand,Rails::Command::GenerateCommand,Rails::Command::InitializersCommand,Rails::Command::NotesCommand,Rails::Command::RoutesCommand,Rails::Command::SecretsCommand,Rails::Console,Rails::DBConsole
 
   # Defines a comma-delimited list of executables that the agent should not
   # instrument. For example, "rake,my_ruby_script.rb".
@@ -324,7 +336,8 @@ common: &default_settings
   # error_collector.ignore_status_codes: ""
 
   # Defines the maximum number of frames in an error backtrace. Backtraces over this
-  # amount are truncated at the beginning and end.
+  # amount are truncated in the middle, preserving the beginning and the end of the
+  # stack trace.
   # error_collector.max_backtrace_frames: 50
 
   # Defines the maximum number of TransactionError events reported per harvest
@@ -341,7 +354,7 @@ common: &default_settings
   # embedded service within another framework and the agent is detecting the Sinatra
   # app and skipping the at_exit handler as a result. Sinatra classically runs the
   # entire application in an at_exit block and would otherwise misbehave if the
-  # Agent's at_exit handler was also installed in those circumstances. Note:
+  # agent's at_exit handler was also installed in those circumstances. Note:
   # send_data_on_exit should also be set to true in  tandem with this setting.
   # force_install_exit_handler: false
 
@@ -374,39 +387,51 @@ common: &default_settings
   # Configures the TCP/IP port for the trace observer Host
   # infinite_tracing.trace_observer.port: 443
 
+  # Controls auto-instrumentation of ActiveSupport::BroadcastLogger at start up. May
+  # be one of: auto, prepend, chain, disabled. Used in Rails versions >= 7.1.
+  # instrumentation.active_support_broadcast_logger: auto
+
   # Controls auto-instrumentation of ActiveSupport::Logger at start up. May be one
-  # of: auto, prepend, chain, disabled.
+  # of: auto, prepend, chain, disabled. Used in Rails versions below 7.1.
   # instrumentation.active_support_logger: auto
 
-  # Controls auto-instrumentation of bunny at start up. May be one of: auto,
+  # Controls auto-instrumentation of Async::HTTP at start up. May be one of: auto,
+  # prepend, chain, disabled.
+  # instrumentation.async_http: auto
+
+  # Controls auto-instrumentation of bunny at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.bunny: auto
 
-  # Controls auto-instrumentation of the concurrent-ruby library at start up. May be
+  # Controls auto-instrumentation of the concurrent-ruby library at start-up. May be
   # one of: auto, prepend, chain, disabled.
   # instrumentation.concurrent_ruby: auto
 
-  # Controls auto-instrumentation of Curb at start up. May be one of: auto, prepend,
+  # Controls auto-instrumentation of Curb at start-up. May be one of: auto, prepend,
   # chain, disabled.
   # instrumentation.curb: auto
 
-  # Controls auto-instrumentation of Delayed Job at start up. May be one of: auto,
+  # Controls auto-instrumentation of Delayed Job at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.delayed_job: auto
 
-  # Controls auto-instrumentation of the elasticsearch library at start up. May be
+  # Controls auto-instrumentation of the elasticsearch library at start-up. May be
   # one of: auto, prepend, chain, disabled.
   # instrumentation.elasticsearch: auto
 
-  # Controls auto-instrumentation of Excon at start up. May be one of: enabled,
+  # Controls auto-instrumentation of ethon at start up. May be one of
+  # [auto|prepend|chain|disabled]
+  # instrumentation.ethon: auto
+
+  # Controls auto-instrumentation of Excon at start-up. May be one of: enabled,
   # disabled.
   # instrumentation.excon: enabled
 
-  # Controls auto-instrumentation of the Fiber class at start up. May be one of:
+  # Controls auto-instrumentation of the Fiber class at start-up. May be one of:
   # auto, prepend, chain, disabled.
   # instrumentation.fiber: auto
 
-  # Controls auto-instrumentation of Grape at start up. May be one of: auto,
+  # Controls auto-instrumentation of Grape at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.grape: auto
 
@@ -419,43 +444,47 @@ common: &default_settings
   # example, "private.com$,exception.*"
   # instrumentation.grpc.host_denylist: []
 
-  # Controls auto-instrumentation of gRPC clients at start up. May be one of: auto,
+  # Controls auto-instrumentation of gRPC clients at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.grpc_client: auto
 
-  # Controls auto-instrumentation of gRPC servers at start up. May be one of: auto,
+  # Controls auto-instrumentation of gRPC servers at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.grpc_server: auto
 
-  # Controls auto-instrumentation of HTTPClient at start up. May be one of: auto,
+  # Controls auto-instrumentation of HTTPClient at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.httpclient: auto
 
-  # Controls auto-instrumentation of http.rb gem at start up. May be one of: auto,
+  # Controls auto-instrumentation of http.rb gem at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.httprb: auto
 
-  # Controls auto-instrumentation of Ruby standard library Logger at start up. May
+  # Controls auto-instrumentation of httpx at start up. May be one of
+  # [auto|prepend|chain|disabled]
+  # instrumentation.httpx: auto
+
+  # Controls auto-instrumentation of Ruby standard library Logger at start-up. May
   # be one of: auto, prepend, chain, disabled.
   # instrumentation.logger: auto
 
-  # Controls auto-instrumentation of dalli gem for Memcache at start up. May be one
+  # Controls auto-instrumentation of dalli gem for Memcache at start-up. May be one
   # of: auto, prepend, chain, disabled.
   # instrumentation.memcache: auto
 
-  # Controls auto-instrumentation of memcache-client gem for Memcache at start up.
+  # Controls auto-instrumentation of memcache-client gem for Memcache at start-up.
   # May be one of: auto, prepend, chain, disabled.
   # instrumentation.memcache_client: auto
 
-  # Controls auto-instrumentation of memcached gem for Memcache at start up. May be
+  # Controls auto-instrumentation of memcached gem for Memcache at start-up. May be
   # one of: auto, prepend, chain, disabled.
   # instrumentation.memcached: auto
 
-  # Controls auto-instrumentation of Mongo at start up. May be one of: enabled,
+  # Controls auto-instrumentation of Mongo at start-up. May be one of: enabled,
   # disabled.
   # instrumentation.mongo: enabled
 
-  # Controls auto-instrumentation of Net::HTTP at start up. May be one of: auto,
+  # Controls auto-instrumentation of Net::HTTP at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.net_http: auto
 
@@ -464,7 +493,7 @@ common: &default_settings
   # application startup. May be one of: auto, prepend, chain, disabled.
   # instrumentation.puma_rack: auto
 
-  # Controls auto-instrumentation of Puma::Rack::URLMap at start up. May be one of:
+  # Controls auto-instrumentation of Puma::Rack::URLMap at start-up. May be one of:
   # auto, prepend, chain, disabled.
   # instrumentation.puma_rack_urlmap: auto
 
@@ -473,27 +502,31 @@ common: &default_settings
   # startup. May be one of: auto, prepend, chain, disabled.
   # instrumentation.rack: auto
 
-  # Controls auto-instrumentation of Rack::URLMap at start up. May be one of: auto,
+  # Controls auto-instrumentation of Rack::URLMap at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.rack_urlmap: auto
 
-  # Controls auto-instrumentation of rake at start up. May be one of: auto, prepend,
+  # Controls auto-instrumentation of rake at start-up. May be one of: auto, prepend,
   # chain, disabled.
   # instrumentation.rake: auto
 
-  # Controls auto-instrumentation of Redis at start up. May be one of: auto,
+  # Controls auto-instrumentation of Redis at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.redis: auto
 
-  # Controls auto-instrumentation of resque at start up. May be one of: auto,
+  # Controls auto-instrumentation of resque at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.resque: auto
 
-  # Controls auto-instrumentation of Roda at start up. May be one of: auto, prepend,
+  # Controls auto-instrumentation of Roda at start-up. May be one of: auto, prepend,
   # chain, disabled.
   # instrumentation.roda: auto
 
-  # Controls auto-instrumentation of Sinatra at start up. May be one of: auto,
+  # Controls auto-instrumentation of the ruby-openai gem at start-up. May be one of:
+  # auto, prepend, chain, disabled.
+  # instrumentation.ruby_openai: auto
+
+  # Controls auto-instrumentation of Sinatra at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.sinatra: auto
 
@@ -501,24 +534,28 @@ common: &default_settings
   # disabled.
   # instrumentation.stripe: enabled
 
-  # Controls auto-instrumentation of the Thread class at start up to allow the agent
+  # Controls auto-instrumentation of the Thread class at start-up to allow the agent
   # to correctly nest spans inside of an asynchronous transaction. This does not
   # enable the agent to automatically trace all threads created (see
   # instrumentation.thread.tracing). May be one of: auto, prepend, chain, disabled.
   # instrumentation.thread: auto
 
-  # Controls auto-instrumentation of the Thread class at start up to automatically
+  # Controls auto-instrumentation of the Thread class at start-up to automatically
   # add tracing to all Threads created in the application.
   # instrumentation.thread.tracing: true
 
-  # Controls auto-instrumentation of the Tilt template rendering library at start
-  # up. May be one of: auto, prepend, chain, disabled.
+  # Controls auto-instrumentation of the Tilt template rendering library at
+  # start-up. May be one of: auto, prepend, chain, disabled.
   # instrumentation.tilt: auto
 
-  # Controls auto-instrumentation of Typhoeus at start up. May be one of: auto,
+  # Controls auto-instrumentation of Typhoeus at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.typhoeus: auto
 
+  # Controls auto-instrumentation of ViewComponent at startup. May be one of: auto,
+  # prepend, chain, disabled.
+  # instrumentation.view_component: auto
+
   # A dictionary of label names and values that will be applied to the data sent
   # from this agent. May also be expressed as a semicolon-delimited ; string of
   # colon-separated : pairs. For example, Server:One;Data Center:Primary.
@@ -668,7 +705,7 @@ common: &default_settings
   # Regexp.new to permit advanced matching. For each hash pair, if either the key or
   # value is matched the
   # pair will not be reported. By default, no user_data is reported, so this option
-  # should only be used if 
+  # should only be used if
   # the stripe.user_data.include option is being used.
   # stripe.user_data.exclude: []
 
@@ -684,6 +721,9 @@ common: &default_settings
   # the New Relic agent has time to report.
   # sync_startup: false
 
+  # If true, tracer state storage is thread-local, otherwise, fiber-local
+  # thread_local_tracer_state: false
+
   # If true, enables use of the thread profiler.
   # thread_profiler.enabled: false
 

data/newrelic_rpm.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
     https://github.com/newrelic/newrelic-ruby-agent/
   EOS
   s.email = 'support@newrelic.com'
-  # TODO: MAJOR VERSION - remove newrelic_cmd, deprecated since version 2.13
-  s.executables = %w[newrelic_cmd newrelic nrdebug]
+  # TODO: MAJOR VERSION - remove newrelic, deprecated since version xxx.
+  s.executables = %w[newrelic_rpm newrelic nrdebug]
   s.extra_rdoc_files = [
     'CHANGELOG.md',
     'LICENSE',
@@ -49,17 +49,18 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/newrelic/newrelic-ruby-agent'
   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
   s.add_development_dependency 'minitest', "#{RUBY_VERSION >= '2.7.0' ? '5.3.3' : '4.7.5'}"
   s.add_development_dependency 'minitest-stub-const', '0.6'
   s.add_development_dependency 'mocha', '~> 1.16'
-  s.add_development_dependency 'pry' unless ENV['CI']
+  s.add_development_dependency 'pry' if ENV['ENABLE_PRY']
   s.add_development_dependency 'rack'
   s.add_development_dependency 'rake', '12.3.3'
 
-  s.add_development_dependency 'rubocop', '1.54' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop', '1.57.2' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
   s.add_development_dependency 'rubocop-ast', '1.28.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'

data/test/agent_helper.rb

@@ -845,7 +845,7 @@ ensure
 end
 
 def json_dump_and_encode(object)
-  Base64.encode64(JSON.dump(object))
+  NewRelic::Base64.encode64(JSON.dump(object))
 end
 
 def get_last_analytics_event
@@ -871,7 +871,7 @@ 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 = JSON.parse(data)
   data.each { |testcase| testcase['testname'].tr!(' ', '_') if String === testcase['testname'] }
   data
 end
@@ -1025,3 +1025,15 @@ def defer_testing_to_min_supported_rails(test_file, min_rails_version, supports_
     puts "Skipping tests in #{File.basename(test_file)} because Rails >= #{min_rails_version} is unavailable" if ENV['VERBOSE_TEST_OUTPUT']
   end
 end
+
+def first_call_for(subject)
+  items = $collector.calls_for(subject)
+
+  if defined?(JRUBY_VERSION)
+    refute_predicate items.size, :zero?, "Expected at least one call for '#{subject}'"
+  else
+    assert_equal 1, items.size, "Expected exactly one call for '#{subject}'"
+  end
+
+  items.first
+end