newrelic_rpm 3.11.2.286 → 3.12.0.288

data/test/multiverse/suites/rails/gc_instrumentation_test.rb

@@ -67,7 +67,7 @@ class GCRailsInstrumentationTest < ActionController::TestCase
     elapsed = Time.now.to_f - start
 
     trace = NewRelic::Agent.instance.transaction_sampler.last_sample
-    assert_in_range(elapsed, trace.params[:custom_params][:gc_time])
+    assert_in_range(elapsed, attributes_for(trace, :intrinsic)[:gc_time])
   end
 
   def assert_in_range(duration, gc_time)

data/test/multiverse/suites/rails/ignore_test.rb

@@ -62,7 +62,7 @@ class IgnoredActionsTest < RailsMultiverseTest
     get '/request_stats/stats_action'
 
     trace = NewRelic::Agent.instance.transaction_sampler.last_sample
-    assert_equal 1, trace.root_segment.called_segments.count
+    assert_equal 1, trace.root_node.called_nodes.count
   end
 
   def test_should_not_write_cat_response_headers_for_ignored_transactions

data/test/multiverse/suites/rails/parameter_capture_test.rb

@@ -10,6 +10,7 @@ class ParameterCaptureController < ApplicationController
   end
 
   def create
+    raise 'problem' if params[:raise]
     render :text => 'created'
   end
 
@@ -33,15 +34,14 @@ class ParameterCaptureController < ApplicationController
 end
 
 class ParameterCaptureTest < RailsMultiverseTest
-  def setup
-    NewRelic::Agent.drop_buffered_data
-  end
+  include MultiverseHelpers
+  setup_and_teardown_agent
 
   def test_no_params_captured_on_errors_when_disabled
     with_config(:capture_params => false) do
       get '/parameter_capture/error?other=1234&secret=4567'
+      refute_contains_request_params(agent_attributes_for_single_error_posted)
     end
-    assert_nil last_traced_error_request_params
   end
 
   def test_no_params_captured_on_tts_when_disabled
@@ -51,49 +51,76 @@ class ParameterCaptureTest < RailsMultiverseTest
     assert_equal({}, last_transaction_trace_request_params)
   end
 
-  def test_uri_on_traced_errors_never_contains_query_string
+  def test_uri_on_traced_errors_never_contains_query_string_without_capture_params
     with_config(:capture_params => false) do
       get '/parameter_capture/error?other=1234&secret=4567'
+      assert_equal('/parameter_capture/error', attributes_for_single_error_posted("request_uri"))
     end
-    assert_equal('/parameter_capture/error', last_traced_error.params[:request_uri])
+  end
 
+  def test_uri_on_traced_errors_never_contains_query_string_with_capture_params
     with_config(:capture_params => true) do
       get '/parameter_capture/error?other=1234&secret=4567'
+      assert_equal('/parameter_capture/error', attributes_for_single_error_posted("request_uri"))
     end
-    assert_equal('/parameter_capture/error', last_traced_error.params[:request_uri])
   end
 
-  def test_referrer_on_traced_errors_never_contains_query_string
+  def test_referrer_on_traced_errors_never_contains_query_string_without_capture_params
     with_config(:capture_params => false) do
       get '/parameter_capture/error?other=1234&secret=4567', {}, { 'HTTP_REFERER' => '/foo/bar?other=123&secret=456' }
+      attributes = agent_attributes_for_single_error_posted
+      assert_equal('/foo/bar', attributes["request.headers.referer"])
     end
-    assert_equal('/foo/bar', last_traced_error.params[:request_referer])
+  end
+
+  def test_referrer_on_traced_errors_never_contains_query_string_even_with_capture_params
     with_config(:capture_params => true) do
       get '/parameter_capture/error?other=1234&secret=4567', {}, { 'HTTP_REFERER' => '/foo/bar?other=123&secret=456' }
+      attributes = agent_attributes_for_single_error_posted
+      assert_equal('/foo/bar', attributes["request.headers.referer"])
+    end
+  end
+
+  def test_controller_and_action_excluded_from_error_parameters
+    with_config(:capture_params => true) do
+      get '/parameter_capture/error'
+      run_harvest
+
+      refute_error_has_agent_attribute('request.parameters.controller')
+      refute_error_has_agent_attribute('request.parameters.action')
+    end
+  end
+
+  def test_controller_and_action_excluded_from_transaction_trace_parameters
+    with_config(:capture_params => true, :'transaction_tracer.transaction_threshold' => -10) do
+      get '/parameter_capture/transaction'
+      run_harvest
+
+      refute_transaction_trace_has_agent_attribute('request.parameters.controller')
+      refute_transaction_trace_has_agent_attribute('request.parameters.action')
     end
-    assert_equal('/foo/bar', last_traced_error.params[:request_referer])
   end
 
   def test_uri_on_tts_never_contains_query_string
     with_config(:capture_params => false) do
       get '/parameter_capture/transaction?other=1234&secret=4567'
     end
-    assert_equal('/parameter_capture/transaction', last_transaction_trace.params[:uri])
+    assert_equal('/parameter_capture/transaction', last_transaction_trace.uri)
 
     with_config(:capture_params => true) do
       get '/parameter_capture/transaction?other=1234&secret=4567'
     end
-    assert_equal('/parameter_capture/transaction', last_transaction_trace.params[:uri])
+    assert_equal('/parameter_capture/transaction', last_transaction_trace.uri)
   end
 
   def test_filters_parameters_on_traced_errors
     with_config(:capture_params => true) do
       get '/parameter_capture/error?other=1234&secret=4567'
-    end
 
-    captured_params = last_traced_error_request_params
-    assert_equal('[FILTERED]', captured_params['secret'])
-    assert_equal('1234',       captured_params['other'])
+      captured_params = agent_attributes_for_single_error_posted
+      assert_equal('[FILTERED]', captured_params['request.parameters.secret'])
+      assert_equal('1234',       captured_params['request.parameters.other'])
+    end
   end
 
   def test_filters_parameters_on_transaction_traces
@@ -102,24 +129,30 @@ class ParameterCaptureTest < RailsMultiverseTest
     end
 
     captured_params = last_transaction_trace_request_params
-    assert_equal('[FILTERED]', captured_params['secret'])
-    assert_equal('1234',       captured_params['other'])
+    assert_equal('[FILTERED]', captured_params['request.parameters.secret'])
+    assert_equal('1234',       captured_params['request.parameters.other'])
   end
 
+  def test_no_traced_error_params_captured_when_bails_before_rails
+    with_config(:capture_params => false) do
+      get '/middleware_error/before?other=1234&secret=4567'
+      refute_contains_request_params(agent_attributes_for_single_error_posted)
+    end
+  end
 
-  def test_no_params_captured_when_bails_before_rails
+  def test_no_transaction_trace_params_captured_when_bails_before_rails
     with_config(:capture_params => false) do
       get '/middleware_error/before?other=1234&secret=4567'
     end
-    assert_nil last_traced_error_request_params
+
     assert_equal({}, last_transaction_trace_request_params)
   end
 
   def test_no_params_captured_on_error_when_bails_before_rails_even_when_enabled
     with_config(:capture_params => true) do
       get '/middleware_error/before?other=1234&secret=4567'
+      refute_contains_request_params(agent_attributes_for_single_error_posted)
     end
-    assert_nil last_traced_error_request_params
   end
 
   def test_no_params_captured_on_tt_when_bails_before_rails_even_when_enabled
@@ -133,28 +166,28 @@ class ParameterCaptureTest < RailsMultiverseTest
     with_config(:capture_params => false) do
       get '/parameter_capture/transaction?param1=value1&param2=value2'
     end
-    assert_equal('/parameter_capture/transaction', last_transaction_trace.params[:uri])
+    assert_equal('/parameter_capture/transaction', last_transaction_trace.uri)
   end
 
   def test_uri_on_tt_should_not_contain_query_string_with_capture_params_on
     with_config(:capture_params => true) do
       get '/parameter_capture/transaction?param1=value1&param2=value2'
     end
-    assert_equal('/parameter_capture/transaction', last_transaction_trace.params[:uri])
+    assert_equal('/parameter_capture/transaction', last_transaction_trace.uri)
   end
 
   def test_uri_on_traced_error_should_not_contain_query_string_with_capture_params_off
     with_config(:capture_params => false) do
       get '/parameter_capture/error?param1=value1&param2=value2'
+      assert_equal('/parameter_capture/error', attributes_for_single_error_posted("request_uri"))
     end
-    assert_equal('/parameter_capture/error', last_traced_error.params[:request_uri])
   end
 
   def test_uri_on_traced_error_should_not_contain_query_string_with_capture_params_on
     with_config(:capture_params => true) do
       get '/parameter_capture/error?param1=value1&param2=value2'
+      assert_equal('/parameter_capture/error', attributes_for_single_error_posted("request_uri"))
     end
-    assert_equal('/parameter_capture/error', last_traced_error.params[:request_uri])
   end
 
   def test_uri_on_sql_trace_should_not_contain_query_string_with_capture_params_off
@@ -171,13 +204,31 @@ class ParameterCaptureTest < RailsMultiverseTest
     assert_equal('/parameter_capture/sql', last_sql_trace.url)
   end
 
+  def test_parameters_attached_to_transaction_events_if_enabled
+    with_config(:'attributes.include' => 'request.parameters.*') do
+      get '/parameter_capture/transaction?param1=value1&param2=value2'
+    end
+
+    actual = agent_attributes_for_single_event_posted_without_ignored_attributes
+
+    expected = {"request.parameters.param1" => "value1",
+      "request.parameters.param2" => "value2"
+    }
+
+    assert_equal expected, actual
+  end
+
   if Rails::VERSION::MAJOR > 2
     def test_params_tts_should_be_filtered_when_serviced_by_rack_app
       params = {"secret" => "shhhhhhh", "name" => "name"}
       with_config(:capture_params => true) do
         post '/filtering_test/', params
       end
-      expected = {"secret" => "[FILTERED]", "name" => "name"}
+
+      expected = {
+        "request.parameters.secret" => "[FILTERED]",
+        "request.parameters.name" => "name"
+      }
       assert_equal expected, last_transaction_trace_request_params
     end
 
@@ -185,9 +236,18 @@ class ParameterCaptureTest < RailsMultiverseTest
       params = {"secret" => "shhhhhhh", "name" => "name"}
       with_config(:capture_params => true) do
         post '/filtering_test?raise=1', params
+
+        expected = {
+          "request.parameters.secret" => "[FILTERED]",
+          "request.parameters.name" => "name",
+          "request.parameters.raise" => "1"
+        }
+
+        attributes = agent_attributes_for_single_error_posted
+        expected.each do |key, value|
+          assert_equal value, attributes[key]
+        end
       end
-      expected = {"secret" => "[FILTERED]", "name" => "name", "raise" => "1"}
-      assert_equal expected, last_traced_error_request_params
     end
 
     def test_parameter_filtering_should_not_mutate_argument
@@ -202,30 +262,38 @@ class ParameterCaptureTest < RailsMultiverseTest
 
   if Rails::VERSION::MAJOR > 2 && defined?(Sinatra)
     def test_params_tts_should_be_filtered_when_serviced_by_sinatra_app
-      params = {"secret" => "shhhhhhh", "name" => "name"}
       with_config(:capture_params => true) do
-        get '/sinatra_app/', params
+        get '/sinatra_app/', "secret" => "shhhhhhh", "name" => "name"
       end
-      expected = {"secret" => "[FILTERED]", "name" => "name"}
+
+      expected = {
+        "request.parameters.secret" => "[FILTERED]",
+        "request.parameters.name" => "name"
+      }
       assert_equal expected, last_transaction_trace_request_params
     end
 
     def test_params_on_errors_should_be_filtered_when_serviced_by_sinatra_app
-      params = {"secret" => "shhhhhhh", "name" => "name"}
       with_config(:capture_params => true) do
-        get '/sinatra_app?raise=1', params
+        get '/sinatra_app?raise=1', "secret" => "shhhhhhh", "name" => "name"
+
+        attributes = agent_attributes_for_single_error_posted
+        assert_equal "[FILTERED]", attributes["request.parameters.secret"]
+        assert_equal "name", attributes["request.parameters.name"]
+        assert_equal "1", attributes["request.parameters.raise"]
       end
-      expected = {"secret" => "[FILTERED]", "name" => "name", "raise" => "1"}
-      assert_equal expected, last_traced_error_request_params
     end
 
     def test_file_upload_params_are_replaced_with_placeholder
-      with_config(:capture_params => true) do
-        params = { :file => Rack::Test::UploadedFile.new(__FILE__, 'text/plain') }
-        post '/parameter_capture', params
-        result = last_transaction_trace_request_params
-        assert_equal("#<ActionDispatch::Http::UploadedFile>", result["file"])
+      with_config(:capture_params => true, :'transaction_tracer.transaction_threshold' => -10) do
+        post '/parameter_capture', :file => Rack::Test::UploadedFile.new(__FILE__, 'text/plain')
+
+        run_harvest
+
+        result = single_transaction_trace_posted
+        assert_equal "#<ActionDispatch::Http::UploadedFile>", result.agent_attributes["request.parameters.file"]
       end
     end
   end
+
 end

data/test/multiverse/suites/rails/request_statistics_test.rb

@@ -18,7 +18,7 @@ class RequestStatsController < ApplicationController
   end
 
   def stats_action_with_custom_params
-    ::NewRelic::Agent.add_custom_parameters('color' => 'blue', 1 => :bar, 'bad' => {})
+    ::NewRelic::Agent.add_custom_attributes('color' => 'blue', 1 => :bar, 'bad' => {})
     render :text => 'some stuff'
   end
 end
@@ -55,9 +55,13 @@ class RequestStatsTest < RailsMultiverseTest
       assert_kind_of Array, post.events
       assert_kind_of Array, post.events.first
 
-      sample = post.events.first.first
-      assert_kind_of Hash, sample
+      assert_equal 3, post.events.first.length
+
+      post.events.first.each do |event_chunk|
+        assert_kind_of Hash, event_chunk
+      end
 
+      sample = post.events.first.first
       assert_equal 'Controller/request_stats/stats_action', sample['name']
       assert_encoding 'utf-8', sample['name']
       assert_equal 'Transaction', sample['type']
@@ -133,14 +137,16 @@ class RequestStatsTest < RailsMultiverseTest
       assert_equal 'Controller/request_stats/stats_action_with_custom_params', sample['name']
       assert_encoding 'utf-8', sample['name']
       assert_equal 'Transaction', sample['type']
+
       ['blue', 'bar', 'bad'].each do |key|
         assert_not_includes(sample, key)
       end
 
       custom_params = post.events.first[1]
+
       assert_equal 'blue', custom_params['color']
       assert_equal 'bar', custom_params['1']
-      assert_false custom_params.has_key?('bad')
+      assert_equal '{}', custom_params['bad']
     end
   end
 

data/test/multiverse/suites/rails/view_instrumentation_test.rb

@@ -112,27 +112,27 @@ class ViewInstrumentationTest < RailsMultiverseTest
       assert_equal 500, status
     end
 
-    def test_should_count_all_the_template_and_partial_segments
+    def test_should_count_all_the_template_and_partial_nodes
       get '/views/template_render_with_3_partial_renders'
       sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-      segments = find_all_segments_with_name_matching(sample, ['^Nested/Controller/views', '^View'])
-      segments_list = "Found these nodes:\n  #{segments.map(&:metric_name).join("\n  ")}"
+      nodes = find_all_nodes_with_name_matching(sample, ['^Nested/Controller/views', '^View'])
+      nodes_list = "Found these nodes:\n  #{nodes.map(&:metric_name).join("\n  ")}"
 
       if Rails::VERSION::MAJOR <= 2
-        assert_equal 8, segments.length, "Should be a node for the controller action, the template, and 3 partials with two nodes each (8). #{segments_list}"
+        assert_equal 8, nodes.length, "Should be a node for the controller action, the template, and 3 partials with two nodes each (8). #{nodes_list}"
       else
-        assert_equal 5, segments.length, "Should be a node for the controller action, the template, and 3 partials (5). #{segments_list}"
+        assert_equal 5, nodes.length, "Should be a node for the controller action, the template, and 3 partials (5). #{nodes_list}"
       end
     end
 
-    def test_should_have_3_segments_with_the_correct_metric_name
+    def test_should_have_3_nodes_with_the_correct_metric_name
       get '/views/template_render_with_3_partial_renders'
 
       sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-      partial_segments = find_all_segments_with_name_matching(sample, 'View/views/_a_partial.html.erb/Partial')
+      partial_nodes = find_all_nodes_with_name_matching(sample, 'View/views/_a_partial.html.erb/Partial')
 
-      assert_equal 3, partial_segments.size, "sanity check"
-      assert_equal ['View/views/_a_partial.html.erb/Partial'], partial_segments.map(&:metric_name).uniq
+      assert_equal 3, partial_nodes.size, "sanity check"
+      assert_equal ['View/views/_a_partial.html.erb/Partial'], partial_nodes.map(&:metric_name).uniq
     end
 
     # We don't capture text or inline template rendering on Rails 2
@@ -141,9 +141,9 @@ class ViewInstrumentationTest < RailsMultiverseTest
         get '/views/inline_render'
 
         sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-        text_segment = find_segment_with_name(sample, 'View/inline template/Rendering')
+        text_node = find_node_with_name(sample, 'View/inline template/Rendering')
 
-        assert text_segment, "Failed to find a node named View/inline template/Rendering"
+        assert text_node, "Failed to find a node named View/inline template/Rendering"
         assert_metrics_recorded('View/inline template/Rendering')
       end
 
@@ -152,16 +152,16 @@ class ViewInstrumentationTest < RailsMultiverseTest
         def test_should_not_instrument_rendering_of_text
           get '/views/text_render'
           sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-          refute find_segment_with_name(sample, 'View/text template/Rendering')
+          refute find_node_with_name(sample, 'View/text template/Rendering')
         end
       else
         def test_should_create_a_metric_for_the_rendered_text
           get '/views/text_render'
 
           sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-          text_segment = find_segment_with_name(sample, 'View/text template/Rendering')
+          text_node = find_node_with_name(sample, 'View/text template/Rendering')
 
-          assert text_segment, "Failed to find a node named View/text template/Rendering"
+          assert text_node, "Failed to find a node named View/text template/Rendering"
           assert_metrics_recorded('View/text template/Rendering')
         end
       end
@@ -171,9 +171,9 @@ class ViewInstrumentationTest < RailsMultiverseTest
       get '/views/haml_render'
 
       sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-      text_segment = find_segment_with_name(sample, 'View/views/haml_view.html.haml/Rendering')
+      text_node = find_node_with_name(sample, 'View/views/haml_view.html.haml/Rendering')
 
-      assert text_segment, "Failed to find a node named View/views/haml_view.html.haml/Rendering"
+      assert text_node, "Failed to find a node named View/views/haml_view.html.haml/Rendering"
       assert_metrics_recorded('View/views/haml_view.html.haml/Rendering')
     end
 
@@ -184,18 +184,18 @@ class ViewInstrumentationTest < RailsMultiverseTest
       # Different versions have significant difference in handling, but we're
       # happy enough with what each of them does in the unknown case
       if Rails::VERSION::MAJOR.to_i < 3 || (Rails::VERSION::MAJOR.to_i == 3 && Rails::VERSION::MINOR.to_i == 0)
-        refute find_segment_with_name_matching(sample, /^View/)
+        refute find_node_with_name_matching(sample, /^View/)
       elsif Rails::VERSION::MAJOR.to_i == 3
-        assert find_segment_with_name(sample, 'View/collection/Partial')
+        assert find_node_with_name(sample, 'View/collection/Partial')
       else
-        assert find_segment_with_name(sample, 'View/(unknown)/Partial')
+        assert find_node_with_name(sample, 'View/(unknown)/Partial')
       end
     end
 
     def test_should_create_a_proper_metric_when_we_render_a_collection
       get '/views/collection_render'
       sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-      assert find_segment_with_name(sample, "View/foos/_foo.html.haml/Partial")
+      assert find_node_with_name(sample, "View/foos/_foo.html.haml/Partial")
     end
 
     [:js_render, :xml_render, :proc_render, :json_render ].each do |action|
@@ -203,8 +203,8 @@ class ViewInstrumentationTest < RailsMultiverseTest
       define_method("test_should_not_instrument_rendering_of_#{action}") do
         get "/views/#{action}"
         sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-        view_segment = find_segment_with_name_matching(sample, /^View\//)
-        refute view_segment, "Should not instrument rendering of #{action}, found #{view_segment}."
+        view_node = find_node_with_name_matching(sample, /^View\//)
+        refute view_node, "Should not instrument rendering of #{action}, found #{view_node}."
       end
     end
 
@@ -214,8 +214,8 @@ class ViewInstrumentationTest < RailsMultiverseTest
       def test_should_create_a_metric_for_rendered_file_that_does_not_include_the_filename_so_it_doesnt_metric_explode
         get '/views/file_render'
         sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-        assert find_segment_with_name(sample, 'View/file/Rendering')
-        refute find_segment_with_name_matching(sample, 'dummy')
+        assert find_node_with_name(sample, 'View/file/Rendering')
+        refute find_node_with_name_matching(sample, 'dummy')
       end
     end