Skip to content

fix: add timeout handling for subprocess wait [backport 2.21] #13145

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.

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
wants to merge 6 commits into from

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Apr 9, 2025

Backport b518cfd from #12806 to 2.21.

After subprocess is opened, wait and kill if Timeout is exceeded to ensure zombie processes are killed.

Checklist

  • PR author has checked that all the criteria below are met
  • The PR description includes an overview of the change
  • The PR description articulates the motivation for the change
  • The change includes tests OR the PR description describes a testing strategy
  • The PR description notes risks associated with the change, if any
  • Newly-added code is easy to change
  • The change follows the library release note guidelines
  • The change includes or references documentation updates if necessary
  • Backport labels are set (if applicable)

Reviewer Checklist

  • Reviewer has checked that all the criteria below are met
  • Title is accurate
  • All changes are related to the pull request's stated goal
  • Avoids breaking API changes
  • Testing strategy adequately addresses listed risks
  • Newly-added code is easy to change
  • Release note makes sense to a user of the library
  • If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment
  • Backport labels are set in a manner that is consistent with the release branch maintenance policy

https://datadoghq.atlassian.net/browse/APMLP-313

After subprocess is opened, wait and kill if Timeout is exceeded to
ensure zombie processes are killed.

## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist
- [ ] Reviewer has checked that all the criteria below are met
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

https://datadoghq.atlassian.net/browse/APMLP-313

---------

Co-authored-by: brettlangdon <[email protected]>
Co-authored-by: Copilot <[email protected]>
(cherry picked from commit b518cfd)
@github-actions github-actions bot requested review from a team as code owners April 9, 2025 19:04
@brettlangdon brettlangdon reopened this Apr 9, 2025
Copy link
Contributor Author

github-actions bot commented Apr 9, 2025

CODEOWNERS have been resolved as:

releasenotes/notes/fix-lib-injection-zombie-dc16ca6c8bf50edb.yaml       @DataDog/apm-python
lib-injection/sources/sitecustomize.py                                  @DataDog/apm-core-python

@pr-commenter
Copy link

pr-commenter bot commented Apr 9, 2025

Benchmarks

Benchmark execution time: 2025-05-14 14:30:00

Comparing candidate commit 579e3f9 in PR branch backport-12806-to-2.21 with baseline commit 91b8f48 in branch 2.21.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 344 metrics, 2 unstable metrics.

@quinna-h quinna-h enabled auto-merge (squash) April 9, 2025 20:28
auto-merge was automatically disabled June 4, 2025 18:50

Pull request was closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants