ref(integrations): Use new scopes API in web framework tests (#2898)

Author: sentrivana

tests/integrations/django/test_basic.py

@@ -18,12 +18,13 @@
     from django.core.urlresolvers import reverse
 
 from sentry_sdk._compat import PY310
-from sentry_sdk import capture_message, capture_exception, configure_scope
+from sentry_sdk import capture_message, capture_exception
 from sentry_sdk.consts import SPANDATA
 from sentry_sdk.integrations.django import DjangoIntegration, _set_db_data
 from sentry_sdk.integrations.django.signals_handlers import _get_receiver_name
 from sentry_sdk.integrations.django.caching import _get_span_description
 from sentry_sdk.integrations.executing import ExecutingIntegration
+from sentry_sdk.scope import Scope
 from sentry_sdk.tracing import Span
 from tests.conftest import unpack_werkzeug_response
 from tests.integrations.django.myapp.wsgi import application
@@ -372,8 +373,7 @@ def test_sql_queries(sentry_init, capture_events, with_integration):
 
     sql = connection.cursor()
 
-    with configure_scope() as scope:
-        scope.clear_breadcrumbs()
+    Scope.get_isolation_scope().clear_breadcrumbs()
 
     with pytest.raises(OperationalError):
         # table doesn't even exist
@@ -407,8 +407,7 @@ def test_sql_dict_query_params(sentry_init, capture_events):
     sql = connections["postgres"].cursor()
 
     events = capture_events()
-    with configure_scope() as scope:
-        scope.clear_breadcrumbs()
+    Scope.get_isolation_scope().clear_breadcrumbs()
 
     with pytest.raises(ProgrammingError):
         sql.execute(
@@ -473,8 +472,7 @@ def test_sql_psycopg2_string_composition(sentry_init, capture_events, query):
 
     sql = connections["postgres"].cursor()
 
-    with configure_scope() as scope:
-        scope.clear_breadcrumbs()
+    Scope.get_isolation_scope().clear_breadcrumbs()
 
     events = capture_events()
 
@@ -507,8 +505,7 @@ def test_sql_psycopg2_placeholders(sentry_init, capture_events):
     sql = connections["postgres"].cursor()
 
     events = capture_events()
-    with configure_scope() as scope:
-        scope.clear_breadcrumbs()
+    Scope.get_isolation_scope().clear_breadcrumbs()
 
     with pytest.raises(DataError):
         names = ["foo", "bar"]

tests/integrations/falcon/test_falcon.py

@@ -404,8 +404,7 @@ def generator():
     expected_response = "".join(str(row) + "\n" for row in range(1000))
     assert response.text == expected_response
     assert not events
-
-    not Scope.get_isolation_scope()._tags["request_data"]
+    assert not Scope.get_isolation_scope()._tags["request_data"]
 
 
 @pytest.mark.skipif(

tests/integrations/flask/test_flask.py

@@ -24,7 +24,6 @@
 import sentry_sdk.integrations.flask as flask_sentry
 from sentry_sdk import (
     set_tag,
-    configure_scope,
     capture_message,
     capture_exception,
 )
@@ -279,8 +278,7 @@ def test_flask_session_tracking(sentry_init, capture_envelopes, app):
 
     @app.route("/")
     def index():
-        with configure_scope() as scope:
-            scope.set_user({"ip_address": "1.2.3.4", "id": "42"})
+        Scope.get_isolation_scope().set_user({"ip_address": "1.2.3.4", "id": "42"})
         try:
             raise ValueError("stuff")
         except Exception:
@@ -668,18 +666,15 @@ def test_does_not_leak_scope(sentry_init, capture_events, app):
     sentry_init(integrations=[flask_sentry.FlaskIntegration()])
     events = capture_events()
 
-    with configure_scope() as scope:
-        scope.set_tag("request_data", False)
+    Scope.get_isolation_scope().set_tag("request_data", False)
 
     @app.route("/")
     def index():
-        with configure_scope() as scope:
-            scope.set_tag("request_data", True)
+        Scope.get_isolation_scope().set_tag("request_data", True)
 
         def generate():
             for row in range(1000):
-                with configure_scope() as scope:
-                    assert scope._tags["request_data"]
+                assert Scope.get_isolation_scope()._tags["request_data"]
 
                 yield str(row) + "\n"
 
@@ -690,8 +685,7 @@ def generate():
     assert response.data.decode() == "".join(str(row) + "\n" for row in range(1000))
     assert not events
 
-    with configure_scope() as scope:
-        assert not scope._tags["request_data"]
+    assert not Scope.get_isolation_scope()._tags["request_data"]
 
 
 def test_scoped_test_client(sentry_init, app):
@@ -839,10 +833,7 @@ def test_template_tracing_meta(sentry_init, app, capture_events, template_string
 
     @app.route("/")
     def index():
-        scope = Scope.get_isolation_scope()
-        capture_message(
-            scope.get_traceparent() + "\n" + scope.get_baggage().serialize()
-        )
+        capture_message(sentry_sdk.get_traceparent() + "\n" + sentry_sdk.get_baggage())
         return render_template_string(template_string)
 
     with app.test_client() as client:

tests/integrations/quart/test_quart.py

@@ -6,12 +6,12 @@
 
 from sentry_sdk import (
     set_tag,
-    configure_scope,
     capture_message,
     capture_exception,
 )
 from sentry_sdk.integrations.logging import LoggingIntegration
 import sentry_sdk.integrations.quart as quart_sentry
+from sentry_sdk.scope import Scope
 
 from quart import Quart, Response, abort, stream_with_context
 from quart.views import View
@@ -378,18 +378,15 @@ async def test_does_not_leak_scope(sentry_init, capture_events, app):
     sentry_init(integrations=[quart_sentry.QuartIntegration()])
     events = capture_events()
 
-    with configure_scope() as scope:
-        scope.set_tag("request_data", False)
+    Scope.get_isolation_scope().set_tag("request_data", False)
 
     @app.route("/")
     async def index():
-        with configure_scope() as scope:
-            scope.set_tag("request_data", True)
+        Scope.get_isolation_scope().set_tag("request_data", True)
 
         async def generate():
             for row in range(1000):
-                with configure_scope() as scope:
-                    assert scope._tags["request_data"]
+                assert Scope.get_isolation_scope()._tags["request_data"]
 
                 yield str(row) + "\n"
 
@@ -401,9 +398,7 @@ async def generate():
         str(row) + "\n" for row in range(1000)
     )
     assert not events
-
-    with configure_scope() as scope:
-        assert not scope._tags["request_data"]
+    assert not Scope.get_isolation_scope()._tags["request_data"]
 
 
 @pytest.mark.asyncio

tests/integrations/tornado/test_tornado.py

@@ -2,8 +2,9 @@
 
 import pytest
 
-from sentry_sdk import configure_scope, start_transaction, capture_message
+from sentry_sdk import start_transaction, capture_message
 from sentry_sdk.integrations.tornado import TornadoIntegration
+from sentry_sdk.scope import Scope
 
 from tornado.web import RequestHandler, Application, HTTPError
 from tornado.testing import AsyncHTTPTestCase
@@ -36,13 +37,11 @@ def bogustest(self):
 
 class CrashingHandler(RequestHandler):
     def get(self):
-        with configure_scope() as scope:
-            scope.set_tag("foo", "42")
+        Scope.get_isolation_scope().set_tag("foo", "42")
         1 / 0
 
     def post(self):
-        with configure_scope() as scope:
-            scope.set_tag("foo", "43")
+        Scope.get_isolation_scope().set_tag("foo", "43")
         1 / 0
 
 
@@ -54,14 +53,12 @@ def get(self):
 
 class HelloHandler(RequestHandler):
     async def get(self):
-        with configure_scope() as scope:
-            scope.set_tag("foo", "42")
+        Scope.get_isolation_scope().set_tag("foo", "42")
 
         return b"hello"
 
     async def post(self):
-        with configure_scope() as scope:
-            scope.set_tag("foo", "43")
+        Scope.get_isolation_scope().set_tag("foo", "43")
 
         return b"hello"
 
@@ -104,8 +101,7 @@ def test_basic(tornado_testcase, sentry_init, capture_events):
     )
     assert event["transaction_info"] == {"source": "component"}
 
-    with configure_scope() as scope:
-        assert not scope._tags
+    assert not Scope.get_isolation_scope()._tags
 
 
 @pytest.mark.parametrize(