newrelic_rpm 3.7.2.195 → 3.7.3.199

data/test/new_relic/agent/transaction/developer_mode_sample_buffer_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 
 class NewRelic::Agent::Transaction
-  class DeveloperModeSampleBufferTest < MiniTest::Unit::TestCase
+  class DeveloperModeSampleBufferTest < Minitest::Test
     def setup
       @buffer = DeveloperModeSampleBuffer.new
     end

data/test/new_relic/agent/transaction/force_persist_sample_buffer_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 
 class NewRelic::Agent::Transaction
-  class ForcePersistSampleBufferTest < MiniTest::Unit::TestCase
+  class ForcePersistSampleBufferTest < Minitest::Test
     def setup
       @buffer = ForcePersistSampleBuffer.new
     end

data/test/new_relic/agent/transaction/pop_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper'))
 require 'new_relic/agent/transaction/pop'
-class NewRelic::Agent::Transaction::PopTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::Transaction::PopTest < Minitest::Test
   include NewRelic::Agent::Transaction::Pop
 
   attr_reader :agent

data/test/new_relic/agent/transaction/slowest_sample_buffer_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 
 class NewRelic::Agent::Transaction
-  class SlowestSampleBufferTest < MiniTest::Unit::TestCase
+  class SlowestSampleBufferTest < Minitest::Test
     def setup
       @buffer = SlowestSampleBuffer.new
     end

data/test/new_relic/agent/transaction/xray_sample_buffer_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 
 class NewRelic::Agent::Transaction
-  class XraySampleBufferTest < MiniTest::Unit::TestCase
+  class XraySampleBufferTest < Minitest::Test
 
     XRAY_SESSION_ID = 123
     MATCHING_TRANSACTION = "Matching/transaction/name"

data/test/new_relic/agent/transaction_interrobang_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require 'new_relic/agent/instrumentation/controller_instrumentation'
 
-class TransactionInterrobangTest < MiniTest::Unit::TestCase
+class TransactionInterrobangTest < Minitest::Test
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
   def interrogate?

data/test/new_relic/agent/transaction_sample_builder_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
-class NewRelic::Agent::TransationSampleBuilderTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::TransationSampleBuilderTest < Minitest::Test
 
   def setup
     freeze_time

data/test/new_relic/agent/transaction_sampler_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require File.expand_path(File.join(File.dirname(__FILE__),'..','data_container_tests'))
 
-class NewRelic::Agent::TransactionSamplerTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::TransactionSamplerTest < Minitest::Test
 
   module MockGCStats
 
@@ -36,7 +36,7 @@ class NewRelic::Agent::TransactionSamplerTest < MiniTest::Unit::TestCase
     NewRelic::Agent.instance.instance_variable_set(:@transaction_sampler, @sampler)
     @test_config = { :'transaction_tracer.enabled' => true }
     NewRelic::Agent.config.apply_config(@test_config)
-    @txn = stub('txn', :name => '/path', :custom_parameters => {})
+    @txn = stub('txn', :name => '/path', :custom_parameters => {}, :guid => 'a guid')
   end
 
   def teardown
@@ -142,7 +142,6 @@ class NewRelic::Agent::TransactionSamplerTest < MiniTest::Unit::TestCase
     builder = mock('builder')
     @sampler.stubs(:builder).returns(builder)
 
-
     builder.expects(:finish_trace).with(100.0, {})
     @sampler.expects(:clear_builder)
 
@@ -151,6 +150,7 @@ class NewRelic::Agent::TransactionSamplerTest < MiniTest::Unit::TestCase
     builder.expects(:set_transaction_name).returns(true)
 
     sample = mock('sample')
+    sample.expects(:guid=)
     builder.expects(:sample).returns(sample)
     @sampler.expects(:store_sample).with(sample)
 
@@ -160,6 +160,20 @@ class NewRelic::Agent::TransactionSamplerTest < MiniTest::Unit::TestCase
     assert_equal(sample, @sampler.instance_variable_get('@last_sample'))
   end
 
+  def test_notice_scope_empty_passes_guid_along
+    builder = stub_everything('builder')
+    @sampler.stubs(:builder).returns(builder)
+
+    @txn.stubs(:guid).returns('a guid')
+
+    sample = stub_everything('sample')
+    sample.expects(:guid=).with(@txn.guid)
+    builder.stubs(:sample).returns(sample)
+
+    @sampler.notice_transaction(nil, {})
+    @sampler.notice_scope_empty(@txn, Time.at(100))
+  end
+
   def test_ignore_transaction_no_builder
     @sampler.expects(:builder).returns(nil).once
     @sampler.ignore_transaction
@@ -172,20 +186,6 @@ class NewRelic::Agent::TransactionSamplerTest < MiniTest::Unit::TestCase
     @sampler.ignore_transaction
   end
 
-  def test_notice_profile_no_builder
-    @sampler.expects(:builder).returns(nil).once
-    @sampler.notice_profile(nil)
-  end
-
-  def test_notice_profile_with_builder
-    profile = mock('profile')
-    builder = mock('builder')
-    @sampler.expects(:builder).returns(builder).twice
-    builder.expects(:set_profile).with(profile)
-
-    @sampler.notice_profile(profile)
-  end
-
   def test_notice_transaction_cpu_time_no_builder
     @sampler.expects(:builder).returns(nil).once
     @sampler.notice_transaction_cpu_time(0.0)

data/test/new_relic/agent/transaction_state_test.rb

@@ -7,7 +7,7 @@ require 'new_relic/agent/transaction'
 require 'new_relic/agent/transaction_state'
 
 module NewRelic::Agent
-  class TransactionStateTest < MiniTest::Unit::TestCase
+  class TransactionStateTest < Minitest::Test
     attr_reader :state
 
     def setup
@@ -48,7 +48,7 @@ module NewRelic::Agent
     def test_timings_without_transaction
       freeze_time
 
-      state.reset(nil)
+      state.reset
       timings = state.timings
 
       assert_equal 0.0, timings.queue_time_in_seconds
@@ -72,6 +72,12 @@ module NewRelic::Agent
       assert_equal transaction.name, timings.transaction_name
     end
 
+    def test_guid_from_transaction
+      txn = NewRelic::Agent::Transaction.new
+      state.transaction = txn
+      assert_equal state.request_guid, txn.guid
+    end
+
     GUID = "goo-id"
 
     def test_request_guid_to_include
@@ -79,12 +85,11 @@ module NewRelic::Agent
         freeze_time
 
         state.request_token = "token"
-        state.request_guid = GUID
         state.transaction = NewRelic::Agent::Transaction.new
 
         advance_time(4.0)
 
-        assert_equal GUID, state.request_guid_to_include
+        assert_equal state.transaction.guid, state.request_guid_to_include
       end
     end
 
@@ -93,7 +98,6 @@ module NewRelic::Agent
         freeze_time
 
         state.request_token = "token"
-        state.request_guid = GUID
         state.transaction = NewRelic::Agent::Transaction.new
 
         advance_time(1.0)
@@ -107,7 +111,6 @@ module NewRelic::Agent
         freeze_time
 
         state.request_token = nil
-        state.request_guid = GUID
         state.transaction = NewRelic::Agent::Transaction.new
 
         advance_time(4.0)
@@ -115,5 +118,57 @@ module NewRelic::Agent
         assert_equal "", state.request_guid_to_include
       end
     end
+
+    def test_no_request_guid_for_event
+      state.request_token = nil
+      state.is_cross_app_caller = false
+      state.referring_transaction_info = nil
+      state.transaction = NewRelic::Agent::Transaction.new
+
+      assert_nil state.request_guid_for_event
+    end
+
+    def test_request_guid_for_event
+      state.request_token = nil
+      state.is_cross_app_caller = true
+      state.referring_transaction_info = nil
+      state.transaction = NewRelic::Agent::Transaction.new
+
+      assert_equal state.transaction.guid, state.request_guid_for_event
+    end
+
+    def test_request_guid_for_event_if_referring_transaction
+      state.request_token = nil
+      state.is_cross_app_caller = false
+      state.referring_transaction_info = ["another"]
+      state.transaction = NewRelic::Agent::Transaction.new
+
+      assert_equal state.transaction.guid, state.request_guid_for_event
+    end
+
+    def test_request_guid_for_event_if_there_for_rum
+      with_config(:apdex_t => 2.0) do
+        state.request_token = "token"
+        state.is_cross_app_caller = false
+        state.transaction = NewRelic::Agent::Transaction.new
+
+        advance_time(10.0)
+
+        assert_equal state.transaction.guid, state.request_guid_for_event
+      end
+    end
+
+    def test_reset_should_reset_cat_state
+      state.is_cross_app_caller = true
+      state.referring_transaction_info = ['foo', 'bar']
+
+      assert_equal(true, state.is_cross_app_callee?)
+      assert_equal(true, state.is_cross_app_caller?)
+
+      state.reset
+
+      assert_equal(false, state.is_cross_app_caller?)
+      assert_equal(false, state.is_cross_app_callee?)
+    end
   end
 end

data/test/new_relic/agent/transaction_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
-class NewRelic::Agent::TransactionTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::TransactionTest < Minitest::Test
 
   attr_reader :txn
 
@@ -203,6 +203,10 @@ class NewRelic::Agent::TransactionTest < MiniTest::Unit::TestCase
     assert txn.name_set?
   end
 
+  def test_generates_guid_on_initialization
+    refute_empty txn.guid
+  end
+
   def test_start_adds_controller_context_to_txn_stack
     NewRelic::Agent::Transaction.start(:controller)
     assert_equal 1, NewRelic::Agent::Transaction.stack.size
@@ -257,14 +261,14 @@ class NewRelic::Agent::TransactionTest < MiniTest::Unit::TestCase
   def test_end_fires_a_transaction_finished_event_with_overview_metrics
     options = nil
     NewRelic::Agent.subscribe(:transaction_finished) do |payload|
-      options = payload[:overview_metrics]
+      options = payload[:metrics]
     end
 
     NewRelic::Agent::Transaction.start(:controller)
     NewRelic::Agent.record_metric("HttpDispatcher", 2.1)
     NewRelic::Agent::Transaction.stop('txn')
 
-    assert_equal 2.1, options[:webDuration]
+    assert_equal 2.1, options[NewRelic::MetricSpec.new('HttpDispatcher')].total_call_time
   end
 
   def test_end_fires_a_transaction_finished_event_with_custom_params
@@ -280,6 +284,59 @@ class NewRelic::Agent::TransactionTest < MiniTest::Unit::TestCase
     assert_equal 'barz', options['fooz']
   end
 
+  def test_end_fires_a_transaction_finished_event_with_transaction_guid
+    guid = nil
+    NewRelic::Agent.subscribe(:transaction_finished) do |payload|
+      guid = payload[:guid]
+    end
+
+    in_transaction do
+      NewRelic::Agent::TransactionState.get.is_cross_app_caller = true
+    end
+
+    refute_empty guid
+  end
+
+  def test_end_fires_a_transaction_finished_event_without_transaction_guid_if_not_cross_app
+    found_guid = :untouched
+    NewRelic::Agent.subscribe(:transaction_finished) do |payload|
+      found_guid = payload.key?(:guid)
+    end
+
+    in_transaction do
+      NewRelic::Agent::TransactionState.get.is_cross_app_caller = false
+    end
+
+    refute found_guid
+  end
+
+  def test_end_fires_a_transaction_finished_event_with_referring_transaction_guid
+    referring_guid = nil
+    NewRelic::Agent.subscribe(:transaction_finished) do |payload|
+      referring_guid = payload[:referring_transaction_guid]
+    end
+
+    in_transaction do
+      NewRelic::Agent::TransactionState.get.referring_transaction_info = ["GUID"]
+    end
+
+    assert_equal "GUID", referring_guid
+  end
+
+  def test_end_fires_a_transaction_finished_event_without_referring_guid_if_not_present
+    found_referring_guid = :untouched
+    NewRelic::Agent.subscribe(:transaction_finished) do |payload|
+      found_referring_guid = payload.key?(:referring_transaction_guid)
+    end
+
+    in_transaction do
+      # Make sure we don't have referring transaction state floating around
+      NewRelic::Agent::TransactionState.get.referring_transaction_info = nil
+    end
+
+    refute found_referring_guid
+  end
+
   def test_logs_warning_if_a_non_hash_arg_is_passed_to_add_custom_params
     expects_logging(:warn, includes("add_custom_parameters"))
     NewRelic::Agent::Transaction.start(:controller)

data/test/new_relic/agent/transaction_timings_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 require 'new_relic/agent/transaction_timings'
 
 module NewRelic::Agent
-  class TransactionTimingsTest < MiniTest::Unit::TestCase
+  class TransactionTimingsTest < Minitest::Test
 
     def setup
       @start_time = freeze_time

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

@@ -0,0 +1,42 @@
+# 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/monotonic_gc_profiler'
+
+class MonotonicGCProfilerTest < Minitest::Test
+  attr_reader :profiler
+
+  def setup
+    @profiler = NewRelic::Agent::VM::MonotonicGCProfiler.new
+    NewRelic::LanguageSupport.stubs(:gc_profiler_enabled?).returns(true)
+  end
+
+  if NewRelic::LanguageSupport.gc_profiler_usable?
+    def test_total_time_isnt_nil
+      refute_nil profiler.total_time
+    end
+
+    def test_total_time_reads_from_gc_profiler
+      GC::Profiler.stubs(:total_time).returns(0)
+      assert_equal 0, profiler.total_time
+
+      GC::Profiler.stubs(:total_time).returns(100)
+      assert_equal 100, profiler.total_time
+    end
+
+    def test_total_time_resets_underlying_gc_profiler
+      GC::Profiler.expects(:clear).once
+      profiler.total_time
+    end
+  end
+
+  def test_total_time_raises_if_called_when_not_enabled
+    NewRelic::LanguageSupport.stubs(:gc_profiler_enabled?).returns(false)
+
+    assert_raises(NewRelic::Agent::VM::MonotonicGCProfiler::ProfilerNotEnabledError) do
+      profiler.total_time
+    end
+  end
+end

data/test/new_relic/agent/vm/mri_vm_test.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 File.expand_path(File.join(File.dirname(__FILE__),'..', '..','..','test_helper'))
+require 'new_relic/agent/vm/mri_vm'
+
+unless NewRelic::LanguageSupport.jruby? || NewRelic::LanguageSupport.rubinius?
+  module NewRelic
+    module Agent
+      module VM
+        class MriVMTest < Minitest::Test
+          def setup
+            @snap = Snapshot.new
+            @vm = MriVM.new
+          end
+
+          unless RUBY_VERSION < '1.9.2'
+            def test_gather_gc_time_sets_gc_total_time_if_gc_profiler_is_enabled
+              NewRelic::LanguageSupport.stubs(:gc_profiler_enabled?).returns(true)
+              @vm.gather_gc_time(@snap)
+              refute_nil @snap.gc_total_time
+            end
+          end
+
+          def test_gather_gc_time_does_not_set_gc_total_time_if_gc_profiler_is_disabled
+            NewRelic::LanguageSupport.stubs(:gc_profiler_enabled?).returns(false)
+            @vm.gather_gc_time(@snap)
+            assert_nil @snap.gc_total_time
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+# 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 'new_relic/agent/vm/snapshot'
+
+class NewRelic::Agent::VM::SnapshotTestCase < Minitest::Test
+end