modified save to cache when RC fetches

Author: leotianlizhan

firebase-perf/src/main/java/com/google/firebase/perf/config/ConfigResolver.java

@@ -115,21 +115,11 @@ public void setMetadataBundle(ImmutableBundle bundle) {
 
   /** Default API to call for whether performance monitoring is currently silent. */
   public boolean isPerformanceMonitoringEnabled() {
-    saveExperimentFlagToDeviceCache();
     Boolean isPerformanceCollectionEnabled = getIsPerformanceCollectionEnabled();
     return (isPerformanceCollectionEnabled == null || isPerformanceCollectionEnabled == true)
         && getIsServiceCollectionEnabled();
   }
 
-  // TODO: remove after _experiment_as_ttid is finished
-  private void saveExperimentFlagToDeviceCache() {
-    ExperimentTTID config = ExperimentTTID.getInstance();
-    Optional<Boolean> rcValue = getRemoteConfigBoolean(config);
-    if (rcValue.isAvailable()) {
-      deviceCacheManager.setValue(config.getDeviceCacheFlag(), rcValue.get());
-    }
-  }
-
   /** Returns whether developers have enabled Firebase Performance event collection. */
   @Nullable
   public Boolean getIsPerformanceCollectionEnabled() {

firebase-perf/src/main/java/com/google/firebase/perf/config/RemoteConfigManager.java

@@ -14,6 +14,8 @@
 
 package com.google.firebase.perf.config;
 
+import static com.google.firebase.perf.config.ConfigurationConstants.ExperimentTTID;
+
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -53,6 +55,7 @@ public class RemoteConfigManager {
   private static final long MIN_APP_START_CONFIG_FETCH_DELAY_MS = 5000;
   private static final int RANDOM_APP_START_CONFIG_FETCH_DELAY_MS = 25000;
 
+  private final DeviceCacheManager cache;
   private final ConcurrentHashMap<String, FirebaseRemoteConfigValue> allRcConfigMap;
   private final Executor executor;
   private final long appStartTimeInMs;
@@ -65,29 +68,25 @@ public class RemoteConfigManager {
 
   private RemoteConfigManager() {
     this(
+        DeviceCacheManager.getInstance(),
         new ThreadPoolExecutor(
             /* corePoolSize= */ 0,
             /* maximumPoolSize= */ 1,
             /* keepAliveTime= */ 0L,
             TimeUnit.SECONDS,
             new LinkedBlockingQueue<Runnable>()),
-        /* firebaseRemoteConfig= */ null // set once FirebaseRemoteConfig is initialized
-        );
-  }
-
-  RemoteConfigManager(Executor executor, FirebaseRemoteConfig firebaseRemoteConfig) {
-    this(
-        executor,
-        firebaseRemoteConfig,
+        /* firebaseRemoteConfig= */ null, // set once FirebaseRemoteConfig is initialized
         MIN_APP_START_CONFIG_FETCH_DELAY_MS
             + new Random().nextInt(RANDOM_APP_START_CONFIG_FETCH_DELAY_MS));
   }
 
   @VisibleForTesting
   RemoteConfigManager(
+      DeviceCacheManager cache,
       Executor executor,
       FirebaseRemoteConfig firebaseRemoteConfig,
       long appStartConfigFetchDelayInMs) {
+    this.cache = cache;
     this.executor = executor;
     this.firebaseRemoteConfig = firebaseRemoteConfig;
     this.allRcConfigMap =
@@ -315,7 +314,7 @@ private void triggerRemoteConfigFetchIfNecessary() {
       return;
     }
     if (allRcConfigMap.isEmpty()) { // Initial fetch.
-      syncConfigValues(firebaseRemoteConfig.getAll());
+      allRcConfigMap.putAll(firebaseRemoteConfig.getAll());
     }
     if (shouldFetchAndActivateRemoteConfigValues()) {
       triggerFirebaseRemoteConfigFetchAndActivateOnSuccessfulFetch();
@@ -342,6 +341,19 @@ protected void syncConfigValues(Map<String, FirebaseRemoteConfigValue> newlyFetc
         allRcConfigMap.remove(existingKey);
       }
     }
+
+    // Save to device cache upon successful RC fetchAndActivate
+    ExperimentTTID flag = ExperimentTTID.getInstance();
+    FirebaseRemoteConfigValue rcValue = allRcConfigMap.get(flag.getRemoteConfigFlag());
+    if (rcValue != null) {
+      try {
+        cache.setValue(flag.getDeviceCacheFlag(), rcValue.asBoolean());
+      } catch (Exception exception) {
+        logger.debug("ExperimentTTID remote config flag has invalid value, expected boolean.");
+      }
+    } else {
+      logger.debug("ExperimentTTID remote config flag does not exist.");
+    }
   }
 
   @VisibleForTesting

firebase-perf/src/test/java/com/google/firebase/perf/config/RemoteConfigManagerTest.java

@@ -52,6 +52,7 @@ public final class RemoteConfigManagerTest extends FirebasePerformanceTestBase {
   @Mock private FirebaseRemoteConfig mockFirebaseRemoteConfig;
   @Mock private RemoteConfigComponent mockFirebaseRemoteConfigComponent;
   @Mock private Provider<RemoteConfigComponent> mockFirebaseRemoteConfigProvider;
+  @Mock private DeviceCacheManager mockCacheManager;
 
   private FakeScheduledExecutorService fakeExecutor;
 
@@ -889,10 +890,13 @@ private RemoteConfigManager setupTestRemoteConfigManager(
     when(mockFirebaseRemoteConfig.getAll()).thenReturn(configs);
     if (initializeFrc) {
       return new RemoteConfigManager(
-          fakeExecutor, mockFirebaseRemoteConfig, appStartConfigFetchDelayInMs);
+          mockCacheManager, fakeExecutor, mockFirebaseRemoteConfig, appStartConfigFetchDelayInMs);
     } else {
       return new RemoteConfigManager(
-          fakeExecutor, /* firebaseRemoteConfig= */ null, appStartConfigFetchDelayInMs);
+          mockCacheManager,
+          fakeExecutor,
+          /* firebaseRemoteConfig= */ null,
+          appStartConfigFetchDelayInMs);
     }
   }