RubyGems - newrelic_rpm - Versions diffs - 3.9.5.251 → 3.9.6.257 - Mend

newrelic_rpm 3.9.5.251 → 3.9.6.257

Files changed (113) hide show

data.tar.gz.sig +0 -0
data/CHANGELOG +74 -3
data/GUIDELINES_FOR_CONTRIBUTING.md +19 -15
data/README.md +1 -1
data/Rakefile +22 -1
data/lib/new_relic/agent/agent.rb +17 -5
data/lib/new_relic/agent/agent_logger.rb +4 -0
data/lib/new_relic/agent/configuration/default_source.rb +45 -1
data/lib/new_relic/agent/configuration/manager.rb +43 -7
data/lib/new_relic/agent/cross_app_monitor.rb +0 -3
data/lib/new_relic/agent/cross_app_tracing.rb +8 -5
data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +4 -1
data/lib/new_relic/agent/instrumentation/active_job.rb +93 -0
data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +2 -1
data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +2 -2
data/lib/new_relic/agent/instrumentation/sinatra.rb +1 -2
data/lib/new_relic/agent/new_relic_service.rb +1 -1
data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +20 -1
data/lib/new_relic/agent/new_relic_service/pruby_marshaller.rb +5 -1
data/lib/new_relic/agent/pipe_channel_manager.rb +32 -11
data/lib/new_relic/agent/threading/agent_thread.rb +1 -1
data/lib/new_relic/agent/threading/backtrace_node.rb +4 -3
data/lib/new_relic/agent/transaction.rb +27 -6
data/lib/new_relic/agent/transaction_state.rb +3 -3
data/lib/new_relic/agent/vm/mri_vm.rb +3 -3
data/lib/new_relic/control/frameworks/rails3.rb +1 -16
data/lib/new_relic/control/instance_methods.rb +2 -0
data/lib/new_relic/json_wrapper.rb +18 -3
data/lib/new_relic/rack/browser_monitoring.rb +7 -5
data/lib/new_relic/rack/developer_mode.rb +2 -0
data/lib/new_relic/rack/error_collector.rb +12 -51
data/lib/new_relic/transaction_sample.rb +0 -4
data/lib/new_relic/transaction_sample/segment.rb +0 -4
data/lib/new_relic/version.rb +1 -1
data/newrelic_rpm.gemspec +3 -2
data/test/agent_helper.rb +1 -1
data/test/config/test.cert.crt +16 -12
data/test/config/test.cert.key +13 -13
data/test/environments/lib/environments/runner.rb +3 -0
data/test/environments/rails30/Gemfile +2 -2
data/test/environments/rails31/Gemfile +2 -2
data/test/environments/rails32/Gemfile +2 -2
data/test/environments/rails40/Gemfile +2 -4
data/test/environments/rails41/Gemfile +2 -4
data/test/environments/rails42/Gemfile +2 -4
data/test/fixtures/cross_agent_tests/attribute_configuration.json +349 -0
data/test/fixtures/cross_agent_tests/labels.json +31 -2
data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/README.md +16 -0
data/test/fixtures/cross_agent_tests/rum_client_config.json +9 -9
data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/empty_head +4 -0
data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/no_end_header.html +6 -0
data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/x_ua_meta_tag_multiple_tags.html +12 -0
data/test/multiverse/lib/multiverse/runner.rb +33 -1
data/test/multiverse/lib/multiverse/suite.rb +79 -7
data/test/multiverse/suites/active_record/Envfile +1 -1
data/test/multiverse/suites/agent_only/encoding_handling_test.rb +1 -1
data/test/multiverse/suites/agent_only/labels_test.rb +2 -1
data/test/multiverse/suites/agent_only/set_transaction_name_test.rb +2 -3
data/test/multiverse/suites/agent_only/thread_profiling_test.rb +6 -6
data/test/multiverse/suites/capistrano/Envfile +2 -2
data/test/multiverse/suites/capistrano2/Envfile +4 -0
data/test/multiverse/suites/curb/Envfile +4 -0
data/test/multiverse/suites/high_security/config/newrelic.yml +5 -2
data/test/multiverse/suites/high_security/high_security_test.rb +10 -8
data/test/multiverse/suites/json/Envfile +23 -0
data/test/multiverse/suites/json/config/newrelic.yml +22 -0
data/test/multiverse/suites/json/json_test.rb +17 -0
data/test/multiverse/suites/marshalling/marshalling_test.rb +2 -45
data/test/multiverse/suites/rails/Envfile +3 -3
data/test/multiverse/suites/rails/activejob_test.rb +137 -0
data/test/multiverse/suites/rails/error_tracing_test.rb +15 -8
data/test/multiverse/suites/rails/parameter_capture_test.rb +39 -19
data/test/multiverse/suites/sequel/Envfile +5 -5
data/test/multiverse/suites/sidekiq/Envfile +2 -2
data/test/multiverse/suites/sinatra/Envfile +2 -1
data/test/multiverse/suites/yajl/Envfile +13 -0
data/test/multiverse/suites/yajl/config/newrelic.yml +21 -0
data/test/multiverse/suites/yajl/yajl_test.rb +19 -0
data/test/new_relic/agent/agent_logger_test.rb +10 -0
data/test/new_relic/agent/agent_test.rb +7 -1
data/test/new_relic/agent/configuration/default_source_test.rb +24 -0
data/test/new_relic/agent/configuration/manager_test.rb +60 -2
data/test/new_relic/agent/configuration/orphan_configuration_test.rb +25 -13
data/test/new_relic/agent/cross_app_tracing_test.rb +10 -1
data/test/new_relic/agent/instrumentation/active_job_test.rb +20 -0
data/test/new_relic/agent/instrumentation/active_record_test.rb +10 -17
data/test/new_relic/agent/instrumentation/controller_instrumentation_test.rb +15 -0
data/test/new_relic/agent/instrumentation/sinatra_test.rb +1 -1
data/test/new_relic/agent/new_relic_service_test.rb +24 -0
data/test/new_relic/agent/pipe_channel_manager_test.rb +44 -2
data/test/new_relic/agent/threading/agent_thread_test.rb +1 -2
data/test/new_relic/agent/threading/backtrace_node_test.rb +12 -0
data/test/new_relic/agent/transaction_state_test.rb +3 -6
data/test/new_relic/agent/transaction_test.rb +163 -0
data/test/new_relic/agent_test.rb +13 -1
data/test/new_relic/fake_collector.rb +5 -5
data/test/new_relic/fake_server.rb +5 -3
data/test/new_relic/http_client_test_cases.rb +0 -4
data/test/new_relic/marshalling_test_cases.rb +54 -0
data/test/new_relic/multiverse_helpers.rb +2 -2
data/test/new_relic/rack/browser_monitoring_test.rb +6 -0
data/test/new_relic/rack/developer_mode_test.rb +8 -0
data/test/new_relic/rack/error_collector_test.rb +0 -41
data/test/new_relic/transaction_sample/segment_test.rb +0 -13
data/test/new_relic/transaction_sample_test.rb +1 -11
data/test/performance/lib/performance/instrumentation/perf_tools.rb +1 -1
data/test/performance/lib/performance/runner.rb +1 -1
data/test/performance/script/runner +2 -1
data/test/performance/suites/rum_autoinsertion.rb +12 -2
metadata +24 -11
metadata.gz.sig +0 -0
data/test/config/test.cert.csr +0 -11
data/test/config/testing-privkey.pem +0 -18

data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/empty_head ADDED

@@ -0,0 +1,4 @@
+<html>
+  <head/>
+  <body>im some body text</body>
+</html>

data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/no_end_header.html ADDED

@@ -0,0 +1,6 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>EXPECTED_RUM_LOADER_LOCATION<body>
+    Cribbed from the Java agent
+  </body>
+</html>

data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/x_ua_meta_tag_multiple_tags.html ADDED

@@ -0,0 +1,12 @@
+<html>
+  <head>
+    <title>im a title</title>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>EXPECTED_RUM_LOADER_LOCATION
+    <meta name="keywords" content="testing,rum,insertion" >
+      <script>
+          junk
+      </script>
+      <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+  </head>
+  <body>im some body text</body>
+</html>

data/test/multiverse/lib/multiverse/runner.rb CHANGED

@@ -62,7 +62,7 @@ module Multiverse
         full_path = File.join(SUITES_DIRECTORY, dir)
         next if dir =~ /\A\./
-        next unless filter.nil? || dir.include?(filter)
+        next unless passes_filter?(dir, filter)
         next unless File.exists?(File.join(full_path, "Envfile"))
         begin
@@ -80,5 +80,37 @@ module Multiverse
       OutputCollector.overall_report
       exit exit_status
     end
+    GROUPS = {
+      "agent"         => ["agent_only", "bare", "config_file_loading",
+                          "deferred_instrumentation", "high_security"],
+      "background"    => ["resque", "sidekiq"],
+      "database"      => ["datamapper", "mongo", "sequel"],
+      "httpclients"   => ["curb", "excon", "httpclient", "typhoeus", "net_http"],
+      "rails"         => ["active_record", "rails"],
+      "serialization" => ["json", "marshalling", "yajl"],
+      "sinatra"       => ["sinatra", "padrino"],
+      "rest"          => []  # Specially handled below
+    }
+    def passes_filter?(dir, filter)
+      return true if filter.nil?
+      if filter.include?("group=")
+        key = filter.sub("group=", "")
+        group = GROUPS[key]
+        if group.nil?
+          puts red("Unrecognized group '#{key}'. Stopping!")
+          exit 1
+        elsif group.any?
+          GROUPS[key].include?(dir)
+        else
+          !GROUPS.values.flatten.include?(dir)
+        end
+      else
+        dir.include?(filter)
+      end
+    end
   end
 end

data/test/multiverse/lib/multiverse/suite.rb CHANGED

@@ -8,6 +8,8 @@
 # Rubies starting with 1.9.x
 require 'rubygems'
 require 'base64'
+require 'fileutils'
+require 'digest'
 require File.expand_path(File.join(File.dirname(__FILE__), 'environment'))
@@ -46,6 +48,10 @@ module Multiverse
       opts.fetch(:names, [])
     end
+    def use_cache?
+      !opts.fetch(:nocache, false)
+    end
     def filter_env
       value = opts.fetch(:env, nil)
       value = value.to_i if value
@@ -60,11 +66,14 @@ module Multiverse
       FileUtils.rm_rf File.join(directory, "Gemfile.#{env_index}.lock")
     end
+    def envfile_path
+      File.join(directory, 'Envfile')
+    end
     def environments
       @environments ||= (
         Dir.chdir directory
-        Envfile.new(File.join(directory, 'Envfile'))
+        Envfile.new(envfile_path)
       )
     end
@@ -74,30 +83,93 @@ module Multiverse
       clean_gemfiles(env_index)
       begin
         generate_gemfile(gemfile_text, env_index)
-        bundle
+        ensure_bundle(env_index)
       rescue => e
         puts "#{e.class}: #{e}"
         puts "Fast local bundle failed.  Attempting to install from rubygems.org"
         clean_gemfiles(env_index)
         generate_gemfile(gemfile_text, env_index, false)
-        bundle
+        ensure_bundle(env_index)
       end
       print_environment if should_print
     end
-    def bundle
+    def bundling_lock_file
+      File.join(Bundler.bundle_path, 'multiverse-bundler.lock')
+    end
+    def bundler_cache_dir
+      File.join(Bundler.bundle_path, 'multiverse-cache')
+    end
+    # Running the bundle should only happen one at a time per Ruby version or
+    # we occasionally get compilation errors. With the groups and parallelizing
+    # things out more, this is more of an issue, so start locking it down.
+    def exclusive_bundle
+      bundler_out = nil
+      File.open(bundling_lock_file, File::RDWR|File::CREAT) do |f|
+        puts "Waiting on '#{bundling_lock_file}' for our chance to bundle" if verbose?
+        f.flock(File::LOCK_EX)
+        puts "Let's get ready to BUNDLE!" if verbose?
+        bundler_out = `bundle`
+      end
+      bundler_out
+    end
+    def ensure_bundle(env_index)
       require 'rubygems'
       require 'bundler'
-      bundler_out = `bundle`
+      if use_cache?
+        ensure_bundle_cached(env_index) || ensure_bundle_uncached(env_index)
+      else
+        ensure_bundle_uncached(env_index)
+      end
+      Bundler.require
+    end
+    def envfile_hash
+      Digest::MD5.hexdigest(File.read(envfile_path))
+    end
+    def cached_gemfile_lock_filename(env_index)
+      "Gemfile.#{suite}.#{env_index}.#{envfile_hash}.lock"
+    end
+    def cache_gemfile_lock(env_index)
+      filename = cached_gemfile_lock_filename(env_index)
+      dst_path = File.join(bundler_cache_dir, filename)
+      src_path = File.join(directory, "Gemfile.#{env_index}.lock")
+      puts "Caching Gemfile.lock from #{src_path} to #{dst_path}" if verbose?
+      FileUtils.cp(src_path, dst_path)
+    end
+    def ensure_bundle_cached(env_index)
+      cache_dir = bundler_cache_dir
+      FileUtils.mkdir_p(cache_dir)
+      filename = cached_gemfile_lock_filename(env_index)
+      path = File.join(cache_dir, filename)
+      if File.exist?(path)
+        dst_path = File.join(directory, "Gemfile.#{env_index}.lock")
+        puts "Using cached Gemfile.lock from #{path} at #{dst_path}" if verbose?
+        FileUtils.cp(path, dst_path)
+        true
+      else
+        false
+      end
+    end
+    def ensure_bundle_uncached(env_index)
+      bundler_out = exclusive_bundle
       puts bundler_out if verbose? || $? != 0
       raise "bundle command failed with (#{$?})" unless $? == 0
-      Bundler.require
+      cache_gemfile_lock(env_index)
     end
     def generate_gemfile(gemfile_text, env_index, local = true)
       gemfile = File.join(Dir.pwd, "Gemfile.#{env_index}")
       File.open(gemfile,'w') do |f|
-        f.puts '  source :rubygems' unless local
+        f.puts '  source "https://rubygems.org"' unless local
         f.print gemfile_text
         f.puts newrelic_gemfile_line unless gemfile_text =~ /^\s*gem .newrelic_rpm./
         f.puts jruby_openssl_line unless gemfile_text =~ /^\s*gem .jruby-openssl./

data/test/multiverse/suites/active_record/Envfile CHANGED

@@ -8,6 +8,6 @@ gemfile <<-RB
     gem 'activerecord', '~> 3.2.0'
   else
     gem 'activerecord', '~> 3.2.0'
-    gem 'sqlite3', '1.3.8'
+    gem 'sqlite3'
   end
 RB

data/test/multiverse/suites/agent_only/encoding_handling_test.rb CHANGED

@@ -88,7 +88,7 @@ class EncodingHandlingTest < Minitest::Test
   def assert_endpoint_received_string(endpoint, string)
     agent.send(:transmit_data)
-    agent.send(:transmit_transaction_event_data)
+    agent.send(:transmit_event_data)
     requests = $collector.calls_for(endpoint)
     assert_equal(1, requests.size)
     request = requests.first

data/test/multiverse/suites/agent_only/labels_test.rb CHANGED

@@ -79,6 +79,7 @@ class LabelsTest < Minitest::Test
   def assert_connect_had_labels(expected)
     result = $collector.calls_for('connect').last['labels']
-    assert_equal expected, result
+    assert_equal expected.sort_by { |h| h['label_type']},
+                 result.sort_by { |h| h['label_type']}
   end
 end

data/test/multiverse/suites/agent_only/set_transaction_name_test.rb CHANGED

@@ -41,9 +41,8 @@ class SetTransactionNameTest < Minitest::Test
     assert_metrics_recorded([
       'Controller/TestTransactor/parent',
-      'OtherTransaction/Background/TestTransactor/child',
-      ['OtherTransaction/Background/TestTransactor/child',
-        'Controller/TestTransactor/parent'],
+      'Nested/OtherTransaction/Background/TestTransactor/child',
+      ['Nested/OtherTransaction/Background/TestTransactor/child', 'Controller/TestTransactor/parent'],
       'Apdex/TestTransactor/parent'])
   end

data/test/multiverse/suites/agent_only/thread_profiling_test.rb CHANGED

@@ -61,8 +61,8 @@ class ThreadProfilingTest < Minitest::Test
   # go only let a few cycles through, so we check less than 10
   def test_thread_profiling
-    run_transaction_in_thread(:type => :controller, :request => stub)
-    run_transaction_in_thread(:type => :task)
+    run_transaction_in_thread(:controller)
+    run_transaction_in_thread(:task)
     issue_command(START_COMMAND)
@@ -80,8 +80,8 @@ class ThreadProfilingTest < Minitest::Test
   def test_thread_profiling_with_pruby_marshaller
     with_config(:marshaller => 'pruby') do
-      run_transaction_in_thread(:type => :controller, :request => stub)
-      run_transaction_in_thread(:type => :task)
+      run_transaction_in_thread(:controller)
+      run_transaction_in_thread(:task)
       issue_command(START_COMMAND)
@@ -118,11 +118,11 @@ class ThreadProfilingTest < Minitest::Test
   end
   # Runs a thread we expect to span entire test and be killed at the end
-  def run_transaction_in_thread(opts)
+  def run_transaction_in_thread(category)
     q = Queue.new
     @threads ||= []
     @threads << Thread.new do
-      in_transaction(opts) do
+      in_transaction(:category => category) do
         q.push('.')
         sleep # sleep until explicitly woken in join_background_threads
       end

data/test/multiverse/suites/capistrano/Envfile CHANGED

@@ -1,5 +1,5 @@
-suite_condition("Capistrano 3 not supported in 1.8.7") do
-  RUBY_VERSION != '1.8.7'
+suite_condition("Capistrano 3 not supported in 1.8.7 and flaky on JRuby") do
+  RUBY_VERSION != '1.8.7' && RUBY_PLATFORM != 'java'
 end
 gemfile <<-RB

data/test/multiverse/suites/capistrano2/Envfile CHANGED

@@ -1,3 +1,7 @@
+suite_condition("Capistrano testing is flaky on JRuby") do
+  RUBY_PLATFORM != 'java'
+end
 gemfile <<-RB
   gem 'capistrano', '~>2.15.5'
   gem 'rack'

data/test/multiverse/suites/curb/Envfile CHANGED

@@ -21,8 +21,12 @@ gemfile <<-RB
   gem 'json', :platforms => [:rbx, :mri_18]
 RB
+# Older curb's than 0.8.6 don't build against Ruby 2.2.0-preview1
+# Recheck on later RC's, but for now, just skip this env for Ruby 2.2.0
+if RUBY_VERSION < "2.2.0"
 gemfile <<-RB
   gem 'curb', '0.8.1'
   gem 'rack'
   gem 'json', :platforms => [:rbx, :mri_18]
 RB
+end

data/test/multiverse/suites/high_security/config/newrelic.yml CHANGED

@@ -20,8 +20,11 @@ development:
   license_key: bootstrap_newrelic_admin_license_key_000
   developer_mode: false
   app_name: test
-  host: 127.0.0.1
-  api_host: 127.0.0.1
+  host: localhost
+  api_host: localhost
   port: <%= $collector && $collector.port %>
   browser_monitoring:
     auto_instrument: true
+  # Fake collector uses SSL, and we want agent to trust its self-signed cert.
+  ca_bundle_path: ../../../config/test.cert.crt

data/test/multiverse/suites/high_security/high_security_test.rb CHANGED

@@ -3,6 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 require 'multiverse_helpers'
+require 'fake_server'
 # These tests are designed to work in conjunction with a local newrelic.yml
 # file set with "insecure" settings and the server returning "insecure" values,
@@ -12,12 +13,11 @@ class HighSecurityTest < Minitest::Test
   include MultiverseHelpers
-  setup_and_teardown_agent do |collector|
-    # Because our tests will default to using SSL, we need to stub that out
-    # on our HTTP connects to the fake collector which doesn't have SSL...
-    Net::HTTPSession.any_instance.expects('use_ssl=').with(true).at_least_once
+  setup_and_teardown_agent do |_collector|
+    $collector = nil
+    setup_collector(true)
-    collector.stub('connect', {
+    $collector.stub('connect', {
       "agent_run_id" => 1,
       "listen_to_server_config" => true,
@@ -28,9 +28,11 @@ class HighSecurityTest < Minitest::Test
   end
   def test_connects_via_ssl_no_matter_what
-    # Expectation is set in setup since we all need to sidestep the use_ssl=
-    # setting, and mocking gets weird if we call `stubs` then try to `expects`
-    NewRelic::Agent.manual_start(:ssl => false)
+    assert_equal 1, $collector.calls_for('connect').size
+    trigger_agent_reconnect(:ssl => false)
+    assert_equal 2, $collector.calls_for('connect').size
   end
   def test_sends_high_security_flag_in_connect

data/test/multiverse/suites/json/Envfile ADDED

@@ -0,0 +1,23 @@
+all_versions = [ '~> 1.8.1', '~> 1.7.7', '~> 1.6.8', '~> 1.5.5' ]
+before_2_0_0 = [ '~> 1.4.6', '~> 1.2.4', '~> 1.1.9' ]
+before_1_9_2 = [ '1.1.2' ]
+json_gems = all_versions.dup
+json_gems += before_2_0_0 if RUBY_VERSION < '2.0.0'
+json_gems += before_1_9_2 if RUBY_VERSION < '1.9.2'
+if defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
+  json_gems.delete('~> 1.7.7')
+end
+if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
+  json_gems.delete('~> 1.2.4')
+  json_gems.delete('~> 1.1.9')
+end
+json_gems.each do |version|
+  gemfile <<-RB
+    gem 'rack'
+    gem 'json', '#{version}'
+  RB
+end

data/test/multiverse/suites/json/config/newrelic.yml ADDED

@@ -0,0 +1,22 @@
+---
+development:
+  error_collector:
+    enabled: true
+  apdex_t: 0.24
+  ssl: false
+  log_level: debug
+  monitor_mode: true
+  license_key: bootstrap_newrelic_admin_license_key_000
+  developer_mode: false
+  app_name: test
+  host: 127.0.0.1
+  api_host: 127.0.0.1
+  port: <%= $collector && $collector.port %>
+  transaction_tracer:
+    record_sql: obfuscated
+    enabled: true
+    stack_trace_threshold: 0.5
+  capture_params: false
+  browser_monitoring:
+    auto_instrument: true
+  marshaller: json

data/test/multiverse/suites/json/json_test.rb ADDED

@@ -0,0 +1,17 @@
+# 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.
+require 'multiverse_helpers'
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'new_relic', 'marshalling_test_cases')
+# This is intended as a sanity check for our serialization to JSON via the
+# json gem across various Ruby versions.
+class JsonTest < Minitest::Test
+  include MultiverseHelpers
+  include MarshallingTestCases
+  setup_and_teardown_agent
+end

data/test/multiverse/suites/marshalling/marshalling_test.rb CHANGED

@@ -3,58 +3,15 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 require 'multiverse_helpers'
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'new_relic', 'marshalling_test_cases')
 # These tests are intended to exercise the basic marshalling functionality of
 # the agent in it's different permutations (Ruby and JSON)
 class MarshallingTest < Minitest::Test
   include MultiverseHelpers
+  include MarshallingTestCases
   setup_and_teardown_agent
-  def test_sends_metrics
-    NewRelic::Agent.record_metric('Boo', 42)
-    transmit_data
-    result = $collector.calls_for('metric_data')
-    assert_equal 1, result.length
-    assert_includes result.first.metric_names, 'Boo'
-  end
-  def test_sends_errors
-    NewRelic::Agent.notice_error(StandardError.new("Boom"))
-    transmit_data
-    result = $collector.calls_for('error_data')
-    assert_equal 1, result.length
-    assert_equal 1, result.first.errors.length
-    assert_equal "StandardError", result.first.errors.first.exception_class_name
-  end
-  def test_sends_transaction_traces
-    with_config(:'transaction_tracer.transaction_threshold' => -1.0) do
-      Transactioner.new.do_it
-    end
-    transmit_data
-    result = $collector.calls_for('transaction_sample_data')
-    assert_equal 1, result.length
-    assert_equal "Controller/MarshallingTest::Transactioner/do_it", result.first.metric_name
-  end
-  class Transactioner
-    include NewRelic::Agent::Instrumentation::ControllerInstrumentation
-    def do_it
-    end
-    add_transaction_tracer :do_it
-  end
-  def transmit_data
-    NewRelic::Agent.instance.send(:transmit_data)
-  end
 end