bottle: fix query string embedded in URL (#921)

There was no test checking that the query string was not part of the URL and it
was actually added. Fix that and add proper testing.

Author: jd

ddtrace/contrib/bottle/trace.py

@@ -54,7 +54,7 @@ def wrapped(*args, **kwargs):
                     raise
                 finally:
                     s.set_tag(http.STATUS_CODE, code or response.status_code)
-                    s.set_tag(http.URL, request.url)
+                    s.set_tag(http.URL, request.urlparts._replace(query='').geturl())
                     s.set_tag(http.METHOD, request.method)
 
         return wrapped

tests/contrib/bottle/test.py

@@ -34,15 +34,20 @@ def _trace_app(self, tracer=None):
         self.app.install(TracePlugin(service=SERVICE, tracer=tracer))
         self.app = webtest.TestApp(self.app)
 
-    def test_200(self):
+    def test_200(self, query_string=''):
+        if query_string:
+            fqs = '?' + query_string
+        else:
+            fqs = ''
+
         # setup our test app
         @self.app.route('/hi/<name>')
         def hi(name):
             return 'hi %s' % name
         self._trace_app(self.tracer)
 
         # make a request
-        resp = self.app.get('/hi/dougie')
+        resp = self.app.get('/hi/dougie' + fqs)
         assert resp.status_int == 200
         assert compat.to_unicode(resp.body) == u'hi dougie'
         # validate it's traced
@@ -60,6 +65,12 @@ def hi(name):
         services = self.tracer.writer.pop_services()
         assert services == {}
 
+    def test_query_string(self):
+        return self.test_200('foo=bar')
+
+    def test_query_string_multi_keys(self):
+        return self.test_200('foo=bar&foo=baz&x=y')
+
     def test_500(self):
         @self.app.route('/hi')
         def hi():