newrelic_rpm 3.6.5.130 → 3.6.6.147

data/test/multiverse/suites/sequel/Envfile

@@ -32,3 +32,11 @@ gemfile <<-RB
 RB
 
 
+gemfile <<-RB
+  gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
+  gem 'jdbc-sqlite3', '3.7.2', :platform => :jruby
+  gem 'sqlite3', '1.3.7', :platform => :ruby
+  gem 'sequel', '4.0.0'
+RB
+
+

data/test/multiverse/suites/sequel/config/newrelic.yml

@@ -11,12 +11,9 @@ development:
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1
-  port: <%= 30_000 + ($$ % 10_000) %>
   transaction_tracer:
     record_sql: obfuscated
     enabled: true
     stack_trace_threshold: 0.5
     transaction_threshold: 1.0
   capture_params: false
-  log_level: debug
-  log_file_path: agent.log

data/test/multiverse/suites/sequel/sequel_test.rb

@@ -22,7 +22,7 @@ DB.create_table( :users ) do
 end
 class User < Sequel::Model; end
 
-class SequelTest < Test::Unit::TestCase
+class SequelTest < MiniTest::Unit::TestCase
 
   def test_it_doesnt_blow_up
     require 'newrelic_rpm'
@@ -32,4 +32,3 @@ class SequelTest < Test::Unit::TestCase
   end
 
 end
-

data/test/multiverse/suites/sidekiq/Envfile

@@ -7,15 +7,3 @@ gemfile <<-RB
   gem 'sidekiq'
   gem 'rack'
 RB
-
-before_suite do
-  ENV["NEWRELIC_MULTIVERSE_REDIS_PORT"] = (20_000 + ($$ % 10_000)).to_s
-  ENV["NEWRELIC_MULTIVERSE_FAKE_COLLECTOR_PORT"] = (30_000 + ($$ % 10_000)).to_s
-  system("echo 'port #{ENV["NEWRELIC_MULTIVERSE_REDIS_PORT"]}' | redis-server - > /dev/null &")
-end
-
-after_suite do
-  system("redis-cli -p #{ENV["NEWRELIC_MULTIVERSE_REDIS_PORT"]} shutdown")
-end
-
-execute_mode 'spawn'

data/test/multiverse/suites/sidekiq/config/newrelic.yml

@@ -11,13 +11,11 @@ development:
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1
-  sync_startup: true
-  port: <%= ENV['NEWRELIC_MULTIVERSE_FAKE_COLLECTOR_PORT'] %>
+  port: <%= $collector && $collector.port %>
   transaction_tracer:
     record_sql: obfuscated
     enabled: true
     stack_trace_threshold: 0.5
     transaction_threshold: 1.0
   capture_params: false
-  log_level: debug
   log_file_path: log

data/test/multiverse/suites/sidekiq/sidekiq_instrumentation_test.rb

@@ -5,93 +5,69 @@
 # https://newrelic.atlassian.net/browse/RUBY-775
 
 require 'sidekiq'
+require 'sidekiq/testing/inline'
 require 'test/unit'
 require 'newrelic_rpm'
 require 'fake_collector'
+require 'multiverse_helpers'
 
-class SidekiqTest < Test::Unit::TestCase
+class SidekiqTest < MiniTest::Unit::TestCase
   JOB_COUNT = 5
-  COLLECTOR_PORT = ENV['NEWRELIC_MULTIVERSE_FAKE_COLLECTOR_PORT']
-
-  def setup
-    $collector ||= NewRelic::FakeCollector.new
-    $collector.reset
-    $collector.run(COLLECTOR_PORT)
-    @pidfile = "sidekiq.#{$$}.pid"
-    @sidekiq_log = "log/sidekiq.#{$$}.log"
-    JOB_COUNT.times do |i|
-      TestWorker.perform_async('jobs_completed', i + 1)
+
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  class TestWorker
+    include Sidekiq::Worker
+
+    @jobs = {}
+
+    def self.reset
+      @jobs = {}
     end
-  end
 
-  def teardown
-    $redis.flushall
-    File.unlink(@pidfile) if File.exist?(@pidfile)
-    File.unlink(@sidekiq_log) if File.exist?(@sidekiq_log)
-  end
+    def self.record(key, val)
+      @jobs[key] ||= []
+      @jobs[key] << val
+    end
 
-  def start_worker(opts={})
-    daemon_arg = opts[:daemonize] ? '-d' : ''
-    worker_cmd = "bundle exec sidekiq #{daemon_arg} -P #{@pidfile} -L #{@sidekiq_log} -r ./app.rb &"
-    system(worker_cmd)
-  end
+    def self.records_for(key)
+      @jobs[key]
+    end
 
-  def stop_worker
-    worker_pid = File.read(@pidfile).to_i
-    Process.kill("TERM", worker_pid)
-    begin
-      Timeout.timeout(5) { sleep(1) until !process_alive?(worker_pid) }
-    rescue Timeout::Error => e
-      raise e.exception("timed out waiting for sidekiq worker exit")
+    def perform(key, val)
+      TestWorker.record(key, val)
     end
   end
 
-  def process_alive?(pid)
-    Process.kill(0, pid)
-    return true
-  rescue Errno::ESRCH
-    return false
+  # Running inline doesn't set up server middlewares
+  # Using the client middleware to get there instead
+  Sidekiq.configure_client do |config|
+    config.client_middleware do |chain|
+      chain.add NewRelic::SidekiqInstrumentation
+    end
   end
 
-  def wait_for_jobs
-    time_for_jobs = 10
-    begin
-      t0 = Time.now
-      stats = Sidekiq::Stats.new
-      Timeout.timeout(time_for_jobs) { sleep(0.1) until stats.processed == JOB_COUNT }
-    rescue Timeout::Error => err
-      completed = stats.processed
-      msg = "waiting #{time_for_jobs}s for completion of #{JOB_COUNT} jobs - only #{completed} completed"
-      msg << "\nstarted waiting at #{t0}, now = #{Time.now}"
-      raise err.exception(msg)
+  def run_jobs
+    TestWorker.reset
+    JOB_COUNT.times do |i|
+      TestWorker.perform_async('jobs_completed', i + 1)
     end
+
+    NewRelic::Agent.instance.send(:transmit_data)
   end
 
-  def run_worker(opts={})
-    begin
-      start_worker(opts)
-      wait_for_jobs
-    ensure
-      stop_worker
-    end
+  def test_all_jobs_ran
+    run_jobs
+    completed_jobs = Set.new(TestWorker.records_for('jobs_completed').map(&:to_i))
+    expected_completed_jobs = Set.new((1..JOB_COUNT).to_a)
+    assert_equal(expected_completed_jobs, completed_jobs)
   end
 
-  # The point here is to supress Sidekiq log output for passing tests, but
-  # dump the log for failing tests.
-  def capture_sidekiq_log
-    File.unlink(@sidekiq_log) if File.exist?(@sidekiq_log)
-    @sidekiq_log = "log/sidekiq.#{$$}.log"
-    begin
-      yield
-    rescue Exception => e
-      if File.exist?(@sidekiq_log)
-        log_contents = File.read(@sidekiq_log)
-        $stderr.puts "Sidekiq log contents (#{@sidekiq_log}):"
-        $stderr.puts log_contents
-      end
-      raise e
-    end
-    File.unlink(@sidekiq_log) if File.exist?(@sidekiq_log)
+  def test_agent_posts_correct_metric_data
+    run_jobs
+    assert_metric_and_call_count('OtherTransaction/SidekiqJob/all', JOB_COUNT)
   end
 
   METRIC_VALUES_POSITION = 3
@@ -106,36 +82,4 @@ class SidekiqTest < Test::Unit::TestCase
     call_count = metric[1][0]
     assert_equal(expected_call_count, call_count)
   end
-
-  def test_all_jobs_ran
-    capture_sidekiq_log do
-      run_worker
-      completed_jobs = Set.new($redis.smembers('jobs_completed').map(&:to_i))
-      expected_completed_jobs = Set.new((1..JOB_COUNT).to_a)
-      assert_equal(expected_completed_jobs, completed_jobs)
-    end
-  end
-
-  def test_agent_posts_correct_metric_data
-    capture_sidekiq_log do
-      run_worker
-      assert_metric_and_call_count('OtherTransaction/SidekiqJob/all', JOB_COUNT)
-    end
-  end
-
-  def test_all_jobs_ran_background
-    capture_sidekiq_log do
-      run_worker(:daemonize => true)
-      completed_jobs = Set.new($redis.smembers('jobs_completed').map(&:to_i))
-      expected_completed_jobs = Set.new((1..JOB_COUNT).to_a)
-      assert_equal(expected_completed_jobs, completed_jobs)
-    end
-  end
-
-  def test_agent_posts_correct_metric_data_background
-    capture_sidekiq_log do
-      run_worker(:daemonize => true)
-      assert_metric_and_call_count('OtherTransaction/SidekiqJob/all', JOB_COUNT)
-    end
-  end
 end

data/test/multiverse/suites/sinatra/config/newrelic.yml

@@ -10,15 +10,12 @@ development:
   license_key: bootstrap_newrelic_admin_license_key_000
   developer_mode: false
   app_name: test
-  sync_startup: true
   host: 127.0.0.1
   api_host: 127.0.0.1
-  port: <%= 30_000 + ($$ % 10_000) %>
   transaction_tracer:
     record_sql: obfuscated
     enabled: true
     stack_trace_threshold: 0.5
     transaction_threshold: 1.0
   capture_params: false
-  log_level: debug
   disable_serialization: false

data/test/multiverse/suites/sinatra/ignoring_test.rb

@@ -2,6 +2,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'
+
 class SinatraIgnoreTestApp < Sinatra::Base
   get '/record' do request.path_info end
 
@@ -34,14 +36,12 @@ class SinatraIgnoreTestApp < Sinatra::Base
 
 end
 
-class SinatraTestCase < Test::Unit::TestCase
+class SinatraTestCase < MiniTest::Unit::TestCase
   include Rack::Test::Methods
   include ::NewRelic::Agent::Instrumentation::Sinatra
+  include MultiverseHelpers
 
-  def setup
-    NewRelic::Agent.manual_start
-    NewRelic::Agent.instance.stats_engine.reset_stats
-  end
+  setup_and_teardown_agent
 
   def get_and_assert_ok(path)
     get(path)
@@ -154,6 +154,9 @@ class SinatraIgnoreItAllTest < SinatraTestCase
   end
 
   def test_ignores_everything
+    # Avoid Supportability metrics from startup of agent for this check
+    NewRelic::Agent.instance.reset_stats
+
     get_and_assert_ok '/'
     assert_metrics_recorded_exclusive([])
   end

data/test/multiverse/suites/sinatra/sinatra_classic_test.rb

@@ -82,7 +82,14 @@ get /\/regex.*/ do
   "Yeah, regex's!"
 end
 
-class SinatraClassicTest < Test::Unit::TestCase
+module Sinatra
+  class Application < Base
+    # Override to not accidentally start the app in at_exit handler
+    set :run, Proc.new { false }
+  end
+end
+
+class SinatraClassicTest < MiniTest::Unit::TestCase
   include SinatraTestCases
 
   def app

data/test/multiverse/suites/sinatra/sinatra_error_tracing_test.rb

@@ -2,6 +2,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'
+
 class SinatraErrorTracingTestApp < Sinatra::Base
   configure do
     set :show_exceptions, false
@@ -16,21 +18,16 @@ class SinatraErrorTracingTestApp < Sinatra::Base
   end
 end
 
-class SinatraErrorTracingTest < Test::Unit::TestCase
+class SinatraErrorTracingTest < MiniTest::Unit::TestCase
   include Rack::Test::Methods
   include ::NewRelic::Agent::Instrumentation::Sinatra
 
-  def app
-    SinatraErrorTracingTestApp
-  end
+  include MultiverseHelpers
 
-  def setup
-    ::NewRelic::Agent.manual_start
-    @error_collector = ::NewRelic::Agent.instance.error_collector
+  setup_and_teardown_agent
 
-    @error_collector.errors.clear
-    assert(@error_collector.enabled?,
-           'error collector should be enabled')
+  def app
+    SinatraErrorTracingTestApp
   end
 
   def test_traps_errors
@@ -38,13 +35,13 @@ class SinatraErrorTracingTest < Test::Unit::TestCase
     assert_equal 500, last_response.status
     assert_equal 'We are sorry', last_response.body
 
-    assert_equal(1, @error_collector.errors.size)
+    assert_equal(1, agent.error_collector.errors.size)
   end
 
   def test_ignores_notfound_errors_by_default
     get '/ignored_boom'
     assert_equal 404, last_response.status
     assert_match %r{Sinatra doesn&rsquo;t know this ditty\.}, last_response.body
-    assert_equal(0, @error_collector.errors.size)
+    assert_equal(0, agent.error_collector.errors.size)
   end
 end

data/test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb

@@ -2,6 +2,7 @@
 # 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'
 
 class SinatraTestApp < Sinatra::Base
   get '/hello/:name' do |name|
@@ -24,18 +25,18 @@ class SinatraTestApp < Sinatra::Base
   end
 end
 
-class SinatraMetricExplosionTest < Test::Unit::TestCase
+class SinatraMetricExplosionTest < MiniTest::Unit::TestCase
   include Rack::Test::Methods
   include ::NewRelic::Agent::Instrumentation::Sinatra
 
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
   def app
     SinatraTestApp
   end
 
-  def setup
-    ::NewRelic::Agent.agent.stats_engine.clear_stats
-  end
-
   def test_sinatra_returns_properly
     get '/hello/world'
     assert_equal 'hello world', last_response.body
@@ -64,13 +65,13 @@ class SinatraMetricExplosionTest < Test::Unit::TestCase
 
     metric_names = ::NewRelic::Agent.agent.stats_engine.metrics
     metric_names -= ['CPU/User Time', "Middleware/all", "WebFrontend/QueueTime", "WebFrontend/WebServer/all"]
+    metric_names.delete_if {|metric| metric.start_with?("Supportability")}
     assert_equal 6, metric_names.size, "Explosion detected in: #{metric_names.inspect}"
   end
 
   def test_does_not_break_when_no_verb_matches
-    assert_nothing_raised do
-      post '/some/garbage'
-    end
+    post '/some/garbage'
+
     metric_names = ::NewRelic::Agent.agent.stats_engine.metrics
     assert metric_names.include?('Controller/Sinatra/SinatraTestApp/POST (unknown)')
     assert metric_names.include?('Apdex/Sinatra/SinatraTestApp/POST (unknown)')

data/test/multiverse/suites/sinatra/sinatra_modular_test.rb

@@ -79,7 +79,7 @@ class SinatraModularTestApp < Sinatra::Base
   end
 end
 
-class SinatraModularTest < Test::Unit::TestCase
+class SinatraModularTest < MiniTest::Unit::TestCase
   include SinatraTestCases
 
   def app

data/test/multiverse/suites/sinatra/sinatra_routes_test.rb

@@ -2,6 +2,7 @@
 # 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'
 
 class SinatraRouteTestApp < Sinatra::Base
   configure do
@@ -24,18 +25,18 @@ class SinatraRouteTestApp < Sinatra::Base
   end
 end
 
-class SinatraRoutesTest < Test::Unit::TestCase
+class SinatraRoutesTest < MiniTest::Unit::TestCase
   include Rack::Test::Methods
   include ::NewRelic::Agent::Instrumentation::Sinatra
 
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
   def app
     SinatraRouteTestApp
   end
 
-  def setup
-    ::NewRelic::Agent.manual_start
-  end
-
   # https://support.newrelic.com/tickets/24779
   def test_lower_priority_route_conditions_arent_applied_to_higher_priority_routes
     get '/user/login'