From f2c7a4977c73a470561eafe354879046f80a702f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 16 May 2024 07:37:22 +0200
Subject: [PATCH] deps: migration to sentry 2.2

- raised dependency to 2.2 for last_event_id
- ported tags handling to changed API
---
 pyproject.toml          |  2 +-
 weblate/utils/errors.py | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 3117f0cdc2c0..a2a49e23c4d0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -72,7 +72,7 @@ dependencies = [
   "redis>=5.0.2,<5.1.0",
   "requests>=2.32.1,<2.33",
   "ruamel.yaml>=0.17.2,<0.19.0",
-  "sentry-sdk>=1.45.0,<2.0",
+  "sentry-sdk>=2.2,<2.3",
   "siphashc>=2.1,<3.0",
   "social-auth-app-django>=5.4.0,<6.0.0",
   "social-auth-core>=4.5.0,<5.0.0",
diff --git a/weblate/utils/errors.py b/weblate/utils/errors.py
index d2b2417e1da6..e88ace4680ca 100644
--- a/weblate/utils/errors.py
+++ b/weblate/utils/errors.py
@@ -50,16 +50,15 @@ def report_error(
         rollbar.report_exc_info(level=level)
 
     if not skip_sentry and settings.SENTRY_DSN:
-        with sentry_sdk.push_scope() as scope:
-            scope.set_tag("cause", cause)
-            if project is not None:
-                scope.set_tag("project", project.slug)
-            scope.set_tag("user.locale", get_language())
-            scope.level = level
-            if message:
-                sentry_sdk.capture_message(cause)
-            else:
-                sentry_sdk.capture_exception()
+        sentry_sdk.set_tag("cause", cause)
+        if project is not None:
+            sentry_sdk.set_tag("project", project.slug)
+        sentry_sdk.set_tag("user.locale", get_language())
+        sentry_sdk.level = level
+        if message:
+            sentry_sdk.capture_message(cause)
+        else:
+            sentry_sdk.capture_exception()
 
     log = getattr(LOGGER, level)