newrelic_rpm 3.8.0.218 → 3.8.1.221

data/test/new_relic/agent/cross_app_tracing_test.rb

@@ -26,7 +26,7 @@ module NewRelic
       end
 
       def test_start_trace_has_time_even_on_agent_failure
-        NewRelic::Agent.instance.stats_engine.stubs(:push_scope).raises("Boom!")
+        NewRelic::Agent::TracedMethodStack.stubs(:push_frame).raises("Boom!")
         t0, segment = CrossAppTracing.start_trace(request)
         refute_nil t0
         assert_nil segment
@@ -42,19 +42,19 @@ module NewRelic
 
       def test_finish_trace_allows_nil_request
         expects_no_logging(:error)
-        expects_pop_scope
+        expects_pop_frame
         CrossAppTracing.finish_trace(Time.now, segment, nil, response)
       end
 
       def test_finish_trace_allows_nil_response
         expects_no_logging(:error)
-        expects_pop_scope
+        expects_pop_frame
         CrossAppTracing.finish_trace(Time.now, segment, request, nil)
       end
 
 
-      def expects_pop_scope
-        NewRelic::Agent.instance.stats_engine.stubs(:pop_scope).once
+      def expects_pop_frame
+        NewRelic::Agent::TracedMethodStack.stubs(:pop_frame).once
       end
     end
   end

data/test/new_relic/agent/datastores/mongo/statement_formatter_test.rb

@@ -30,18 +30,18 @@ module NewRelic
                                                   :_id       => "BSON::ObjectId('?')" } }.freeze
 
           def test_doesnt_modify_incoming_statement
-            formatted = StatementFormatter.format(DOC_STATEMENT)
+            formatted = StatementFormatter.format(DOC_STATEMENT, :find)
             refute_same DOC_STATEMENT, formatted
           end
 
           def test_statement_formatter_removes_unwhitelisted_keys
-            formatted = StatementFormatter.format(DOC_STATEMENT)
+            formatted = StatementFormatter.format(DOC_STATEMENT, :find)
             assert_equal_unordered(formatted.keys, StatementFormatter::PLAINTEXT_KEYS)
           end
 
           def test_can_disable_statement_capturing_queries
             with_config(:'mongo.capture_queries' => false) do
-              formatted = StatementFormatter.format(DOC_STATEMENT)
+              formatted = StatementFormatter.format(DOC_STATEMENT, :find)
               assert_nil formatted
             end
           end
@@ -49,18 +49,19 @@ module NewRelic
           def test_statement_formatter_obfuscates_by_default
             expected = { :database   => 'multiverse',
                          :collection => 'tribbles',
+                         :operation  => :find,
                          :selector   => { 'name'     => '?',
                                           :operation => :find,
                                           :_id       => '?' } }
 
-            result = StatementFormatter.format(SELECTOR_STATEMENT)
+            result = StatementFormatter.format(SELECTOR_STATEMENT, :find)
             assert_equal expected, result
           end
 
           def test_statement_formatter_raw_selectors
             with_config(:'mongo.obfuscate_queries' => false) do
-              result = StatementFormatter.format(SELECTOR_STATEMENT)
-              assert_equal SELECTOR_STATEMENT, result
+              result = StatementFormatter.format(SELECTOR_STATEMENT, :find)
+              assert_equal SELECTOR_STATEMENT.merge(:operation => :find), result
             end
           end
 

data/test/new_relic/agent/error_collector_test.rb

@@ -322,12 +322,11 @@ class NewRelic::Agent::ErrorCollectorTest < Minitest::Test
   end
 
   def test_blamed_metric_from_transaction
-    NewRelic::Agent::TransactionState.get.transaction = stub(:name => "Controller/foo/bar")
+    NewRelic::Agent::TransactionState.get.most_recent_transaction = stub(:name => "Controller/foo/bar")
     assert_equal "Errors/Controller/foo/bar", @error_collector.blamed_metric_name({})
   end
 
   def test_blamed_metric_with_no_transaction
-    NewRelic::Agent::TransactionState.get.transaction = nil
     assert_nil @error_collector.blamed_metric_name({})
   end
 

data/test/new_relic/agent/instrumentation/action_controller_subscriber_test.rb

@@ -25,6 +25,7 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Minites
   end
 
   def setup
+    freeze_time
     @subscriber = NewRelic::Agent::Instrumentation::ActionControllerSubscriber.new
     NewRelic::Agent.instance.stats_engine.clear_stats
     @entry_payload = {
@@ -49,7 +50,6 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Minites
   end
 
   def test_record_controller_metrics
-    freeze_time
     @subscriber.start('process_action.action_controller', :id, @entry_payload)
     advance_time(2)
     @subscriber.finish('process_action.action_controller', :id, @exit_payload)
@@ -62,7 +62,6 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Minites
   end
 
   def test_record_apdex_metrics
-    freeze_time
     @subscriber.start('process_action.action_controller', :id, @entry_payload)
     advance_time(1.5)
     @subscriber.finish('process_action.action_controller', :id, @exit_payload)
@@ -74,6 +73,19 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Minites
     )
   end
 
+  def test_record_apdex_metrics_with_error
+    @subscriber.start('process_action.action_controller', :id, @entry_payload)
+    advance_time(1.5)
+    @exit_payload[:exception] = StandardError.new("boo")
+    @subscriber.finish('process_action.action_controller', :id, @exit_payload)
+
+    expected_values = { :apdex_f => 1, :apdex_t => 0, :apdex_s => 0 }
+    assert_metrics_recorded(
+      'Apdex/test/index' => expected_values,
+      'Apdex' => expected_values
+    )
+  end
+
   def test_records_scoped_metrics_for_evented_child_txn
     @subscriber.start('process_action.action_controller', :id, @entry_payload)
     @subscriber.start('process_action.action_controller', :id, @entry_payload \
@@ -83,7 +95,7 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Minites
     @subscriber.finish('process_action.action_controller', :id, @exit_payload)
 
     assert_metrics_recorded(
-      ['Controller/test/child', 'Controller/test/index'] => { :call_count => 1 }
+      ['Nested/Controller/test/child', 'Controller/test/child'] => { :call_count => 1 }
     )
   end
 
@@ -99,13 +111,13 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Minites
     end
 
     assert_metrics_recorded(
-      ['Controller/test/child', 'Controller/test/index'] => { :call_count => 1 }
+      ['Nested/Controller/test/child', 'Controller/test/child'] => { :call_count => 1 }
     )
   end
 
   def test_sets_default_transaction_name_on_start
     @subscriber.start('process_action.action_controller', :id, @entry_payload)
-    assert_equal 'Controller/test/index', NewRelic::Agent::Transaction.current.name
+    assert_equal 'Controller/test/index', NewRelic::Agent::Transaction.current.best_name
   ensure
     @subscriber.finish('process_action.action_controller', :id, @entry_payload)
   end
@@ -114,13 +126,13 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Minites
     @subscriber.start('process_action.action_controller', :id, @entry_payload)
     txn = NewRelic::Agent::Transaction.current
     @subscriber.finish('process_action.action_controller', :id, @entry_payload)
-    assert_equal 'Controller/test/index', txn.name
+    assert_equal 'Controller/test/index', txn.best_name
   end
 
   def test_sets_transaction_name
     @subscriber.start('process_action.action_controller', :id, @entry_payload)
     NewRelic::Agent.set_transaction_name('something/else')
-    assert_equal 'Controller/something/else', NewRelic::Agent::Transaction.current.name
+    assert_equal 'Controller/something/else', NewRelic::Agent::Transaction.current.best_name
   ensure
     @subscriber.finish('process_action.action_controller', :id, @entry_payload)
   end
@@ -130,7 +142,7 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Minites
     txn = NewRelic::Agent::Transaction.current
     NewRelic::Agent.set_transaction_name('something/else')
     @subscriber.finish('process_action.action_controller', :id, @entry_payload)
-    assert_equal 'Controller/something/else', txn.name
+    assert_equal 'Controller/something/else', txn.best_name
   end
 
   def test_record_nothing_for_ignored_action
@@ -168,10 +180,11 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Minites
 
   def test_record_busy_time
     @subscriber.start('process_action.action_controller', :id, @entry_payload)
+    advance_time(1)
     @subscriber.finish('process_action.action_controller', :id, @exit_payload)
     NewRelic::Agent::BusyCalculator.harvest_busy
 
-    assert_metrics_recorded('Instance/Busy' => { :call_count => 1 })
+    assert_metrics_recorded('Instance/Busy' => { :call_count => 1, :total_call_time => 1.0 })
   end
 
   def test_creates_transaction
@@ -204,7 +217,7 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Minites
   end
 
   def test_record_queue_time_metrics
-    t0 = freeze_time
+    t0 = Time.now
     env = { 'HTTP_X_REQUEST_START' => (t0 - 5).to_f.to_s }
     NewRelic::Agent.instance.events.notify(:before_call, env)
 
@@ -228,7 +241,7 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Minites
   end
 
   def test_dont_record_queue_time_in_nested_transaction
-    t0 = freeze_time
+    t0 = Time.now
 
     env = { 'HTTP_X_REQUEST_START' => (t0 - 5).to_f.to_s }
     NewRelic::Agent.instance.events.notify(:before_call, env)

data/test/new_relic/agent/instrumentation/action_view_subscriber_test.rb

@@ -200,7 +200,7 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
     end
 
     sampler = NewRelic::Agent.instance.transaction_sampler
-    template_segment = sampler.last_sample.root_segment.called_segments[0]
+    template_segment = sampler.last_sample.root_segment.called_segments[0].called_segments[0]
     partial_segment = template_segment.called_segments[0]
 
     assert_equal('View/model/index.html.erb/Rendering',
@@ -232,7 +232,7 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
     end
 
     sampler = NewRelic::Agent.instance.transaction_sampler
-    partial_segments = sampler.last_sample.root_segment.called_segments
+    partial_segments = sampler.last_sample.root_segment.called_segments[0].called_segments
 
     assert_equal 3, partial_segments.size
     assert_equal('View/model/_list.html.erb/Partial',

data/test/new_relic/agent/instrumentation/active_record_subscriber_test.rb

@@ -89,19 +89,13 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
   def test_creates_txn_segment
     freeze_time
 
-    NewRelic::Agent.manual_start
-    @stats_engine.start_transaction
-    sampler = NewRelic::Agent.instance.transaction_sampler
-    sampler.notice_first_scope_push(Time.now.to_f)
-    sampler.notice_transaction('/path', {})
-    sampler.notice_push_scope('Controller/sandwiches/index')
-    simulate_query(2)
-    sampler.notice_pop_scope('Controller/sandwiches/index')
-    sampler.notice_scope_empty(stub('txn', :name => '/path', :custom_parameters => {}, :guid => 'a guid'))
+    in_transaction do
+      simulate_query(2)
+    end
 
     last_segment = nil
+    sampler = NewRelic::Agent.instance.transaction_sampler
     sampler.last_sample.root_segment.each_segment{|s| last_segment = s }
-    NewRelic::Agent.shutdown
 
     assert_equal('ActiveRecord/NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest::Order/find',
                  last_segment.metric_name)
@@ -110,16 +104,17 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
   end
 
   def test_creates_slow_sql_node
-    NewRelic::Agent.manual_start
-    sampler = NewRelic::Agent.instance.sql_sampler
-    sampler.notice_first_scope_push nil
     freeze_time
 
-    simulate_query(2)
+    sampler = NewRelic::Agent.instance.sql_sampler
+    sql = nil
+
+    in_transaction do
+      simulate_query(2)
+      sql = sampler.transaction_data.sql_data[0].sql
+    end
 
-    assert_equal 'SELECT * FROM sandwiches', sampler.transaction_data.sql_data[0].sql
-  ensure
-    NewRelic::Agent.shutdown
+    assert_equal 'SELECT * FROM sandwiches', sql
   end
 
   def test_should_not_raise_due_to_an_exception_during_instrumentation_callback

data/test/new_relic/agent/instrumentation/controller_instrumentation_test.rb

@@ -22,48 +22,26 @@ class NewRelic::Agent::Instrumentation::ControllerInstrumentationTest < Minitest
   end
 
   def setup
+    NewRelic::Agent.drop_buffered_data
     @object = TestObject.new
     @dummy_headers = { :request => 'headers' }
     @txn_namer = NewRelic::Agent::Instrumentation:: \
       ControllerInstrumentation::TransactionNamer.new(@object)
   end
 
-  def test_detect_upstream_wait_returns_transaction_start_time_if_nothing_from_headers
-    @object.stubs(:newrelic_request_headers).returns(@dummy_headers)
-    in_transaction do |txn|
-      NewRelic::Agent::Instrumentation::QueueTime.expects(:parse_frontend_timestamp) \
-        .with(@dummy_headers, txn.start_time).returns(txn.start_time)
-      assert_equal(txn.start_time, @object.send(:_detect_upstream_wait, txn))
-    end
+  def teardown
+    NewRelic::Agent.instance.stats_engine.clear_stats
   end
 
-  def test_detect_upstream_wait_returns_parsed_timestamp_from_headers
-    @object.stubs(:newrelic_request_headers).returns(@dummy_headers)
-    in_transaction do |txn|
-      earlier_time = txn.start_time - 1
-      NewRelic::Agent::Instrumentation::QueueTime.expects(:parse_frontend_timestamp) \
-        .with(@dummy_headers, txn.start_time).returns(earlier_time)
-      assert_equal(earlier_time, @object.send(:_detect_upstream_wait, txn))
-    end
-  end
-
-  def test_detect_upstream_wait_swallows_errors
-    @object.stubs(:newrelic_request_headers).returns(@dummy_headers)
-    in_transaction do |txn|
-      NewRelic::Agent::Instrumentation::QueueTime.expects(:parse_frontend_timestamp) \
-        .with(@dummy_headers, txn.start_time).raises("an error")
-      assert_equal(txn.start_time, @object.send(:_detect_upstream_wait, txn))
-    end
+  def test_apdex_recorded
+    @object.public_transaction
+    assert_metrics_recorded("Apdex")
   end
 
-  def test_detect_upsteam_wait_does_not_parse_timestamp_in_nested_transaction
-    @object.stubs(:newrelic_request_headers).returns(@dummy_headers)
-    in_transaction do |outer|
-      in_transaction do |inner|
-        NewRelic::Agent::Instrumentation::QueueTime.expects(:parse_frontend_timestamp).never
-        assert_equal(inner.start_time, @object.send(:_detect_upstream_wait, inner))
-      end
-    end
+  def test_apdex_ignored
+    @object.stubs(:ignore_apdex?).returns(true)
+    @object.public_transaction
+    assert_metrics_not_recorded("Apdex")
   end
 
   def test_transaction_name_calls_newrelic_metric_path
@@ -127,4 +105,37 @@ class NewRelic::Agent::Instrumentation::ControllerInstrumentationTest < Minitest
     end
     obj = TestObject.new
   end
+
+  def test_add_transaction_tracer_defines_with_method
+    assert TestObject.method_defined? :public_transaction_with_newrelic_transaction_trace
+  end
+
+  def test_add_transaction_tracer_defines_without_method
+    assert TestObject.method_defined? :public_transaction_without_newrelic_transaction_trace
+  end
+
+  def test_parse_punctuation
+    ['?', '!', '='].each do |punctuation_mark|
+      result = TestObject.parse_punctuation("foo#{punctuation_mark}")
+      assert_equal ['foo', punctuation_mark], result
+    end
+  end
+
+  def test_argument_list
+    options = {:foo => :bar, :params => '{ :account_name => args[0].name }', :far => 7}
+    result = TestObject.generate_argument_list(options)
+    expected = [":far => \"7\"", ":foo => :bar", ":params => { :account_name => args[0].name }"]
+    assert_equal expected.sort, result.sort
+  end
+
+  def test_build_method_names
+    result = TestObject.build_method_names('foo', '?')
+    expected = ["foo_with_newrelic_transaction_trace?", "foo_without_newrelic_transaction_trace?"]
+    assert_equal expected, result
+  end
+
+  def test_already_added_transaction_tracer_returns_true_if_with_method_defined
+    with_method_name = 'public_transaction_with_newrelic_transaction_trace'
+    assert TestObject.already_added_transaction_tracer?(TestObject, with_method_name)
+  end
 end

data/test/new_relic/agent/instrumentation/net_instrumentation_test.rb

@@ -18,16 +18,15 @@ class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Minitest::Test
 
     @socket = fixture_tcp_socket( @response )
 
-    @engine = NewRelic::Agent.instance.stats_engine
-    @engine.clear_stats
+    NewRelic::Agent.instance.stats_engine.clear_stats
   end
 
   def test_scope_stack_integrity_maintained_on_request_failure
     @socket.stubs(:write).raises('fake network error')
     with_config(:"cross_application_tracer.enabled" => true) do
-      expected = @engine.push_scope('dummy')
+      expected = NewRelic::Agent::TracedMethodStack.push_frame('dummy')
       Net::HTTP.get(URI.parse('http://www.google.com/index.html')) rescue nil
-      @engine.pop_scope(expected, 42)
+      NewRelic::Agent::TracedMethodStack.pop_frame(expected, 42)
     end
   end
 

data/test/new_relic/agent/instrumentation/task_instrumentation_test.rb

@@ -58,14 +58,21 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Minitest::Test
     run_task_inner(1)
     assert_metrics_recorded_exclusive(
       [
+        'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0',
+
+        'Nested/Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0',
         [
-          'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0',
-          'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_1'
+          'Nested/Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0',
+          'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0'
+        ],
+
+        'Nested/Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_1',
+        [
+          'Nested/Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_1',
+          'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0'
         ],
-        'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0',
-        'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_1'
       ],
-      :filter => /^Controller/
+      :filter => /^(Sub)?Controller/
     )
   end
 
@@ -73,32 +80,41 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Minitest::Test
     run_task_inner(3)
     assert_metrics_recorded_exclusive(
       [
+        'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0',
+
+        'Nested/Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0',
         [
-          'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0',
-          'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_1'
+          'Nested/Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0',
+          'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0'
         ],
+
+        'Nested/Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_1',
         [
-          'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_1',
-          'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_2'
+          'Nested/Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_1',
+          'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0'
         ],
+
+        'Nested/Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_2',
         [
-          'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_2',
-          'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_3'
+          'Nested/Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_2',
+          'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0'
+        ],
+
+        'Nested/Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_3',
+        [
+          'Nested/Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_3',
+          'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0'
         ],
-        'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0',
-        'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_1',
-        'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_2',
-        'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_3'
       ],
-      :filter => /^Controller/
+      :filter => /^(Nested\/)?Controller/
     )
   end
 
   def test_should_handle_nested_task_invocations
     run_task_outer(3)
     assert_metrics_recorded({
-      'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/outer_task'   => { :call_count => 1 },
-      'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0' => { :call_count => 2 }
+      'Nested/Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/outer_task' => { :call_count => 1 },
+      'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0'  => { :call_count => 1 }
     })
   end
 
@@ -106,8 +122,8 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Minitest::Test
     run_task_outer(10)
 
     assert_metrics_recorded({
-      'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/outer_task'   => { :call_count => 1 },
-      'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0' => { :call_count => 2 }
+      'Nested/Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/outer_task'   => { :call_count => 1 },
+      'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0' => { :call_count => 1 }
     })
     assert_metrics_not_recorded(['Controller'])