tracer: allow host/port to be configured

Author: clutchski

ddtrace/api.py

@@ -1,6 +1,6 @@
 
 # stdlib
-import httplib
+from .compat import httplib
 import logging
 import time
 

ddtrace/contrib/django/apps.py

@@ -38,8 +38,8 @@ def ready(self):
         # AgentWriter, it breaks all tests. The configure() behavior must
         # be changed to use it in this integration
         tracer.enabled = settings.ENABLED
-        tracer.writer._reporter.transport.hostname = settings.AGENT_HOSTNAME
-        tracer.writer._reporter.transport.port = settings.AGENT_PORT
+        tracer.writer.api.hostname = settings.AGENT_HOSTNAME
+        tracer.writer.api.port = settings.AGENT_PORT
 
         if settings.AUTO_INSTRUMENT:
             # trace Django internals

ddtrace/writer.py

@@ -26,7 +26,7 @@ def __init__(self, hostname='localhost', port=7777):
         self._traces = None
         self._services = None
         self._worker = None
-        self._api = api.API(hostname, port)
+        self.api = api.API(hostname, port)
 
     def write(self, spans=None, services=None):
         # if the worker needs to be reset, do it.
@@ -51,7 +51,7 @@ def _reset_worker(self):
 
         # ensure we have an active thread working on this queue
         if not self._worker or not self._worker.is_alive():
-            self._worker = AsyncWorker(self._api, self._traces, self._services)
+            self._worker = AsyncWorker(self.api, self._traces, self._services)
 
 
 class AsyncWorker(object):
@@ -62,7 +62,7 @@ def __init__(self, api, trace_queue, service_queue, shutdown_timeout=DEFAULT_TIM
         self._lock = threading.Lock()
         self._thread = None
         self._shutdown_timeout = shutdown_timeout
-        self._api = api
+        self.api = api
         self.start()
 
     def is_alive(self):
@@ -101,14 +101,14 @@ def _target(self):
             if traces:
                 # If we have data, let's try to send it.
                 try:
-                    self._api.send_traces(traces)
+                    self.api.send_traces(traces)
                 except Exception:
                     log.exception("error sending spans")
 
                 services = self._service_queue.pop()
                 if services:
                     try:
-                        self._api.send_services(services)
+                        self.api.send_services(services)
                     except Exception:
                         log.exception("error sending spans")
 

tests/contrib/django/test_instrumentation.py

@@ -14,5 +14,5 @@ class DjangoInstrumentationTest(DjangoTraceTestCase):
     users settings
     """
     def test_enabled_flag(self):
-        eq_(self.tracer.writer._reporter.transport.hostname, 'agent.service.consul')
-        eq_(self.tracer.writer._reporter.transport.port, '8777')
+        eq_(self.tracer.writer.api.hostname, 'agent.service.consul')
+        eq_(self.tracer.writer.api.port, '8777')

tests/test_tracer.py

@@ -10,7 +10,6 @@
 from ddtrace import encoding
 from ddtrace.tracer import Tracer
 from ddtrace.writer import AgentWriter
-from ddtrace.transport import ThreadedHTTPTransport
 
 
 def test_tracer_vars():