review feedback

Author: colin-sentry

sentry_sdk/client.py

@@ -886,7 +886,9 @@ def _capture_experimental_log(self, scope, log):
 
         propagation_context = scope.get_active_propagation_context()
         if propagation_context is not None:
-            headers["trace_id"] = propagation_context.trace_id
+            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/integrations/logging.py

@@ -63,14 +63,21 @@ def ignore_logger(
 class LoggingIntegration(Integration):
     identifier = "logging"
 
-    def __init__(self, level=DEFAULT_LEVEL, event_level=DEFAULT_EVENT_LEVEL):
+    def __init__(
+        self,
+        level=DEFAULT_LEVEL,
+        sentry_logs_level=DEFAULT_LEVEL,
+        event_level=DEFAULT_EVENT_LEVEL,
+    ):
         # type: (Optional[int], Optional[int]) -> None
         self._handler = None
         self._breadcrumb_handler = None
         self._sentry_logs_handler = None
 
         if level is not None:
             self._breadcrumb_handler = BreadcrumbHandler(level=level)
+
+        if sentry_logs_level is not None:
             self._sentry_logs_handler = SentryLogsHandler(level=level)
 
         if event_level is not None: