Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4497 +/- ##
==========================================
- Coverage 69.30% 69.30% -0.01%
==========================================
Files 502 502
Lines 51632 51637 +5
==========================================
+ Hits 35786 35788 +2
- Misses 13077 13084 +7
+ Partials 2769 2765 -4 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Contributor
There was a problem hiding this comment.
Pull request overview
This PR makes TestMonitoredTokenSource_SingleflightDeduplicatesConcurrentRetries deterministic by adding two test-only synchronization hooks around the singleflight entry/leader execution, preventing late-arriving goroutines from starting independent retry loops.
Changes:
- Added
beforeSingleflightEntryandafterSingleflightEntry(nil in production) to coordinate concurrent callers in tests. - Wired these hooks into
MonitoredTokenSource.Token()aroundrefreshGroup.Do. - Rewrote the flaky singleflight retry deduplication test to use a two-phase barrier and tightened the expected call-count assertion.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| pkg/auth/monitored_token_source.go | Adds two optional hooks and invokes them around the singleflight boundary to enable deterministic test synchronization. |
| pkg/auth/monitored_token_source_test.go | Updates the concurrent retry deduplication test to use a two-phase barrier and assert exact underlying call counts. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
yrobla
force-pushed
the
fix/monitored-token-source-singleflight-test
branch
from
4801741 to
b73060b
Compare
github-actions
bot
added
size/S
yrobla
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
github-actions
bot
added
size/S
TestMonitoredTokenSource_SingleflightDeduplicatesConcurrentRetries was non-deterministic: the singleflight leader could complete its retry and return before follower goroutines reached refreshGroup.Do, causing them to start independent retry loops and fail the call-count assertion. Add beforeSingleflightEntry and afterSingleflightEntry test hooks (both nil in production) to MonitoredTokenSource. The test uses a two-phase barrier: - Phase 1 (beforeSingleflightEntry): all goroutines rendezvous and are released simultaneously toward refreshGroup.Do. - Phase 2 (afterSingleflightEntry): the leader waits inside Do until all goroutines have signalled they are about to call Do, guaranteeing the group is fully formed before the retry returns.
yrobla
force-pushed
the
fix/monitored-token-source-singleflight-test
branch
from
b73060b to
8496fa6
Compare
github-actions
bot
added
size/S
jerm-dro
approved these changes
Apr 2, 2026
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.
Summary
TestMonitoredTokenSource_SingleflightDeduplicatesConcurrentRetrieswas non-deterministic: after a barrier released all goroutines towardrefreshGroup.Do, the singleflight leader could complete its retry and return before follower goroutines reachedDo— causing each follower to start an independent retry loop and fail the call-count assertion.The fix also addresses a design smell: the singleflight/retry logic and its test hooks were embedded in
MonitoredTokenSource, making that struct own too many concerns.Changes:
transientRefresher— a small, focused type that owns thesingleflight.Group, exponential-backoff retry, and the two synchronisation hooks (beforeEntry,afterEntry). Nil in production; set in tests only.MonitoredTokenSourcenow holds a*transientRefresherand delegates transient-error handling torefresher.Refresh(). The three test hooks (beforeEntry,afterEntry,newRetryBackOff) are removed from the production struct.TestTransientRefresher_SingleflightDeduplicatesConcurrentRetries, targetingtransientRefresherdirectly with the two-phase barrier. NoMonitoredTokenSourceor status-updater mock needed. Key assertion simplifies to exactly 1tokenSource.Token()call (only the singleflight leader retries).callCountinsidetokenFnwould require re-acquiring the mock's mutex and deadlock (it would not — the mutex is already held).Type of change
Test plan
task test)task test-e2e)task lint-fix)Changes
pkg/auth/monitored_token_source.gotransientRefresherwithRefresh,retry,getBackOff;MonitoredTokenSourcedelegates to it, test hooks removedpkg/auth/monitored_token_source_test.gotransientRefresherdirectly; update remaining tests to useats.refresher.newBackOff; fix misleading comment; remove unusedsync/atomicimportDoes this introduce a user-facing change?
No.