ref(integrations): Use new scopes API in pymongo, clickhouse integration (#2862)

Author: sentrivana

sentry_sdk/integrations/clickhouse_driver.py

@@ -1,9 +1,9 @@
-from sentry_sdk import Hub
+import sentry_sdk
 from sentry_sdk.consts import OP, SPANDATA
-from sentry_sdk.hub import _should_send_default_pii
 from sentry_sdk.integrations import Integration, DidNotEnable
 from sentry_sdk.tracing import Span
 from sentry_sdk._types import TYPE_CHECKING
+from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.utils import capture_internal_exceptions
 
 from typing import TypeVar
@@ -75,15 +75,14 @@ def setup_once() -> None:
 
 def _wrap_start(f: Callable[P, T]) -> Callable[P, T]:
     def _inner(*args: P.args, **kwargs: P.kwargs) -> T:
-        hub = Hub.current
-        if hub.get_integration(ClickhouseDriverIntegration) is None:
+        if sentry_sdk.get_client().get_integration(ClickhouseDriverIntegration) is None:
             return f(*args, **kwargs)
         connection = args[0]
         query = args[1]
         query_id = args[2] if len(args) > 2 else kwargs.get("query_id")
         params = args[3] if len(args) > 3 else kwargs.get("params")
 
-        span = hub.start_span(op=OP.DB, description=query)
+        span = sentry_sdk.start_span(op=OP.DB, description=query)
 
         connection._sentry_span = span  # type: ignore[attr-defined]
 
@@ -94,7 +93,7 @@ def _inner(*args: P.args, **kwargs: P.kwargs) -> T:
         if query_id:
             span.set_data("db.query_id", query_id)
 
-        if params and _should_send_default_pii():
+        if params and should_send_default_pii():
             span.set_data("db.params", params)
 
         # run the original code
@@ -112,7 +111,7 @@ def _inner_end(*args: P.args, **kwargs: P.kwargs) -> T:
         span = instance.connection._sentry_span  # type: ignore[attr-defined]
 
         if span is not None:
-            if res is not None and _should_send_default_pii():
+            if res is not None and should_send_default_pii():
                 span.set_data("db.result", res)
 
             with capture_internal_exceptions():
@@ -135,7 +134,7 @@ def _inner_send_data(*args: P.args, **kwargs: P.kwargs) -> T:
 
         _set_db_data(span, instance.connection)
 
-        if _should_send_default_pii():
+        if should_send_default_pii():
             db_params = span._data.get("db.params", [])
             db_params.extend(data)
             span.set_data("db.params", db_params)

sentry_sdk/integrations/pymongo.py

@@ -1,9 +1,9 @@
 import copy
 
-from sentry_sdk import Hub
+import sentry_sdk
 from sentry_sdk.consts import SPANDATA
-from sentry_sdk.hub import _should_send_default_pii
 from sentry_sdk.integrations import DidNotEnable, Integration
+from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.tracing import Span
 from sentry_sdk.utils import capture_internal_exceptions
 
@@ -116,9 +116,9 @@ def _operation_key(self, event):
 
     def started(self, event):
         # type: (CommandStartedEvent) -> None
-        hub = Hub.current
-        if hub.get_integration(PyMongoIntegration) is None:
+        if sentry_sdk.get_client().get_integration(PyMongoIntegration) is None:
             return
+
         with capture_internal_exceptions():
             command = dict(copy.deepcopy(event.command))
 
@@ -152,11 +152,11 @@ def started(self, event):
             except KeyError:
                 pass
 
-            if not _should_send_default_pii():
+            if not should_send_default_pii():
                 command = _strip_pii(command)
 
             query = "{} {}".format(event.command_name, command)
-            span = hub.start_span(op=op, description=query)
+            span = sentry_sdk.start_span(op=op, description=query)
 
             for tag, value in tags.items():
                 span.set_tag(tag, value)
@@ -165,14 +165,15 @@ def started(self, event):
                 span.set_data(key, value)
 
             with capture_internal_exceptions():
-                hub.add_breadcrumb(message=query, category="query", type=op, data=tags)
+                sentry_sdk.add_breadcrumb(
+                    message=query, category="query", type=op, data=tags
+                )
 
             self._ongoing_operations[self._operation_key(event)] = span.__enter__()
 
     def failed(self, event):
         # type: (CommandFailedEvent) -> None
-        hub = Hub.current
-        if hub.get_integration(PyMongoIntegration) is None:
+        if sentry_sdk.get_client().get_integration(PyMongoIntegration) is None:
             return
 
         try:
@@ -184,8 +185,7 @@ def failed(self, event):
 
     def succeeded(self, event):
         # type: (CommandSucceededEvent) -> None
-        hub = Hub.current
-        if hub.get_integration(PyMongoIntegration) is None:
+        if sentry_sdk.get_client().get_integration(PyMongoIntegration) is None:
             return
 
         try: