newrelic_rpm 4.0.0.332 → 6.13.1

data/lib/new_relic/version.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 
 module NewRelic
@@ -10,9 +10,9 @@ module NewRelic
       parts.compact.join('.')
     end
 
-    MAJOR = 4
-    MINOR = 0
-    TINY  = 0
+    MAJOR = 6
+    MINOR = 13
+    TINY  = 1
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/lib/newrelic_rpm.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 # == New Relic Initialization
 #
@@ -37,7 +37,7 @@ elsif defined?(Rails::VERSION)
     module NewRelic
       class Railtie < Rails::Railtie
 
-        initializer "newrelic_rpm.start_plugin" do |app|
+        initializer "newrelic_rpm.start_plugin", before: :load_config_initializers do |app|
           NewRelic::Control.instance.init_plugin(:config => app.config)
         end
       end

data/lib/sequel/extensions/newrelic_instrumentation.rb

@@ -1,7 +1,7 @@
 # -*- ruby -*-
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'sequel' unless defined?( Sequel )
 require 'newrelic_rpm' unless defined?( NewRelic )
@@ -47,26 +47,44 @@ module Sequel
 
       product = NewRelic::Agent::Instrumentation::SequelHelper.product_name_from_adapter(self.class.adapter_scheme)
       operation = NewRelic::Agent::Datastores::MetricHelper.operation_from_sql(sql)
-      segment = NewRelic::Agent::Transaction.start_datastore_segment product, operation
+      segment = NewRelic::Agent::Tracer.start_datastore_segment(
+        product: product,
+        operation: operation
+      )
 
       begin
         super(*args, &blk)
       ensure
-        notice_sql(sql, segment.name, segment.start_time, Time.now)
-        segment.finish
+        notice_sql(sql)
+        segment.finish if segment
       end
     end
 
+    # We notice sql through the current_segment due to the disable_all_tracing
+    # block in the sequel Plugin instrumentation. A simple ORM operation from the Plugin
+    # instrumentation may trigger a number of calls to this method. We want to append
+    # the statements that come from the disable_all_tracing block into this node's
+    # statement, otherwise we would end up ovewriting the sql statement with the
+    # last one executed.
+    def notice_sql sql
+      return unless txn = NewRelic::Agent::Tracer.current_transaction
+
+      current_segment = txn.current_segment
+      return unless current_segment.is_a?(NewRelic::Agent::Transaction::DatastoreSegment)
+
+      if current_segment.sql_statement
+        current_segment.sql_statement.append_sql sql
+      else
+        current_segment._notice_sql sql, self.opts, explainer_for(sql)
+      end
+    end
 
     THREAD_SAFE_CONNECTION_POOL_CLASSES = [
       (defined?(::Sequel::ThreadedConnectionPool) && ::Sequel::ThreadedConnectionPool)
     ].freeze
 
-    def notice_sql(sql, metric_name, start, finish)
-      state    = NewRelic::Agent::TransactionState.tl_get
-      duration = finish - start
-
-      explainer = Proc.new do |*|
+    def explainer_for sql
+      Proc.new do |*|
         if THREAD_SAFE_CONNECTION_POOL_CLASSES.include?(self.pool.class)
           self[ sql ].explain
         else
@@ -74,10 +92,7 @@ module Sequel
           nil
         end
       end
-      NewRelic::Agent.instance.transaction_sampler.notice_sql(sql, self.opts, duration, state, explainer)
-      NewRelic::Agent.instance.sql_sampler.notice_sql(sql, metric_name, self.opts, duration, state, explainer)
     end
-
   end # module NewRelicInstrumentation
 
   NewRelic::Agent.logger.debug "Registering the :newrelic_instrumentation extension."

data/lib/sequel/plugins/newrelic_instrumentation.rb

@@ -1,7 +1,7 @@
 # -*- ruby -*-
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'sequel' unless defined?( Sequel )
 require 'newrelic_rpm' unless defined?( NewRelic )
@@ -23,12 +23,16 @@ module Sequel
           define_method(method_name) do |*args, &block|
             klass = self.is_a?(Class) ? self : self.class
             product = NewRelic::Agent::Instrumentation::SequelHelper.product_name_from_adapter(db.adapter_scheme)
-            segment = NewRelic::Agent::Transaction.start_datastore_segment(product, operation_name, klass.name)
+            segment = NewRelic::Agent::Tracer.start_datastore_segment(
+              product: product,
+              operation: operation_name,
+              collection: klass.name
+            )
 
             begin
               NewRelic::Agent.disable_all_tracing { super(*args, &block) }
             ensure
-              segment.finish
+              segment.finish if segment
             end
           end
         end

data/lib/tasks/all.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 # This is required to load in task definitions from merb
 Dir.glob(File.join(File.dirname(__FILE__),'*.rake')) do |file|

data/lib/tasks/config.rake

@@ -17,8 +17,7 @@ namespace :newrelic do
     }
 
     NAME_OVERRIDES = {
-      "slow_sql"     => "Slow SQL",
-      "xray_session" => "X-Ray Session"
+      "slow_sql"     => "Slow SQL"
     }
 
     def output(format)

data/lib/tasks/multiverse.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 #
 # 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.
@@ -43,11 +43,45 @@ namespace :test do
 
   namespace :multiverse do
 
+    def remove_local_multiverse_databases
+      list_databases_command = %{echo "show databases" | mysql -u root}
+      databases = `#{list_databases_command}`.chomp!.split("\n").select{|s| s =~ /multiverse/}
+      databases.each do |database|
+        puts "Dropping #{database}"
+        `echo "drop database #{database}" | mysql -u root`
+      end
+    rescue => error
+      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|
+        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|
+        puts "Removing #{fn.gsub(file_path,'.../environments')}"
+        FileUtils.rm fn
+      end
+    end
+
     task :env do
       # ENV['SUITES_DIRECTORY'] = File.expand_path('../../test/multiverse/suites', __FILE__)
       require File.expand_path('../../../test/multiverse/lib/multiverse', __FILE__)
     end
 
+    task :clobber do
+      remove_local_multiverse_databases
+      remove_generated_gemfiles
+      remove_generated_gemfile_lockfiles
+    end
+
     desc "Clean cached gemfiles from Bundler.bundle_path"
     task :clean_gemfile_cache do
       glob = File.expand_path 'multiverse-cache/Gemfile.*.lock', Bundler.bundle_path

data/lib/tasks/newrelic.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 #
 # 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

@@ -26,9 +26,14 @@ if defined? Rake::TestTask
     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 ||= "#{agent_home}/test/new_relic/**/*_test.rb"
+
       t.libs << "#{agent_home}/test"
       t.libs << "#{agent_home}/lib"
-      t.pattern = "#{agent_home}/test/new_relic/**/*_test.rb"
+      t.pattern = Array(file_pattern)
       t.verbose = true
     end
 

data/newrelic.yml

@@ -1,6 +1,6 @@
 #
 # This file configures the New Relic Agent.  New Relic monitors Ruby, Java,
-# .NET, PHP, Python and Node applications with deep visibility and low
+# .NET, PHP, Python, Node, and Go applications with deep visibility and low
 # overhead.  For more information, visit www.newrelic.com.
 #
 # Generated <%= Time.now.strftime('%B %d, %Y') %><%= ", for version #{@agent_version}" if @agent_version %>
@@ -30,10 +30,6 @@ development:
   <<: *default_settings
   app_name: <%= app_name %> (Development)
 
-  # NOTE: There is substantial overhead when running in developer mode.
-  # Do not use for production or load testing.
-  developer_mode: true
-
 test:
   <<: *default_settings
   # It doesn't make sense to report to New Relic from automated test runs.

data/newrelic_rpm.gemspec

@@ -10,16 +10,16 @@ Gem::Specification.new do |s|
   s.version = NewRelic::VERSION::STRING
   s.required_ruby_version = '>= 2.0.0'
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Tim Krajcar", "Matthew Wear", "Katherine Wu", "Kenichi Nakamura" ]
+  s.authors = [ "Rachel Klein", "Tanna McClure", "Michael Lang" ]
   s.date = Time.now.strftime('%Y-%m-%d')
-  s.licenses    = ['New Relic', 'MIT', 'Ruby']
+  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
+in production. The New Relic Ruby agent is dual-purposed as a either a
 Gem or plugin, hosted on
-https://github.com/newrelic/rpm/
+https://github.com/newrelic/newrelic-ruby-agent/
 EOS
   s.email = "support@newrelic.com"
   s.executables = [ "mongrel_rpm", "newrelic_cmd", "newrelic", "nrdebug" ]
@@ -31,7 +31,15 @@ EOS
     "newrelic.yml"
   ]
 
-  file_list = `git ls-files`.split
+  s.metadata = {
+    'bug_tracker_uri'   => 'https://github.com/newrelic/newrelic-ruby-agent/issues',
+    '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",
+  }
+
+  file_list = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|infinite_tracing)/(?!agent_helper.rb)}) }
   build_file_path = 'lib/new_relic/build.rb'
   file_list << build_file_path if File.exist?(build_file_path)
   s.files = file_list
@@ -41,18 +49,16 @@ EOS
   s.rubygems_version = Gem::VERSION
   s.summary = "New Relic Ruby Agent"
 
-  s.add_development_dependency 'rake', '10.1.0'
-  s.add_development_dependency 'minitest', '~> 4.7.5'
-  s.add_development_dependency 'mocha', '~> 0.13.0'
+  s.add_development_dependency 'rake', '12.3.3'
+  s.add_development_dependency 'rb-inotify', '0.9.10'   # locked to support < Ruby 2.3 (and listen 3.0.8)
+  s.add_development_dependency 'listen', '3.0.8'        # locked to support < Ruby 2.3
+  s.add_development_dependency 'minitest', '4.7.5'
+  s.add_development_dependency 'mocha', '~> 1.9.0'
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'rails', '~> 3.2.13'
-  s.add_development_dependency 'json', '>= 2.0.2' if RUBY_VERSION >= '2.4.0' # possible bundler issue?
-  s.add_development_dependency 'pry', '~> 0.9.12'
+  s.add_development_dependency 'pry-nav', '~> 0.3.0'
+  s.add_development_dependency 'pry-stack_explorer', '~> 0.4.9'
+  s.add_development_dependency 'guard', '~> 2.16.0'
+  s.add_development_dependency 'guard-minitest', '~> 2.4.0'
   s.add_development_dependency 'hometown', '~> 0.2.5'
-
-  if RUBY_PLATFORM == 'java'
-    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
-  else
-    s.add_development_dependency 'sqlite3'
-  end
+  s.add_development_dependency 'bundler'
 end

data/recipes/newrelic.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 # The capistrano recipes in plugins are automatically
 # loaded from here.  From gems, they are available from

data/test/agent_helper.rb

@@ -1,30 +1,61 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 # These helpers should not have any gem dependencies except on newrelic_rpm
 # itself, and should be usable from within any multiverse suite.
 
 require 'json'
+require 'net/http'
+begin
+  require 'net/http/status'
+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 assert_between(floor, ceiling, value, message="expected #{floor} <= #{value} <= #{ceiling}")
+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
+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
 
@@ -36,7 +67,7 @@ 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, \
@@ -47,38 +78,68 @@ def last_traced_error
   harvest_error_traces!.last
 end
 
-unless defined?( assert_block )
-  def assert_block(*msgs)
+def harvest_transaction_events!
+  NewRelic::Agent.instance.transaction_event_aggregator.harvest!
+end
+
+def last_transaction_event
+  harvest_transaction_events!.last.last
+end
+
+def harvest_span_events!
+  NewRelic::Agent.instance.span_event_aggregator.harvest!
+end
+
+def last_span_event
+  harvest_span_events!.last.last
+end
+
+def harvest_error_events!
+  NewRelic::Agent.instance.error_collector.error_event_aggregator.harvest!
+end
+
+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 )
+unless defined? assert_includes
+  def assert_includes collection, member, msg=nil
     msg = "Expected #{collection.inspect} to include #{member.inspect}"
     assert_block( msg ) { collection.include?(member) }
   end
 end
 
-unless defined?( assert_not_includes )
-  def assert_not_includes( collection, member, msg=nil )
+unless defined? assert_not_includes
+  def assert_not_includes collection, member, msg=nil
     msg = "Expected #{collection.inspect} not to include #{member.inspect}"
     assert !collection.include?(member), msg
   end
 end
 
-unless defined?( assert_empty )
-  def assert_empty(collection, msg=nil)
+unless defined? assert_empty
+  def assert_empty collection, msg=nil
     assert collection.empty?, 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_audit_log_contains(audit_log_contents, needle)
+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
+end
+
+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.
@@ -96,7 +157,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|
@@ -114,12 +175,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)
@@ -127,7 +188,7 @@ def metric_spec_from_specish(specish)
   spec
 end
 
-def _normalize_metric_expectations(expectations)
+def _normalize_metric_expectations expectations
   case expectations
   when Array
     hash = {}
@@ -141,7 +202,7 @@ def _normalize_metric_expectations(expectations)
   end
 end
 
-def dump_stats(stats)
+def dump_stats stats
   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"
@@ -154,7 +215,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)
     if attr == :call_count
@@ -167,7 +228,7 @@ def assert_stats_has_values(stats, expected_spec, expected_attrs)
   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)
@@ -196,9 +257,9 @@ end
 #
 # If you want to *allow* unexpected metrics matching certain patterns, use
 # the :ignore_filter option. This will allow you to specify a Regex that
-# whitelists broad swathes of metric territory (e.g. 'Supportability/').
+# 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)
 
@@ -219,7 +280,24 @@ def assert_metrics_recorded_exclusive(expected, options={})
   assert_equal(0, unexpected_metrics.size, "Found unexpected metrics: #{format_metric_spec_list(unexpected_metrics)}")
 end
 
-def assert_metrics_not_recorded(not_expected)
+# 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.
+
+module NewRelic
+  module Agent
+    class StatsEngine
+      def reset_for_test!
+        @stats_hash = StatsHash.new
+      end
+    end
+  end
+end
+
+def clear_metrics!
+  NewRelic::Agent.instance.stats_engine.reset_for_test!
+end
+
+def assert_metrics_not_recorded not_expected
   not_expected = _normalize_metric_expectations(not_expected)
   found_but_not_expected = []
   not_expected.each do |specish, _|
@@ -233,7 +311,7 @@ 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
@@ -248,30 +326,30 @@ 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
 end
 
-def assert_falsy(expected, msg = nil)
+def assert_falsy expected, msg=nil
   msg ||= "Expected #{expected.inspect} to be falsy"
   assert !expected, msg
 end
 
-unless defined?( assert_false )
-  def assert_false(expected)
+unless defined? assert_false
+  def assert_false expected
     assert_equal false, expected
   end
 end
 
-unless defined?(refute)
+unless defined? refute
   alias refute assert_false
 end
 
@@ -293,7 +371,7 @@ 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
 
@@ -301,10 +379,10 @@ def in_transaction(*args, &blk)
   name = opts.key?(:transaction_name) ? opts.delete(:transaction_name) :
                                         args.first || 'dummy'
 
-  state = NewRelic::Agent::TransactionState.tl_get
+  state = NewRelic::Agent::Tracer.state
   txn = nil
 
-  NewRelic::Agent::Transaction.wrap(state, name, category, opts) do
+  NewRelic::Agent::Tracer.in_transaction(name: name, category: category, options: opts) do
     txn = state.current_transaction
     yield state.current_transaction
   end
@@ -312,32 +390,78 @@ def in_transaction(*args, &blk)
   txn
 end
 
-def stub_transaction_guid(guid)
+# Temporarily disables default transformer so tests with invalid inputs can be tried
+def with_disabled_defaults_transformer key
+  begin
+    transformer = NewRelic::Agent::Configuration::DEFAULTS[key][:transform]
+    NewRelic::Agent::Configuration::DEFAULTS[key][:transform] = nil
+    yield
+  ensure
+    NewRelic::Agent::Configuration::DEFAULTS[key][:transform] = transformer
+  end
+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
+# may be supplied.
+def with_segment *args, &blk
+  segment = nil
+  txn = in_transaction(*args) do |txn|
+    segment = txn.current_segment
+    yield segment, txn
+  end
+  [segment, txn]
+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
+  return unless segment.noticed_error
+  segment.noticed_error.build_error_attributes
+end
+
+def capture_segment_with_error
+  begin
+    segment_with_error = nil
+    with_segment do |segment|
+      segment_with_error = segment
+      raise "oops!"
+    end
+  rescue Exception => exception
+    assert segment_with_error, "expected to have a segment_with_error"
+    build_deferred_error_attributes segment_with_error
+    return segment_with_error, exception
+  end
+end
+
+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
   end
 end
 
-def in_background_transaction(name='silly')
+def in_background_transaction name='silly'
   in_transaction(name, :category => :task) do |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
 end
 
 def last_transaction_trace
-  NewRelic::Agent.agent.transaction_sampler.last_sample
+  return unless last_sample = NewRelic::Agent.agent.transaction_sampler.last_sample
+  NewRelic::Agent::Transaction::TraceBuilder.build_trace(last_sample)
 end
 
 def last_transaction_trace_request_params
@@ -348,7 +472,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
@@ -358,12 +482,11 @@ 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
-    builder = NewRelic::Agent.agent.transaction_sampler.tl_builder
-    root_node = builder.current_node
+    root_node = last_transaction_trace.root_node
   end
 
   last_node = nil
@@ -372,7 +495,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
@@ -382,7 +505,7 @@ 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
       return node
@@ -392,7 +515,7 @@ 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 = []
 
@@ -407,7 +530,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
@@ -419,13 +542,20 @@ def with_config(config_hash, at_start=true)
   end
 end
 
-def with_config_low_priority(config_hash)
+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
   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)
@@ -451,19 +581,19 @@ unless Time.respond_to?(:__original_now)
   end
 end
 
-def freeze_time(now=Time.now)
+def nr_freeze_time now=Time.now
   Time.__frozen_now = now
 end
 
-def unfreeze_time
+def nr_unfreeze_time
   Time.__frozen_now = nil
 end
 
-def advance_time(seconds)
-  freeze_time(Time.now + seconds)
+def advance_time seconds
+  Time.__frozen_now = Time.now + seconds
 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
@@ -483,12 +613,12 @@ 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('::')
   parts.each do |part|
-    if !path.last.const_defined?(part)
+    if !path.last.constants.include?(part.to_sym)
       return allow_partial ? path : nil
     end
     path << path.last.const_get(part)
@@ -496,11 +626,17 @@ def constant_path(name, opts={})
   path
 end
 
-def undefine_constant(constant_symbol)
-  const_path = constant_path(constant_symbol.to_s)
-  return yield unless const_path
-  parent = const_path[-2]
-  const_name = constant_symbol.to_s.gsub(/.*::/, '')
+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
+  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)
   removed_constant = parent.send(:remove_const, const_name)
   yield
 ensure
@@ -520,11 +656,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,
@@ -550,7 +686,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
@@ -566,20 +702,90 @@ ensure
   NewRelic::Agent.logger = orig_logger
 end
 
-def with_environment(env)
-  old_env = {}
-  env.each do |key, val|
-    old_env[key] = ENV[key]
-    ENV[key]     = val.to_s
+# The EnvUpdater was introduced due to random fails in JRuby environment
+# whereby attempting to set ENV[key] = some_value randomly failed.
+# It is conjectured that this is thread related, but may also be
+# a core bug in the JVM implementation of Ruby.  Root cause was not
+# discovered, but it was found that a combination of retrying and using
+# mutex lock around the update operation was the only consistently working
+# solution as the error continued to surface without the mutex and
+# retry alone wasn't enough, either.
+#
+# JRUBY: oraclejdk8 + jruby-9.2.6.0
+#
+# NOTE: Singleton pattern to ensure one mutex lock for all threads
+class EnvUpdater
+  MAX_RETRIES = 5
+
+  def initialize
+    @mutex = Mutex.new
   end
-  begin
+
+  # Will attempt the given block up to MAX_RETRIES before
+  # surfacing the exception down the chain.
+  def with_retry retry_limit=MAX_RETRIES
+    retries ||= 0
+    sleep(retries)
     yield
-  ensure
-    old_env.each { |key, old_val| ENV[key] = old_val }
+  rescue
+    (retries += 1) < retry_limit ? retry : raise
+  end
+
+  # Locks and updates the ENV
+  def safe_update env
+    with_retry do
+      @mutex.synchronize do
+        env.each{ |key, val| ENV[key] = val.to_s }
+      end
+    end
+  end
+
+  # Locks and restores the ENV
+  def safe_restore old_env
+    with_retry do
+      @mutex.synchronize do
+        old_env.each{ |key, val| val ? ENV[key] = val : ENV.delete(key) }
+      end
+    end
+  end
+
+  # Singleton pattern implemented via @@instance
+  def self.instance
+    @@instance ||= EnvUpdater.new
+  end
+
+  def self.safe_update env
+    instance.safe_update env
+  end
+
+  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
+    old_env = {}
+    env.each{ |key, val| old_env[key] = ENV[key] }
+    begin
+      safe_update(env)
+      yield
+    ensure
+      safe_restore(old_env)
+    end
   end
+
+  # must call instance here to ensure only one @mutex for all threads.
+  instance
+end
+
+# Changes ENV settings to given and runs given block and restores ENV
+# to original values before returning.
+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)
@@ -592,7 +798,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)
 
@@ -601,7 +807,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
 
@@ -609,7 +815,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
@@ -624,7 +830,7 @@ 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')
@@ -633,13 +839,13 @@ def load_cross_agent_test(name)
   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}
 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]
@@ -663,10 +869,116 @@ def assert_event_attributes(event, test_name, expected_attributes, non_expected_
   assert(incorrect_attributes.empty?, msg)
 
   non_expected_attributes.each do |name|
-    assert_nil(event_attrs[name], "Found value '#{event_attrs[name]}' for attribute '#{name}', but expected nothing in #{test_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
+end
+
+def reset_buffers_and_caches
+  NewRelic::Agent.drop_buffered_data
+  uncache_trusted_account_key
+end
+
+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]
+  end
+
+  case code
+  when 200 then "OK"
+  when 404 then "Not Found"
+  when 403 then "Forbidden"
+  else "Unknown"
+  end
+end
+
+# wraps the given headers in a Net::HTTPResponse which has accompanying
+# 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
+  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
+  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
+  if expected.is_a?(Regexp)
+    assert_match expected, value
+  else
+    assert_equal expected, value
+  end
+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
+  error_segment = txn.segments.reverse.detect{|s| s.noticed_error}
+  assert error_segment, "Expected at least one segment with a noticed_error"
+
+  assert_match_or_equal segment_name, error_segment.name
+
+  noticed_error = error_segment.noticed_error
+
+  assert_match_or_equal error_classes, noticed_error.exception_class_name
+  assert_match_or_equal error_message, noticed_error.message
+end
+
+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
+  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
+  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
+    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}"
+  end
+end
+
+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
+  if defined?(::Rails) &&
+    defined?(::Rails::VERSION::STRING) &&
+    (::Rails::VERSION::STRING.to_f >= min_rails_version) &&
+    (supports_jruby || !NewRelic::LanguageSupport.jruby?)
+
+    yield
+  else
+    puts "Skipping tests in #{test_file} because Rails >= #{min_rails_version} is unavailable"
+  end
+end