switches from sentry's push_scope

posthog/api/capture.py

@@ -9,7 +9,7 @@
 from django.utils import timezone
 from django.views.decorators.csrf import csrf_exempt
 from rest_framework import status
-from sentry_sdk import capture_exception, push_scope
+from sentry_sdk import capture_exception, configure_scope
 from statshog.defaults.django import statsd
 
 from posthog.api.utils import get_token
@@ -249,7 +249,8 @@ def get_event(request):
 
         library = event["properties"].get("$lib", "unknown")
         library_version = event["properties"].get("$lib_version", "unknown")
-        with push_scope() as scope:
+
+        with configure_scope() as scope:
             scope.set_tag("library", library)
             scope.set_tag("library.version", library_version)
 

posthog/api/test/mock_sentry.py

@@ -1,13 +1,13 @@
 from unittest.mock import Mock
 
 
-def mock_sentry_context_for_tagging(patched_push_scope):
+def mock_sentry_context_for_tagging(patched_scope):
     mock_scope = Mock()
     mock_set_tag = Mock()
     mock_scope.set_context = Mock()
     mock_scope.set_tag = mock_set_tag
     mock_context_manager = Mock()
     mock_context_manager.__enter__ = Mock(return_value=mock_scope)
     mock_context_manager.__exit__ = Mock(return_value=None)
-    patched_push_scope.return_value = mock_context_manager
+    patched_scope.return_value = mock_context_manager
     return mock_set_tag

posthog/api/test/test_capture.py

@@ -3,7 +3,7 @@
 import json
 from datetime import timedelta
 from typing import Any, Dict, List, Union
-from unittest.mock import MagicMock, Mock, call, patch
+from unittest.mock import MagicMock, call, patch
 from urllib.parse import quote
 
 import lzstring
@@ -87,10 +87,10 @@ def test_capture_event(self, patch_process_event_with_plugins):
             },
         )
 
-    @patch("posthog.api.capture.push_scope")
+    @patch("posthog.api.capture.configure_scope")
     @patch("posthog.api.capture.celery_app.send_task", MagicMock())
-    def test_capture_event_adds_library_to_sentry(self, patch_push_scope):
-        mock_set_tag = mock_sentry_context_for_tagging(patch_push_scope)
+    def test_capture_event_adds_library_to_sentry(self, patched_scope):
+        mock_set_tag = mock_sentry_context_for_tagging(patched_scope)
 
         data = {
             "event": "$autocapture",
@@ -112,10 +112,10 @@ def test_capture_event_adds_library_to_sentry(self, patch_push_scope):
 
         mock_set_tag.assert_has_calls([call("library", "web"), call("library.version", "1.14.1")])
 
-    @patch("posthog.api.capture.push_scope")
+    @patch("posthog.api.capture.configure_scope")
     @patch("posthog.api.capture.celery_app.send_task", MagicMock())
-    def test_capture_event_adds_unknown_to_sentry_when_no_properties_sent(self, patch_push_scope):
-        mock_set_tag = mock_sentry_context_for_tagging(patch_push_scope)
+    def test_capture_event_adds_unknown_to_sentry_when_no_properties_sent(self, patched_scope):
+        mock_set_tag = mock_sentry_context_for_tagging(patched_scope)
 
         data = {
             "event": "$autocapture",