ref(gcp): Use new scopes API (#2884)

Author: sentrivana

sentry_sdk/integrations/gcp.py

@@ -3,9 +3,12 @@
 from datetime import datetime, timedelta, timezone
 from os import environ
 
+import sentry_sdk
 from sentry_sdk.api import continue_trace
 from sentry_sdk.consts import OP
-from sentry_sdk.hub import Hub, _should_send_default_pii
+from sentry_sdk.integrations import Integration
+from sentry_sdk.integrations._wsgi_common import _filter_headers
+from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.tracing import TRANSACTION_SOURCE_COMPONENT
 from sentry_sdk.utils import (
     AnnotatedValue,
@@ -15,8 +18,6 @@
     TimeoutThread,
     reraise,
 )
-from sentry_sdk.integrations import Integration
-from sentry_sdk.integrations._wsgi_common import _filter_headers
 
 from sentry_sdk._types import TYPE_CHECKING
 
@@ -39,15 +40,12 @@ def _wrap_func(func):
     # type: (F) -> F
     def sentry_func(functionhandler, gcp_event, *args, **kwargs):
         # type: (Any, Any, *Any, **Any) -> Any
+        client = sentry_sdk.get_client()
 
-        hub = Hub.current
-        integration = hub.get_integration(GcpIntegration)
+        integration = client.get_integration(GcpIntegration)
         if integration is None:
             return func(functionhandler, gcp_event, *args, **kwargs)
 
-        # If an integration is there, a client has to be there.
-        client = hub.client  # type: Any
-
         configured_time = environ.get("FUNCTION_TIMEOUT_SEC")
         if not configured_time:
             logger.debug(
@@ -59,7 +57,7 @@ def sentry_func(functionhandler, gcp_event, *args, **kwargs):
 
         initial_time = datetime.now(timezone.utc)
 
-        with hub.push_scope() as scope:
+        with sentry_sdk.isolation_scope() as scope:
             with capture_internal_exceptions():
                 scope.clear_breadcrumbs()
                 scope.add_event_processor(
@@ -100,7 +98,7 @@ def sentry_func(functionhandler, gcp_event, *args, **kwargs):
                 },
                 "gcp_event": gcp_event,
             }
-            with hub.start_transaction(
+            with sentry_sdk.start_transaction(
                 transaction, custom_sampling_context=sampling_context
             ):
                 try:
@@ -112,13 +110,13 @@ def sentry_func(functionhandler, gcp_event, *args, **kwargs):
                         client_options=client.options,
                         mechanism={"type": "gcp", "handled": False},
                     )
-                    hub.capture_event(sentry_event, hint=hint)
+                    sentry_sdk.capture_event(sentry_event, hint=hint)
                     reraise(*exc_info)
                 finally:
                     if timeout_thread:
                         timeout_thread.stop()
                     # Flush out the event queue
-                    hub.flush()
+                    client.flush()
 
     return sentry_func  # type: ignore
 
@@ -187,7 +185,7 @@ def event_processor(event, hint):
         if hasattr(gcp_event, "headers"):
             request["headers"] = _filter_headers(gcp_event.headers)
 
-        if _should_send_default_pii():
+        if should_send_default_pii():
             if hasattr(gcp_event, "data"):
                 request["data"] = gcp_event.data
         else: