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(ssi): do not include boto3 in min versions listing #12305

Merged
merged 15 commits into from
Feb 14, 2025

Conversation

emmettbutler
Copy link
Collaborator

@emmettbutler emmettbutler commented Feb 12, 2025

This change removes boto3 from the minimum versions list to avoid blocking SSI on boto3 version.

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

@emmettbutler emmettbutler requested a review from a team as a code owner February 12, 2025 16:10
Copy link
Contributor

github-actions bot commented Feb 12, 2025

CODEOWNERS have been resolved as:

releasenotes/notes/boto3-min-d282e4795f1f1631.yaml                      @DataDog/apm-python
lib-injection/sources/min_compatible_versions.csv                       @DataDog/apm-core-python
min_compatible_versions.csv                                             @DataDog/apm-core-python
scripts/min_compatible_versions.py                                      @DataDog/apm-core-python

@emmettbutler emmettbutler requested a review from a team as a code owner February 12, 2025 16:12
@emmettbutler emmettbutler requested review from ZStriker19 and brettlangdon and removed request for a team February 12, 2025 16:12
@pr-commenter
Copy link

pr-commenter bot commented Feb 12, 2025

Benchmarks

Benchmark execution time: 2025-02-14 14:54:18

Comparing candidate commit a7c25e5 in PR branch emmett.butler/boto3-ignore with baseline commit 05c9824 in branch main.

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

@emmettbutler emmettbutler enabled auto-merge (squash) February 12, 2025 19:43
@datadog-dd-trace-py-rkomorn
Copy link

datadog-dd-trace-py-rkomorn bot commented Feb 13, 2025

Datadog Report

Branch report: emmett.butler/boto3-ignore
Commit report: 2dc0d89
Test service: dd-trace-py

✅ 0 Failed, 130 Passed, 1184 Skipped, 3m 22.64s Total duration (25m 38.5s time saved)

@emmettbutler emmettbutler merged commit a87b4f7 into main Feb 14, 2025
262 of 264 checks passed
@emmettbutler emmettbutler deleted the emmett.butler/boto3-ignore branch February 14, 2025 14:55
Copy link
Contributor

The backport to 2.21 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.21 2.21
# Navigate to the new working tree
cd .worktrees/backport-2.21
# Create a new branch
git switch --create backport-12305-to-2.21
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a87b4f7c30e73966f598d73163d0fdf9ed9ff69f
# Push it to GitHub
git push --set-upstream origin backport-12305-to-2.21
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.21

Then, create a pull request where the base branch is 2.21 and the compare/head branch is backport-12305-to-2.21.

emmettbutler added a commit that referenced this pull request Feb 14, 2025
This change removes boto3 from the minimum versions list to avoid
blocking SSI on boto3 version.

- [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 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: erikayasuda <[email protected]>
(cherry picked from commit a87b4f7)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants