newrelic_rpm 3.8.1.221 → 3.9.0.229

data/test/new_relic/agent/vm/monotonic_gc_profiler_test.rb

@@ -30,13 +30,13 @@ class MonotonicGCProfilerTest < Minitest::Test
       GC::Profiler.expects(:clear).once
       profiler.total_time_s
     end
-  end
 
-  def test_total_time_raises_if_called_when_not_enabled
-    NewRelic::LanguageSupport.stubs(:gc_profiler_enabled?).returns(false)
+    def test_total_time_does_not_raise_if_called_when_not_enabled
+      NewRelic::LanguageSupport.stubs(:gc_profiler_enabled?).returns(false)
+      GC::Profiler.expects(:total_time).never
 
-    assert_raises(NewRelic::Agent::VM::MonotonicGCProfiler::ProfilerNotEnabledError) do
       profiler.total_time_s
     end
   end
+
 end

data/test/new_relic/agent/vm/rubinius_vm_test.rb

@@ -0,0 +1,68 @@
+# 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 File.expand_path(File.join(__FILE__, "..", "..", "..", "..", "test_helper"))
+require 'new_relic/agent/vm/rubinius_vm'
+
+if NewRelic::LanguageSupport.rubinius?
+  class NewRelic::Agent::VM::RubiniusVMTest < Minitest::Test
+    def test_normal_usage
+      with_stats({ :gc => {
+        :full  => { :count => 1 },
+        :young => { :count => 2 }
+      }})
+
+      has_major_minor(1, 2)
+    end
+
+    def test_missing_full
+      with_stats({ :gc => {
+        :young => { :count => 2 }
+      }})
+
+      has_major_minor(nil, 2)
+    end
+
+    def test_missing_full_count
+      with_stats({ :gc => {
+        :full  => { },
+        :young => { :count => 2 }
+      }})
+
+      has_major_minor(nil, 2)
+    end
+
+    def test_missing_young
+      with_stats({ :gc => {
+        :full => { :count => 1 }
+      }})
+
+      has_major_minor(1, nil)
+    end
+
+    def test_missing_young_count
+      with_stats({ :gc => {
+        :full  => { :count => 1},
+        :young => { }
+      }})
+
+      has_major_minor(1, nil)
+    end
+
+    def test_missing_gc
+      with_stats({})
+      has_major_minor(nil, nil)
+    end
+
+    def with_stats(stats)
+      GC.stubs(:stat).returns(stats)
+    end
+
+    def has_major_minor(major, minor)
+      snapshot = NewRelic::Agent::VM::RubiniusVM.new.snapshot
+      assert_equal(major, snapshot.major_gc_count)
+      assert_equal(minor, snapshot.minor_gc_count)
+    end
+  end
+end

data/test/new_relic/agent_test.rb

@@ -18,7 +18,7 @@ module NewRelic
     end
 
     def teardown
-      NewRelic::Agent::TransactionState.clear
+      NewRelic::Agent::TransactionState.tl_clear_for_testing
     end
 
     def test_shutdown
@@ -126,53 +126,53 @@ module NewRelic
     end
 
     def test_is_transaction_traced_true
-      NewRelic::Agent::TransactionState.get.record_tt = true
-      assert_equal(true, NewRelic::Agent.is_transaction_traced?, 'should be true since the thread local is set')
+      NewRelic::Agent::TransactionState.tl_get.record_tt = true
+      assert_equal(true, NewRelic::Agent.tl_is_transaction_traced?, 'should be true since the thread local is set')
     end
 
     def test_is_transaction_traced_blank
-      NewRelic::Agent::TransactionState.get.record_tt = nil
-      assert_equal(true, NewRelic::Agent.is_transaction_traced?, 'should be true since the thread local is not set')
+      NewRelic::Agent::TransactionState.tl_get.record_tt = nil
+      assert_equal(true, NewRelic::Agent.tl_is_transaction_traced?, 'should be true since the thread local is not set')
     end
 
     def test_is_transaction_traced_false
-      NewRelic::Agent::TransactionState.get.record_tt = false
-      assert_equal(false, NewRelic::Agent.is_transaction_traced?, 'should be false since the thread local is false')
+      NewRelic::Agent::TransactionState.tl_get.record_tt = false
+      assert_equal(false, NewRelic::Agent.tl_is_transaction_traced?, 'should be false since the thread local is false')
     end
 
     def test_is_sql_recorded_true
-      NewRelic::Agent::TransactionState.get.record_sql = true
-      assert_equal(true, NewRelic::Agent.is_sql_recorded?, 'should be true since the thread local is set')
+      NewRelic::Agent::TransactionState.tl_get.record_sql = true
+      assert_equal(true, NewRelic::Agent.tl_is_sql_recorded?, 'should be true since the thread local is set')
     end
 
     def test_is_sql_recorded_blank
-      NewRelic::Agent::TransactionState.get.record_sql = nil
-      assert_equal(true, NewRelic::Agent.is_sql_recorded?, 'should be true since the thread local is not set')
+      NewRelic::Agent::TransactionState.tl_get.record_sql = nil
+      assert_equal(true, NewRelic::Agent.tl_is_sql_recorded?, 'should be true since the thread local is not set')
     end
 
     def test_is_sql_recorded_false
-      NewRelic::Agent::TransactionState.get.record_sql = false
-      assert_equal(false, NewRelic::Agent.is_sql_recorded?, 'should be false since the thread local is false')
+      NewRelic::Agent::TransactionState.tl_get.record_sql = false
+      assert_equal(false, NewRelic::Agent.tl_is_sql_recorded?, 'should be false since the thread local is false')
     end
 
     def test_is_execution_traced_true
-      NewRelic::Agent::TransactionState.get.untraced = [true, true]
-      assert_equal(true, NewRelic::Agent.is_execution_traced?, 'should be true since the thread local is set')
+      NewRelic::Agent::TransactionState.tl_get.untraced = [true, true]
+      assert_equal(true, NewRelic::Agent.tl_is_execution_traced?, 'should be true since the thread local is set')
     end
 
     def test_is_execution_traced_blank
-      NewRelic::Agent::TransactionState.get.untraced = nil
-      assert_equal(true, NewRelic::Agent.is_execution_traced?, 'should be true since the thread local is not set')
+      NewRelic::Agent::TransactionState.tl_get.untraced = nil
+      assert_equal(true, NewRelic::Agent.tl_is_execution_traced?, 'should be true since the thread local is not set')
     end
 
     def test_is_execution_traced_empty
-      NewRelic::Agent::TransactionState.get.untraced = []
-      assert_equal(true, NewRelic::Agent.is_execution_traced?, 'should be true since the thread local is an empty array')
+      NewRelic::Agent::TransactionState.tl_get.untraced = []
+      assert_equal(true, NewRelic::Agent.tl_is_execution_traced?, 'should be true since the thread local is an empty array')
     end
 
     def test_is_execution_traced_false
-      NewRelic::Agent::TransactionState.get.untraced = [true, false]
-      assert_equal(false, NewRelic::Agent.is_execution_traced?, 'should be false since the thread local stack has the last element false')
+      NewRelic::Agent::TransactionState.tl_get.untraced = [true, false]
+      assert_equal(false, NewRelic::Agent.tl_is_execution_traced?, 'should be false since the thread local stack has the last element false')
     end
 
     def test_instance
@@ -188,7 +188,7 @@ module NewRelic
 
     def test_record_metric
       dummy_engine = NewRelic::Agent.agent.stats_engine
-      dummy_engine.expects(:record_metrics).with('foo', 12)
+      dummy_engine.expects(:tl_record_unscoped_metrics).with('foo', 12)
       NewRelic::Agent.record_metric('foo', 12)
     end
 
@@ -208,7 +208,7 @@ module NewRelic
       expected_stats.min_call_time = 1
       expected_stats.max_call_time = 5
       expected_stats.sum_of_squares = 999
-      dummy_engine.expects(:record_metrics).with('foo', expected_stats)
+      dummy_engine.expects(:tl_record_unscoped_metrics).with('foo', expected_stats)
       NewRelic::Agent.record_metric('foo', stats_hash)
     end
 
@@ -228,7 +228,7 @@ module NewRelic
       expected_stats.max_call_time = 5
       expected_stats.sum_of_squares = 999
 
-      dummy_engine.expects(:record_metrics).with('foo', expected_stats)
+      dummy_engine.expects(:tl_record_unscoped_metrics).with('foo', expected_stats)
       NewRelic::Agent.record_metric('foo', incomplete_stats_hash)
     end
 
@@ -236,7 +236,7 @@ module NewRelic
       dummy_engine = NewRelic::Agent.agent.stats_engine
       dummy_stats = mock
       dummy_stats.expects(:increment_count).with(12)
-      dummy_engine.expects(:record_metrics).with('foo').yields(dummy_stats)
+      dummy_engine.expects(:tl_record_unscoped_metrics).with('foo').yields(dummy_stats)
       NewRelic::Agent.increment_metric('foo', 12)
     end
 
@@ -301,7 +301,11 @@ module NewRelic
         trace_execution_scoped('Custom/something') {}
         NewRelic::Agent.set_transaction_name('new_name')
       end
-      assert engine.lookup_stats('Custom/something', 'Controller/new_name')
+
+      assert_metrics_recorded([
+        'Custom/something',
+        'Controller/new_name'
+      ])
     end
 
     def test_set_transaction_name_sets_tt_name
@@ -316,7 +320,7 @@ module NewRelic
       engine = NewRelic::Agent.instance.stats_engine
       engine.reset!
       Transactor.new.txn do
-        NewRelic::Agent::Transaction.current.freeze_name_and_execute_if_not_ignored do
+        NewRelic::Agent::Transaction.tl_current.freeze_name_and_execute_if_not_ignored do
           NewRelic::Agent.set_transaction_name('new_name')
         end
       end

data/test/new_relic/cli/commands/deployments_test.rb

@@ -16,8 +16,9 @@ class NewRelic::Cli::DeploymentsTest < Minitest::Test
       def just_exit(status=0); @exit_status ||= status; end
     end
     @config = { :license_key => 'a' * 40 }
-    NewRelic::Agent.config.apply_config(@config)
+    NewRelic::Agent.config.add_config_for_testing(@config)
   end
+
   def teardown
     super
     return unless @deployment
@@ -26,19 +27,23 @@ class NewRelic::Cli::DeploymentsTest < Minitest::Test
     puts @deployment.exit_status
     NewRelic::Agent.config.remove_config(@config)
   end
+
+
   def test_help
     begin
       NewRelic::Cli::Deployments.new "-h"
       fail "should have thrown"
     rescue NewRelic::Cli::Command::CommandFailure => c
-      assert_match /^Usage/, c.message
+      assert_match(/^Usage/, c.message)
     end
   end
+
   def test_bad_command
     assert_raises NewRelic::Cli::Command::CommandFailure do
       NewRelic::Cli::Deployments.new ["-foo", "bar"]
     end
   end
+
   def test_interactive
     mock_the_connection
     @deployment = NewRelic::Cli::Deployments.new(:appname => 'APP',

data/test/new_relic/control/instance_methods_test.rb

@@ -17,14 +17,14 @@ class NewRelic::Control::InstanceMethodsTest < Minitest::Test
   end
 
   def test_configure_agent_adds_the_yaml_config
-    refute NewRelic::Agent.config.config_stack_index_for NewRelic::Agent::Configuration::YamlSource
+    refute NewRelic::Agent.config.config_classes_for_testing.include? NewRelic::Agent::Configuration::YamlSource
     @test.configure_agent('test', {})
-    assert NewRelic::Agent.config.config_stack_index_for NewRelic::Agent::Configuration::YamlSource
+    assert NewRelic::Agent.config.config_classes_for_testing.include? NewRelic::Agent::Configuration::YamlSource
   end
 
   def test_configure_agent_adds_the_manual_config
-    refute NewRelic::Agent.config.config_stack_index_for NewRelic::Agent::Configuration::ManualSource
+    refute NewRelic::Agent.config.config_classes_for_testing.include? NewRelic::Agent::Configuration::ManualSource
     @test.configure_agent('test', {})
-    assert NewRelic::Agent.config.config_stack_index_for NewRelic::Agent::Configuration::ManualSource
+    assert NewRelic::Agent.config.config_classes_for_testing.include? NewRelic::Agent::Configuration::ManualSource
   end
 end

data/test/new_relic/control_test.rb

@@ -23,14 +23,14 @@ class NewRelic::ControlTest < Minitest::Test
 
   def test_root
     assert File.directory?(NewRelic::Control.newrelic_root), NewRelic::Control.newrelic_root
-    if defined?(Rails)
+    if defined?(Rails::VERSION)
       assert File.directory?(File.join(NewRelic::Control.newrelic_root, "lib")), NewRelic::Control.newrelic_root +  "/lib"
     end
   end
 
   def test_info
     NewRelic::Agent.manual_start
-    if defined?(Rails)
+    if defined?(Rails::VERSION)
       assert_match /jdbc|postgres|mysql|sqlite/, NewRelic::EnvironmentReport.new["Database adapter"]
     end
   end
@@ -122,21 +122,21 @@ class NewRelic::ControlTest < Minitest::Test
   def test_transaction_tracer_disabled
     with_config(:'transaction_tracer.enabled' => false,
                 :developer_mode => false, :monitor_mode => true) do
-      assert(!NewRelic::Agent::Agent.instance.transaction_sampler.enabled?,
+      assert(!NewRelic::Agent.instance.transaction_sampler.enabled?,
              'transaction tracer enabled when config calls for disabled')
     end
   end
 
   def test_sql_tracer_disabled
     with_config(:'slow_sql.enabled' => false, :monitor_mode => true) do
-      assert(!NewRelic::Agent::Agent.instance.sql_sampler.enabled?,
+      assert(!NewRelic::Agent.instance.sql_sampler.enabled?,
              'sql tracer enabled when config calls for disabled')
     end
   end
 
   def test_sql_tracer_disabled_with_record_sql_false
     with_config(:slow_sql => { :enabled => true, :record_sql => 'off' }) do
-      refute NewRelic::Agent::Agent.instance.sql_sampler.enabled?,
+      refute NewRelic::Agent.instance.sql_sampler.enabled?,
              'sql tracer enabled when config calls for disabled'
     end
   end
@@ -145,7 +145,7 @@ class NewRelic::ControlTest < Minitest::Test
     with_config(:'transaction_tracer.enabled' => false,
                 :'slow_sql.enabled' => true,
                 :developer_mode => false, :monitor_mode => true) do
-      refute NewRelic::Agent::Agent.instance.sql_sampler.enabled?,
+      refute NewRelic::Agent.instance.sql_sampler.enabled?,
              'sql enabled when transaction tracer disabled'
     end
   end
@@ -163,10 +163,12 @@ class NewRelic::ControlTest < Minitest::Test
 
   def test_init_plugin_loads_samplers_enabled
     reset_agent
-    with_config(:disable_samplers => false,
-                :agent_enabled    => true,
-                :monitor_mode     => true,
-                :license_key      => 'a'*40) do
+
+    with_config(:disable_samplers       => false,
+                :disable_harvest_thread => true,
+                :agent_enabled          => true,
+                :monitor_mode           => true,
+                :license_key            => 'a'*40) do
       NewRelic::Control.instance.init_plugin
       assert NewRelic::Agent.instance.harvest_samplers.any?
     end
@@ -174,10 +176,12 @@ class NewRelic::ControlTest < Minitest::Test
 
   def test_init_plugin_loads_samplers_disabled
     reset_agent
-    with_config(:disable_samplers => true,
-                :agent_enabled    => true,
-                :monitor_mode     => true,
-                :license_key      => 'a'*40) do
+
+    with_config(:disable_samplers       => true,
+                :disable_harvest_thread => true,
+                :agent_enabled          => true,
+                :monitor_mode           => true,
+                :license_key            => 'a'*40) do
       NewRelic::Control.instance.init_plugin
       refute NewRelic::Agent.instance.harvest_samplers.any?
     end
@@ -188,10 +192,11 @@ class NewRelic::ControlTest < Minitest::Test
 
     NewRelic::Agent.instance.stubs(:defer_for_delayed_job?).returns(true)
 
-    with_config(:disable_samplers => false,
-                :agent_enabled    => true,
-                :monitor_mode     => true,
-                :license_key      => 'a'*40) do
+    with_config(:disable_samplers       => false,
+                :disable_harvest_thread => true,
+                :agent_enabled          => true,
+                :monitor_mode           => true,
+                :license_key            => 'a'*40) do
       NewRelic::Control.instance.init_plugin
       refute NewRelic::Agent.instance.already_started?
       refute NewRelic::Agent.instance.harvest_samplers.any?
@@ -203,10 +208,11 @@ class NewRelic::ControlTest < Minitest::Test
 
     NewRelic::Agent.instance.stubs(:defer_for_delayed_job?).returns(true)
 
-    with_config(:disable_samplers => false,
-                :agent_enabled    => true,
-                :monitor_mode     => true,
-                :license_key      => 'a'*40) do
+    with_config(:disable_samplers       => false,
+                :disable_harvest_thread => true,
+                :agent_enabled          => true,
+                :monitor_mode           => true,
+                :license_key            => 'a'*40) do
       NewRelic::Control.instance.init_plugin
       NewRelic::Agent.instance.stubs(:defer_for_delayed_job?).returns(false)
       NewRelic::Agent.after_fork

data/test/new_relic/dependency_detection_test.rb

@@ -96,6 +96,20 @@ class DependencyDetectionTest < Minitest::Test
     assert !executed
   end
 
+  def test_named_disabling_with_instance_variable
+    executed = false
+
+    DependencyDetection.defer do
+      @name = :testing
+      executes { executed = true }
+    end
+
+    with_config(:disable_testing => true) do
+      DependencyDetection.detect!
+    end
+
+    assert !executed
+  end
 
   def test_exception_during_depends_on_check_doesnt_propagate
     DependencyDetection.defer do

data/test/new_relic/fake_external_server.rb

@@ -4,6 +4,7 @@
 
 require 'rack'
 require 'fake_server'
+require 'new_relic/rack/agent_hooks'
 
 require 'json' if RUBY_VERSION >= '1.9'
 

data/test/new_relic/fake_rpm_site.rb

@@ -0,0 +1,35 @@
+# 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 'rack'
+require 'rack/request'
+require 'fake_server'
+
+module NewRelic
+  class FakeRpmSite < FakeServer
+    def initialize(*_)
+      super
+      @requests = []
+    end
+
+    attr_reader :requests
+
+    def call(env)
+      @requests << unpack(env)
+      [200, {}, ["Fine"]]
+    end
+
+    def unpack(env)
+      ::Rack::Request.new(env).params
+    end
+
+    def reset
+      @requests.clear
+    end
+
+    def app
+      self
+    end
+  end
+end