aiohttp: do not set query string in http.url tag (#923)

Author: jd

ddtrace/contrib/aiohttp/middlewares.py

@@ -99,7 +99,7 @@ def on_prepare(request, response):
     request_span.resource = resource
     request_span.set_tag('http.method', request.method)
     request_span.set_tag('http.status_code', response.status)
-    request_span.set_tag(http.URL, request.url)
+    request_span.set_tag(http.URL, request.url.with_query(None))
     request_span.finish()
 
 

tests/contrib/aiohttp/test_middleware.py

@@ -46,11 +46,14 @@ def test_handler(self):
         assert '200' == span.get_tag('http.status_code')
         assert 0 == span.error
 
-    @unittest_run_loop
     @asyncio.coroutine
-    def test_param_handler(self):
+    def _test_param_handler(self, query_string=''):
+        if query_string:
+            fqs = '?' + query_string
+        else:
+            fqs = ''
         # it should manage properly handlers with params
-        request = yield from self.client.request('GET', '/echo/team')
+        request = yield from self.client.request('GET', '/echo/team' + fqs)
         assert 200 == request.status
         text = yield from request.text()
         assert 'Hello team' == text
@@ -64,6 +67,18 @@ def test_param_handler(self):
         assert str(self.client.make_url('/echo/team')) == span.get_tag(http.URL)
         assert '200' == span.get_tag('http.status_code')
 
+    @unittest_run_loop
+    def test_param_handler(self):
+        return self._test_param_handler()
+
+    @unittest_run_loop
+    def test_query_string(self):
+        return self._test_param_handler("foo=bar")
+
+    @unittest_run_loop
+    def test_query_string_duplicate_keys(self):
+        return self._test_param_handler("foo=bar&foo=baz&x=y")
+
     @unittest_run_loop
     @asyncio.coroutine
     def test_404_handler(self):