Skip to content

Add default timeout for join #18895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
VianneyRuhlmann wants to merge 2 commits into from
Closed

Add default timeout for join #18895

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb1c13e
Add default timeout for join
VianneyRuhlmann Jul 7, 2026
649b2d5
catch error
VianneyRuhlmann Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ddtrace/internal/writer/writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading