Fixes AB#3444129 Merge release 23.1.1 into dev #2828
+10
−7
Conversation
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
…427295 (#2812) The Final Monthly Release pipeline failed, so I manually merged the working release branch into the release branch to proceed with the release. [AB#3427295](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3427295) --------- Co-authored-by: Azure DevOps Pipeline <[email protected]>
…B#3444129 (#2822) Fixes [AB#3444129](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3444129) Cherry-picks two commits from dev to enable in-memory caching for accounts and credentials in the broker. ## Commits - **f904c60** - Use in-memory cache for accounts and credentials ([AB#3417272](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3417272), #2802) - **228db78** - Share SharedPreferencesInMemoryCache across cache instances ([AB#3428107](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3428107), #2813) ## Changes **Core Implementation** (`BrokerOAuth2TokenCache.java`) - Added static `ConcurrentHashMap` to share in-memory cache instances across `BrokerOAuth2TokenCache` instances - Reduces disk I/O and serialization overhead by reusing cache layers for the same underlying storage **Feature Flag** (`CommonFlight.java`) - Added `USE_IN_MEMORY_CACHE_FOR_ACCOUNTS_AND_CREDENTIALS` (default: false) **Telemetry** (`AttributeName.java`) - Added `in_memory_cache_used_for_accounts_and_credentials` attribute **Tests** - New `BrokerOAuth2TokenCacheWithInMemoryCacheTest.java` (1240 lines) - Extended `BrokerOAuth2TokenCacheTest.java` with cache sharing tests ## Conflicts Resolved `changelog.txt` had conflicts due to version markers in the release branch. Resolved by adding entries under vNext: ``` - [MINOR] Share SharedPreferencesInMemoryCache across instances of BrokerOAuth2TokenCache (#2813) - [MINOR] Use SharedPreferencesInMemoryCache implementation in Broker (#2802) ``` > [!WARNING] > > <details> > <summary>Firewall rules blocked me from connecting to one or more addresses (expand for details)</summary> > > #### I tried to connect to the following addresses, but was blocked by firewall rules: > > - `dl.google.com` > - Triggering command: `/usr/lib/jvm/temurin-17-jdk-amd64/bin/java /usr/lib/jvm/temurin-17-jdk-amd64/bin/java --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.xml/javax.xml.namespace=ALL-UNNAMED -XX:MaxMetaspaceSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Xmx3072m -Dfile.encoding=UTF-8 -Duser.country -Duser.language=en -Duser.variant` (dns block) > - `www.puppycrawl.com` > - Triggering command: `/opt/hostedtoolcache/CodeQL/2.23.3/x64/codeql/tools/linux64/java/bin/java /opt/hostedtoolcache/CodeQL/2.23.3/x64/codeql/tools/linux64/java/bin/java -jar /opt/hostedtoolcache/CodeQL/2.23.3/x64/codeql/xml/tools/xml-extractor.jar --fileList=/home/REDACTED/work/microsoft-authentication-library-common-for-android/.codeql-scratch/dbs/java/working/files-to-index2294403091429273239.list --sourceArchiveDir=/home/REDACTED/work/microsoft-authentication-library-common-for-android/.codeql-scratch/dbs/java/src --outputDir=/home/REDACTED/work/microsoft-authentication-library-common-for-android/.codeql-scratch/dbs/java/trap/java` (dns block) > > If you need me to access, download, or install something from one of these locations, you can either: > > - Configure [Actions setup steps](https://gh.io/copilot/actions-setup-steps) to set up my environment, which run before the firewall is enabled > - Add the appropriate URLs or hosts to the custom allowlist in this repository's [Copilot coding agent settings](https://github.com/AzureAD/microsoft-authentication-library-common-for-android/settings/copilot/coding_agent) (admins only) > > </details> <!-- START COPILOT CODING AGENT SUFFIX --> <details> <summary>Original prompt</summary> > Cherry-pick the following commits from the dev branch to the working/release/23.1.1 branch: > > - f904c60 > - 228db78 > > Include all files and changes from the specified commits. Ensure that any conflicts are noted in the pull request description. Provide a detailed summary of what was cherry-picked in the PR body. </details> *This pull request was created as a result of the following prompt from Copilot chat.* > Cherry-pick the following commits from the dev branch to the working/release/23.1.1 branch: > > - f904c60 > - 228db78 > > Include all files and changes from the specified commits. Ensure that any conflicts are noted in the pull request description. Provide a detailed summary of what was cherry-picked in the PR body. <!-- START COPILOT CODING AGENT TIPS --> --- 💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more [Copilot coding agent tips](https://gh.io/copilot-coding-agent-tips) in the docs. --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: siddhijain <[email protected]> Co-authored-by: Siddhi <[email protected]>
|
❌ Work item link check failed. Description does not contain AB#{ID}. Click here to Learn more. |
Copilot
AI
changed the title
[WIP] Merge working release 23.1.1 into dev branch
Merge release 23.1.1 into dev
Dec 3, 2025
Copilot finished work on behalf of
siddhijain
December 3, 2025 19:35
Contributor
|
@copilot Few changes - we do not want to merge the changes in build.gradle. Could you remove that file from the PR? |
Co-authored-by: siddhijain <[email protected]>
Author
Copilot finished work on behalf of
siddhijain
December 3, 2025 19:40
Contributor
There was a problem hiding this comment.
Pull request overview
This PR merges the release branch sjain/working/release/23.1.1 back into dev after preparing the 23.1.1 patch release. The release includes improvements to SharedPreferencesInMemoryCache for better memory efficiency in broker scenarios.
- Version bumped from 23.1.0 to 23.1.1 across both Common and Common4j modules
- Changelog updated to document 23.1.1 patch changes that were previously under vNext
- Whitespace and formatting normalized during conflict resolution
Reviewed changes
Copilot reviewed 3 out of 5 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| versioning/version.properties | Bumps Common library version to 23.1.1 |
| common4j/versioning/version.properties | Bumps Common4j library version to 23.1.1 |
| changelog.txt | Adds Version 23.1.1 section with SharedPreferencesInMemoryCache PATCH changes |
| common4j/src/main/com/microsoft/identity/common/java/opentelemetry/AttributeName.java | Normalizes whitespace formatting (removes trailing spaces) |
| common4j/src/main/com/microsoft/identity/common/java/cache/BrokerOAuth2TokenCache.java | Adds proper spacing after comma in method call |
richardtz12
approved these changes
Dec 4, 2025
andwhysoft
approved these changes
Dec 4, 2025
siddhijain
changed the title
siddhijain
approved these changes
Dec 4, 2025
|
✅ Work item link check complete. Description contains link AB#3444129 to an Azure Boards work item. |
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#3444129 Merges
sjain/working/release/23.1.1intodevafter syncing the release branch with latest dev changes.Changes
versioning/version.propertiesandcommon4j/versioning/version.propertiesConflict Resolutions
CommonFlight.java- Retained newDISABLE_UNNECESSARY_CRYPTO_PURPOSES_FROM_DEVICE_POP_MANAGERflight from devBrokerOAuth2TokenCache.java,AttributeName.java- Whitespace normalizationThis pull request was created as a result of the following prompt from Copilot chat.
Original prompt
This pull request was created as a result of the following prompt from Copilot chat.
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.