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

chore: migrate to main as default branch #7792

Merged
merged 5 commits into from
Nov 30, 2023
Merged

Conversation

majorgreys
Copy link
Contributor

@majorgreys majorgreys commented Nov 30, 2023

We make main the default branch.

Contributors should update their local clone:

git remote set-head origin -a

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.

@majorgreys majorgreys added the changelog/no-changelog A changelog entry is not required for this PR. label Nov 30, 2023
@majorgreys majorgreys requested review from a team as code owners November 30, 2023 17:30
@majorgreys majorgreys changed the base branch from 2.x to main November 30, 2023 18:57
@majorgreys majorgreys enabled auto-merge (squash) November 30, 2023 20:11
@pr-commenter
Copy link

pr-commenter bot commented Nov 30, 2023

Benchmarks

Benchmark execution time: 2023-11-30 21:46:17

Comparing candidate commit 6ab140b in PR branch majorgreys/2.x-main with baseline commit c89c376 in branch main.

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

scenario:flasksimple-appsec-get

  • 🟩 max_rss_usage [-1.331MB; -1.105MB] or [-3.699%; -3.071%]

scenario:flasksimple-appsec-post

  • 🟥 execution_time [+370.765µs; +482.851µs] or [+5.859%; +7.631%]
  • 🟩 max_rss_usage [-1.386MB; -1.123MB] or [-3.848%; -3.117%]

scenario:flasksimple-appsec-telemetry

  • 🟩 max_rss_usage [-1.235MB; -1.039MB] or [-3.507%; -2.951%]

scenario:span-add-metrics

  • 🟩 max_rss_usage [-20.836MB; -20.671MB] or [-33.262%; -32.998%]

@P403n1x87
Copy link
Contributor

Should there be a change for the test image building as well? Or is/was that done in another PR?

@majorgreys majorgreys merged commit 577ed15 into main Nov 30, 2023
28 checks passed
@majorgreys majorgreys deleted the majorgreys/2.x-main branch November 30, 2023 23:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog A changelog entry is not required for this PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants