Merge pull request #3103 from newrelic/request-uri

Add request.uri to transaction events

Author: kaylareopelle

CHANGELOG.md

@@ -1,5 +1,11 @@
 # New Relic Ruby Agent Release Notes
 
+## dev
+
+- **Bugfix: Include request.uri in Transaction events by default**
+
+  [The New Relic data dictionary expects Transaction events to have the `request.uri` attribute.](https://docs.newrelic.com/attribute-dictionary/?event=Transaction&attribute=request.uri) The Ruby agent now fulfills this expectation. If you would like to exclude `request.uri` from Transaction events, you can do so by setting `transaction_events.attributes.exclude` to `'request.uri'`. [PR#3103](https://github.com/newrelic/newrelic-ruby-agent/pull/3103)
+
 ## v9.18.0
 
 - **Feature: Add elasticsearch.capture_cluster_name configuration option**

lib/new_relic/agent/transaction/request_attributes.rb

@@ -43,12 +43,7 @@ def assign_agent_attributes(txn)
           end
 
           if request_path
-            destinations = if allow_other_headers?
-              default_destinations
-            else
-              AttributeFilter::DST_TRANSACTION_TRACER | AttributeFilter::DST_ERROR_COLLECTOR
-            end
-            txn.add_agent_attribute(:'request.uri', request_path, destinations)
+            txn.add_agent_attribute(:'request.uri', request_path, default_destinations)
           end
 
           if accept

test/multiverse/suites/agent_only/agent_attributes_test.rb

@@ -226,7 +226,7 @@ def test_request_uri_collected_on_default_destinations
     assert_transaction_trace_has_agent_attribute('request.uri', '/foobar')
 
     assert_error_has_agent_attribute('request.uri', '/foobar')
-    refute_event_has_agent_attribute('request.uri')
+    assert_event_has_agent_attribute('request.uri', '/foobar')
     refute_browser_monitoring_has_agent_attribute('request.uri')
   end
 
@@ -242,8 +242,8 @@ def test_request_uri_can_be_disabled_on_tts
     refute last_transaction_trace.uri
 
     assert_error_has_agent_attribute('request.uri', '/foobar')
+    assert_event_has_agent_attribute('request.uri', '/foobar')
     refute_transaction_trace_has_agent_attribute('request.uri')
-    refute_event_has_agent_attribute('request.uri')
     refute_browser_monitoring_has_agent_attribute('request.uri')
   end
 
@@ -259,8 +259,8 @@ def test_request_uri_can_be_disabled_on_error_traces
     refute last_error_trace.params['agentAttributes']['request.uri']
 
     assert_transaction_trace_has_agent_attribute('request.uri', '/foobar')
+    assert_event_has_agent_attribute('request.uri', '/foobar')
     refute_error_has_agent_attribute('request.uri')
-    refute_event_has_agent_attribute('request.uri')
     refute_browser_monitoring_has_agent_attribute('request.uri')
   end
 

test/multiverse/suites/grape/grape_test.rb

@@ -222,7 +222,8 @@ def test_request_and_response_attributes_recorded_as_agent_attributes
         'request.headers.contentLength' => last_request.content_length.to_i,
         'request.headers.contentType' => last_request.content_type,
         'request.headers.host' => last_request.host,
-        'request.method' => last_request.request_method
+        'request.method' => last_request.request_method,
+        'request.uri' => last_request.path_info
       }
       actual = agent_attributes_for_single_event_posted_without_ignored_attributes
 

test/multiverse/suites/rails/parameter_capture_test.rb

@@ -257,7 +257,8 @@ def test_request_and_response_attributes_recorded_as_agent_attributes
       'response.headers.contentType' => "#{response.content_type}; charset=#{response.charset}",
       'request.headers.contentLength' => request.content_length.to_i,
       'request.headers.host' => request.host,
-      'request.headers.accept' => request.accept
+      'request.headers.accept' => request.accept,
+      'request.uri' => request.path_info
     }
 
     if request.content_type

test/multiverse/suites/sinatra/sinatra_parameter_capture_test.rb

@@ -73,7 +73,8 @@ def test_request_and_response_attributes_recorded_as_agent_attributes
       'request.headers.contentLength' => last_request.content_length.to_i,
       'request.headers.contentType' => last_request.content_type,
       'request.headers.host' => last_request.host,
-      'request.method' => last_request.request_method
+      'request.method' => last_request.request_method,
+      'request.uri' => last_request.path_info
     }
     actual = agent_attributes_for_single_event_posted_without_ignored_attributes