test

Author: VianneyRuhlmann

ddtrace/_trace/tracer.py

@@ -204,7 +204,8 @@ def sample(self, span):
 
     def _sample_before_fork(self) -> None:
         if isinstance(self._span_aggregator.writer, AgentWriterInterface):
-            self._span_aggregator.writer.before_fork()
+            pass
+            #self._span_aggregator.writer.before_fork()
         span = self.current_root_span()
         if span is not None and span.context.sampling_priority is None:
             self.sample(span)

ddtrace/internal/writer/writer.py

@@ -14,6 +14,7 @@
 from typing import TextIO
 
 from ddtrace import config
+from ddtrace.internal import forksafe
 from ddtrace.internal.dist_computing.utils import in_ray_job
 from ddtrace.internal.hostname import get_hostname
 import ddtrace.internal.native as native
@@ -786,6 +787,7 @@ def __init__(
         self._compute_stats_enabled = compute_stats_enabled
         self._response_cb = response_callback
         self._stats_opt_out = stats_opt_out
+        forksafe.register_before_fork(self.before_fork)
         self._exporter = self._create_exporter()
 
     def _create_exporter(self) -> native.TraceExporter:
@@ -933,7 +935,6 @@ def _set_keep_rate(self, trace):
     def _send_payload(self, payload: bytes, count: int, client: WriterClientBase):
         try:
             response_body = self._exporter.send(payload, count)
-            self._exporter.stop_worker()
         except native.RequestError as e:
             try:
                 # Request errors are formatted as "Error code: {code}, Response: {response}"
@@ -1065,6 +1066,7 @@ def _stop_service(
     ) -> None:
         # FIXME: don't join() on stop(), let the caller handle this
         super(NativeWriter, self)._stop_service()
+        self.before_fork()
         self.join(timeout=timeout)
 
     def before_fork(self) -> None:
@@ -1074,6 +1076,7 @@ def on_shutdown(self):
         try:
             self.periodic()
         finally:
+            forksafe.unregister_before_fork(self.before_fork)
             self._exporter.shutdown(3_000_000_000)  # 3 seconds timeout