finish trace id logic

Author: colin-sentry

sentry_sdk/client.py

@@ -886,9 +886,6 @@ def _capture_experimental_log(self, scope, log):
 
         propagation_context = scope.get_active_propagation_context()
         if propagation_context is not None:
-            if propagation_context.dynamic_sampling_context is not None:
-                headers["trace"] = propagation_context.dynamic_sampling_context
-
             if log["trace_id"] is None:
                 log["trace_id"] = propagation_context.trace_id
 

sentry_sdk/scope.py

@@ -1047,10 +1047,12 @@ def start_transaction(
         }
         sampling_context.update(custom_sampling_context)
         transaction._set_initial_sampling_decision(sampling_context=sampling_context)
+        propagation_context = self.get_active_propagation_context()
 
+        if "trace_id" not in transaction_kwargs:
+            transaction.trace_id = propagation_context.trace_id
         # update the sample rate in the dsc
         if transaction.sample_rate is not None:
-            propagation_context = self.get_active_propagation_context()
             if propagation_context:
                 dsc = propagation_context.dynamic_sampling_context
                 if dsc is not None: