circular import, etc

Author: colin-sentry

sentry_sdk/_types.py

@@ -239,6 +239,7 @@ class SDKInfo(TypedDict):
         "metric_bucket",
         "monitor",
         "span",
+        "log",
     ]
     SessionStatus = Literal["ok", "exited", "crashed", "abnormal"]
 

sentry_sdk/client.py

@@ -10,7 +10,6 @@
 from typing import TYPE_CHECKING, List, Dict, cast, overload
 import warnings
 
-from sentry_sdk import get_current_scope
 from sentry_sdk._compat import PY37, check_uwsgi_thread_support
 from sentry_sdk.utils import (
     AnnotatedValue,
@@ -209,8 +208,8 @@ def capture_event(self, *args, **kwargs):
         # type: (*Any, **Any) -> Optional[str]
         return None
 
-    def capture_log(self, severity_text, severity_number, template, **kwargs):
-        # type: (str, int, str, **Any) -> None
+    def capture_log(self, scope, severity_text, severity_number, template, **kwargs):
+        # type: (Scope, str, int, str, **Any) -> None
         pass
 
     def capture_session(self, *args, **kwargs):
@@ -854,8 +853,8 @@ def capture_event(
 
         return return_value
 
-    def capture_log(self, severity_text, severity_number, template, **kwargs):
-        # type: (str, int, str, **Any) -> None
+    def capture_log(self, scope, severity_text, severity_number, template, **kwargs):
+        # type: (Scope, str, int, str, **Any) -> None
         if not self.options.get("enable_sentry_logs", False):
             return
 
@@ -894,7 +893,7 @@ def format_attribute(key: str, val: int | float | str | bool):
             "time_unix_nano": time.time_ns(),
         }
 
-        if (ctx := get_current_scope().get_active_propagation_context()) is not None:
+        if (ctx := scope.get_active_propagation_context()) is not None:
             headers["trace_id"] = ctx.trace_id
             log["trace_id"] = ctx.trace_id
         envelope = Envelope(headers=headers)

sentry_sdk/envelope.py

@@ -274,6 +274,8 @@ def data_category(self):
             return "transaction"
         elif ty == "event":
             return "error"
+        elif ty == "otel_log":
+            return "log"
         elif ty == "client_report":
             return "internal"
         elif ty == "profile":

sentry_sdk/logger.py

@@ -2,13 +2,14 @@
 import functools
 from typing import Any, Optional
 
-from sentry_sdk import get_client
+from sentry_sdk import get_client, get_current_scope
 
 
 def capture_log(severity_text, severity_number, template, **kwargs):
     # type: (str, int, str, **Any) -> Optional[str]
     client = get_client()
-    return client.capture_log(severity_text, severity_number, template, **kwargs)
+    scope = get_current_scope()
+    return client.capture_log(scope, severity_text, severity_number, template, **kwargs)
 
 
 trace = functools.partial(capture_log, "trace", 1)