Fixes AB#3590267 Extend filter-then-clone optimization to deleteAccessTokensWithInters…#3114
Merged
siddhijain merged 5 commits intoMay 15, 2026
Conversation
…ectingScopes and add telemetry attributes
Contributor
Author
|
@copilot resolve the merge conflicts in this pull request |
Contributor
There was a problem hiding this comment.
Pull request overview
Extends the ENABLE_FILTER_THEN_CLONE_IN_MEMORY_CACHE flight to deleteAccessTokensWithIntersectingScopes in MsalOAuth2TokenCache, and adds two telemetry attributes capturing in-memory cache sizes to help correlate ATS latency with cache population. Also removes the now-unused in_memory_cache_used_for_accounts_and_credentials attribute and its emission site in BrokerOAuth2TokenCache.
Changes:
- Add flight-gated filter-then-clone path to
deleteAccessTokensWithIntersectingScopes, falling back to the legacy clone-all-then-filter path when the flight is off. - Introduce
number_of_accounts_in_cache/number_of_credentials_in_cachetelemetry attributes set inSharedPreferencesAccountCredentialCacheWithMemoryCache.getAccounts(). - Remove the obsolete
in_memory_cache_used_for_accounts_and_credentialsattribute and itsBrokerOAuth2TokenCache.getCacheToBeUsedemission; update changelog.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| common4j/src/main/com/microsoft/identity/common/java/cache/MsalOAuth2TokenCache.java | Adds flight-gated filter-then-clone branch in deleteAccessTokensWithIntersectingScopes. |
| common4j/src/main/com/microsoft/identity/common/java/cache/SharedPreferencesAccountCredentialCacheWithMemoryCache.java | Emits new account/credential count attributes in getAccounts(). |
| common4j/src/main/com/microsoft/identity/common/java/cache/BrokerOAuth2TokenCache.java | Removes emission of the deleted in_memory_cache_used_for_accounts_and_credentials attribute. |
| common4j/src/main/com/microsoft/identity/common/java/opentelemetry/AttributeName.java | Adds two new attribute names; deletes the obsolete one. |
| changelog.txt | Adds PATCH entry describing the optimization extension and telemetry. |
…ersectingScopes Resolved merge conflict in changelog.txt by keeping both entries in vNext section. Co-authored-by: siddhijain <30181294+siddhijain@users.noreply.github.com>
Contributor
…ntersectingScopes
rpdome
approved these changes
May 15, 2026
Member
rpdome
left a comment
rpdome
left a comment
There was a problem hiding this comment.
Let's remove mustMatchExactClaims if it's not used anywhere today, otherwise someone might make a regression in the future.
Contributor
Author
|
@copilot resolve the merge conflicts in this pull request |
…ngScopes Resolved merge conflict in changelog.txt by keeping both entries in vNext section. Co-authored-by: siddhijain <30181294+siddhijain@users.noreply.github.com>
Contributor
rpdome
approved these changes
May 15, 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.
Fixes AB#3590267
This PR extends use-filter-then-clone flight to one more method and add some telemetry attributes to check if the latency of ATS can be correlated to the number of accounts and credentials in memory.