Fix TraceStateBuilder.remove corrupting the builder when the same key is removed twice#8613
Draft
thswlsqls wants to merge 1 commit into
Draft
Conversation
… is removed twice
thswlsqls
force-pushed
the
fix/trace-state-builder-double-remove
branch
from
July 16, 2026 21:00
184a512 to
0b8dc2f
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #8613 +/- ##
=========================================
Coverage 91.63% 91.63%
- Complexity 10326 10327 +1
=========================================
Files 1013 1013
Lines 27295 27296 +1
Branches 3205 3206 +1
=========================================
+ Hits 25011 25013 +2
Misses 1558 1558
+ Partials 726 725 -1 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
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
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.
Fixes #8612
Description
ArrayBasedTraceStateBuilder.remove()decrementednumEntrieswithout checking whether the value was alreadynull, so removing a key twice drove the counter below the real count.build()trustsnumEntriesin three places, so the drift leaks a{a=null}entry, silently drops live entries, or throwsArrayIndexOutOfBoundsException.put()(same class, line 74-78), which already does this check; first removal is unchanged.TraceStateBuilderis stable public API for external instrumentation and vendor propagators. The silent data loss contradicts the no-op contract of theremove(String)Javadoc ("if it is present") and ofremoveNotPresent(), and is reachable viareuseBuilder().PooledHashMapdropping live entries).Testing done
TraceStateTest#removeTwice,#removeTwice_KeepsRemainingEntry,#removeTwice_KeepsRemainingEntriesfor one, two, and three entries. All three fail without the fix; 41 pass with it../gradlew :api:all:check— passed, 504 tests.CHANGELOG.md## Unreleased→### APIentry added.