Rename cross_process_headers to distributed_tracing_headers

Author: TimPansino

tests/external_http/test_http.py

@@ -17,7 +17,7 @@
 import pytest
 from testing_support.external_fixtures import cache_outgoing_headers
 from testing_support.fixtures import override_application_settings
-from testing_support.validators.validate_cross_process_headers import validate_cross_process_headers
+from testing_support.validators.validate_distributed_tracing_headers import validate_distributed_tracing_headers
 from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
 
 from newrelic.api.background_task import background_task
@@ -74,7 +74,7 @@ def _test():
 def test_http_cross_process_request(distributed_tracing, span_events, server):
     @background_task(name="test_http:test_http_cross_process_request")
     @cache_outgoing_headers
-    @validate_cross_process_headers
+    @validate_distributed_tracing_headers
     def _test():
         connection = http.client.HTTPConnection("localhost", server.port)
         connection.request("GET", "/")

tests/external_httplib/test_httplib.py

@@ -19,7 +19,7 @@
 import pytest
 from testing_support.external_fixtures import cache_outgoing_headers
 from testing_support.fixtures import override_application_settings
-from testing_support.validators.validate_cross_process_headers import validate_cross_process_headers
+from testing_support.validators.validate_distributed_tracing_headers import validate_distributed_tracing_headers
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
 from testing_support.validators.validate_tt_segment_params import validate_tt_segment_params
@@ -114,7 +114,7 @@ def _test():
 def test_httplib_cross_process_request(server, distributed_tracing, span_events):
     @background_task(name="test_httplib:test_httplib_cross_process_request")
     @cache_outgoing_headers
-    @validate_cross_process_headers
+    @validate_distributed_tracing_headers
     def _test():
         connection = httplib.HTTPConnection("localhost", server.port)
         connection.request("GET", "/")

tests/external_httplib/test_urllib.py

@@ -22,7 +22,7 @@
     import urllib
 
 from testing_support.external_fixtures import cache_outgoing_headers
-from testing_support.validators.validate_cross_process_headers import validate_cross_process_headers
+from testing_support.validators.validate_distributed_tracing_headers import validate_distributed_tracing_headers
 from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
 
 from newrelic.api.background_task import background_task
@@ -136,7 +136,7 @@ def test_urlopener_file_request():
 @SKIP_IF_PYTHON_3_14_OR_ABOVE
 @background_task()
 @cache_outgoing_headers
-@validate_cross_process_headers
+@validate_distributed_tracing_headers
 def test_urlopener_cross_process_request(server):
     opener = urllib.URLopener()
     opener.open(f"http://localhost:{server.port}/")
@@ -175,6 +175,6 @@ def _test():
 
 @background_task()
 @cache_outgoing_headers
-@validate_cross_process_headers
+@validate_distributed_tracing_headers
 def test_urlretrieve_cross_process_request(server):
     urllib.urlretrieve(f"http://localhost:{server.port}/")

tests/external_httplib/test_urllib2.py

@@ -16,7 +16,7 @@
 
 import pytest
 from testing_support.external_fixtures import cache_outgoing_headers
-from testing_support.validators.validate_cross_process_headers import validate_cross_process_headers
+from testing_support.validators.validate_distributed_tracing_headers import validate_distributed_tracing_headers
 from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
 
 from newrelic.api.background_task import background_task
@@ -113,6 +113,6 @@ def test_urlopen_file_request():
 
 @background_task()
 @cache_outgoing_headers
-@validate_cross_process_headers
+@validate_distributed_tracing_headers
 def test_urlopen_cross_process_request(server):
     urllib2.urlopen(f"http://localhost:{server.port}/")

tests/external_httplib2/test_httplib2.py

@@ -16,7 +16,7 @@
 import pytest
 from testing_support.external_fixtures import cache_outgoing_headers
 from testing_support.fixtures import override_application_settings
-from testing_support.validators.validate_cross_process_headers import validate_cross_process_headers
+from testing_support.validators.validate_distributed_tracing_headers import validate_distributed_tracing_headers
 from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
 
 from newrelic.api.background_task import background_task
@@ -92,7 +92,7 @@ def _test():
 def test_httplib2_cross_process_request(distributed_tracing, span_events, server):
     @background_task(name="test_httplib2:test_httplib2_cross_process_response")
     @cache_outgoing_headers
-    @validate_cross_process_headers
+    @validate_distributed_tracing_headers
     def _test():
         connection = httplib2.HTTPConnectionWithTimeout("localhost", server.port)
         connection.request("GET", "/")

tests/external_httpx/test_client.py

@@ -17,7 +17,7 @@
 import pytest
 from testing_support.fixtures import dt_enabled, override_application_settings, override_generic_settings
 from testing_support.mock_external_http_server import MockExternalHTTPHResponseHeadersServer
-from testing_support.validators.validate_cross_process_headers import validate_cross_process_headers
+from testing_support.validators.validate_distributed_tracing_headers import validate_distributed_tracing_headers
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_errors import validate_transaction_errors
 from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
@@ -112,7 +112,7 @@ def test_sync_cross_process_request(httpx, sync_client, mock_server, distributed
     )
     @validate_transaction_errors(errors=[])
     @background_task(name="test_sync_cross_process_request")
-    @validate_cross_process_headers
+    @validate_distributed_tracing_headers
     def _test():
         transaction = current_transaction()
 
@@ -129,7 +129,7 @@ def _test():
 @pytest.mark.parametrize("distributed_tracing,span_events", ((True, True), (True, False), (False, False)))
 @validate_transaction_errors(errors=[])
 @background_task(name="test_async_cross_process_request")
-@validate_cross_process_headers
+@validate_distributed_tracing_headers
 def test_async_cross_process_request(httpx, async_client, mock_server, loop, distributed_tracing, span_events):
     global DT_RESPONSE_CODE
     DT_RESPONSE_CODE = 200

tests/external_requests/test_requests.py

@@ -17,7 +17,7 @@
 import requests.exceptions
 from testing_support.external_fixtures import cache_outgoing_headers
 from testing_support.fixtures import override_application_settings, validate_tt_parenting
-from testing_support.validators.validate_cross_process_headers import validate_cross_process_headers
+from testing_support.validators.validate_distributed_tracing_headers import validate_distributed_tracing_headers
 from testing_support.validators.validate_transaction_errors import validate_transaction_errors
 from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
 
@@ -157,7 +157,7 @@ def test_requests_cross_process_request(distributed_tracing, span_events, server
     @validate_transaction_errors(errors=[])
     @background_task(name="test_requests:test_requests_cross_process_request")
     @cache_outgoing_headers
-    @validate_cross_process_headers
+    @validate_distributed_tracing_headers
     def _test():
         requests.get(f"http://localhost:{server.port}/")
 

tests/external_urllib3/test_urllib3.py

@@ -22,7 +22,7 @@
 
 from testing_support.external_fixtures import cache_outgoing_headers
 from testing_support.fixtures import override_application_settings
-from testing_support.validators.validate_cross_process_headers import validate_cross_process_headers
+from testing_support.validators.validate_distributed_tracing_headers import validate_distributed_tracing_headers
 from testing_support.validators.validate_transaction_errors import validate_transaction_errors
 from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
 
@@ -206,7 +206,7 @@ def test_urlopen_cross_process_request(distributed_tracing, span_events, server)
     @validate_transaction_errors(errors=[])
     @background_task(name="test_urllib3:test_urlopen_cross_process_request")
     @cache_outgoing_headers
-    @validate_cross_process_headers
+    @validate_distributed_tracing_headers
     def _test():
         pool = urllib3.HTTPConnectionPool(f"localhost:{server.port}")
         pool.urlopen("GET", "/")

tests/testing_support/validators/validate_cross_process_headers.py renamed to tests/testing_support/validators/validate_distributed_tracing_headers.py

@@ -18,7 +18,7 @@
 
 
 @function_wrapper
-def validate_cross_process_headers(wrapped, instance, args, kwargs):
+def validate_distributed_tracing_headers(wrapped, instance, args, kwargs):
     result = wrapped(*args, **kwargs)
 
     transaction = current_transaction()