Working/release/24.0.0 (#2913)

Co-authored-by: Azure DevOps Pipeline <build-agent@azuredevops.com>
Co-authored-by: Praveen Kumar <prvnkmr337@gmail.com>
Co-authored-by: prsaminathan <prsaminathan@microsoft.com>

Author: 4 people

changelog.txt

@@ -1,5 +1,8 @@
 vNext
 ----------
+
+Version 24.0.0
+----------
 - [MINOR] Add tracking for urls loaded by our webview (#2892)
 - [MINOR] Rework OpenTelemetry spans for secret key generation and retrieval operations (#2869)
 - [MAJOR] add isBrokerProcess to IPlatformUtil (#2882)

common/build.gradle

@@ -87,7 +87,7 @@ tasks.register("jacocoTestReport", JacocoReport) {
 
 // In dev, we want to keep the dependencies(common4j, broker4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline.
 // In release/*, we change these to specific versions being consumed.
-def common4jVersion = "1.0.+"
+def common4jVersion = "24.0.0"
 if (project.hasProperty("distCommon4jVersion") && project.distCommon4jVersion != '') {
     common4jVersion = project.distCommon4jVersion
 }

common/src/androidTest/java/com/microsoft/identity/common/CommandDispatcherTest.java

@@ -111,9 +111,6 @@ public class CommandDispatcherTest {
     /** Small delay to ensure blocking tasks are fully blocking before submitting test request */
     private static final long TASK_STABILIZATION_DELAY_MS = 100;
 
-    /** Thread pool size for silent requests (matches CommandDispatcher.SILENT_REQUEST_THREAD_POOL_SIZE) */
-    private static final int SILENT_THREAD_POOL_SIZE = 12;
-
     /** Number of concurrent requests for state collision test */
     private static final int CONCURRENT_REQUEST_COUNT = 20;
 
@@ -891,7 +888,7 @@ public void accept(String s) {
      *
      * <p>Test Strategy:
      * <ol>
-     *   <li>Fill all {@link #SILENT_THREAD_POOL_SIZE} thread pool threads with blocking tasks</li>
+     *   <li>Fill all thread pool threads with blocking tasks</li>
      *   <li>Submit a new request that will be queued (state: QUEUED)</li>
      *   <li>Request times out after 30 seconds while still in queue</li>
      *   <li>Verify error code is TIMED_OUT_THREAD_POOL_SATURATED</li>
@@ -904,7 +901,7 @@ public void accept(String s) {
     @Test
     public void testTimeoutClassification_ThreadPoolSaturated() throws Exception {
         Log.d(TAG, "testTimeoutClassification_ThreadPoolSaturated: Starting test");
-        final int POOL_SIZE = SILENT_THREAD_POOL_SIZE;
+        final int POOL_SIZE = CommandDispatcher.SILENT_REQUEST_THREAD_POOL_SIZE;
         final CountDownLatch tasksStarted = new CountDownLatch(POOL_SIZE);
         final CountDownLatch releaseBlockingTasks = new CountDownLatch(1);
         final CountDownLatch tasksCompleted = new CountDownLatch(POOL_SIZE); // Track completion

common4j/src/main/com/microsoft/identity/common/java/controllers/CommandDispatcher.java

@@ -107,7 +107,8 @@ public class CommandDispatcher {
     private static final int EXECUTOR_GRACEFUL_TERMINATION_TIMEOUT_MS = 500;
     private static final int EXECUTOR_FORCED_TERMINATION_TIMEOUT_MS = 1000;
     // Cache the pool size for the session
-    private static final int SILENT_REQUEST_THREAD_POOL_SIZE = computeSilentRequestThreadPoolSize();
+    //@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    public static final int SILENT_REQUEST_THREAD_POOL_SIZE = computeSilentRequestThreadPoolSize();
     private static ExecutorService sInteractiveExecutor = Executors.newSingleThreadExecutor();
     private static ExecutorService sSilentExecutor = Executors.newFixedThreadPool(SILENT_REQUEST_THREAD_POOL_SIZE);
     private static final ExecutorService sDCFExecutor = Executors.newFixedThreadPool(DCF_REQUEST_THREAD_POOL_SIZE);

common4j/versioning/version.properties

@@ -1,4 +1,4 @@
 #Wed May 12 20:08:39 UTC 2021
-versionName=23.3.0
+versionName=24.0.0
 versionCode=1
 latestPatchVersion=227

versioning/version.properties

@@ -1,4 +1,4 @@
 #Tue Apr 06 22:55:08 UTC 2021
-versionName=23.3.0
+versionName=24.0.0
 versionCode=1
 latestPatchVersion=234