Merge pull request #1388 from opengisch/QF-4835-Bump_sentry_to_v2

Bump sentry to v2

Author: Rakanhf

docker-app/qfieldcloud/core/utils2/sentry.py

@@ -24,35 +24,35 @@ def report_serialization_diff_to_sentry(
         bodystream: BytesIO buffer capturing the request's raw body.
         capture_message: bool used as a flag by the caller to create an extra event against Sentry to attach the files to.
     """
-    with sentry_sdk.configure_scope() as scope:
-        try:
-            logger.info("Sending explicit sentry report!")
-
-            filename = f"{name}_contents.txt"
-            scope.add_attachment(
-                bytes=bytes(
-                    f"Pre:\n{pre_serialization}\n\nPost:{post_serialization}",
-                    encoding="utf8",
-                ),
-                filename=filename,
-            )
-
-            filename = f"{name}_traceback.txt"
-            scope.add_attachment(
-                bytes=bytes(buffer.getvalue(), encoding="utf8"),
-                filename=filename,
-            )
-
-            if body_stream:
-                filename = f"{name}_rawbody.txt"
-                scope.add_attachment(bytes=body_stream.getvalue(), filename=filename)
-
-            if capture_message:
-                sentry_sdk.capture_message("Explicit Sentry report!", scope=scope)
-
-            return True
-
-        except Exception as error:
-            logger.error(f"Unable to send file to Sentry: failed on {error}")
-            sentry_sdk.capture_exception(error)
-            return False
+    scope = sentry_sdk.get_current_scope()
+    try:
+        logger.info("Sending explicit sentry report!")
+
+        filename = f"{name}_contents.txt"
+        scope.add_attachment(
+            bytes=bytes(
+                f"Pre:\n{pre_serialization}\n\nPost:{post_serialization}",
+                encoding="utf8",
+            ),
+            filename=filename,
+        )
+
+        filename = f"{name}_traceback.txt"
+        scope.add_attachment(
+            bytes=bytes(buffer.getvalue(), encoding="utf8"),
+            filename=filename,
+        )
+
+        if body_stream:
+            filename = f"{name}_rawbody.txt"
+            scope.add_attachment(bytes=body_stream.getvalue(), filename=filename)
+
+        if capture_message:
+            sentry_sdk.capture_message("Explicit Sentry report!", scope=scope)
+
+        return True
+
+    except Exception as error:
+        logger.error(f"Unable to send file to Sentry: failed on {error}")
+        sentry_sdk.capture_exception(error)
+        return False

docker-app/requirements/requirements.in

@@ -41,5 +41,5 @@ phonenumbers==9.0.15
 Pillow==11.3.0
 psycopg2==2.9.11
 pymemcache==4.0.0
-sentry-sdk==1.45.1
+sentry-sdk==2.42.0
 stripe==4.2.0

docker-app/requirements/requirements.txt

@@ -198,7 +198,7 @@ rpds-py==0.27.0
     #   referencing
 s3transfer==0.10.4
     # via boto3
-sentry-sdk==1.45.1
+sentry-sdk==2.42.0
     # via -r /requirements/requirements.in
 six==1.17.0
     # via python-dateutil