newrelic_rpm 3.8.1.221 → 3.9.0.229

data/test/new_relic/agent/transaction_state_test.rb

@@ -11,12 +11,12 @@ module NewRelic::Agent
     attr_reader :state
 
     def setup
-      TransactionState.clear
-      @state = TransactionState.get
+      TransactionState.tl_clear_for_testing
+      @state = TransactionState.tl_get
     end
 
     def teardown
-      TransactionState.clear
+      TransactionState.tl_clear_for_testing
     end
 
     def test_without_transaction_stack_on_thread
@@ -25,7 +25,7 @@ module NewRelic::Agent
     end
 
     def test_in_background_transaction
-      in_transaction(:type => :task) do |txn|
+      in_transaction(:category => :task) do |txn|
         txn.request = nil # this makes it a "background transaction"
         assert state.in_background_transaction?
       end
@@ -39,17 +39,6 @@ module NewRelic::Agent
       end
     end
 
-    def test_timings_without_transaction
-      freeze_time
-
-      state.reset
-      timings = state.timings
-
-      assert_equal 0.0, timings.queue_time_in_seconds
-      assert_equal 0.0, timings.app_time_in_seconds
-      assert_equal nil, timings.transaction_name
-    end
-
     def test_timings_with_transaction
       earliest_time = freeze_time
 
@@ -77,10 +66,8 @@ module NewRelic::Agent
     def test_request_guid_to_include
       with_config(:apdex_t => 2.0) do
         freeze_time
-
-        state.request_token = "token"
-
         in_transaction do |txn|
+          state.request_token = "token"
           advance_time(4.0)
           assert_equal state.current_transaction.guid, state.request_guid_to_include
         end
@@ -121,28 +108,28 @@ module NewRelic::Agent
     end
 
     def test_request_guid_for_event
-      state.request_token = nil
-      state.is_cross_app_caller = true
-      state.referring_transaction_info = nil
       in_transaction do
+        state.request_token = nil
+        state.is_cross_app_caller = true
+        state.referring_transaction_info = nil
         assert_equal state.current_transaction.guid, state.request_guid_for_event
       end
     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"]
       in_transaction do
+        state.request_token = nil
+        state.is_cross_app_caller = false
+        state.referring_transaction_info = ["another"]
         assert_equal state.current_transaction.guid, state.request_guid_for_event
       end
     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
         in_transaction do
+          state.request_token = "token"
+          state.is_cross_app_caller = false
           advance_time(10.0)
           assert_equal state.current_transaction.guid, state.request_guid_for_event
         end
@@ -161,5 +148,54 @@ module NewRelic::Agent
       assert_equal(false, state.is_cross_app_caller?)
       assert_equal(false, state.is_cross_app_callee?)
     end
+
+    def test_reset_forces_traced_method_stack_clear
+      state.traced_method_stack.push_frame(state, :reset_me)
+      state.reset
+      assert_empty state.traced_method_stack
+    end
+
+    def test_reset_doesnt_touch_record_tt
+      state.record_tt = false
+      state.reset
+      refute state.record_tt
+    end
+
+    def test_reset_doesnt_touch_record_sql
+      state.record_sql = false
+      state.reset
+      refute state.record_sql
+    end
+
+    def test_reset_doesnt_touch_untraced_stack
+      state.push_traced(true)
+      state.reset
+      assert_equal [true], state.untraced
+    end
+
+    def test_reset_touches_everything!
+      state.request = ::Rack::Request.new({})
+      state.is_cross_app_caller = true
+      state.client_cross_app_id = :client_cross_app_id
+      state.referring_transaction_info = :referring_transaction_info
+      state.request_token = :request_token
+      state.busy_entries = 1
+      state.sql_sampler_transaction_data = Object.new
+      state.transaction_sample_builder = Object.new
+      state.push_traced(true)
+
+      state.reset
+
+      # Anything in this list should be tested explicitly by itself!
+      skip_checking = [:@traced_method_stack, :@record_tt, :@record_sql,
+                       :@untraced]
+      variables = state.instance_variables.map(&:to_sym) - skip_checking
+
+      variables.each do |ivar|
+        value = state.instance_variable_get(ivar)
+        assert [0, nil, false, []].include?(value),
+               "Expected #{ivar} to reset, but was #{value}"
+      end
+    end
   end
 end

data/test/new_relic/agent/transaction_test.rb

@@ -18,7 +18,7 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
   end
 
   def cleanup_transaction
-    NewRelic::Agent::TransactionState.clear
+    NewRelic::Agent::TransactionState.tl_clear_for_testing
   end
 
   def test_request_parsing__none
@@ -139,9 +139,11 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
 
     with_config(KEY_TRANSACTION_CONFIG, :do_not_cast => true) do
       in_web_transaction('Controller/slow/txn') do
-        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)
+        state = NewRelic::Agent::TransactionState.tl_get
+        txn = state.current_transaction
+        txn.record_apdex(state, t0 +  3.5)
+        txn.record_apdex(state, t0 +  5.5)
+        txn.record_apdex(state, t0 + 16.5)
       end
 
       # apdex_s is 2 because the transaction itself records apdex
@@ -157,9 +159,11 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
 
     with_config(KEY_TRANSACTION_CONFIG, :do_not_cast => true) do
       in_web_transaction('Controller/other/txn') do
-        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)
+        state = NewRelic::Agent::TransactionState.tl_get
+        txn = state.current_transaction
+        txn.record_apdex(state, t0 + 0.5)
+        txn.record_apdex(state, t0 + 2)
+        txn.record_apdex(state, t0 + 5)
       end
 
       # apdex_s is 2 because the transaction itself records apdex
@@ -173,7 +177,9 @@ 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.record_apdex(Time.now, false)
+        state = NewRelic::Agent::TransactionState.tl_get
+        txn = state.current_transaction
+        txn.record_apdex(state, Time.now)
       end
     end
 
@@ -184,6 +190,49 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     )
   end
 
+  class SillyError < StandardError
+  end
+
+  def test_apdex_success_with_ignored_error
+    filter = Proc.new do |error|
+      error.is_a?(SillyError) ? nil : error
+    end
+
+    with_ignore_error_filter(filter) do
+      txn_name = 'Controller/whatever'
+      in_web_transaction(txn_name) do
+        NewRelic::Agent::Transaction.notice_error(SillyError.new)
+      end
+
+      in_web_transaction(txn_name) do
+        NewRelic::Agent::Transaction.notice_error(RuntimeError.new)
+      end
+    end
+
+    assert_metrics_recorded(
+      'Apdex'          => { :apdex_s => 1, :apdex_t => 0, :apdex_f => 1 },
+      'Apdex/whatever' => { :apdex_s => 1, :apdex_t => 0, :apdex_f => 1 }
+    )
+  end
+
+  def test_apdex_success_with_config_ignored_error
+    txn_name = 'Controller/whatever'
+    with_config(:'error_collector.ignore_errors' => SillyError.name) do
+      in_web_transaction(txn_name) do
+        NewRelic::Agent::Transaction.notice_error(SillyError.new)
+      end
+
+      in_web_transaction(txn_name) do
+        NewRelic::Agent::Transaction.notice_error(RuntimeError.new)
+      end
+
+      assert_metrics_recorded(
+        'Apdex'          => { :apdex_s => 1, :apdex_t => 0, :apdex_f => 1 },
+        'Apdex/whatever' => { :apdex_s => 1, :apdex_t => 0, :apdex_f => 1 }
+      )
+    end
+  end
+
   def test_name_is_unset_if_nil
     in_transaction do |txn|
       txn.default_name = nil
@@ -209,7 +258,7 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
                                                     'replacement'      => '*',
                                                     'replace_all'      => true)
       NewRelic::Agent.instance.transaction_rules << rule
-      NewRelic::Agent::Transaction.freeze_name_and_execute_if_not_ignored
+      NewRelic::Agent::Transaction.tl_current.freeze_name_and_execute_if_not_ignored
       assert_equal 'Controller/foo/*/bar/*', txn.best_name
     end
   ensure
@@ -218,24 +267,22 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
   end
 
   def test_end_fires_a_transaction_finished_event
-    name, timestamp, duration, type = nil
+    name, timestamp, duration = nil
     NewRelic::Agent.subscribe(:transaction_finished) do |payload|
       name = payload[:name]
       timestamp = payload[:start_timestamp]
       duration = payload[:duration]
-      type = payload[:type]
     end
 
     start_time = freeze_time
     in_web_transaction('Controller/foo/1/bar/22') do
       advance_time(5)
-      NewRelic::Agent::Transaction.freeze_name_and_execute_if_not_ignored
+      NewRelic::Agent::Transaction.tl_current.freeze_name_and_execute_if_not_ignored
     end
 
     assert_equal 'Controller/foo/1/bar/22', name
     assert_equal start_time.to_f, timestamp
     assert_equal 5.0, duration
-    assert_equal :controller, type
   end
 
   def test_end_fires_a_transaction_finished_event_with_overview_metrics
@@ -249,7 +296,7 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
       NewRelic::Agent.record_metric("HttpDispatcher", 2.1)
     end
 
-    assert_equal 2.1, options[NewRelic::MetricSpec.new('HttpDispatcher')].total_call_time
+    assert_equal 2.1, options['HttpDispatcher'].total_call_time
   end
 
   def test_end_fires_a_transaction_finished_event_with_custom_params
@@ -272,7 +319,7 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     end
 
     in_transaction do
-      NewRelic::Agent::TransactionState.get.is_cross_app_caller = true
+      NewRelic::Agent::TransactionState.tl_get.is_cross_app_caller = true
     end
 
     refute_empty guid
@@ -285,7 +332,7 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     end
 
     in_transaction do
-      NewRelic::Agent::TransactionState.get.is_cross_app_caller = false
+      NewRelic::Agent::TransactionState.tl_get.is_cross_app_caller = false
     end
 
     refute found_guid
@@ -298,7 +345,7 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     end
 
     in_transaction do
-      NewRelic::Agent::TransactionState.get.referring_transaction_info = ["GUID"]
+      NewRelic::Agent::TransactionState.tl_get.referring_transaction_info = ["GUID"]
     end
 
     assert_equal "GUID", referring_guid
@@ -312,7 +359,7 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
 
     in_transaction do
       # Make sure we don't have referring transaction state floating around
-      NewRelic::Agent::TransactionState.get.referring_transaction_info = nil
+      NewRelic::Agent::TransactionState.tl_get.referring_transaction_info = nil
     end
 
     refute found_referring_guid
@@ -326,26 +373,25 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
   end
 
   def test_user_attributes_alias_to_custom_parameters
-    in_transaction('user_attributes') do
-      txn = NewRelic::Agent::Transaction.current
+    in_transaction('user_attributes') do |txn|
       txn.set_user_attributes(:set_instance => :set_instance)
       txn.user_attributes[:indexer_instance] = :indexer_instance
 
-      NewRelic::Agent::Transaction.set_user_attributes(:set_class => :set_class)
-      NewRelic::Agent::Transaction.user_attributes[:indexer_class] = :indexer_class
+      txn.set_user_attributes(:set_class => :set_class)
+      txn.user_attributes[:indexer_class] = :indexer_class
 
-      assert_has_custom_parameter(:set_instance)
-      assert_has_custom_parameter(:indexer_instance)
+      assert_has_custom_parameter(txn, :set_instance)
+      assert_has_custom_parameter(txn, :indexer_instance)
 
-      assert_has_custom_parameter(:set_class)
-      assert_has_custom_parameter(:indexer_class)
+      assert_has_custom_parameter(txn, :set_class)
+      assert_has_custom_parameter(txn, :indexer_class)
     end
   end
 
   def test_notice_error_in_current_transaction_saves_it_for_finishing
-    in_transaction('failing') do
+    in_transaction('failing') do |txn|
       NewRelic::Agent::Transaction.notice_error("")
-      assert_equal 1, NewRelic::Agent::Transaction.current.exceptions.count
+      assert_equal 1, txn.exceptions.count
     end
   end
 
@@ -357,39 +403,6 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     assert_equal 1, NewRelic::Agent.instance.error_collector.errors.count
   end
 
-  def test_notice_error_after_current_transaction_gets_custom_params
-    in_transaction('failing') do
-      NewRelic::Agent.add_custom_parameters(:custom => "parameter")
-    end
-    NewRelic::Agent::Transaction.notice_error("")
-
-    error = NewRelic::Agent.instance.error_collector.errors.first
-    assert_equal({ :custom => "parameter" }, error.params[:custom_params])
-  end
-
-  def test_notice_error_after_current_transcation_doesnt_tromp_passed_params
-    in_transaction('failing') do
-      NewRelic::Agent.add_custom_parameters(:custom => "parameter")
-    end
-    NewRelic::Agent::Transaction.notice_error("", :custom_params => { :passing => true })
-
-    error = NewRelic::Agent.instance.error_collector.errors.first
-    expected = {
-      :custom => "parameter",
-      :passing => true,
-    }
-    assert_equal(expected, error.params[:custom_params])
-  end
-
-  def test_notice_error_after_current_transaction_gets_name
-    in_transaction('failing') do
-      #no-op
-    end
-    NewRelic::Agent::Transaction.notice_error("")
-    error = NewRelic::Agent.instance.error_collector.errors.first
-    assert_equal 'failing', error.path
-  end
-
   def test_notice_error_without_transaction_notifies_error_collector
     cleanup_transaction
     NewRelic::Agent::Transaction.notice_error("")
@@ -401,9 +414,9 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     gc_end   = mock('gc end')
     NewRelic::Agent::StatsEngine::GCProfiler.stubs(:take_snapshot).returns(gc_start, gc_end)
 
-    txn = in_transaction do
+    txn = in_transaction do |transaction|
       NewRelic::Agent::StatsEngine::GCProfiler.expects(:record_delta).with(gc_start, gc_end).returns(42)
-      NewRelic::Agent::Transaction.current
+      transaction
     end
 
     trace = txn.transaction_trace
@@ -413,9 +426,9 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
   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
+    in_transaction('non-ignored-transaction') do |txn|
       block_was_called = false
-      NewRelic::Agent::Transaction.freeze_name_and_execute_if_not_ignored do
+      txn.freeze_name_and_execute_if_not_ignored do
         block_was_called = true
       end
 
@@ -426,9 +439,9 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
   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
+    in_transaction('ignored-transaction') do |txn|
       block_was_called = false
-      NewRelic::Agent::Transaction.freeze_name_and_execute_if_not_ignored do
+      txn.freeze_name_and_execute_if_not_ignored do
         block_was_called = true
       end
 
@@ -438,18 +451,20 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
 
   def test_record_transaction_cpu_positive
     in_transaction do |txn|
+      state = NewRelic::Agent::TransactionState.tl_get
       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
+      NewRelic::Agent.instance.transaction_sampler.expects(:notice_transaction_cpu_time).twice.with(state, 1.0)
+      txn.record_transaction_cpu(state)
     end
   end
 
   def test_record_transaction_cpu_negative
     in_transaction do |txn|
+      state = NewRelic::Agent::TransactionState.tl_get
       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
+      txn.record_transaction_cpu(state)
     end
   end
 
@@ -493,18 +508,18 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     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
+  def test_transaction_takes_child_name_if_similar_category
+    in_transaction('Controller/parent', :category => :sinatra) do
+      in_transaction('Controller/child', :category => :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
+  def test_transaction_doesnt_take_child_name_if_different_category
+    in_transaction('Controller/parent', :category => :sinatra) do
+      in_transaction('Whatever/child', :category => :task) do
       end
     end
 
@@ -512,8 +527,8 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
   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|
+    in_transaction('Controller/parent', :category => :sinatra) do
+      in_transaction('Controller/child', :category => :controller) do |txn|
         txn.freeze_name_and_execute_if_not_ignored
       end
     end
@@ -521,8 +536,111 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     assert_metrics_recorded(['Controller/child'])
   end
 
-  def assert_has_custom_parameter(key, value = key)
-    assert_equal(value, NewRelic::Agent::Transaction.current.custom_parameters[key])
+  def test_ignored_returns_false_if_a_transaction_is_not_ignored
+    in_transaction('Controller/test', :category => :sinatra) do |txn|
+      refute txn.ignore?
+    end
+  end
+
+  def test_ignored_returns_true_for_an_ignored_transaction
+    in_transaction('Controller/test', :category => :sinatra) do |txn|
+      txn.ignore!
+      assert txn.ignore?
+    end
+  end
+
+  def test_ignore_apdex_returns_true_if_apdex_is_ignored
+    in_transaction('Controller/test', :category => :sinatra) do |txn|
+      txn.ignore_apdex!
+      assert txn.ignore_apdex?
+    end
+  end
+
+  def test_ignore_apdex_returns_false_if_apdex_is_not_ignored
+    in_transaction('Controller/test', :category => :sinatra) do |txn|
+      refute txn.ignore_apdex?
+    end
+  end
+
+  def test_ignore_enduser_returns_true_if_enduser_is_ignored
+    in_transaction('Controller/test', :category => :sinatra) do  |txn|
+      txn.ignore_enduser!
+      assert txn.ignore_enduser?
+    end
+  end
+
+  def test_ignore_enduser_returns_false_if_enduser_is_not_ignored
+    in_transaction('Controller/test', :category => :sinatra) do |txn|
+      refute txn.ignore_enduser?
+    end
+  end
+
+  def test_ignored_transactions_do_not_record_metrics
+    in_transaction('Controller/test', :category => :sinatra) do |txn|
+      txn.ignore!
+    end
+
+    assert_metrics_not_recorded(['Controller/test'])
+  end
+
+  def test_nested_transactions_are_ignored_if_nested_transaction_is_ignored
+    in_transaction('Controller/parent', :category => :sinatra) do
+      in_transaction('Controller/child', :category => :controller) do |txn|
+        txn.ignore!
+      end
+    end
+
+    assert_metrics_not_recorded(['Controller/sinatra', 'Controller/child'])
+  end
+
+  def test_nested_transactions_are_ignored_if_double_nested_transaction_is_ignored
+    in_transaction('Controller/parent', :category => :sinatra) do
+      in_transaction('Controller/toddler', :category => :controller) do
+        in_transaction('Controller/infant', :category => :controller) do |txn|
+          txn.ignore!
+        end
+      end
+    end
+
+    assert_metrics_not_recorded(['Controller/sinatra', 'Controller/toddler', 'Controller/infant'])
+  end
+
+  def test_failure_during_ignore_error_filter_doesnt_prevent_transaction
+    filter = Proc.new do |*_|
+      raise "HAHAHAHAH, error in the filter for ignoring errors!"
+    end
+
+    with_ignore_error_filter(filter) do
+      expects_logging(:error, includes("HAHAHAHAH"), any_parameters)
+
+      in_transaction("Controller/boom") do
+        NewRelic::Agent::Transaction.notice_error(SillyError.new)
+      end
+
+      assert_metrics_recorded('Controller/boom')
+    end
+  end
+
+  def test_multiple_similar_errors_in_transaction_do_not_crash
+    error_class = Class.new(StandardError) do
+      def ==(other)
+        self.message == other.message
+      end
+    end
+
+    in_transaction do |txn|
+      e0 = error_class.new('err')
+      e1 = error_class.new('err')
+      assert_equal(e0, e1)
+      txn.notice_error(e0)
+      txn.notice_error(e1)
+    end
+
+    assert_metrics_recorded('Errors/all' => { :call_count => 2 })
+  end
+
+  def assert_has_custom_parameter(txn, key, value = key)
+    assert_equal(value, txn.custom_parameters[key])
   end
 
 end