use consts and string lookup for client.getintegration

Author: pabloDeputter

sentry_sdk/integrations/boto3/_client.py

@@ -4,6 +4,7 @@
 import sentry_sdk
 from sentry_sdk.integrations import DidNotEnable
 from sentry_sdk.integrations.boto3._context import AwsCallContext
+from sentry_sdk.integrations.boto3.consts import IDENTIFIER
 from sentry_sdk.integrations.boto3._instrumentation import (
     _finish_span,
     _get_error_attributes,
@@ -68,8 +69,6 @@ def _activate_client_span(
 
 
 def _patch_botocore_client() -> None:
-    from sentry_sdk.integrations.boto3 import Boto3Integration
-
     orig_init = BaseClient.__init__
     orig_make_api_call = BaseClient._make_api_call  # type: ignore
 
@@ -91,7 +90,7 @@ def sentry_patched_make_api_call(
         https://opentelemetry.io/docs/specs/semconv/rpc/rpc-spans/#rpc-client-span
         """
         client = sentry_sdk.get_client()
-        if client.get_integration(Boto3Integration) is None:
+        if client.get_integration(IDENTIFIER) is None:
             return orig_make_api_call(self, operation_name, api_params)
 
         ctx = AwsCallContext(operation_name, api_params)

sentry_sdk/integrations/boto3/_instrumentation.py

@@ -4,7 +4,7 @@
 import sentry_sdk
 from sentry_sdk.consts import OP, SPANDATA, SPANSTATUS
 from sentry_sdk.integrations import DidNotEnable
-from sentry_sdk.integrations.boto3.consts import ORIGIN
+from sentry_sdk.integrations.boto3.consts import IDENTIFIER, ORIGIN
 from sentry_sdk.traces import NoOpStreamedSpan, StreamedSpan
 from sentry_sdk.tracing import BAGGAGE_HEADER_NAME, Span
 from sentry_sdk.tracing_utils import (
@@ -188,7 +188,7 @@ def _start_client_span(
     ctx: "AwsCallContext",
 ) -> "Optional[Union[Span, StreamedSpan]]":
     client = sentry_sdk.get_client()
-    if client.get_integration("boto3") is None:
+    if client.get_integration(IDENTIFIER) is None:
         return None
 
     # use unknown if `service_id_hyphenized` so span name can still be created.
@@ -437,7 +437,7 @@ def _sentry_request_created(
     """
 
     client = sentry_sdk.get_client()
-    if client.get_integration("boto3") is None:
+    if client.get_integration(IDENTIFIER) is None:
         return
 
     with capture_internal_exceptions():
@@ -465,7 +465,7 @@ def _sentry_before_sign(
     request: "AWSRequest", signature_version: "Any", **kwargs: "Any"
 ) -> None:
     client = sentry_sdk.get_client()
-    if client.get_integration("boto3") is None:
+    if client.get_integration(IDENTIFIER) is None:
         return
 
     with capture_internal_exceptions():

tests/integrations/boto3/test_client.py

@@ -613,7 +613,7 @@ def test_client_call_attributes_are_available_at_span_creation(
         item.payload
         for item in items
         if item.payload["attributes"].get(SPANDATA.SENTRY_ORIGIN)
-        == Boto3Integration.origin
+        == ORIGIN
     ]
     assert client_spans == []
 

tests/integrations/boto3/test_s3.py

@@ -7,6 +7,7 @@
 from sentry_sdk import capture_message
 from sentry_sdk.consts import SPANDATA
 from sentry_sdk.integrations.boto3 import Boto3Integration
+from sentry_sdk.integrations.boto3.consts import ORIGIN
 from tests.conftest import ApproxDict
 from tests.integrations.boto3 import read_fixture
 from tests.integrations.boto3.aws_mock import MockResponse
@@ -130,7 +131,7 @@ def test_streaming(
             "rpc.service": "S3",
             "sentry.environment": "production",
             "sentry.op": "http.client",
-            "sentry.origin": "auto.http.boto3",
+            "sentry.origin": ORIGIN,
             "sentry.release": mock.ANY,
             "sentry.sdk.name": "sentry.python",
             "sentry.sdk.version": mock.ANY,
@@ -292,7 +293,7 @@ def test_omit_url_data_if_parsing_fails(
                         "rpc.service": "S3",
                         "sentry.environment": "production",
                         "sentry.op": "http.client",
-                        "sentry.origin": "auto.http.boto3",
+                        "sentry.origin": ORIGIN,
                         "sentry.release": mock.ANY,
                         "sentry.sdk.name": "sentry.python",
                         "sentry.sdk.version": mock.ANY,
@@ -364,7 +365,7 @@ def test_span_origin(
         spans = [item.payload for item in items]
 
         assert spans[1]["attributes"]["sentry.origin"] == "manual"
-        assert spans[0]["attributes"]["sentry.origin"] == "auto.http.boto3"
+        assert spans[0]["attributes"]["sentry.origin"] == ORIGIN
     else:
         events = capture_events()
 
@@ -376,7 +377,7 @@ def test_span_origin(
         (event,) = events
 
         assert event["contexts"]["trace"]["origin"] == "manual"
-        assert event["spans"][0]["origin"] == "auto.http.boto3"
+        assert event["spans"][0]["origin"] == ORIGIN
 
 
 def test_breadcrumb(sentry_init, capture_events):