Merge branch 'dev' into somalaya/edgeToEdgeBugTesting

Author: somalaya

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

@@ -29,6 +29,7 @@
 import com.microsoft.identity.common.java.interfaces.INameValueStorage;
 import com.microsoft.identity.common.java.interfaces.IPlatformComponents;
 import com.microsoft.identity.common.java.opentelemetry.AttributeName;
+import com.microsoft.identity.common.java.opentelemetry.OTelUtility;
 import com.microsoft.identity.common.java.opentelemetry.SpanExtension;
 import com.microsoft.identity.common.java.providers.oauth2.OAuth2Strategy;
 import com.microsoft.identity.common.java.providers.oauth2.OAuth2TokenCache;
@@ -278,6 +279,7 @@ public ICacheRecord save(@NonNull AccountRecord accountRecord,
                              @Nullable RefreshTokenRecord refreshTokenRecord,
                              @Nullable String familyId) throws ClientException {
         final String methodName = ":save (5 args)";
+        final long saveStartTime = System.currentTimeMillis();
 
         final ICacheRecord result;
 
@@ -319,7 +321,7 @@ public ICacheRecord save(@NonNull AccountRecord accountRecord,
                 familyId,
                 mUid
         );
-
+        OTelUtility.recordElapsedTime(AttributeName.elapsed_time_save_aggregated_account_data.name(), saveStartTime);
         return result;
     }
 
@@ -366,6 +368,7 @@ public synchronized List<ICacheRecord> saveAndLoadAggregatedAccountData(
     private List<ICacheRecord> loadAggregatedAccountData(final @NonNull AbstractAuthenticationScheme authScheme,
                                                          final @NonNull ICacheRecord cacheRecord) {
         final String methodName = ":loadAggregatedAccountData";
+        final long loadStartTime = System.currentTimeMillis();
 
         final String clientId = cacheRecord.getAccessToken().getClientId();
         final String target = cacheRecord.getAccessToken().getTarget();
@@ -386,14 +389,17 @@ private List<ICacheRecord> loadAggregatedAccountData(final @NonNull AbstractAuth
             return null;
         }
 
-        return cache.loadWithAggregatedAccountData(
+        List<ICacheRecord> cacheRecordList =  cache.loadWithAggregatedAccountData(
                 clientId,
                 applicationIdentifier,
                 mamEnrollmentIdentifier,
                 target,
                 cacheRecord.getAccount(),
                 authScheme
         );
+        OTelUtility.recordElapsedTime(AttributeName.elapsed_time_load_aggregated_account_data.name(),
+                loadStartTime);
+        return cacheRecordList;
     }
 
     @Override

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

@@ -502,5 +502,15 @@ public enum AttributeName {
     /**
      * Passkey DOM exception name (if any).
      */
-    passkey_dom_exception_name
+    passkey_dom_exception_name,
+
+    /**
+     *  Elapsed time (in milliseconds) spent in executing the save() method in BrokerOAuth2TokenCache.
+     */
+    elapsed_time_save_aggregated_account_data,
+
+    /**
+     *  Elapsed time (in milliseconds) spent in executing the loadAggregatedAccountData() method in BrokerOAuth2TokenCache.
+     */
+    elapsed_time_load_aggregated_account_data
 }