Merge pull request #88 from DataDog/matt/memleak

Matt/memleak

Author: clutchski

ddtrace/api.py

@@ -0,0 +1,42 @@
+
+# stdlib
+from .compat import httplib
+import logging
+import time
+
+# project
+import ddtrace.encoding
+
+
+log = logging.getLogger(__name__)
+
+
+class API(object):
+
+    def __init__(self, hostname, port):
+        self.hostname = hostname
+        self.port = port
+        self.headers = {}
+
+    def send_traces(self, traces):
+        spans = [item for sublist in traces for item in sublist]
+        self.send_spans(spans)
+
+    def send_spans(self, spans):
+        start = time.time()
+        data = ddtrace.encoding.encode_spans(spans)
+        self._send_span_data(data)
+        log.debug("reported %d spans in %.5fs", len(spans), time.time() - start)
+
+    def send_services(self, services):
+        log.debug("Reporting %d services", len(services))
+        data = ddtrace.encoding.encode_services(services)
+        self._put("/services", data, self.headers)
+
+    def _send_span_data(self, data):
+        self._put("/spans", data, self.headers)
+
+    def _put(self, endpoint, data, headers):
+        conn = httplib.HTTPConnection(self.hostname, self.port)
+        conn.request("PUT", endpoint, data, self.headers)
+

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/reporter.py

@@ -42,9 +42,6 @@ def __init__(self):
         # track the active span
         self.span_buffer = ThreadLocalSpanBuffer()
 
-        # a collection of registered services by name.
-        self._services = {}
-
         # A hook for local debugging. shouldn't be needed or used
         # in production.
         self.debug_logging = False
@@ -163,7 +160,7 @@ def write(self, spans):
 
         if self.enabled and self.writer:
             # only submit the spans if we're actually enabled (and don't crash :)
-            self.writer.write(spans, self._services)
+            self.writer.write(spans=spans)
 
     def set_service_info(self, service, app, app_type):
         """Set the information about the given service.
@@ -172,15 +169,21 @@ def set_service_info(self, service, app, app_type):
         :param str app: the off the shelf name of the application (e.g. rails, postgres, custom-app)
         :param str app_type: the type of the application (e.g. db, web)
         """
-        self._services[service] = {
-            "app" : app,
-            "app_type": app_type,
+
+        services = {
+            service : {
+                "app" : app,
+                "app_type": app_type,
+            }
         }
 
         if self.debug_logging:
             log.debug("set_service_info: service:%s app:%s type:%s",
                 service, app, app_type)
 
+        if self.enabled and self.writer:
+            self.writer.write(services=services)
+
     def wrap(self, name=None, service=None, resource=None, span_type=None):
         """A decorator used to trace an entire function.