rename, fix

Author: sentrivana

sentry_sdk/_log_batcher.py

@@ -4,7 +4,7 @@
 from datetime import datetime, timezone
 from typing import Optional, List, Callable, TYPE_CHECKING, Any
 
-from sentry_sdk.utils import format_attribute, format_timestamp, safe_repr
+from sentry_sdk.utils import format_timestamp, safe_repr, serialize_attribute
 from sentry_sdk.envelope import Envelope, Item, PayloadRef
 
 if TYPE_CHECKING:
@@ -127,7 +127,7 @@ def _log_to_transport_format(log: "Log") -> "Any":
             "level": str(log["severity_text"]),
             "body": str(log["body"]),
             "attributes": {
-                k: format_attribute(v) for (k, v) in log["attributes"].items()
+                k: serialize_attribute(v) for (k, v) in log["attributes"].items()
             },
         }
 

sentry_sdk/_metrics_batcher.py

@@ -4,7 +4,7 @@
 from datetime import datetime, timezone
 from typing import Optional, List, Callable, TYPE_CHECKING, Any, Union
 
-from sentry_sdk.utils import format_attribute, format_timestamp, safe_repr
+from sentry_sdk.utils import format_timestamp, safe_repr, serialize_attribute
 from sentry_sdk.envelope import Envelope, Item, PayloadRef
 
 if TYPE_CHECKING:
@@ -103,7 +103,7 @@ def _metric_to_transport_format(metric: "Metric") -> "Any":
             "type": metric["type"],
             "value": metric["value"],
             "attributes": {
-                k: format_attribute(v) for (k, v) in metric["attributes"].items()
+                k: serialize_attribute(v) for (k, v) in metric["attributes"].items()
             },
         }
 

sentry_sdk/scope.py

@@ -1625,11 +1625,11 @@ def apply_to_telemetry(self, telemetry: "Union[Log, Metric]") -> None:
         options = self.get_client().options
 
         trace_context = self.get_trace_context()
-        trace_id = trace_context.get("span_id")
-        span_id = trace_context.get("span_id")
+        trace_id = trace_context.get("trace_id")
         if telemetry.get("trace_id") is None:
-            telemetry["trace_id"] = trace_id
-        if telemetry.get("span_id") is None:
+            telemetry["trace_id"] = trace_id or "00000000-0000-0000-0000-000000000000"
+        span_id = trace_context.get("span_id")
+        if telemetry.get("span_id") is None and span_id:
             telemetry["span_id"] = span_id
 
         self._apply_global_attributes_to_telemetry(telemetry, options)

sentry_sdk/utils.py

@@ -2047,7 +2047,7 @@ def get_before_send_metric(
     )
 
 
-def format_attribute(val: "AttributeValue") -> "SerializedAttributeValue":
+def serialize_attribute(val: "AttributeValue") -> "SerializedAttributeValue":
     if isinstance(val, bool):
         return {"value": val, "type": "boolean"}
     if isinstance(val, int):