ref(aws-lambda): Use new scopes API (#2882)

---------

Co-authored-by: Daniel Szoke <[email protected]>

Author: sentrivana

sentry_sdk/integrations/aws_lambda.py

@@ -3,9 +3,10 @@
 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.scope import Scope, should_send_default_pii
 from sentry_sdk.tracing import TRANSACTION_SOURCE_COMPONENT
 from sentry_sdk.utils import (
     AnnotatedValue,
@@ -38,18 +39,13 @@ def _wrap_init_error(init_error):
     # type: (F) -> F
     def sentry_init_error(*args, **kwargs):
         # type: (*Any, **Any) -> Any
-
-        hub = Hub.current
-        integration = hub.get_integration(AwsLambdaIntegration)
+        client = sentry_sdk.get_client()
+        integration = client.get_integration(AwsLambdaIntegration)
         if integration is None:
             return init_error(*args, **kwargs)
 
-        # If an integration is there, a client has to be there.
-        client = hub.client  # type: Any
-
         with capture_internal_exceptions():
-            with hub.configure_scope() as scope:
-                scope.clear_breadcrumbs()
+            Scope.get_isolation_scope().clear_breadcrumbs()
 
             exc_info = sys.exc_info()
             if exc_info and all(exc_info):
@@ -58,7 +54,7 @@ def sentry_init_error(*args, **kwargs):
                     client_options=client.options,
                     mechanism={"type": "aws_lambda", "handled": False},
                 )
-                hub.capture_event(sentry_event, hint=hint)
+                sentry_sdk.capture_event(sentry_event, hint=hint)
 
         return init_error(*args, **kwargs)
 
@@ -93,16 +89,14 @@ def sentry_handler(aws_event, aws_context, *args, **kwargs):
             # this is empty
             request_data = {}
 
-        hub = Hub.current
-        integration = hub.get_integration(AwsLambdaIntegration)
+        client = sentry_sdk.get_client()
+        integration = client.get_integration(AwsLambdaIntegration)
         if integration is None:
             return handler(aws_event, aws_context, *args, **kwargs)
 
-        # If an integration is there, a client has to be there.
-        client = hub.client  # type: Any
         configured_time = aws_context.get_remaining_time_in_millis()
 
-        with hub.push_scope() as scope:
+        with sentry_sdk.isolation_scope() as scope:
             timeout_thread = None
             with capture_internal_exceptions():
                 scope.clear_breadcrumbs()
@@ -148,7 +142,7 @@ def sentry_handler(aws_event, aws_context, *args, **kwargs):
                 name=aws_context.function_name,
                 source=TRANSACTION_SOURCE_COMPONENT,
             )
-            with hub.start_transaction(
+            with sentry_sdk.start_transaction(
                 transaction,
                 custom_sampling_context={
                     "aws_event": aws_event,
@@ -164,7 +158,7 @@ def sentry_handler(aws_event, aws_context, *args, **kwargs):
                         client_options=client.options,
                         mechanism={"type": "aws_lambda", "handled": False},
                     )
-                    hub.capture_event(sentry_event, hint=hint)
+                    sentry_sdk.capture_event(sentry_event, hint=hint)
                     reraise(*exc_info)
                 finally:
                     if timeout_thread:
@@ -176,12 +170,12 @@ def sentry_handler(aws_event, aws_context, *args, **kwargs):
 def _drain_queue():
     # type: () -> None
     with capture_internal_exceptions():
-        hub = Hub.current
-        integration = hub.get_integration(AwsLambdaIntegration)
+        client = sentry_sdk.get_client()
+        integration = client.get_integration(AwsLambdaIntegration)
         if integration is not None:
             # Flush out the event queue before AWS kills the
             # process.
-            hub.flush()
+            client.flush()
 
 
 class AwsLambdaIntegration(Integration):
@@ -358,7 +352,7 @@ def event_processor(sentry_event, hint, start_time=start_time):
         if "headers" in aws_event:
             request["headers"] = _filter_headers(aws_event["headers"])
 
-        if _should_send_default_pii():
+        if should_send_default_pii():
             user_info = sentry_event.setdefault("user", {})
 
             identity = aws_event.get("identity")

sentry_sdk/integrations/boto3.py

@@ -1,6 +1,6 @@
 from functools import partial
 
-from sentry_sdk import Hub
+import sentry_sdk
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import Integration, DidNotEnable
 from sentry_sdk.tracing import Span
@@ -59,13 +59,11 @@ def sentry_patched_init(self, *args, **kwargs):
 
 def _sentry_request_created(service_id, request, operation_name, **kwargs):
     # type: (str, AWSRequest, str, **Any) -> None
-    hub = Hub.current
-    if hub.get_integration(Boto3Integration) is None:
+    if sentry_sdk.get_client().get_integration(Boto3Integration) is None:
         return
 
     description = "aws.%s.%s" % (service_id, operation_name)
-    span = hub.start_span(
-        hub=hub,
+    span = sentry_sdk.start_span(
         op=OP.HTTP_CLIENT,
         description=description,
     )

tests/integrations/aws_lambda/test_aws.py

@@ -672,9 +672,9 @@ def test_serverless_no_code_instrumentation(run_lambda_function):
             import sentry_sdk
 
             def test_handler(event, context):
-                current_client = sentry_sdk.Hub.current.client
+                current_client = sentry_sdk.get_client()
 
-                assert current_client is not None
+                assert current_client.is_active()
 
                 assert len(current_client.options['integrations']) == 1
                 assert isinstance(current_client.options['integrations'][0],

tests/integrations/boto3/test_s3.py

@@ -3,7 +3,7 @@
 import boto3
 import pytest
 
-from sentry_sdk import Hub
+import sentry_sdk
 from sentry_sdk.integrations.boto3 import Boto3Integration
 from tests.integrations.boto3 import read_fixture
 from tests.integrations.boto3.aws_mock import MockResponse
@@ -20,7 +20,7 @@ def test_basic(sentry_init, capture_events):
     events = capture_events()
 
     s3 = session.resource("s3")
-    with Hub.current.start_transaction() as transaction, MockResponse(
+    with sentry_sdk.start_transaction() as transaction, MockResponse(
         s3.meta.client, 200, {}, read_fixture("s3_list.xml")
     ):
         bucket = s3.Bucket("bucket")
@@ -43,7 +43,7 @@ def test_streaming(sentry_init, capture_events):
     events = capture_events()
 
     s3 = session.resource("s3")
-    with Hub.current.start_transaction() as transaction, MockResponse(
+    with sentry_sdk.start_transaction() as transaction, MockResponse(
         s3.meta.client, 200, {}, b"hello"
     ):
         obj = s3.Bucket("bucket").Object("foo.pdf")
@@ -79,7 +79,7 @@ def test_streaming_close(sentry_init, capture_events):
     events = capture_events()
 
     s3 = session.resource("s3")
-    with Hub.current.start_transaction() as transaction, MockResponse(
+    with sentry_sdk.start_transaction() as transaction, MockResponse(
         s3.meta.client, 200, {}, b"hello"
     ):
         obj = s3.Bucket("bucket").Object("foo.pdf")
@@ -108,7 +108,7 @@ def test_omit_url_data_if_parsing_fails(sentry_init, capture_events):
         "sentry_sdk.integrations.boto3.parse_url",
         side_effect=ValueError,
     ):
-        with Hub.current.start_transaction() as transaction, MockResponse(
+        with sentry_sdk.start_transaction() as transaction, MockResponse(
             s3.meta.client, 200, {}, read_fixture("s3_list.xml")
         ):
             bucket = s3.Bucket("bucket")