Skip to content
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

fix: pin importlib to 6.5.0 [backport 2.5] #8196

Merged
merged 2 commits into from Jan 29, 2024
Merged

Conversation

github-actions[bot]
Copy link

Backport c8d5e9f from #8075 to 2.5.

Description

Fixes #8068

Checklist

  • Change(s) are motivated and described in the PR description.
  • Testing strategy is described if automated tests are not included in the PR.
  • Risk is outlined (performance impact, potential for breakage, maintainability, etc).
  • Change is maintainable (easy to change, telemetry, documentation).
  • Library release note guidelines are followed. If no release note is required, add label changelog/no-changelog.
  • Documentation is included (in-code, generated user docs, public corp docs).
  • Backport labels are set (if applicable)

Reviewer Checklist

  • Title is accurate.
  • No unnecessary changes are introduced.
  • Description motivates each change.
  • Avoids breaking API changes unless absolutely necessary.
  • Testing strategy adequately addresses listed risk(s).
  • Change is maintainable (easy to change, telemetry, documentation).
  • Release note makes sense to a user of the library.
  • Reviewer has explicitly 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
  • If this PR touches code that signs or publishes builds or packages, or handles credentials of any kind, I've requested a review from @DataDog/security-design-and-guidance.
  • This PR doesn't touch any of that.

## Description

- Pin importlib to 6.5.0 to avoid issue
python/importlib_metadata#455
- Fix a potential unbound local error.

Fixes #8068

## Checklist

- [X] Change(s) are motivated and described in the PR description.
- [X] Testing strategy is described if automated tests are not included
in the PR.
- [X] Risk is outlined (performance impact, potential for breakage,
maintainability, etc).
- [X] Change is maintainable (easy to change, telemetry, documentation).
- [X] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed. If no release note is required, add label
`changelog/no-changelog`.
- [X] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/)).
- [X] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist

- [x] Title is accurate.
- [x] No unnecessary changes are introduced.
- [x] Description motivates each change.
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes unless absolutely necessary.
- [x] Testing strategy adequately addresses listed risk(s).
- [x] Change is maintainable (easy to change, telemetry, documentation).
- [x] Release note makes sense to a user of the library.
- [x] Reviewer has explicitly acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment.
- [x] 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)
- [x] If this PR touches code that signs or publishes builds or
packages, or handles credentials of any kind, I've requested a review
from `@DataDog/security-design-and-guidance`.
- [x] This PR doesn't touch any of that.

---------

Signed-off-by: Juanjo Alvarez <juanjo.alvarezmartinez@datadoghq.com>
Co-authored-by: Tahir H. Butt <tahir.butt@datadoghq.com>
Co-authored-by: Zachary Groves <32471391+ZStriker19@users.noreply.github.com>
(cherry picked from commit c8d5e9f)
@github-actions github-actions bot requested review from a team as code owners January 25, 2024 20:53
@github-actions github-actions bot added the ASM Application Security Monitoring label Jan 25, 2024
@ZStriker19 ZStriker19 enabled auto-merge (squash) January 25, 2024 21:55
@pr-commenter
Copy link

pr-commenter bot commented Jan 25, 2024

Benchmarks

Benchmark execution time: 2024-01-25 21:57:10

Comparing candidate commit 58bb0d3 in PR branch backport-8075-to-2.5 with baseline commit 64ba71c in branch 2.5.

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

@gnufede gnufede closed this Jan 29, 2024
auto-merge was automatically disabled January 29, 2024 10:14

Pull request was closed

@gnufede gnufede reopened this Jan 29, 2024
@gnufede gnufede enabled auto-merge (squash) January 29, 2024 10:15
@gnufede gnufede merged commit a55c4e7 into 2.5 Jan 29, 2024
141 checks passed
@gnufede gnufede deleted the backport-8075-to-2.5 branch January 29, 2024 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ASM Application Security Monitoring
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants