Merge branch 'dev' into pedroro/automatic-pr

Author: p3dr0rv

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).
      */