move compat funcs to utils, no circ imports that way

Author: sentrivana

sentry_sdk/client.py

@@ -23,6 +23,8 @@
     handle_in_app,
     is_gevent,
     logger,
+    get_before_send_log,
+    has_logs_enabled,
 )
 from sentry_sdk.serializer import serialize
 from sentry_sdk.tracing import trace
@@ -383,8 +385,6 @@ def _capture_envelope(envelope):
 
             self.log_batcher = None
 
-            from sentry_sdk.logger import has_logs_enabled
-
             if has_logs_enabled(self.options):
                 from sentry_sdk._log_batcher import LogBatcher
 
@@ -902,8 +902,6 @@ def capture_event(
 
     def _capture_experimental_log(self, log):
         # type: (Optional[Log]) -> None
-        from sentry_sdk.logger import get_before_send_log, has_logs_enabled
-
         if not has_logs_enabled(self.options) or log is None:
             return
 

sentry_sdk/integrations/logging.py

@@ -5,13 +5,14 @@
 
 import sentry_sdk
 from sentry_sdk.client import BaseClient
-from sentry_sdk.logger import _log_level_to_otel, has_logs_enabled
+from sentry_sdk.logger import _log_level_to_otel
 from sentry_sdk.utils import (
     safe_repr,
     to_string,
     event_from_exception,
     current_stacktrace,
     capture_internal_exceptions,
+    has_logs_enabled,
 )
 from sentry_sdk.integrations import Integration
 

sentry_sdk/integrations/loguru.py

@@ -7,7 +7,8 @@
     EventHandler,
     _BaseHandler,
 )
-from sentry_sdk.logger import _log_level_to_otel, has_logs_enabled
+from sentry_sdk.logger import _log_level_to_otel
+from sentry_sdk.utils import has_logs_enabled
 
 from typing import TYPE_CHECKING
 

sentry_sdk/logger.py

@@ -1,11 +1,10 @@
 # NOTE: this is the logger sentry exposes to users, not some generic logger.
 import functools
 import time
-from typing import Any, Callable, Optional
+from typing import Any
 
 from sentry_sdk import get_client
 from sentry_sdk.utils import safe_repr
-from sentry_sdk.types import Log, Hint
 
 OTEL_RANGES = [
     # ((severity level range), severity text)
@@ -82,24 +81,3 @@ def _log_level_to_otel(level, mapping):
             return otel_severity_number, _otel_severity_text(otel_severity_number)
 
     return 0, "default"
-
-
-def has_logs_enabled(options):
-    # type: (Optional[dict[str, Any]]) -> bool
-    if options is None:
-        return False
-
-    return bool(
-        options.get("enable_logs", False)
-        or options["_experiments"].get("enable_logs", False)
-    )
-
-
-def get_before_send_log(options):
-    # type: (Optional[dict[str, Any]]) -> Optional[Callable[[Log, Hint], Optional[Log]]]
-    if options is None:
-        return None
-
-    return options.get("before_send_log") or options["_experiments"].get(
-        "before_send_log"
-    )

sentry_sdk/utils.py

@@ -59,7 +59,7 @@
 
     from gevent.hub import Hub
 
-    from sentry_sdk._types import Event, ExcInfo
+    from sentry_sdk._types import Event, ExcInfo, Log, Hint
 
     P = ParamSpec("P")
     R = TypeVar("R")
@@ -1984,3 +1984,24 @@ def serialize_item(item):
         return json.dumps(serialized, default=str)
     except Exception:
         return str(data)
+
+
+def has_logs_enabled(options):
+    # type: (Optional[dict[str, Any]]) -> bool
+    if options is None:
+        return False
+
+    return bool(
+        options.get("enable_logs", False)
+        or options["_experiments"].get("enable_logs", False)
+    )
+
+
+def get_before_send_log(options):
+    # type: (Optional[dict[str, Any]]) -> Optional[Callable[[Log, Hint], Optional[Log]]]
+    if options is None:
+        return None
+
+    return options.get("before_send_log") or options["_experiments"].get(
+        "before_send_log"
+    )