req body

Author: sl0thentr0py

sentry_sdk/consts.py

@@ -404,6 +404,12 @@ class SPANDATA:
     Example: template.cache.some_item.867da7e2af8e6b2f3aa7213a4080edb3
     """
 
+    CLIENT_ADDRESS = "client.address"
+    """
+    Client address of the network connection - IP address or Unix domain socket name.
+    Example: "10.1.2.80"
+    """
+
     CODE_FILEPATH = "code.filepath"
     """
     .. deprecated::
@@ -819,12 +825,25 @@ class SPANDATA:
     Example: GET
     """
 
+    HTTP_REQUEST_HEADER = "http.request.header"
+    """
+    Prefix for HTTP request header attributes. The header name (lowercased) is
+    appended to form the full attribute key.
+    Example: "http.request.header.content-type"
+    """
+
     HTTP_REQUEST_METHOD = "http.request.method"
     """
     The HTTP method used.
     Example: GET
     """
 
+    HTTP_REQUEST_BODY_DATA = "http.request.body.data"
+    """
+    The HTTP request body data as string.
+    Example: "[{\"role\": \"user\", \"message\": \"hello\"}]"
+    """
+
     HTTP_QUERY = "http.query"
     """
     The Query string present in the URL.
@@ -863,6 +882,12 @@ class SPANDATA:
     The messaging system's name, e.g. `kafka`, `aws_sqs`
     """
 
+    NETWORK_PROTOCOL_NAME = "network.protocol.name"
+    """
+    The application layer protocol name used for the network connection.
+    Example: "http", "https"
+    """
+
     NETWORK_PEER_ADDRESS = "network.peer.address"
     """
     Peer address of the network connection - IP address or Unix domain socket name.
@@ -942,6 +967,12 @@ class SPANDATA:
     Example: "MainThread"
     """
 
+    USER_IP_ADDRESS = "user.ip_address"
+    """
+    The IP address of the user that triggered the request.
+    Example: "10.1.2.80"
+    """
+
     URL_FULL = "url.full"
     """
     The URL of the resource that was fetched.

sentry_sdk/integrations/tornado.py

@@ -10,15 +10,17 @@
     RequestExtractor,
     _filter_headers,
     _is_json_content_type,
+    request_body_within_bounds,
 )
 from sentry_sdk.integrations.logging import ignore_logger
 from sentry_sdk.scope import should_send_default_pii
-from sentry_sdk.traces import SegmentSource, StreamedSpan
+from sentry_sdk.traces import NoOpStreamedSpan, SegmentSource, StreamedSpan
 from sentry_sdk.tracing import TransactionSource
 from sentry_sdk.tracing_utils import has_span_streaming_enabled
 from sentry_sdk.utils import (
     CONTEXTVARS_ERROR_MESSAGE,
     HAS_REAL_CONTEXTVARS,
+    AnnotatedValue,
     capture_internal_exceptions,
     ensure_integration_enabled,
     event_from_exception,
@@ -155,14 +157,16 @@ def _handle_request_impl(self: "RequestHandler") -> "Generator[None, None, None]
             )
 
         with span_ctx as span:
-            if isinstance(span, StreamedSpan):
+            if isinstance(span, StreamedSpan) and not isinstance(
+                span, NoOpStreamedSpan
+            ):
                 with capture_internal_exceptions():
                     for attr, value in _get_request_attributes(self.request).items():
                         span.set_attribute(attr, value)
 
                     method = getattr(self, self.request.method.lower(), None)
                     if method is not None:
-                        span_name = transaction_from_function(method) or ""
+                        span_name = transaction_from_function(method)
                         if span_name:
                             span.name = span_name
                             span.set_attribute(
@@ -173,7 +177,9 @@ def _handle_request_impl(self: "RequestHandler") -> "Generator[None, None, None]
             try:
                 yield
             finally:
-                if isinstance(span, StreamedSpan):
+                if isinstance(span, StreamedSpan) and not isinstance(
+                    span, NoOpStreamedSpan
+                ):
                     with capture_internal_exceptions():
                         status_int = self.get_status()
                         span.set_attribute(SPANDATA.HTTP_STATUS_CODE, status_int)
@@ -188,7 +194,7 @@ def _get_request_attributes(request: "Any") -> "Dict[str, Any]":
 
     headers = _filter_headers(dict(request.headers), use_annotated_value=False)
     for header, value in headers.items():
-        attributes[f"http.request.header.{header.lower()}"] = value
+        attributes[f"{SPANDATA.HTTP_REQUEST_HEADER}.{header.lower()}"] = value
 
     if request.query:
         attributes[SPANDATA.HTTP_QUERY] = request.query
@@ -200,15 +206,34 @@ def _get_request_attributes(request: "Any") -> "Dict[str, Any]":
     )
 
     if request.protocol:
-        attributes["network.protocol.name"] = request.protocol
+        attributes[SPANDATA.NETWORK_PROTOCOL_NAME] = request.protocol
 
     if should_send_default_pii() and request.remote_ip:
-        attributes["client.address"] = request.remote_ip
-        attributes["user.ip_address"] = request.remote_ip
+        attributes[SPANDATA.CLIENT_ADDRESS] = request.remote_ip
+        attributes[SPANDATA.USER_IP_ADDRESS] = request.remote_ip
+
+    with capture_internal_exceptions():
+        raw_data = _get_tornado_request_data(request)
+        body_data = raw_data.value if isinstance(raw_data, AnnotatedValue) else raw_data
+        if body_data is not None:
+            attributes[SPANDATA.HTTP_REQUEST_BODY_DATA] = body_data
 
     return attributes
 
 
+def _get_tornado_request_data(
+    request: "Any",
+) -> "Union[Optional[str], AnnotatedValue]":
+    body = request.body
+    if not body:
+        return None
+
+    if not request_body_within_bounds(sentry_sdk.get_client(), len(body)):
+        return AnnotatedValue.substituted_because_over_size_limit()
+
+    return body.decode("utf-8", "replace")
+
+
 @ensure_integration_enabled(TornadoIntegration)
 def _capture_exception(ty: type, value: BaseException, tb: "Any") -> None:
     if isinstance(value, HTTPError):

tests/integrations/tornado/test_tornado.py

@@ -176,6 +176,7 @@ def test_transactions(
         assert server_segment["name"] == expected_handler
         assert server_segment["attributes"]["sentry.span.source"] == "component"
         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["status"] == ("ok" if code == 200 else "error")
         assert client_segment["trace_id"] == server_segment["trace_id"]