move common function between flask and starlette to more central place

Author: ericapisani

sentry_sdk/integrations/_wsgi_common.py

@@ -214,6 +214,15 @@ def _is_json_content_type(ct: "Optional[str]") -> bool:
     )
 
 
+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 _filter_headers(
     headers: "Mapping[str, str]",
     use_annotated_value: bool = True,

sentry_sdk/integrations/flask.py

@@ -1,4 +1,3 @@
-import json
 from typing import TYPE_CHECKING
 
 import sentry_sdk
@@ -7,6 +6,7 @@
     _RAW_DATA_EXCEPTIONS,
     DEFAULT_HTTP_METHODS_TO_CAPTURE,
     RequestExtractor,
+    _serialize_request_body_data,
     request_body_within_bounds,
 )
 from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
@@ -197,14 +197,9 @@ def _set_request_body_data_on_streaming_segment(
             else:
                 return
 
-        def _default(value: "Any") -> "Any":
-            if isinstance(value, AnnotatedValue):
-                return value.value
-            return str(value)
-
         current_span._segment.set_attribute(
             "http.request.body.data",
-            json.dumps(data, default=_default),
+            _serialize_request_body_data(data),
         )
 
 

sentry_sdk/integrations/starlette.py

@@ -1,5 +1,4 @@
 import functools
-import json
 import sys
 import warnings
 from collections.abc import Set
@@ -18,6 +17,7 @@
     DEFAULT_HTTP_METHODS_TO_CAPTURE,
     HttpCodeRangeContainer,
     _is_json_content_type,
+    _serialize_request_body_data,
     request_body_within_bounds,
 )
 from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
@@ -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: