bot comments

Author: sl0thentr0py

sentry_sdk/integrations/tornado.py

@@ -169,6 +169,7 @@ def _handle_request_impl(self: "RequestHandler") -> "Generator[None, None, None]
                         ).items():
                             span.set_attribute(attr, value)
 
+                    with capture_internal_exceptions():
                         method = getattr(self, self.request.method.lower(), None)
                         if method is not None:
                             span_name = transaction_from_function(method)
@@ -179,6 +180,7 @@ def _handle_request_impl(self: "RequestHandler") -> "Generator[None, None, None]
                                     SegmentSource.COMPONENT,
                                 )
 
+                    with capture_internal_exceptions():
                         status_int = self.get_status()
                         span.set_attribute(SPANDATA.HTTP_STATUS_CODE, status_int)
                         span.status = "error" if status_int >= 400 else "ok"
@@ -195,13 +197,9 @@ def _get_request_attributes(request: "Any") -> "Dict[str, Any]":
         attributes[f"{SPANDATA.HTTP_REQUEST_HEADER}.{header.lower()}"] = value
 
     if request.query:
-        attributes[SPANDATA.HTTP_QUERY] = request.query
+        attributes[SPANDATA.URL_QUERY] = request.query
 
-    attributes[SPANDATA.URL_FULL] = "%s://%s%s" % (
-        request.protocol,
-        request.host,
-        request.path,
-    )
+    attributes[SPANDATA.URL_FULL] = request.full_url()
 
     if request.protocol:
         attributes[SPANDATA.NETWORK_PROTOCOL_NAME] = request.protocol

tests/integrations/tornado/test_tornado.py

@@ -142,7 +142,7 @@ def test_transactions(
         request_headers = dict(span.iter_headers())
 
     response = client.fetch(
-        "/hi", method="POST", body=b"heyoo", headers=request_headers
+        "/hi?foo=bar", method="POST", body=b"heyoo", headers=request_headers
     )
     assert response.code == code
 
@@ -178,6 +178,9 @@ def test_transactions(
         assert server_segment["attributes"]["http.request.method"] == "POST"
         assert server_segment["attributes"]["http.request.body.data"] == "heyoo"
         assert server_segment["attributes"]["http.response.status_code"] == code
+        assert server_segment["attributes"]["url.query"] == "foo=bar"
+        assert server_segment["attributes"]["url.full"].endswith("/hi?foo=bar")
+        assert server_segment["attributes"]["url.full"].startswith("http://")
         assert server_segment["status"] == ("ok" if code == 200 else "error")
         assert client_segment["trace_id"] == server_segment["trace_id"]
     else:
@@ -225,7 +228,7 @@ def test_transactions(
                 **request["headers"],
             },
             "method": "POST",
-            "query_string": "",
+            "query_string": "foo=bar",
             "data": {"heyoo": [""]},
             "url": "http://{host}/hi".format(host=host),
         }