Skip to content

fix: generator wrapping with Python 3.10 [backport 3.9] #13841

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

Merged
merged 1 commit into from
Jul 3, 2025

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jul 1, 2025

Backport 5d10180 from #13835 to 3.9.

We fix an issue with generator wrapping with Python 3.10 that could have caused an exception to be raised after the generator had been used and exhausted.

Testing Strategy

The issue has been caught by the exploration tests.

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

@github-actions github-actions bot added the Dynamic Instrumentation Dynamic Instrumentation/Live Debugger label Jul 1, 2025
@github-actions github-actions bot requested review from a team as code owners July 1, 2025 13:44
@P403n1x87 P403n1x87 closed this Jul 1, 2025
@P403n1x87 P403n1x87 reopened this Jul 1, 2025
@P403n1x87 P403n1x87 enabled auto-merge (squash) July 1, 2025 13:45
Copy link
Contributor Author

github-actions bot commented Jul 1, 2025

CODEOWNERS have been resolved as:

releasenotes/notes/fix-generator-wrapping-86af0ae55ba2723a.yaml         @DataDog/apm-python
ddtrace/internal/wrapping/context.py                                    @DataDog/apm-core-python

Copy link
Contributor Author

github-actions bot commented Jul 1, 2025

Bootstrap import analysis

Comparison of import times between this PR and base.

Summary

The average import time from this PR is: 278 ± 4 ms.

The average import time from base is: 281 ± 4 ms.

The import time difference between this PR and base is: -2.6 ± 0.2 ms.

Import time breakdown

The following import paths have shrunk:

ddtrace.auto 2.045 ms (0.74%)
ddtrace.bootstrap.sitecustomize 1.363 ms (0.49%)
ddtrace.bootstrap.preload 1.363 ms (0.49%)
ddtrace.internal.remoteconfig.client 0.646 ms (0.23%)
ddtrace 0.681 ms (0.24%)
ddtrace.internal._unpatched 0.031 ms (0.01%)
json 0.031 ms (0.01%)
json.decoder 0.031 ms (0.01%)
re 0.031 ms (0.01%)
enum 0.031 ms (0.01%)
types 0.031 ms (0.01%)

@pr-commenter
Copy link

pr-commenter bot commented Jul 1, 2025

Benchmarks

Benchmark execution time: 2025-07-03 14:19:11

Comparing candidate commit 1a75d0a in PR branch backport-13835-to-3.9 with baseline commit b712298 in branch 3.9.

Found 1 performance improvements and 0 performance regressions! Performance is the same for 556 metrics, 5 unstable metrics.

scenario:iastdjangostartup-appsec

  • 🟩 execution_time [-1.442s; -1.315s] or [-66.974%; -61.065%]

@brettlangdon brettlangdon force-pushed the backport-13835-to-3.9 branch from 9472e87 to 3ee203a Compare July 3, 2025 13:24
@brettlangdon brettlangdon requested review from a team as code owners July 3, 2025 13:24
We fix an issue with generator wrapping with Python 3.10 that could have
caused an exception to be raised after the generator had been used and
exhausted.

The issue has been caught by the exploration tests.

- [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))

- [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)
@P403n1x87 P403n1x87 merged commit 5f36c1c into 3.9 Jul 3, 2025
795 checks passed
@P403n1x87 P403n1x87 deleted the backport-13835-to-3.9 branch July 3, 2025 14:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Dynamic Instrumentation Dynamic Instrumentation/Live Debugger
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants