.

Author: sentrivana

sentry_sdk/integrations/_wsgi_common.py

@@ -51,9 +51,7 @@
 )
 
 
-def should_include_request_body(
-    client: Optional[sentry_sdk.client.BaseClient], content_length: int
-) -> bool:
+def should_include_request_body(client: Optional[sentry_sdk.client.BaseClient]) -> bool:
     if client is None:
         return False
 
@@ -79,14 +77,12 @@ def extract_into_event(self, event: Event) -> None:
             return
 
         data: Optional[Union[AnnotatedValue, Dict[str, Any]]] = None
-
-        content_length = self.content_length()
         request_info = event.get("request", {})
 
         if should_send_default_pii():
             request_info["cookies"] = dict(self.cookies())
 
-        if not should_include_request_body(client, content_length):
+        if not should_include_request_body(client):
             data = AnnotatedValue.removed_because_over_size_limit()
         else:
             # First read the raw body data

sentry_sdk/integrations/aiohttp.py

@@ -366,7 +366,7 @@ def get_aiohttp_request_data(request: Request) -> Union[Optional[str], Annotated
 
     if bytes_body is not None:
         # we have body to show
-        if not should_include_request_body(sentry_sdk.get_client(), len(bytes_body)):
+        if not should_include_request_body(sentry_sdk.get_client()):
             return AnnotatedValue.removed_because_over_size_limit()
 
         encoding = request.charset or "utf-8"

sentry_sdk/integrations/ariadne.py

@@ -120,17 +120,7 @@ def inner(event: Event, hint: dict[str, Any]) -> Event:
         if not isinstance(data, dict):
             return event
 
-        with capture_internal_exceptions():
-            try:
-                content_length = int(
-                    (data.get("headers") or {}).get("Content-Length", 0)
-                )
-            except (TypeError, ValueError):
-                return event
-
-            if should_send_default_pii() and should_include_request_body(
-                get_client(), content_length
-            ):
+            if should_send_default_pii() and should_include_request_body(get_client()):
                 request_info = event.setdefault("request", {})
                 request_info["api_target"] = "graphql"
                 request_info["data"] = data

sentry_sdk/integrations/dramatiq.py

@@ -160,7 +160,7 @@ def extract_into_event(self, event: Event) -> None:
         request_info["type"] = "dramatiq"
 
         data: Optional[Union[AnnotatedValue, Dict[str, Any]]] = None
-        if not should_include_request_body(client, self.content_length()):
+        if not should_include_request_body(client):
             data = AnnotatedValue.removed_because_over_size_limit()
         else:
             data = self.message_data

sentry_sdk/integrations/starlette.py

@@ -598,9 +598,7 @@ async def extract_request_info(
                 return request_info
 
             # Add annotation if body is too big
-            if content_length and not should_include_request_body(
-                client, content_length
-            ):
+            if not should_include_request_body(client):
                 request_info["data"] = AnnotatedValue.removed_because_over_size_limit()
                 return request_info
 

tests/integrations/bottle/test_bottle.py

@@ -7,7 +7,6 @@
 from sentry_sdk import capture_message
 from sentry_sdk.consts import DEFAULT_MAX_VALUE_LENGTH
 from sentry_sdk.integrations.bottle import BottleIntegration
-from sentry_sdk.serializer import MAX_DATABAG_BREADTH
 
 from sentry_sdk.integrations.logging import LoggingIntegration
 from werkzeug.test import Client
@@ -256,9 +255,7 @@ def index():
 def test_json_not_truncated(sentry_init, capture_events, app, get_client):
     sentry_init(integrations=[BottleIntegration()])
 
-    data = {
-        "key{}".format(i): "value{}".format(i) for i in range(MAX_DATABAG_BREADTH + 10)
-    }
+    data = {"key{}".format(i): "value{}".format(i) for i in range(10**4)}
 
     @app.route("/", method="POST")
     def index():

tests/integrations/flask/test_flask.py

@@ -29,7 +29,6 @@
 )
 from sentry_sdk.consts import DEFAULT_MAX_VALUE_LENGTH
 from sentry_sdk.integrations.logging import LoggingIntegration
-from sentry_sdk.serializer import MAX_DATABAG_BREADTH
 
 
 login_manager = LoginManager()
@@ -459,9 +458,7 @@ def test_json_not_truncated(sentry_init, capture_events, app):
         integrations=[flask_sentry.FlaskIntegration()],
     )
 
-    data = {
-        "key{}".format(i): "value{}".format(i) for i in range(MAX_DATABAG_BREADTH + 10)
-    }
+    data = {"key{}".format(i): "value{}".format(i) for i in range(10**4)}
 
     @app.route("/", methods=["POST"])
     def index():

tests/integrations/pure_eval/test_pure_eval.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from sentry_sdk import capture_exception, serializer
+from sentry_sdk import capture_exception
 from sentry_sdk.integrations.pure_eval import PureEvalIntegration
 
 
@@ -85,4 +85,4 @@ def foo():
             "s",
             "events",
         }
-        assert len(frame_vars) == serializer.MAX_DATABAG_BREADTH
+        assert len(frame_vars) == 99

tests/integrations/pyramid/test_pyramid.py

@@ -11,7 +11,6 @@
 from sentry_sdk import capture_message, add_breadcrumb
 from sentry_sdk.consts import DEFAULT_MAX_VALUE_LENGTH
 from sentry_sdk.integrations.pyramid import PyramidIntegration
-from sentry_sdk.serializer import MAX_DATABAG_BREADTH
 from tests.conftest import unpack_werkzeug_response
 
 
@@ -211,9 +210,7 @@ def index(request):
 def test_json_not_truncated(sentry_init, capture_events, route, get_client):
     sentry_init(integrations=[PyramidIntegration()])
 
-    data = {
-        "key{}".format(i): "value{}".format(i) for i in range(MAX_DATABAG_BREADTH + 10)
-    }
+    data = {"key{}".format(i): "value{}".format(i) for i in range(10**4)}
 
     @route("/")
     def index(request):