feat(writer): rename agent_url to intake_url

Author: VianneyRuhlmann

ddtrace/_trace/processor/__init__.py

@@ -278,7 +278,7 @@ def __init__(
         else:
             verify_url(agent_config.trace_agent_url)
             self.writer = NativeWriter(
-                agent_url=agent_config.trace_agent_url,
+                intake_url=agent_config.trace_agent_url,
                 dogstatsd=get_dogstatsd_client(agent_config.dogstatsd_url),
                 sync_mode=SpanAggregator._use_sync_mode(),
                 compute_stats_enabled=config._trace_compute_stats,

ddtrace/_trace/tracer.py

@@ -750,7 +750,7 @@ def current_span(self) -> Optional[Span]:
     def agent_trace_url(self) -> Optional[str]:
         """Trace agent url"""
         if isinstance(self._span_aggregator.writer, NativeWriter):
-            return self._span_aggregator.writer.agent_url
+            return self._span_aggregator.writer.intake_url
 
         return None
 

ddtrace/internal/debug.py

@@ -61,7 +61,7 @@ def collect(tracer):
         tracer._span_aggregator.writer, NativeWriter
     ):
         writer = tracer._span_aggregator.writer
-        agent_url = writer.agent_url
+        agent_url = writer.intake_url
         try:
             writer.write([])
             writer.flush_queue(raise_exc=True)

ddtrace/internal/writer/writer.py

@@ -450,7 +450,7 @@ class AgentWriter(HTTPWriter):
 
     def __init__(
         self,
-        agent_url: str,
+        intake_url: str,
         processing_interval: Optional[float] = None,
         # Match the payload size since there is no functionality
         # to flush dynamically.
@@ -530,7 +530,7 @@ def __init__(
         self._response_cb = response_callback
         self._report_metrics = report_metrics
         super(AgentWriter, self).__init__(
-            intake_url=agent_url,
+            intake_url=intake_url,
             clients=[client],
             processing_interval=processing_interval,
             buffer_size=buffer_size,
@@ -545,7 +545,7 @@ def __init__(
 
     def recreate(self) -> HTTPWriter:
         new_instance = self.__class__(
-            agent_url=self.agent_url,
+            intake_url=self.intake_url,
             processing_interval=self._interval,
             buffer_size=self._buffer_size,
             max_payload_size=self._max_payload_size,
@@ -559,10 +559,6 @@ def recreate(self) -> HTTPWriter:
         )
         return new_instance
 
-    @property
-    def agent_url(self):
-        return self.intake_url
-
     @property
     def _agent_endpoint(self):
         return self._intake_endpoint(client=None)
@@ -631,7 +627,7 @@ class NativeWriter(periodic.PeriodicService, TraceWriter):
 
     def __init__(
         self,
-        agent_url: str,
+        intake_url: str,
         processing_interval: Optional[float] = None,
         # Match the payload size since there is no functionality
         # to flush dynamically.
@@ -705,7 +701,7 @@ def __init__(
                 test_session_token = additional_header["X-Datadog-Test-Session-Token"]
 
         super(NativeWriter, self).__init__(interval=processing_interval)
-        self.agent_url = agent_url
+        self.intake_url = intake_url
         self._buffer_size = buffer_size
         self._max_payload_size = max_payload_size
         self._timeout = timeout
@@ -736,7 +732,7 @@ def _create_exporter(self) -> native.TraceExporter:
 
         builder = (
             native.TraceExporterBuilder()
-            .set_url(self.agent_url)
+            .set_url(self.intake_url)
             .set_language("python")
             .set_language_version(compat.PYTHON_VERSION)
             .set_language_interpreter(compat.PYTHON_INTERPRETER)
@@ -767,7 +763,7 @@ def set_test_session_token(self, token: Optional[str]) -> None:
     def recreate(self):
         self._exporter.stop_worker()
         return self.__class__(
-            agent_url=self.agent_url,
+            intake_url=self.intake_url,
             processing_interval=self._interval,
             compute_stats_enabled=self._compute_stats_enabled,
             buffer_size=self._buffer_size,
@@ -802,12 +798,12 @@ def _downgrade(self, response, client):
                 "unsupported endpoint '%s': received response %s from intake (%s)",
                 client.ENDPOINT,
                 response.status,
-                self.agent_url,
+                self.intake_url,
             )
 
     # NOTE: Only used for logging
     def _intake_endpoint(self, client=None):
-        return "{}/{}".format(self.agent_url, client.ENDPOINT if client else self._endpoint)
+        return "{}/{}".format(self.intake_url, client.ENDPOINT if client else self._endpoint)
 
     # NOTE: Only used for logging
     @property

tests/appsec/integrations/utils_testagent.py

@@ -33,6 +33,6 @@ def _get_span(token):
 
 
 def _get_agent_client():
-    parsed = parse.urlparse(tracer._span_aggregator.writer.agent_url)
+    parsed = parse.urlparse(tracer._span_aggregator.writer.intake_url)
     conn = httplib.HTTPConnection(parsed.hostname, parsed.port)
     return conn

tests/commands/ddtrace_run_hostname.py

@@ -2,5 +2,5 @@
 
 
 if __name__ == "__main__":
-    assert tracer._span_aggregator.writer.agent_url == "http://172.10.0.1:8120"
+    assert tracer._span_aggregator.writer.intake_url == "http://172.10.0.1:8120"
     print("Test success")

tests/integration/test_debug.py

@@ -162,7 +162,7 @@ def test_tracer_loglevel_info_connection(self):
         with mock.patch.object(logging.Logger, "log") as mock_logger:
             # shove an unserializable object into the config log output
             # regression: this used to cause an exception to be raised
-            ddtrace.config.version = AgentWriter(agent_url="foobar")
+            ddtrace.config.version = AgentWriter(intake_url="foobar")
             ddtrace.trace.tracer.configure()
         assert mock.call(logging.INFO, re_matcher("- DATADOG TRACER CONFIGURATION - ")) in mock_logger.mock_calls
 

tests/integration/test_integration.py

@@ -511,7 +511,7 @@ def test_trace_with_invalid_client_endpoint_generates_error_log():
             "unsupported endpoint '%s': received response %s from intake (%s)",
             "/bad",
             404,
-            t._span_aggregator.writer.agent_url,
+            t._span_aggregator.writer.intake_url,
         )
     ]
     log.error.assert_has_calls(calls)
@@ -680,7 +680,7 @@ def test_writer_flush_queue_generates_debug_log():
                 "sent %s in %.5fs to %s",
                 AnyStr(),
                 AnyFloat(),
-                "{}/{}/traces".format(writer.agent_url, encoding),
+                "{}/{}/traces".format(writer.intake_url, encoding),
             )
         ]
         log.log.assert_has_calls(calls)

tests/integration/test_integration_snapshots.py

@@ -84,7 +84,7 @@ def test_synchronous_writer():
     from ddtrace.internal.writer import NativeWriter
     from ddtrace.trace import tracer
 
-    writer = NativeWriter(tracer._span_aggregator.writer.agent_url, sync_mode=True)
+    writer = NativeWriter(tracer._span_aggregator.writer.intake_url, sync_mode=True)
     tracer._span_aggregator.writer = writer
     tracer._recreate()
     with tracer.trace("operation1", service="my-svc"):

tests/tracer/test_tracer.py

@@ -684,7 +684,7 @@ def test_tracer_set_user_propagation_string_error(self):
 def test_tracer_url_default():
     import ddtrace
 
-    assert ddtrace.trace.tracer._span_aggregator.writer.agent_url == "http://localhost:8126"
+    assert ddtrace.trace.tracer._span_aggregator.writer.intake_url == "http://localhost:8126"
 
 
 @pytest.mark.subprocess()