diff --git a/ddtrace/internal/writer/writer.py b/ddtrace/internal/writer/writer.py index c0b879ebb2f..8f8fa4596a2 100644 --- a/ddtrace/internal/writer/writer.py +++ b/ddtrace/internal/writer/writer.py @@ -503,11 +503,14 @@ def periodic(self): def _stop_service( self, - timeout: Optional[float] = None, + timeout: Optional[float] = 0.1, ) -> None: # FIXME: don't join() on stop(), let the caller handle this super(HTTPWriter, self)._stop_service() - self.join(timeout=timeout) + try: + self.join(timeout=timeout) + except: + log.error("Join on periodic thread failed", exc_info=True) def on_shutdown(self): try: