wip req bod

Author: sl0thentr0py

sentry_sdk/integrations/starlette.py

@@ -1,5 +1,4 @@
 import functools
-import json
 import sys
 import warnings
 from collections.abc import Set
@@ -35,6 +34,7 @@
     ensure_integration_enabled,
     event_from_exception,
     parse_version,
+    serialize_request_body_data,
     transaction_from_function,
 )
 
@@ -242,16 +242,6 @@ async def _sentry_send(*args: "Any", **kwargs: "Any") -> "Any":
     return middleware_class
 
 
-def _serialize_request_body_data(data: "Any") -> str:
-    # data may be a JSON-serializable value, an AnnotatedValue, or a dict with AnnotatedValue values
-    def _default(value: "Any") -> "Any":
-        if isinstance(value, AnnotatedValue):
-            return value.value
-        return str(value)
-
-    return json.dumps(data, default=_default)
-
-
 def _set_request_body_data_on_streaming_segment(
     info: "Optional[Dict[str, Any]]",
 ) -> None:
@@ -260,7 +250,7 @@ def _set_request_body_data_on_streaming_segment(
         with capture_internal_exceptions():
             current_span._segment.set_attribute(
                 "http.request.body.data",
-                _serialize_request_body_data(info["data"]),
+                serialize_request_body_data(info["data"]),
             )
 
 

sentry_sdk/integrations/tornado.py

@@ -10,18 +10,21 @@
 from sentry_sdk.tracing import TransactionSource
 from sentry_sdk.tracing_utils import has_span_streaming_enabled
 from sentry_sdk.utils import (
+    AnnotatedValue,
     HAS_REAL_CONTEXTVARS,
     CONTEXTVARS_ERROR_MESSAGE,
     ensure_integration_enabled,
     event_from_exception,
     capture_internal_exceptions,
+    serialize_request_body_data,
     transaction_from_function,
 )
 from sentry_sdk.integrations import _check_minimum_version, Integration, DidNotEnable
 from sentry_sdk.integrations._wsgi_common import (
     RequestExtractor,
     _filter_headers,
     _is_json_content_type,
+    request_body_within_bounds,
 )
 from sentry_sdk.integrations.logging import ignore_logger
 
@@ -169,7 +172,7 @@ def _handle_request_impl(self: "RequestHandler") -> "Generator[None, None, None]
 
                     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(
@@ -213,9 +216,37 @@ def _get_request_attributes(request: "Any") -> "Dict[str, Any]":
         attributes["client.address"] = request.remote_ip
         attributes["user.ip_address"] = request.remote_ip
 
+    with capture_internal_exceptions():
+        body_data = _extract_request_body_data(request)
+        if body_data is not None:
+            attributes["http.request.body.data"] = serialize_request_body_data(
+                body_data
+            )
+
     return attributes
 
 
+def _extract_request_body_data(request: "Any") -> "Any":
+    client = sentry_sdk.get_client()
+    extractor = TornadoRequestExtractor(request)
+    content_length = extractor.content_length()
+
+    if not content_length:
+        return None
+
+    if not request_body_within_bounds(client, content_length):
+        return AnnotatedValue.removed_because_over_size_limit()
+
+    parsed_body = extractor.parsed_body()
+    if parsed_body is not None:
+        return parsed_body
+
+    if extractor.raw_data():
+        return AnnotatedValue.removed_because_raw_data()
+
+    return None
+
+
 @ensure_integration_enabled(TornadoIntegration)
 def _capture_exception(ty: type, value: BaseException, tb: "Any") -> None:
     if isinstance(value, HTTPError):

sentry_sdk/utils.py

@@ -143,6 +143,15 @@ def json_dumps(data: "Any") -> bytes:
     return json.dumps(data, allow_nan=False, separators=(",", ":")).encode("utf-8")
 
 
+def serialize_request_body_data(data: "Any") -> str:
+    def _default(value: "Any") -> "Any":
+        if isinstance(value, AnnotatedValue):
+            return value.value
+        return str(value)
+
+    return json.dumps(data, default=_default)
+
+
 def get_git_revision() -> "Optional[str]":
     try:
         with open(os.path.devnull, "w+") as null: