chore: back-merge main into next (merge commit to clear release PR #382)#385
Merged
Conversation
Co-authored-by: Max Parke <max.parke@scale.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: stainless-app[bot] <142633134+stainless-app[bot]@users.noreply.github.com> Co-authored-by: Stas Moreinis <stas.moreinis@scale.com> Co-authored-by: Declan Brady <declan.brady@scale.com> Co-authored-by: Michael Chou <michael.chou@scale.com> Co-authored-by: Daniel Miller <daniel.miller@scale.com>
Co-authored-by: Max Parke <max.parke@scale.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: stainless-app[bot] <142633134+stainless-app[bot]@users.noreply.github.com> Co-authored-by: Stas Moreinis <stas.moreinis@scale.com> Co-authored-by: Declan Brady <declan.brady@scale.com> Co-authored-by: Michael Chou <michael.chou@scale.com> Co-authored-by: Daniel Miller <daniel.miller@scale.com> Co-authored-by: Matteo Librizzi <matteo.librizzi@scale.com>
…into-next-2 # Conflicts: # src/agentex/lib/core/tracing/span_queue.py # tests/lib/core/tracing/test_span_queue.py
|
No reviewable files after applying ignore patterns. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
The prior back-merge (#384) was squash-merged, which flattened the merge commit and dropped
mainfromnext's ancestry — so the merge base stayed at0f177c9fand release PR #382 kept re-deriving the samespan_queue.pyconflict.This PR carries a true merge commit (
mainas a second parent). It MUST be merged with the "Create a merge commit" method (not squash) somainbecomes an ancestor ofnext, advancing the merge base and clearing #382.Conflicts resolved
span_queue.py/test_span_queue.py: keptnext's version (bounded-concurrency perf(tracing): bounded-concurrency span export #374 on top of linger perf(tracing): span queue linger + per-loop httpx keepalive #362) — verified byte-identical toorigin/next. Version/CHANGELOG bookkeeping auto-merged cleanly (already aligned by chore: back-merge release 0.11.6 into next #384).Verification
next+main@release:0.11.6;mainis now an ancestor.tests/lib/core/tracing/→ 52 passed, 2 skipped;ruffclean.