fix(tracer): improve error handling for subprocess instrumentation #13625
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
avara1986
changed the title
avara1986
changed the title
avara1986
changed the title
Bootstrap import analysisComparison of import times between this PR and base. SummaryThe average import time from this PR is: 282 ± 5 ms. The average import time from base is: 292 ± 3 ms. The import time difference between this PR and base is: -9.9 ± 0.2 ms. Import time breakdownThe following import paths have shrunk:
|
BenchmarksBenchmark execution time: 2025-06-11 19:57:18 Comparing candidate commit bb89b2d in PR branch Found 0 performance improvements and 2 performance regressions! Performance is the same for 564 metrics, 6 unstable metrics. scenario:iastaspectsospath-ospathjoin_aspect
scenario:iastaspectsospath-ospathnormcase_aspect
|
![datadog-datadog-prod-us1[bot]](https://avatars.githubusercontent.com/u/365230?s=60&v=4){kind=small}
avara1986
requested review from
RamyElkest,
florentinl and
christophe-papazian
and removed request for
gnufede
gnufede
reviewed
Jun 11, 2025
RamyElkest
approved these changes
Jun 11, 2025
brettlangdon
approved these changes
Jun 11, 2025
github-actions bot
pushed a commit
that referenced
this pull request
Jun 18, 2025
…13625) This PR improves error handling for subprocess instrumentation. This PR fixes #13208 **Restructured error handling**: Moved subprocess calls outside of try-except blocks so legitimate errors are properly propagated: ```python # After (CORRECT - preserves errors) @trace_utils.with_traced_module def _traced_subprocess_init(module, pin, wrapped, instance, args, kwargs): if not should_instrument: return wrapped(*args, **kwargs) try: # Only tracing logic in try-catch, not the subprocess call # ... instrumentation code ... except Exception: log.debug("Could not trace subprocess execution", exc_info=True) return wrapped(*args, **kwargs) # ← Always called, errors propagate correctly ``` - **Insufficient error handling tests**: Limited coverage of error conditions across different subprocess and os functions - **Parameterized tests** across different configuration scenarios: - ASM enabled/disabled combinations - IAST enabled/disabled combinations - WAF bypass configurations ## 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 - [x] 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) (cherry picked from commit cb08856)
2 tasks
avara1986
added a commit
that referenced
this pull request
Jun 18, 2025
…ackport 3.9] (#13702) Backport cb08856 from #13625 to 3.9. This PR improves error handling for subprocess instrumentation. This PR fixes #13208 **Restructured error handling**: Moved subprocess calls outside of try-except blocks so legitimate errors are properly propagated: ```python # After (CORRECT - preserves errors) @trace_utils.with_traced_module def _traced_subprocess_init(module, pin, wrapped, instance, args, kwargs): if not should_instrument: return wrapped(*args, **kwargs) try: # Only tracing logic in try-catch, not the subprocess call # ... instrumentation code ... except Exception: log.debug("Could not trace subprocess execution", exc_info=True) return wrapped(*args, **kwargs) # ← Always called, errors propagate correctly ``` - **Insufficient error handling tests**: Limited coverage of error conditions across different subprocess and os functions - **Parameterized tests** across different configuration scenarios: - ASM enabled/disabled combinations - IAST enabled/disabled combinations - WAF bypass configurations ## 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 - [x] 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) --------- Co-authored-by: Alberto Vara <alberto.vara@datadoghq.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR improves error handling for subprocess instrumentation. This PR fixes #13208
Restructured error handling: Moved subprocess calls outside of try-except blocks so legitimate errors are properly propagated:
Checklist
Reviewer Checklist