newrelic_rpm 3.11.2.286 → 3.12.0.288

data/test/multiverse/suites/excon/excon_test.rb

@@ -60,9 +60,9 @@ class ExconTest < Minitest::Test
     end
 
     tt = NewRelic::Agent.agent.transaction_sampler.last_sample
-    segment = tt.root_segment.called_segments.first.called_segments.first
-    assert_equal("External/localhost/Excon/GET", segment.metric_name)
-    assert_equal(target_url, segment.params[:uri])
+    node = tt.root_node.called_nodes.first.called_nodes.first
+    assert_equal("External/localhost/Excon/GET", node.metric_name)
+    assert_equal(target_url, node.params[:uri])
   end
 
   def test_still_records_tt_node_when_request_expects_different_response_code
@@ -74,8 +74,8 @@ class ExconTest < Minitest::Test
         # meh
       end
 
-      last_segment = find_last_transaction_segment()
-      assert_equal("External/localhost/Excon/GET", last_segment.metric_name)
+      last_node = find_last_transaction_node()
+      assert_equal("External/localhost/Excon/GET", last_node.metric_name)
     end
   end
 end

data/test/multiverse/suites/grape/config/newrelic.yml

@@ -10,6 +10,7 @@ development:
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1
+  port: <%= $collector && $collector.port %>
   transaction_tracer:
     record_sql: obfuscated
     enabled: true

data/test/multiverse/suites/grape/grape_test.rb

@@ -59,7 +59,7 @@ class GrapeTest < Minitest::Test
 
     def test_transaction_renaming
       get '/grape_ape/renamed'
-      # The second segment here is 'Rack' because of an idiosyncrasy of
+      # The second node here is 'Rack' because of an idiosyncrasy of
       # the set_transaction_name API: when you call set_transaction_name and
       # don't provide an explicit category, you lock in the category prefix
       # that was in use at the time you made the call.
@@ -69,34 +69,71 @@ class GrapeTest < Minitest::Test
       # truly separate entities.
       #
       assert_grape_metrics('Controller/Rack/RenamedTxn')
-      #assert_metrics_recorded(['Controller/Rack/RenamedTxn'])
     end
 
     def test_params_are_not_captured_with_capture_params_disabled
       with_config(:capture_params => false) do
         get '/grape_ape/10'
-        assert_equal({}, last_transaction_trace_request_params)
+
+        expected = {}
+        assert_equal expected, last_transaction_trace_request_params
       end
     end
 
     def test_route_params_are_captured
       with_config(:capture_params => true) do
         get '/grape_ape/10'
-        assert_equal({"id" => "10"}, last_transaction_trace_request_params)
+
+        expected = {
+          "request.parameters.id" => "10"
+        }
+        assert_equal expected, last_transaction_trace_request_params
       end
     end
 
     def test_query_params_are_captured
       with_config(:capture_params => true) do
         get '/grape_ape?q=1234&foo=bar'
-        assert_equal({'q' => '1234', 'foo' => 'bar'}, last_transaction_trace_request_params)
+
+        expected = {
+          'request.parameters.q' => '1234',
+          'request.parameters.foo' => 'bar'
+        }
+        assert_equal expected, last_transaction_trace_request_params
       end
     end
 
     def test_post_body_params_are_captured
       with_config(:capture_params => true) do
         post '/grape_ape', {'q' => '1234', 'foo' => 'bar'}.to_json, "CONTENT_TYPE" => "application/json"
-        assert_equal({'q' => '1234', 'foo' => 'bar'}, last_transaction_trace_request_params)
+
+        expected = {
+          'request.parameters.q' => '1234',
+          'request.parameters.foo' => 'bar'
+        }
+        assert_equal expected, last_transaction_trace_request_params
+      end
+    end
+
+    def test_post_body_params_are_captured_with_error
+      with_config(:capture_params => true) do
+        assert_raises(GrapeTestApiError) do
+          post '/grape_ape_fail', {'q' => '1234', 'foo' => 'fail'}.to_json, "CONTENT_TYPE" => "application/json"
+        end
+
+        agent_attributes = attributes_for(last_traced_error, :agent)
+        assert_equal('1234', agent_attributes['request.parameters.q'])
+        assert_equal('fail', agent_attributes['request.parameters.foo'])
+      end
+    end
+
+    def test_post_body_params_are_captured_with_rescue_from
+      with_config(:capture_params => true) do
+        post '/grape_ape_fail_rescue', {'q' => '1234', 'foo' => 'fail'}.to_json, "CONTENT_TYPE" => "application/json"
+
+        agent_attributes = attributes_for(last_traced_error, :agent)
+        assert_equal('1234', agent_attributes['request.parameters.q'])
+        assert_equal('fail', agent_attributes['request.parameters.foo'])
       end
     end
 
@@ -104,7 +141,12 @@ class GrapeTest < Minitest::Test
       with_config(:capture_params => true) do
         params = {"ape" => {"first_name" => "koko", "last_name" => "gorilla"}}
         post '/grape_ape', params.to_json, "CONTENT_TYPE" => "application/json"
-        assert_equal(params, last_transaction_trace_request_params)
+
+        expected = {
+          "request.parameters.ape.first_name" => "koko",
+          "request.parameters.ape.last_name" => "gorilla"
+        }
+        assert_equal expected, last_transaction_trace_request_params
       end
     end
 
@@ -115,22 +157,44 @@ class GrapeTest < Minitest::Test
           :file => Rack::Test::UploadedFile.new(__FILE__, 'text/plain')
         }
         post '/grape_ape', params
-        assert_equal({"title" => "blah", "file" => "[FILE]"}, last_transaction_trace_request_params)
+
+        expected = {
+          "request.parameters.title" => "blah",
+          "request.parameters.file" => "[FILE]"
+        }
+        assert_equal expected, last_transaction_trace_request_params
       end
     end
 
     def test_404_with_params_does_not_capture_them
       with_config(:capture_params => true) do
         post '/grape_catfish', {"foo" => "bar"}
-        assert_equal({}, last_transaction_trace_request_params)
+        expected = {}
+        assert_equal expected, last_transaction_trace_request_params
+      end
+    end
+
+    def test_params_are_captured_on_transaction_events
+      with_config(:'attributes.include' => 'request.parameters.*') do
+        json = {
+          :foo => "bar",
+          :bar => "baz"
+        }.to_json
+
+        post '/grape_ape', json, {"CONTENT_TYPE" => "application/json"}
+
+        expected = {"request.parameters.foo" => "bar", "request.parameters.bar" => "baz"}
+        actual = agent_attributes_for_single_event_posted_without_ignored_attributes
+
+        assert_equal(expected, actual)
       end
     end
 
     def assert_grape_metrics(expected_txn_name)
-      expected_segment_name = 'Middleware/Grape/GrapeTestApi/call'
+      expected_node_name = 'Middleware/Grape/GrapeTestApi/call'
       assert_metrics_recorded([
-        expected_segment_name,
-        [expected_segment_name, expected_txn_name],
+        expected_node_name,
+        [expected_node_name, expected_txn_name],
         expected_txn_name
       ])
     end

data/test/multiverse/suites/grape/grape_test_api.rb

@@ -45,4 +45,20 @@ class GrapeTestApi < Grape::API
       'Destroy grape ape!'
     end
   end
+
+  resource :grape_ape_fail do
+    post do
+      raise GrapeTestApiError.new("I'm sorry Dave, I'm afraid I can't do that.")
+    end
+  end
+
+  resource :grape_ape_fail_rescue do
+    rescue_from :all do |e|
+      error_response({ message: "rescued from #{e.class.name}" })
+    end
+
+    post do
+      raise GrapeTestApiError.new("I'm sorry Dave, I'm afraid I can't do that.")
+    end
+  end
 end

data/test/multiverse/suites/high_security/config/newrelic.yml

@@ -5,16 +5,56 @@ development:
   # Settings known to be overridden by high security, purposefully set wrong
   # in local configuration for testing purposes!
   ssl: false
+  capture_params: true
+
+  attributes:
+    enabled: true
+    include:
+      - "*"
+      - "request.parameters.*"
+
   transaction_tracer:
     record_sql: raw
     enabled: true
     stack_trace_threshold: 0.5
-  slow_sql:
-    record_sql: obfuscated
-  capture_params: true
+
+    capture_attributes: true,
+    attributes:
+      enabled: true,
+      include:
+        - "*"
+        - "request.parameters.*"
 
   error_collector:
     enabled: true
+    capture_attributes: true,
+    attributes:
+      enabled: true,
+      include:
+        - "*"
+        - "request.parameters.*"
+
+  analytics_events:
+    capture_attributes: true
+
+  transaction_events:
+    attributes:
+      enabled: true
+      include:
+        - "*"
+        - "request.parameters.*"
+
+  browser_monitoring:
+    capture_attributes: true
+    attributes:
+      enabled: true
+      include:
+        - "*"
+        - "request.parameters.*"
+
+  slow_sql:
+    record_sql: obfuscated
+
   apdex_t: 0.24
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000

data/test/multiverse/suites/high_security/high_security_test.rb

@@ -17,7 +17,32 @@ class HighSecurityTest < Minitest::Test
     collector.stub('connect', {
       "agent_run_id" => 1,
       "agent_config" => {
+        # Make sure that we take TT's all the time for testing purposes
+        "transaction_tracer.transaction_threshold" => -10,
+
+        # Really, really try to get us to allow things that we shouldn't when
+        # in high security mode
         "capture_params" => true,
+
+        "transaction_tracer.capture_attributes" => true,
+        "error_collector.capture_attributes"    => true,
+        "browser_monitoring.capture_attributes" => true,
+        "analytics_events.capture_attributes"   => true,
+
+        "attributes.enabled" => true,
+        "attributes.include" => ["*", "request.parameters.*"],
+
+        "transaction_tracer.attributes.enabled" => true,
+        "transaction_tracer.attributes.include" => ["*", "request.parameters.*"],
+
+        "transaction_events.attributes.enabled" => true,
+        "transaction_events.attributes.include" => ["*", "request.parameters.*"],
+
+        "error_collector.attributes.enabled" => true,
+        "error_collector.attributes.include" => ["*", "request.parameters.*"],
+
+        "browser_monitoring.attributes.enabled" => true,
+        "browser_monitoring.attributes.include" => ["*", "request.parameters.*"],
       }
     }, 200)
   end
@@ -37,22 +62,153 @@ class HighSecurityTest < Minitest::Test
     refute NewRelic::Agent.config[:capture_params]
   end
 
-  def test_doesnt_capture_params
+  def test_doesnt_capture_params_to_transaction_traces
     in_transaction(:filtered_params => { "loose" => "params" }) do
-      # no-op
     end
-    assert_empty last_transaction_trace_request_params
+
+    run_harvest
+
+    trace = single_transaction_trace_posted
+    assert_empty trace.custom_attributes
+    assert_empty trace.agent_attributes
   end
 
-  def test_doesnt_record_custom_parameters
+  def test_doesnt_capture_params_to_errors
+    assert_raises(RuntimeError) do
+      in_transaction(:filtered_params => { "loose" => "params" }) do
+        raise "O_o"
+      end
+    end
+
+    run_harvest
+
+    error = single_error_posted
+    assert_empty error.agent_attributes
+    assert_empty error.custom_attributes
+  end
+
+  def test_doesnt_capture_params_to_events
+    in_transaction(:filtered_params => { "loose" => "params" }) do
+    end
+
+    run_harvest
+
+    event = single_event_posted
+    assert_empty event[1]
+    assert_empty event[2]
+  end
+
+  def test_doesnt_capture_params_to_browser
+    in_transaction(:filtered_params => { "loose" => "params" }) do
+      capture_js_data
+    end
+
+    run_harvest
+
+    refute_browser_monitoring_has_any_attributes
+  end
+
+  def test_disallows_custom_attributes_to_transaction_traces
+    in_transaction do
+      NewRelic::Agent.add_custom_attributes(:not => "allowed")
+    end
+
+    run_harvest
+
+    trace = single_transaction_trace_posted
+    assert_empty trace.custom_attributes
+    assert_empty trace.agent_attributes
+  end
+
+  def test_disallows_custom_attributes_on_errors
+    assert_raises(RuntimeError) do
+      in_transaction do
+        NewRelic::Agent.add_custom_attributes(:not => "allowed")
+        raise "O_o"
+      end
+    end
+
+    run_harvest
+
+    error = single_error_posted
+    assert_empty error.agent_attributes
+    assert_empty error.custom_attributes
+  end
+
+  def test_disallows_custom_attributes_on_events
+    in_transaction do
+      NewRelic::Agent.add_custom_attributes(:not => "allowed")
+    end
+
+    run_harvest
+
+    event = single_event_posted
+    assert_empty event[1]
+    assert_empty event[2]
+  end
+
+  def test_disallows_custom_attributes_on_browser
+    in_transaction do
+      NewRelic::Agent.add_custom_attributes(:not => "allowed")
+      capture_js_data
+    end
+
+    run_harvest
+
+    refute_browser_monitoring_has_any_attributes
+  end
+
+  def test_doesnt_block_agent_attributes_to_transaction_traces
+    in_transaction do |txn|
+      txn.http_response_code = 200
+    end
+
+    run_harvest
+
+    expected = { "httpResponseCode" => 200 }
+    assert_equal expected, single_transaction_trace_posted.agent_attributes
+  end
+
+  def test_doesnt_block_agent_attributes_to_errors
+    assert_raises(RuntimeError) do
+      in_transaction do |txn|
+        txn.http_response_code = 500
+        raise "O_o"
+      end
+    end
+
+    run_harvest
+
+    expected = { "httpResponseCode" => 500 }
+    assert_equal expected, single_error_posted.agent_attributes
+  end
+
+  def test_doesnt_block_intrinsic_attributes_on_transaction_traces
     in_transaction do
       NewRelic::Agent::TransactionState.tl_get.is_cross_app_caller = true
-      NewRelic::Agent.add_custom_parameters(:not => "allowed")
     end
 
-    assert_nil last_transaction_trace.params[:custom_params][:not]
-    refute_nil last_transaction_trace.params[:custom_params][:cpu_time]
-    refute_nil last_transaction_trace.params[:custom_params][:'nr.trip_id']
-    refute_nil last_transaction_trace.params[:custom_params][:'nr.path_hash']
+    run_harvest
+
+    intrinsic_attributes = single_transaction_trace_posted.intrinsic_attributes
+    refute_nil intrinsic_attributes['cpu_time']
+    refute_nil intrinsic_attributes['trip_id']
+    refute_nil intrinsic_attributes['path_hash']
+  end
+
+  def test_doesnt_block_intrinsic_attributes_on_errors
+    assert_raises(RuntimeError) do
+      in_transaction do
+        NewRelic::Agent::TransactionState.tl_get.is_cross_app_caller = true
+        raise "O_o"
+      end
+    end
+
+    run_harvest
+
+    intrinsic_attributes = single_error_posted.intrinsic_attributes
+    refute_nil intrinsic_attributes['cpu_time']
+    refute_nil intrinsic_attributes['trip_id']
+    refute_nil intrinsic_attributes['path_hash']
   end
 end