From 2bdcc826bdc60e6f04503ce2a789a93dda97f4a2 Mon Sep 17 00:00:00 2001 From: Brendan Smith <brendan.smith@digital.trade.gov.uk> Date: Fri, 1 Nov 2024 14:24:56 +0000 Subject: [PATCH] Make sentry scoping compatible with sentry-sdk 1.X --- mail/libraries/helpers.py | 2 +- mail/tests/libraries/test_helpers.py | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 mail/tests/libraries/test_helpers.py diff --git a/mail/libraries/helpers.py b/mail/libraries/helpers.py index f7e4258f..c6e778e5 100644 --- a/mail/libraries/helpers.py +++ b/mail/libraries/helpers.py @@ -338,7 +338,7 @@ def sort_dtos_by_date(input_dtos): def log_to_sentry(message, extra=None, level="info"): extra = extra or {} - with sentry_sdk.new_scope() as scope: + with sentry_sdk.push_scope() as scope: for key, value in extra.items(): scope.set_extra(key, value) sentry_sdk.capture_message(message, level=level) diff --git a/mail/tests/libraries/test_helpers.py b/mail/tests/libraries/test_helpers.py deleted file mode 100644 index 17c12e20..00000000 --- a/mail/tests/libraries/test_helpers.py +++ /dev/null @@ -1,15 +0,0 @@ -import unittest -from unittest import mock - -from mail.libraries.helpers import log_to_sentry - - -class TestLogToSentry(unittest.TestCase): - - @mock.patch("sentry_sdk.scope.Scope.capture_event") - def test_log_to_sentry(self, mock_capture_event): - log_to_sentry("some message", {"extra": "context"}, level="debug") - mock_capture_event.assert_called_with( - {"message": "some message", "level": "debug"}, - scope=None, - )