move thread id/name into trace context

Zylphrex · Zylphrex · commit ed66f590aed8 · 2024-06-06T14:26:16.000-04:00
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
@@ -109,10 +109,7 @@ class TransactionKwargs(SpanKwargs, total=False):
         "ProfileContext",
         {
             "profiler.id": str,
-            "thread.id": str,
-            "thread.name": str,
         },
-        total=False,
     )
 
 
@@ -661,6 +658,19 @@ def get_trace_context(self):
                 self.containing_transaction.get_baggage().dynamic_sampling_context()
             )
 
+        data = {}
+
+        thread_id = self._data.get(SPANDATA.THREAD_ID)
+        if thread_id is not None:
+            data["thread.id"] = thread_id
+
+        thread_name = self._data.get(SPANDATA.THREAD_NAME)
+        if thread_name is not None:
+            data["thread.name"] = thread_name
+
+        if data:
+            rv["data"] = data
+
         return rv
 
     def get_profile_context(self):
@@ -669,19 +679,9 @@ def get_profile_context(self):
         if profiler_id is None:
             return None
 
-        rv = {
+        return {
             "profiler.id": profiler_id,
-        }  # type: ProfileContext
-
-        thread_id = self._data.get(SPANDATA.THREAD_ID)
-        if thread_id is not None:
-            rv["thread.id"] = thread_id
-
-        thread_name = self._data.get(SPANDATA.THREAD_NAME)
-        if thread_name is not None:
-            rv["thread.name"] = thread_name
-
-        return rv
+        }
 
 
 class Transaction(Span):
diff --git a/tests/profiler/test_continuous_profiler.py b/tests/profiler/test_continuous_profiler.py
@@ -86,15 +86,21 @@ def assert_single_transaction_with_profile_chunks(envelopes, thread):
     assert len(items["profile_chunk"]) > 0
 
     transaction = items["transaction"][0].payload.json
+    trace_context = transaction["contexts"]["trace"]
+    assert trace_context["data"] == ApproxDict(
+        {
+            "thread.id": str(thread.ident),
+            "thread.name": thread.name,
+        }
+    )
+
     profile_context = transaction["contexts"]["profile"]
 
     profiler_id = profile_context["profiler.id"]
 
     assert profile_context == ApproxDict(
         {
             "profiler.id": profiler_id,
-            "thread.id": str(thread.ident),
-            "thread.name": thread.name,
         }
     )
 
