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(setuptools_scm): backport setuptools_scm version scheme to guess-next-dev #8800

Merged
merged 1 commit into from
Mar 28, 2024

Conversation

tabgok
Copy link
Contributor

@tabgok tabgok commented Mar 28, 2024

Prior to this change, setuptools_scm reported the version for patch releases as the next minor release. Afterwards, versions are patch releases (as expected).

Checklist

  • Change(s) are motivated and described in the PR description
  • Testing strategy is described if automated tests are not included in the PR
  • Risks are described (performance impact, potential for breakage, maintainability)
  • Change is maintainable (easy to change, telemetry, documentation)
  • Library release note guidelines are followed or label changelog/no-changelog is set
  • Documentation is included (in-code, generated user docs, public corp docs)
  • Backport labels are set (if applicable)
  • If this PR changes the public interface, I've notified @DataDog/apm-tees.
  • If change 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.

Reviewer Checklist

  • Title is accurate
  • All changes are related to the pull request's stated goal
  • Description motivates each change
  • Avoids breaking API changes
  • Testing strategy adequately addresses listed risks
  • Change is maintainable (easy to change, telemetry, documentation)
  • Release note makes sense to a user of the library
  • 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

@tabgok tabgok changed the base branch from main to 2.7 March 28, 2024 11:20
@tabgok tabgok self-assigned this Mar 28, 2024
@tabgok tabgok marked this pull request as ready for review March 28, 2024 11:21
@tabgok tabgok requested review from a team as code owners March 28, 2024 11:21
@datadog-dd-trace-py-rkomorn
Copy link

datadog-dd-trace-py-rkomorn bot commented Mar 28, 2024

Datadog Report

Branch report: teague.bick/DSMS-16/2.7-guess-next-dev
Commit report: 70d98b2
Test service: dd-trace-py

✅ 0 Failed, 170929 Passed, 1008 Skipped, 12h 13m 20.38s Total duration (18m 6.35s time saved)

@tabgok tabgok changed the title Teague.bick/dsms 16/2.7 guess next dev chore(setuptools_scm): add comment explaining version scheme Mar 28, 2024
@tabgok tabgok changed the title chore(setuptools_scm): add comment explaining version scheme fix(setuptools_scm): backport setuptools_scm version scheme to guess-next-dev Mar 28, 2024
@pr-commenter
Copy link

pr-commenter bot commented Mar 28, 2024

Benchmarks

Benchmark execution time: 2024-03-28 12:22:41

Comparing candidate commit ce809cb in PR branch teague.bick/DSMS-16/2.7-guess-next-dev with baseline commit 1776fd0 in branch 2.7.

Found 4 performance improvements and 8 performance regressions! Performance is the same for 189 metrics, 9 unstable metrics.

scenario:flasksimple-appsec-telemetry

  • 🟥 execution_time [+233.179µs; +284.928µs] or [+3.693%; +4.513%]

scenario:flasksimple-tracer

  • 🟩 execution_time [-251.806µs; -203.460µs] or [-3.853%; -3.113%]

scenario:httppropagationextract-datadog_tracecontext_tracestate_not_propagated_on_trace_id_no_match

  • 🟩 max_rss_usage [-760.483KB; -546.551KB] or [-3.477%; -2.499%]

scenario:httppropagationextract-large_header_no_matches

  • 🟥 max_rss_usage [+671.023KB; +753.975KB] or [+3.173%; +3.566%]

scenario:httppropagationextract-medium_header_no_matches

  • 🟥 max_rss_usage [+699.046KB; +780.020KB] or [+3.312%; +3.696%]

scenario:httppropagationextract-wsgi_empty_headers

  • 🟥 max_rss_usage [+698.307KB; +776.253KB] or [+3.306%; +3.675%]

scenario:httppropagationextract-wsgi_invalid_span_id_header

  • 🟥 max_rss_usage [+449.851KB; +701.534KB] or [+2.129%; +3.320%]

scenario:httppropagationextract-wsgi_invalid_trace_id_header

  • 🟥 max_rss_usage [+730.392KB; +939.138KB] or [+3.487%; +4.483%]

scenario:httppropagationextract-wsgi_large_header_no_matches

  • 🟥 max_rss_usage [+541.480KB; +762.686KB] or [+2.550%; +3.592%]

scenario:sethttpmeta-no-collectipvariant

  • 🟩 max_rss_usage [-742.815KB; -530.632KB] or [-3.367%; -2.405%]

scenario:sethttpmeta-useragentvariant_exists_2

  • 🟩 max_rss_usage [-737.557KB; -468.715KB] or [-3.354%; -2.132%]

scenario:sethttpmeta-useragentvariant_not_exists_1

  • 🟥 max_rss_usage [+468.664KB; +738.427KB] or [+2.180%; +3.434%]

@tabgok tabgok enabled auto-merge (squash) March 28, 2024 15:09
@tabgok
Copy link
Contributor Author

tabgok commented Mar 28, 2024

/merge

@dd-devflow
Copy link

dd-devflow bot commented Mar 28, 2024

🚂 MergeQueue

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.

Use /merge -c to cancel this operation!

Prior to this change, setuptools_scm reported the version for patch releases as the next minor release. Afterwards, versions are patch releases (as expected).
@tabgok tabgok force-pushed the teague.bick/DSMS-16/2.7-guess-next-dev branch from ce809cb to 70d98b2 Compare March 28, 2024 15:53
@tabgok tabgok merged commit 1ffb660 into 2.7 Mar 28, 2024
153 checks passed
@tabgok tabgok deleted the teague.bick/DSMS-16/2.7-guess-next-dev branch March 28, 2024 16:27
@dd-devflow
Copy link

dd-devflow bot commented Mar 28, 2024

🚂 MergeQueue

This pull request was merged directly.

Copy link

The backport to 2.8 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.8 2.8
# Navigate to the new working tree
cd .worktrees/backport-2.8
# Create a new branch
git switch --create backport-8800-to-2.8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1ffb660728e5b338c2381db9764d46fa5d12e62b
# Push it to GitHub
git push --set-upstream origin backport-8800-to-2.8
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.8

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

gnufede pushed a commit that referenced this pull request Apr 12, 2024
…next-dev (#8800)

Prior to this change, setuptools_scm reported the version for patch
releases as the next minor release. Afterwards, versions are patch
releases (as expected).

- [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] Risks are described (performance impact, potential for breakage,
maintainability)
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed or label `changelog/no-changelog` is set
- [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))
- [x] If this PR changes the public interface, I've notified
`@DataDog/apm-tees`.
- [x] If change 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`.

- [ ] Title is accurate
- [ ] All changes are related to the pull request's stated goal
- [ ] Description motivates each change
- [ ] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- [ ] Testing strategy adequately addresses listed risks
- [ ] Change is maintainable (easy to change, telemetry, documentation)
- [ ] Release note makes sense to a user of the library
- [ ] 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 1ffb660)
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.

None yet

4 participants