fixes

Author: sentrivana

sentry_sdk/traces.py

@@ -21,7 +21,6 @@
     try_autostart_continuous_profiler,
     try_profile_lifecycle_trace_start,
 )
-from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.tracing_utils import Baggage
 from sentry_sdk.utils import (
     capture_internal_exceptions,
@@ -557,6 +556,8 @@ def _start_profile(self) -> None:
         self._continuous_profile = try_profile_lifecycle_trace_start()
 
     def _set_segment_attributes(self) -> None:
+        from sentry_sdk.scope import should_send_default_pii
+
         if not self._is_segment():
             return
 

tests/tracing/test_span_streaming.py

@@ -1504,11 +1504,13 @@ def test_profile_stops_when_segment_ends(
     assert get_profiler_id() is None, "profiler should have stopped"
 
 
-def test_default_attributes(sentry_init, capture_envelopes):
+@pytest.mark.parametrize("send_default_pii", [True, False])
+def test_default_attributes(sentry_init, capture_envelopes, send_default_pii):
     sentry_init(
         server_name="test-server",
         release="1.0.0",
         traces_sample_rate=1.0,
+        send_default_pii=send_default_pii,
         _experiments={"trace_lifecycle": "stream"},
     )
 
@@ -1529,10 +1531,10 @@ def test_default_attributes(sentry_init, capture_envelopes):
         "item_count": 1,
         "content_type": "application/vnd.sentry.items.span.v2+json",
     }
-    assert item.payload.json["items"][0]["attributes"] == {
+
+    expected_attributes = {
         "thread.id": {"value": mock.ANY, "type": "string"},
         "thread.name": {"value": "MainThread", "type": "string"},
-        "process.command_args": {"value": mock.ANY, "type": "array"},
         "sentry.segment.id": {"value": mock.ANY, "type": "string"},
         "sentry.segment.name": {"value": "test", "type": "string"},
         "sentry.sdk.name": {"value": "sentry.python", "type": "string"},
@@ -1542,6 +1544,12 @@ def test_default_attributes(sentry_init, capture_envelopes):
         "sentry.release": {"value": "1.0.0", "type": "string"},
         "sentry.origin": {"value": "manual", "type": "string"},
     }
+    if send_default_pii is True:
+        expected_attributes |= {
+            "process.command_args": {"value": mock.ANY, "type": "array"}
+        }
+
+    assert item.payload.json["items"][0]["attributes"] == expected_attributes
 
 
 def test_transport_format(sentry_init, capture_envelopes):