Move from sentry_sdk.push_scope to sentry_sdk.new_scope

3 files changed, 9 insertions, 9 deletions

diff --git a/bot/bot.py b/bot/bot.py
index fa3617f1b..35dbd1ba4 100644
--- a/bot/bot.py
+++ b/bot/bot.py
@@ -6,7 +6,7 @@ import aiohttp
 from discord.errors import Forbidden
 from pydis_core import BotBase
 from pydis_core.utils.error_handling import handle_forbidden_from_block
-from sentry_sdk import push_scope, start_transaction
+from sentry_sdk import new_scope, start_transaction
 
 from bot import constants, exts
 from bot.log import get_logger
@@ -71,7 +71,7 @@ class Bot(BotBase):
 
         self.stats.incr(f"errors.event.{event}")
 
-        with push_scope() as scope:
+        with new_scope() as scope:
             scope.set_tag("event", event)
             scope.set_extra("args", args)
             scope.set_extra("kwargs", kwargs)
diff --git a/bot/exts/backend/error_handler.py b/bot/exts/backend/error_handler.py
index 5cf07613d..352be313d 100644
--- a/bot/exts/backend/error_handler.py
+++ b/bot/exts/backend/error_handler.py
@@ -7,7 +7,7 @@ from discord.ext.commands import ChannelNotFound, Cog, Context, TextChannelConve
 from pydis_core.site_api import ResponseCodeError
 from pydis_core.utils.error_handling import handle_forbidden_from_block
 from pydis_core.utils.interactions import DeleteMessageButton, ViewWithUserAndRoleCheck
-from sentry_sdk import push_scope
+from sentry_sdk import new_scope
 
 from bot.bot import Bot
 from bot.constants import Colours, Icons, MODERATION_ROLES
@@ -400,7 +400,7 @@ class ErrorHandler(Cog):
 
         ctx.bot.stats.incr("errors.unexpected")
 
-        with push_scope() as scope:
+        with new_scope() as scope:
             scope.user = {
                 "id": ctx.author.id,
                 "username": str(ctx.author)
diff --git a/tests/bot/exts/backend/test_error_handler.py b/tests/bot/exts/backend/test_error_handler.py
index dbc62270b..85dc33999 100644
--- a/tests/bot/exts/backend/test_error_handler.py
+++ b/tests/bot/exts/backend/test_error_handler.py
@@ -495,26 +495,26 @@ class IndividualErrorHandlerTests(unittest.IsolatedAsyncioTestCase):
                 else:
                     log_mock.debug.assert_called_once()
 
-    @patch("bot.exts.backend.error_handler.push_scope")
+    @patch("bot.exts.backend.error_handler.new_scope")
     @patch("bot.exts.backend.error_handler.log")
-    async def test_handle_unexpected_error(self, log_mock, push_scope_mock):
+    async def test_handle_unexpected_error(self, log_mock, new_scope_mock):
         """Should `ctx.send` this error, error log this and sent to Sentry."""
         for case in (None, MockGuild()):
             with self.subTest(guild=case):
                 self.ctx.reset_mock()
                 log_mock.reset_mock()
-                push_scope_mock.reset_mock()
+                new_scope_mock.reset_mock()
                 scope_mock = Mock()
 
                 # Mock `with push_scope_mock() as scope:`
-                push_scope_mock.return_value.__enter__.return_value = scope_mock
+                new_scope_mock.return_value.__enter__.return_value = scope_mock
 
                 self.ctx.guild = case
                 await self.cog.handle_unexpected_error(self.ctx, errors.CommandError())
 
                 self.ctx.send.assert_awaited_once()
                 log_mock.error.assert_called_once()
-                push_scope_mock.assert_called_once()
+                new_scope_mock.assert_called_once()
 
                 set_tag_calls = [
                     call("command", self.ctx.command.qualified_name),