Merge pull request #920 from jd/fix-django-query-string-url

django: remove query string from http.url tag

Author: jd

ddtrace/contrib/django/middleware.py

@@ -130,7 +130,7 @@ def process_request(self, request):
                 )
 
             span.set_tag(http.METHOD, request.method)
-            span.set_tag(http.URL, request.build_absolute_uri())
+            span.set_tag(http.URL, request.build_absolute_uri(request.path))
             _set_req_span(request, span)
         except Exception:
             log.debug('error tracing request', exc_info=True)

tests/contrib/django/test_middleware.py

@@ -17,10 +17,14 @@ class DjangoMiddlewareTest(DjangoTraceTestCase):
     """
     Ensures that the middleware traces all Django internals
     """
-    def test_middleware_trace_request(self):
+    def test_middleware_trace_request(self, query_string=''):
         # ensures that the internals are properly traced
         url = reverse('users-list')
-        response = self.client.get(url)
+        if query_string:
+            fqs = '?' + query_string
+        else:
+            fqs = ''
+        response = self.client.get(url + fqs)
         assert response.status_code == 200
 
         # check for spans
@@ -38,6 +42,12 @@ def test_middleware_trace_request(self):
         assert sp_request.span_type == 'http'
         assert sp_request.resource == 'tests.contrib.django.app.views.UserList'
 
+    def test_middleware_trace_request_qs(self):
+        return self.test_middleware_trace_request('foo=bar')
+
+    def test_middleware_trace_request_multi_qs(self):
+        return self.test_middleware_trace_request('foo=bar&foo=baz&x=y')
+
     def test_analytics_global_on_integration_default(self):
         """
         When making a request