newrelic_rpm 3.8.0.218 → 3.8.1.221

data/test/new_relic/agent/transaction_test.rb

@@ -6,10 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 
 class NewRelic::Agent::TransactionTest < Minitest::Test
 
-  attr_reader :txn
-
   def setup
-    @txn = NewRelic::Agent::Transaction.new
     @stats_engine = NewRelic::Agent.instance.stats_engine
     @stats_engine.reset!
     NewRelic::Agent.instance.error_collector.reset!
@@ -21,59 +18,74 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
   end
 
   def cleanup_transaction
-    NewRelic::Agent::Transaction.stack.clear
     NewRelic::Agent::TransactionState.clear
   end
 
   def test_request_parsing__none
-    assert_nil txn.uri
-    assert_nil txn.referer
+    in_transaction do |txn|
+      assert_nil txn.uri
+      assert_nil txn.referer
+    end
   end
 
   def test_request_parsing__path
-    request = stub(:path => '/path?hello=bob#none')
-    txn.request = request
-    assert_equal "/path", txn.uri
+    in_transaction do |txn|
+      request = stub(:path => '/path?hello=bob#none')
+      txn.request = request
+      assert_equal "/path", txn.uri
+    end
   end
 
   def test_request_parsing__fullpath
-    request = stub(:fullpath => '/path?hello=bob#none')
-    txn.request = request
-    assert_equal "/path", txn.uri
+    in_transaction do |txn|
+      request = stub(:fullpath => '/path?hello=bob#none')
+      txn.request = request
+      assert_equal "/path", txn.uri
+    end
   end
 
   def test_request_parsing__referer
-    request = stub(:referer => 'https://www.yahoo.com:8080/path/hello?bob=none&foo=bar')
-    txn.request = request
-    assert_nil txn.uri
-    assert_equal "https://www.yahoo.com:8080/path/hello", txn.referer
+    in_transaction do |txn|
+      request = stub(:referer => 'https://www.yahoo.com:8080/path/hello?bob=none&foo=bar')
+      txn.request = request
+      assert_nil txn.uri
+      assert_equal "https://www.yahoo.com:8080/path/hello", txn.referer
+    end
   end
 
   def test_request_parsing__uri
-    request = stub(:uri => 'http://creature.com/path?hello=bob#none', :referer => '/path/hello?bob=none&foo=bar')
-    txn.request = request
-    assert_equal "/path", txn.uri
-    assert_equal "/path/hello", txn.referer
+    in_transaction do |txn|
+      request = stub(:uri => 'http://creature.com/path?hello=bob#none', :referer => '/path/hello?bob=none&foo=bar')
+      txn.request = request
+      assert_equal "/path", txn.uri
+      assert_equal "/path/hello", txn.referer
+    end
   end
 
   def test_request_parsing__hostname_only
-    request = stub(:uri => 'http://creature.com')
-    txn.request = request
-    assert_equal "/", txn.uri
-    assert_nil txn.referer
+    in_transaction do |txn|
+      request = stub(:uri => 'http://creature.com')
+      txn.request = request
+      assert_equal "/", txn.uri
+      assert_nil txn.referer
+    end
   end
 
   def test_request_parsing__slash
-    request = stub(:uri => 'http://creature.com/')
-    txn.request = request
-    assert_equal "/", txn.uri
-    assert_nil txn.referer
+    in_transaction do |txn|
+      request = stub(:uri => 'http://creature.com/')
+      txn.request = request
+      assert_equal "/", txn.uri
+      assert_nil txn.referer
+    end
   end
 
   def test_queue_time
-    txn.apdex_start = 1000
-    txn.start_time = 1500
-    assert_equal 500, txn.queue_time
+    in_transaction do |txn|
+      txn.apdex_start = 1000
+      txn.start_time = 1500
+      assert_equal 500, txn.queue_time
+    end
   end
 
   def test_apdex_bucket_counts_errors_as_frustrating
@@ -105,61 +117,55 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     }
 
     with_config(config, :do_not_cast => true) do
-      txn.name = 'Controller/foo/bar'
-      assert_equal 1.5, txn.apdex_t
+      in_transaction('Controller/foo/bar') do |txn|
+        assert_equal 1.5, txn.apdex_t
+      end
 
-      txn.name = 'Controller/some/other'
-      assert_equal 2.0, txn.apdex_t
+      in_transaction('Controller/some/other') do |txn|
+        assert_equal 2.0, txn.apdex_t
+      end
     end
   end
 
-  def test_update_apdex_records_correct_apdex_for_key_transaction
-    config = {
+  KEY_TRANSACTION_CONFIG = {
       :web_transactions_apdex => {
         'Controller/slow/txn' => 4,
-        'Controller/fast/txn' => 0.1,
       },
       :apdex => 1
-    }
+  }
 
-    freeze_time
-    t0 = Time.now
+  def test_update_apdex_records_correct_apdex_for_key_transaction
+    t0 = freeze_time
 
-    # Setting the transaction name from within the in_transaction block seems
-    # like cheating, but it mimics the way things are actually done, where we
-    # finalize the transaction name before recording the Apdex metrics.
-    with_config(config, :do_not_cast => true) do
+    with_config(KEY_TRANSACTION_CONFIG, :do_not_cast => true) do
       in_web_transaction('Controller/slow/txn') do
-        NewRelic::Agent::Transaction.current.name = 'Controller/slow/txn'
         NewRelic::Agent::Transaction.record_apdex(t0 + 3.5,  false)
         NewRelic::Agent::Transaction.record_apdex(t0 + 5.5,  false)
         NewRelic::Agent::Transaction.record_apdex(t0 + 16.5, false)
       end
-      assert_metrics_recorded(
-        'Apdex'          => { :apdex_s => 1, :apdex_t => 1, :apdex_f => 1 },
-        'Apdex/slow/txn' => { :apdex_s => 1, :apdex_t => 1, :apdex_f => 1 }
-      )
 
-      in_web_transaction('Controller/fast/txn') do
-        NewRelic::Agent::Transaction.current.name = 'Controller/fast/txn'
-        NewRelic::Agent::Transaction.record_apdex(t0 + 0.05, false)
-        NewRelic::Agent::Transaction.record_apdex(t0 + 0.2,  false)
-        NewRelic::Agent::Transaction.record_apdex(t0 + 0.5,  false)
-      end
+      # apdex_s is 2 because the transaction itself records apdex
       assert_metrics_recorded(
-        'Apdex'          => { :apdex_s => 2, :apdex_t => 2, :apdex_f => 2 },
-        'Apdex/fast/txn' => { :apdex_s => 1, :apdex_t => 1, :apdex_f => 1 }
+        'Apdex'          => { :apdex_s => 2, :apdex_t => 1, :apdex_f => 1 },
+        'Apdex/slow/txn' => { :apdex_s => 2, :apdex_t => 1, :apdex_f => 1 }
       )
+    end
+  end
+
+  def test_update_apdex_records_correct_apdex_for_non_key_transaction
+    t0 = freeze_time
 
+    with_config(KEY_TRANSACTION_CONFIG, :do_not_cast => true) do
       in_web_transaction('Controller/other/txn') do
-        NewRelic::Agent::Transaction.current.name = 'Controller/other/txn'
         NewRelic::Agent::Transaction.record_apdex(t0 + 0.5, false)
         NewRelic::Agent::Transaction.record_apdex(t0 + 2,   false)
         NewRelic::Agent::Transaction.record_apdex(t0 + 5,   false)
       end
+
+      # apdex_s is 2 because the transaction itself records apdex
       assert_metrics_recorded(
-        'Apdex'           => { :apdex_s => 3, :apdex_t => 3, :apdex_f => 3 },
-        'Apdex/other/txn' => { :apdex_s => 1, :apdex_t => 1, :apdex_f => 1 }
+        'Apdex'           => { :apdex_s => 2, :apdex_t => 1, :apdex_f => 1 },
+        'Apdex/other/txn' => { :apdex_s => 2, :apdex_t => 1, :apdex_f => 1 }
       )
     end
   end
@@ -167,7 +173,6 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
   def test_record_apdex_stores_apdex_t_in_min_and_max
     with_config(:apdex_t => 2.5) do
       in_web_transaction('Controller/some/txn') do
-        NewRelic::Agent::Transaction.current.name = 'Controller/some/txn'
         NewRelic::Agent::Transaction.record_apdex(Time.now, false)
       end
     end
@@ -179,58 +184,34 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     )
   end
 
-  def test_stop_sets_name
-    NewRelic::Agent::Transaction.start(:controller)
-    txn = NewRelic::Agent::Transaction.stop('new_name')
-    assert_equal 'new_name', txn.name
-  end
-
   def test_name_is_unset_if_nil
-    txn = NewRelic::Agent::Transaction.new
-    txn.name = nil
-    assert !txn.name_set?
-  end
-
-  def test_name_is_unset_if_unknown
-    txn = NewRelic::Agent::Transaction.new
-    txn.name = NewRelic::Agent::UNKNOWN_METRIC
-    assert !txn.name_set?
+    in_transaction do |txn|
+      txn.default_name = nil
+      assert !txn.name_set?
+    end
   end
 
   def test_name_set_if_anything_else
-    txn = NewRelic::Agent::Transaction.new
-    txn.name = "anything else"
-    assert txn.name_set?
+    in_transaction("anything else") do |txn|
+      assert txn.name_set?
+    end
   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
-
-    NewRelic::Agent::Transaction.start(:controller)
-    assert_equal 2, NewRelic::Agent::Transaction.stack.size
-
-    NewRelic::Agent::Transaction.stop('txn')
-    assert_equal 1, NewRelic::Agent::Transaction.stack.size
-
-    NewRelic::Agent::Transaction.stop('txn')
-    assert_equal 0, NewRelic::Agent::Transaction.stack.size
+    in_transaction do |txn|
+      refute_empty txn.guid
+    end
   end
 
   def test_end_applies_transaction_name_rules
-    rule = NewRelic::Agent::RulesEngine::Rule.new('match_expression' => '[0-9]+',
-                                                  'replacement'      => '*',
-                                                  'replace_all'      => true)
-    NewRelic::Agent.instance.transaction_rules << rule
-    NewRelic::Agent::Transaction.start(:controller)
-    NewRelic::Agent.set_transaction_name('foo/1/bar/22')
-    NewRelic::Agent::Transaction.freeze_name
-    txn = NewRelic::Agent::Transaction.stop('txn')
-    assert_equal 'Controller/foo/*/bar/*', txn.name
+    in_transaction('Controller/foo/1/bar/22') do |txn|
+      rule = NewRelic::Agent::RulesEngine::Rule.new('match_expression' => '[0-9]+',
+                                                    'replacement'      => '*',
+                                                    'replace_all'      => true)
+      NewRelic::Agent.instance.transaction_rules << rule
+      NewRelic::Agent::Transaction.freeze_name_and_execute_if_not_ignored
+      assert_equal 'Controller/foo/*/bar/*', txn.best_name
+    end
   ensure
     NewRelic::Agent.instance.instance_variable_set(:@transaction_rules,
                                               NewRelic::Agent::RulesEngine.new)
@@ -246,11 +227,10 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     end
 
     start_time = freeze_time
-    NewRelic::Agent::Transaction.start(:controller)
-    advance_time(5)
-    NewRelic::Agent.set_transaction_name('foo/1/bar/22')
-    NewRelic::Agent::Transaction.freeze_name
-    NewRelic::Agent::Transaction.stop('txn')
+    in_web_transaction('Controller/foo/1/bar/22') do
+      advance_time(5)
+      NewRelic::Agent::Transaction.freeze_name_and_execute_if_not_ignored
+    end
 
     assert_equal 'Controller/foo/1/bar/22', name
     assert_equal start_time.to_f, timestamp
@@ -259,14 +239,15 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
   end
 
   def test_end_fires_a_transaction_finished_event_with_overview_metrics
+    freeze_time
     options = nil
     NewRelic::Agent.subscribe(:transaction_finished) do |payload|
       options = payload[:metrics]
     end
 
-    NewRelic::Agent::Transaction.start(:controller)
-    NewRelic::Agent.record_metric("HttpDispatcher", 2.1)
-    NewRelic::Agent::Transaction.stop('txn')
+    in_web_transaction('Controller/foo/1/bar/22') do
+      NewRelic::Agent.record_metric("HttpDispatcher", 2.1)
+    end
 
     assert_equal 2.1, options[NewRelic::MetricSpec.new('HttpDispatcher')].total_call_time
   end
@@ -277,9 +258,9 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
       options = payload[:custom_params]
     end
 
-    NewRelic::Agent::Transaction.start(:controller)
-    NewRelic::Agent.add_custom_parameters('fooz' => 'barz')
-    NewRelic::Agent::Transaction.stop('txn')
+    in_web_transaction('Controller/foo/1/bar/22') do
+      NewRelic::Agent.add_custom_parameters('fooz' => 'barz')
+    end
 
     assert_equal 'barz', options['fooz']
   end
@@ -339,32 +320,9 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
 
   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)
-    NewRelic::Agent.add_custom_parameters('fooz')
-    NewRelic::Agent::Transaction.stop('txn')
-  end
-
-  def test_parent_returns_parent_transaction_if_there_is_one
-    txn, outer_txn = nil
-    in_transaction('outer') do
-      outer_txn = NewRelic::Agent::Transaction.current
-      in_transaction('inner') do
-        txn = NewRelic::Agent::Transaction.parent
-      end
-    end
-    assert_same(outer_txn, txn)
-  end
-
-  def test_parent_returns_nil_if_there_is_no_parent
-    txn = 'this is a non-nil placeholder'
-    in_transaction('outer') do
-      txn = NewRelic::Agent::Transaction.parent
+    in_transaction do
+      NewRelic::Agent.add_custom_parameters('fooz')
     end
-    assert_nil(txn)
-  end
-
-  def test_parent_returns_nil_if_outside_transaction_entirely
-    assert_nil(NewRelic::Agent::Transaction.parent)
   end
 
   def test_user_attributes_alias_to_custom_parameters
@@ -452,6 +410,117 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     assert_equal(42, trace.params[:custom_params][:gc_time])
   end
 
+  def test_freeze_name_and_execute_if_not_ignored_executes_given_block_if_not_ignored
+    NewRelic::Agent.instance.transaction_rules.expects(:rename).
+                                               returns('non-ignored-transaction')
+    in_transaction('non-ignored-transaction') do
+      block_was_called = false
+      NewRelic::Agent::Transaction.freeze_name_and_execute_if_not_ignored do
+        block_was_called = true
+      end
+
+      assert block_was_called
+    end
+  end
+
+  def test_freeze_name_and_execute_if_not_ignored_ignores_given_block_if_transaction_ignored
+    NewRelic::Agent.instance.transaction_rules.expects(:rename).
+                                               returns(nil)
+    in_transaction('ignored-transaction') do
+      block_was_called = false
+      NewRelic::Agent::Transaction.freeze_name_and_execute_if_not_ignored do
+        block_was_called = true
+      end
+
+      refute block_was_called
+    end
+  end
+
+  def test_record_transaction_cpu_positive
+    in_transaction do |txn|
+      txn.expects(:cpu_burn).twice.returns(1.0)
+      NewRelic::Agent.instance.transaction_sampler.expects(:notice_transaction_cpu_time).twice.with(1.0)
+      txn.record_transaction_cpu
+    end
+  end
+
+  def test_record_transaction_cpu_negative
+    in_transaction do |txn|
+      txn.expects(:cpu_burn).twice.returns(nil)
+      # should not be called for the nil case
+      NewRelic::Agent.instance.transaction_sampler.expects(:notice_transaction_cpu_time).never
+      txn.record_transaction_cpu
+    end
+  end
+
+  def test_normal_cpu_burn_positive
+    in_transaction do |txn|
+      txn.instance_variable_set(:@process_cpu_start, 3)
+      txn.expects(:process_cpu).twice.returns(4)
+      assert_equal 1, txn.normal_cpu_burn
+    end
+  end
+
+  def test_normal_cpu_burn_negative
+    in_transaction do |txn|
+      txn.instance_variable_set(:@process_cpu_start, nil)
+      txn.expects(:process_cpu).never
+      assert_equal nil, txn.normal_cpu_burn
+    end
+  end
+
+  def test_jruby_cpu_burn_negative
+    in_transaction do |txn|
+      txn.instance_variable_set(:@jruby_cpu_start, nil)
+      txn.expects(:jruby_cpu_time).never
+      assert_equal nil, txn.jruby_cpu_burn
+    end
+  end
+
+  def test_cpu_burn_normal
+    in_transaction do |txn|
+      txn.expects(:normal_cpu_burn).twice.returns(1)
+      txn.expects(:jruby_cpu_burn).never
+      assert_equal 1, txn.cpu_burn
+    end
+  end
+
+  def test_cpu_burn_jruby
+    in_transaction do |txn|
+      txn.expects(:normal_cpu_burn).twice.returns(nil)
+      txn.expects(:jruby_cpu_burn).twice.returns(2)
+      assert_equal 2, txn.cpu_burn
+    end
+  end
+
+  def test_transaction_takes_child_name_if_similar_type
+    in_transaction('Controller/parent', :type => :sinatra) do
+      in_transaction('Controller/child', :type => :controller) do
+      end
+    end
+
+    assert_metrics_recorded(['Controller/child'])
+  end
+
+  def test_transaction_doesnt_take_child_name_if_different_type
+    in_transaction('Controller/parent', :type => :sinatra) do
+      in_transaction('Whatever/child', :type => :task) do
+      end
+    end
+
+    assert_metrics_recorded(['Controller/parent'])
+  end
+
+  def test_transaction_should_take_child_name_if_frozen_early
+    in_transaction('Controller/parent', :type => :sinatra) do
+      in_transaction('Controller/child', :type => :controller) do |txn|
+        txn.freeze_name_and_execute_if_not_ignored
+      end
+    end
+
+    assert_metrics_recorded(['Controller/child'])
+  end
+
   def assert_has_custom_parameter(key, value = key)
     assert_equal(value, NewRelic::Agent::Transaction.current.custom_parameters[key])
   end