Merge branch 'dev' into fadi/tweakGradle

Author: fadidurah

.github/workflows/integration/release-fix.yml

@@ -0,0 +1,50 @@
+##
+# Workflow: release-fix auto PR
+# Purpose: When a `release-fix/*` branch is created, automatically
+#          open a pull request targeting the corresponding `release/<version>` branch.
+# Maintainer: Android Team - Release Engineering
+# Docs: See repository CONTRIBUTING.md for release process guidance
+##
+name: Auto PR to merge release-fix branches into release
+
+permissions:
+  contents: read
+  pull-requests: write
+
+on:
+  create:
+
+jobs:
+  create-pr:
+    if: >
+      github.event.ref_type == 'branch' &&
+      startsWith(github.event.ref, 'release-fix/') &&
+      vars.ENABLE_RELEASE_AUTOMATION == 'true'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Compute target release version
+        id: compute_version
+        run: |
+          BRANCH_NAME="${{ github.event.ref }}"
+          if [[ "$BRANCH_NAME" =~ ^release-fix/(.+)$ ]]; then
+            VERSION="${BASH_REMATCH[1]}"
+            echo "version=$VERSION" >> $GITHUB_OUTPUT
+            echo "Computed version: $VERSION"
+          else
+            echo "Failed to compute version from branch: $BRANCH_NAME"
+            exit 1
+          fi
+
+      - name: Create Pull Request
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr create \
+            --base "release/${{ steps.compute_version.outputs.version }}" \
+            --head "${{ github.event.ref }}" \
+            --title "Auto PR: ${{ github.event.ref }} → release/${{ steps.compute_version.outputs.version }}" \
+            --body "This is an automated pull request created to integrate release changes into release/${{ steps.compute_version.outputs.version }}. Triggered when the branch ${{ github.event.ref }} was published."

.github/workflows/integration/release-integration.yml

@@ -0,0 +1,38 @@
+##
+# Workflow: release-integration auto PR
+# Purpose: When a `release-integration/*` branch is created, automatically
+#          open a pull request targeting `dev` to integrate release changes.
+##
+name: Auto PR to dev for release-integration branches
+
+permissions:
+  contents: read
+  pull-requests: write
+
+on:
+  create:
+
+concurrency:
+  group: auto-pr-release-integration-${{ github.event.ref }}
+  cancel-in-progress: false
+
+jobs:
+  create-pr:
+    if: >
+      github.event.ref_type == 'branch' &&
+      startsWith(github.event.ref, 'release-integration/') &&
+      vars.ENABLE_RELEASE_AUTOMATION == 'true'
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+    - name: Create Pull Request
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        gh pr create \
+          --base dev \
+          --head "${{ github.event.ref }}" \
+          --title "Auto PR: ${{ github.event.ref }} → dev" \
+          --body "This is an automated pull request created to integrate release changes into **dev**. Triggered when the branch **${{ github.event.ref }}** was published."

common4j/src/main/com/microsoft/identity/common/java/cache/SharedPreferencesAccountCredentialCacheWithMemoryCache.java

@@ -33,6 +33,7 @@
 import com.microsoft.identity.common.java.logging.Logger;
 import com.microsoft.identity.common.java.opentelemetry.AttributeName;
 import com.microsoft.identity.common.java.opentelemetry.OTelUtility;
+import com.microsoft.identity.common.java.opentelemetry.OtelContextExtension;
 import com.microsoft.identity.common.java.util.StringUtil;
 import com.microsoft.identity.common.java.util.ported.Predicate;
 
@@ -76,10 +77,11 @@ public SharedPreferencesAccountCredentialCacheWithMemoryCache(
         super(sharedPreferencesFileManager);
         Logger.verbose(TAG, "Init: " + TAG);
         mCacheValueDelegate = accountCacheValueDelegate;
-        new Thread(() -> load()).start();
+        new Thread(OtelContextExtension.wrap(() -> load())).start();
     }
 
     private void load() {
+        final long loadStartTime = System.currentTimeMillis();
         final String methodTag = TAG + ":load";
 
         synchronized (mCacheLock) {
@@ -93,6 +95,8 @@ private void load() {
             } finally {
                 mLoaded = true;
                 mCacheLock.notifyAll();
+                OTelUtility.recordElapsedTime(AttributeName.elapsed_time_in_memory_cache_load.name(),
+                        loadStartTime);
             }
         }
     }

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

@@ -346,6 +346,11 @@ public static FinalizableResultFuture<CommandResult> submitSilentReturningFuture
                     AttributeName.num_concurrent_silent_requests.name(),
                     sExecutingCommandMap.size()
             );
+            int queueSize = ((ThreadPoolExecutor)sSilentExecutor).getQueue().size();
+            SpanExtension.current().setAttribute(
+                    AttributeName.silent_requests_queue_size.name(),
+                    queueSize
+            );
 
             commandExecutor.execute(OtelContextExtension.wrap(new Runnable() {
                 @Override

common4j/src/main/com/microsoft/identity/common/java/opentelemetry/AttributeName.java

@@ -146,10 +146,17 @@ public enum AttributeName {
     http_status_code,
 
     /**
-     * The size of the silent command executor queue when starting to process an ATS request.
+     * The number of unique cacheable silent requests currently being tracked in the executing command map.
+     * This represents deduplicated commands that are either executing or waiting in the thread pool queue.
      */
     num_concurrent_silent_requests,
 
+    /**
+     * The number of tasks waiting in the silent request thread pool queue to be executed.
+     * This does not include tasks currently being executed by worker threads.
+     */
+    silent_requests_queue_size,
+
     /**
      * The time (in milliseconds) spent in executing the save method in OAuth2TokenCache.
      */
@@ -494,6 +501,11 @@ public enum AttributeName {
      */
     in_memory_cache_used_for_accounts_and_credentials,
 
+    /**
+     * Elapsed time (in milliseconds) spent in executing the load() method in BrokerOAuth2TokenCache for in memory cache.
+     */
+    elapsed_time_in_memory_cache_load,
+
     /**
      * Passkey operation type (e.g., registration, authentication).
      */