fix(logs): Set span_id instead of sentry.trace.parent_span_id

Author: sentrivana

sentry_sdk/client.py

@@ -927,11 +927,8 @@ def _capture_log(self, log: "Optional[Log]") -> None:
         if trace_id is not None and log.get("trace_id") is None:
             log["trace_id"] = trace_id
 
-        if (
-            span_id is not None
-            and "sentry.trace.parent_span_id" not in log["attributes"]
-        ):
-            log["attributes"]["sentry.trace.parent_span_id"] = span_id
+        if span_id is not None and not log.get("span_id"):
+            log["attributes"]["span_id"] = span_id
 
         # The user, if present, is always set on the isolation scope.
         if isolation_scope._user is not None:

tests/integrations/logging/test_logging.py

@@ -438,6 +438,9 @@ def test_logger_with_all_attributes(sentry_init, capture_envelopes):
 
     logs = envelopes_to_logs(envelopes)
 
+    assert "span_id" in logs[0]
+    assert isinstance(logs[0]["span_id"], str)
+
     attributes = logs[0]["attributes"]
 
     assert "process.pid" in attributes
@@ -478,10 +481,6 @@ def test_logger_with_all_attributes(sentry_init, capture_envelopes):
 
     assert attributes.pop("sentry.sdk.name").startswith("sentry.python")
 
-    assert "sentry.trace.parent_span_id" in attributes
-    assert isinstance(attributes["sentry.trace.parent_span_id"], str)
-    del attributes["sentry.trace.parent_span_id"]
-
     # Assert on the remaining non-dynamic attributes.
     assert attributes == {
         "foo": "bar",

tests/integrations/loguru/test_loguru.py

@@ -420,6 +420,9 @@ def test_logger_with_all_attributes(
 
     attributes = logs[0]["attributes"]
 
+    assert "span_id" in logs[0]
+    assert isinstance(logs[0]["span_id"], str)
+
     assert "process.pid" in attributes
     assert isinstance(attributes["process.pid"], int)
     del attributes["process.pid"]
@@ -458,10 +461,6 @@ def test_logger_with_all_attributes(
 
     assert attributes.pop("sentry.sdk.name").startswith("sentry.python")
 
-    assert "sentry.trace.parent_span_id" in attributes
-    assert isinstance(attributes["sentry.trace.parent_span_id"], str)
-    del attributes["sentry.trace.parent_span_id"]
-
     # Assert on the remaining non-dynamic attributes.
     assert attributes == {
         "logger.name": "tests.integrations.loguru.test_loguru",

tests/test_logs.py

@@ -319,7 +319,9 @@ def test_logs_tied_to_transactions(sentry_init, capture_envelopes):
 
     get_client().flush()
     logs = envelopes_to_logs(envelopes)
-    assert logs[0]["attributes"]["sentry.trace.parent_span_id"] == trx.span_id
+
+    assert "span_id" in logs[0]
+    assert logs[0]["span_id"] == trx.span_id
 
 
 @minimum_python_37
@@ -336,7 +338,7 @@ def test_logs_tied_to_spans(sentry_init, capture_envelopes):
 
     get_client().flush()
     logs = envelopes_to_logs(envelopes)
-    assert logs[0]["attributes"]["sentry.trace.parent_span_id"] == span.span_id
+    assert logs[0]["span_id"] == span.span_id
 
 
 def test_auto_flush_logs_after_100(sentry_init, capture_envelopes):
@@ -491,6 +493,7 @@ def record_lost_event(reason, data_category=None, item=None, *, quantity=1):
                     "level": "info",
                     "timestamp": mock.ANY,
                     "trace_id": mock.ANY,
+                    "span_id": mock.ANY,
                     "attributes": {
                         "sentry.environment": {
                             "type": "string",
@@ -516,10 +519,6 @@ def record_lost_event(reason, data_category=None, item=None, *, quantity=1):
                             "type": "string",
                             "value": "info",
                         },
-                        "sentry.trace.parent_span_id": {
-                            "type": "string",
-                            "value": mock.ANY,
-                        },
                         "server.address": {
                             "type": "string",
                             "value": "test-server",