move more stuff to client

Author: sentrivana

sentry_sdk/_metrics.py

@@ -21,7 +21,6 @@ def _capture_metric(
     attributes=None,  # type: Optional[dict[str, Any]]
 ):
     # type: (...) -> None
-
     client = sentry_sdk.get_client()
 
     attrs = {}  # type: dict[str, Union[str, bool, float, int]]
@@ -38,25 +37,10 @@ def _capture_metric(
                 else safe_repr(v)
             )
 
-    span = sentry_sdk.get_current_span()
-    trace_id = "00000000-0000-0000-0000-000000000000"
-    span_id = None
-
-    if span:
-        trace_context = span.get_trace_context()
-        trace_id = trace_context.get("trace_id", trace_id)
-        span_id = trace_context.get("span_id")
-    else:
-        scope = sentry_sdk.get_current_scope()
-        if scope:
-            propagation_context = scope._propagation_context
-            if propagation_context:
-                trace_id = propagation_context.trace_id or trace_id
-
     metric = {
         "timestamp": time.time(),
-        "trace_id": trace_id,
-        "span_id": span_id,
+        "trace_id": None,
+        "span_id": None,
         "name": name,
         "type": metric_type,
         "value": float(value),

sentry_sdk/_types.py

@@ -248,7 +248,7 @@ class SDKInfo(TypedDict):
         "Metric",
         {
             "timestamp": float,
-            "trace_id": str,
+            "trace_id": Optional[str],
             "span_id": Optional[str],
             "name": str,
             "type": MetricType,

sentry_sdk/client.py

@@ -976,6 +976,17 @@ def _capture_metric(self, metric):
         if release is not None and "sentry.release" not in metric["attributes"]:
             metric["attributes"]["sentry.release"] = release
 
+        span = sentry_sdk.get_current_span()
+        trace_id = "00000000-0000-0000-0000-000000000000"
+
+        if span:
+            metric["trace_id"] = span.trace_id or trace_id
+            metric["span_id"] = span.span_id or None
+        else:
+            propagation_context = isolation_scope.get_active_propagation_context()
+            if propagation_context:
+                metric["trace_id"] = propagation_context.trace_id or trace_id
+
         if isolation_scope._user is not None:
             for metric_attribute, user_attribute in (
                 ("user.id", "id"),