Add dynamic module support to Remote Config. (#2547)

Author: vkryachko

firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigComponent.java

@@ -26,6 +26,7 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.abt.FirebaseABTesting;
 import com.google.firebase.analytics.connector.AnalyticsConnector;
+import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.remoteconfig.internal.ConfigCacheClient;
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler;
@@ -78,7 +79,7 @@ public class RemoteConfigComponent {
   private final FirebaseApp firebaseApp;
   private final FirebaseInstallationsApi firebaseInstallations;
   private final FirebaseABTesting firebaseAbt;
-  @Nullable private final AnalyticsConnector analyticsConnector;
+  @Nullable private final Provider<AnalyticsConnector> analyticsConnector;
 
   private final String appId;
 
@@ -91,7 +92,7 @@ public class RemoteConfigComponent {
       FirebaseApp firebaseApp,
       FirebaseInstallationsApi firebaseInstallations,
       FirebaseABTesting firebaseAbt,
-      @Nullable AnalyticsConnector analyticsConnector) {
+      Provider<AnalyticsConnector> analyticsConnector) {
     this(
         context,
         Executors.newCachedThreadPool(),
@@ -110,7 +111,7 @@ protected RemoteConfigComponent(
       FirebaseApp firebaseApp,
       FirebaseInstallationsApi firebaseInstallations,
       FirebaseABTesting firebaseAbt,
-      @Nullable AnalyticsConnector analyticsConnector,
+      Provider<AnalyticsConnector> analyticsConnector,
       boolean loadGetDefault) {
     this.context = context;
     this.executorService = executorService;
@@ -265,10 +266,8 @@ static ConfigMetadataClient getMetadataClient(Context context, String appId, Str
 
   @Nullable
   private static Personalization getPersonalization(
-      FirebaseApp firebaseApp, String namespace, @Nullable AnalyticsConnector analyticsConnector) {
-    if (isPrimaryApp(firebaseApp)
-        && namespace.equals(DEFAULT_NAMESPACE)
-        && analyticsConnector != null) {
+      FirebaseApp firebaseApp, String namespace, Provider<AnalyticsConnector> analyticsConnector) {
+    if (isPrimaryApp(firebaseApp) && namespace.equals(DEFAULT_NAMESPACE)) {
       return new Personalization(analyticsConnector);
     }
     return null;

firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigRegistrar.java

@@ -45,15 +45,15 @@ public List<Component<?>> getComponents() {
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.required(FirebaseInstallationsApi.class))
             .add(Dependency.required(AbtComponent.class))
-            .add(Dependency.optional(AnalyticsConnector.class))
+            .add(Dependency.optionalProvider(AnalyticsConnector.class))
             .factory(
                 container ->
                     new RemoteConfigComponent(
                         container.get(Context.class),
                         container.get(FirebaseApp.class),
                         container.get(FirebaseInstallationsApi.class),
                         container.get(AbtComponent.class).get(OriginService.REMOTE_CONFIG),
-                        container.get(AnalyticsConnector.class)))
+                        container.getProvider(AnalyticsConnector.class)))
             .eagerInDefaultApp()
             .build(),
         LibraryVersionComponent.create("fire-rc", BuildConfig.VERSION_NAME));

firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigFetchHandler.java

@@ -35,6 +35,7 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.analytics.connector.AnalyticsConnector;
+import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.installations.InstallationTokenResult;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigClientException;
@@ -79,7 +80,7 @@ public class ConfigFetchHandler {
   @VisibleForTesting static final int HTTP_TOO_MANY_REQUESTS = 429;
 
   private final FirebaseInstallationsApi firebaseInstallations;
-  @Nullable private final AnalyticsConnector analyticsConnector;
+  private final Provider<AnalyticsConnector> analyticsConnector;
 
   private final Executor executor;
   private final Clock clock;
@@ -93,7 +94,7 @@ public class ConfigFetchHandler {
   /** FRC Fetch Handler constructor. */
   public ConfigFetchHandler(
       FirebaseInstallationsApi firebaseInstallations,
-      @Nullable AnalyticsConnector analyticsConnector,
+      Provider<AnalyticsConnector> analyticsConnector,
       Executor executor,
       Clock clock,
       Random randomGenerator,
@@ -497,21 +498,21 @@ private void updateLastFetchStatusAndTime(
   @WorkerThread
   private Map<String, String> getUserProperties() {
     Map<String, String> userPropertiesMap = new HashMap<>();
-    if (analyticsConnector == null) {
+    AnalyticsConnector connector = this.analyticsConnector.get();
+    if (connector == null) {
       return userPropertiesMap;
     }
 
     for (Map.Entry<String, Object> userPropertyEntry :
-        analyticsConnector.getUserProperties(/*includeInternal=*/ false).entrySet()) {
+        connector.getUserProperties(/*includeInternal=*/ false).entrySet()) {
       userPropertiesMap.put(userPropertyEntry.getKey(), userPropertyEntry.getValue().toString());
     }
     return userPropertiesMap;
   }
 
   /** Used to verify that the fetch handler is getting Analytics as expected. */
   @VisibleForTesting
-  @Nullable
-  public AnalyticsConnector getAnalyticsConnector() {
+  public Provider<AnalyticsConnector> getAnalyticsConnector() {
     return analyticsConnector;
   }
 

firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/Personalization.java

@@ -17,6 +17,7 @@
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import com.google.firebase.analytics.connector.AnalyticsConnector;
+import com.google.firebase.inject.Provider;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -41,14 +42,13 @@ public class Personalization {
   public static final String INTERNAL_CHOICE_ID_PARAM = "_fpid";
 
   /** The app's Firebase Analytics client. */
-  private final AnalyticsConnector analyticsConnector;
+  private final Provider<AnalyticsConnector> analyticsConnector;
 
   /** Remote Config parameter key and choice ID pairs that have already been logged to Analytics. */
-  private final Map<String, String> loggedChoiceIds =
-      Collections.synchronizedMap(new HashMap<String, String>());
+  private final Map<String, String> loggedChoiceIds = Collections.synchronizedMap(new HashMap<>());
 
   /** Creates an instance of {@code Personalization}. */
-  public Personalization(@NonNull AnalyticsConnector analyticsConnector) {
+  public Personalization(Provider<AnalyticsConnector> analyticsConnector) {
     this.analyticsConnector = analyticsConnector;
   }
 
@@ -61,6 +61,11 @@ public Personalization(@NonNull AnalyticsConnector analyticsConnector) {
    *     key}
    */
   public void logArmActive(@NonNull String rcParameter, @NonNull ConfigContainer configContainer) {
+    AnalyticsConnector connector = this.analyticsConnector.get();
+    if (connector == null) {
+      return;
+    }
+
     JSONObject ids = configContainer.getPersonalizationMetadata();
     if (ids.length() < 1) {
       return;
@@ -94,11 +99,10 @@ public void logArmActive(@NonNull String rcParameter, @NonNull ConfigContainer c
     logParams.putString(EXTERNAL_PERSONALIZATION_ID_PARAM, metadata.optString(PERSONALIZATION_ID));
     logParams.putInt(EXTERNAL_ARM_INDEX_PARAM, metadata.optInt(ARM_INDEX, -1));
     logParams.putString(EXTERNAL_GROUP_PARAM, metadata.optString(GROUP));
-    analyticsConnector.logEvent(ANALYTICS_ORIGIN_PERSONALIZATION, EXTERNAL_EVENT, logParams);
+    connector.logEvent(ANALYTICS_ORIGIN_PERSONALIZATION, EXTERNAL_EVENT, logParams);
 
     Bundle internalLogParams = new Bundle();
     internalLogParams.putString(INTERNAL_CHOICE_ID_PARAM, choiceId);
-    analyticsConnector.logEvent(
-        ANALYTICS_ORIGIN_PERSONALIZATION, INTERNAL_EVENT, internalLogParams);
+    connector.logEvent(ANALYTICS_ORIGIN_PERSONALIZATION, INTERNAL_EVENT, internalLogParams);
   }
 }

firebase-config/src/test/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigTest.java

@@ -163,7 +163,7 @@ public void setUp() throws Exception {
     Context context = RuntimeEnvironment.application;
     FirebaseApp firebaseApp = initializeFirebaseApp(context);
 
-    Personalization personalization = new Personalization(mockAnalyticsConnector);
+    Personalization personalization = new Personalization(() -> mockAnalyticsConnector);
     ConfigGetParameterHandler parameterHandler =
         new ConfigGetParameterHandler(directExecutor, mockActivatedCache, mockDefaultsCache);
     parameterHandler.addListener(personalization::logArmActive);

firebase-config/src/test/java/com/google/firebase/remoteconfig/RemoteConfigComponentTest.java

@@ -172,7 +172,7 @@ private RemoteConfigComponent getNewFrcComponent() {
         mockFirebaseApp,
         mockFirebaseInstallations,
         mockFirebaseAbt,
-        mockAnalyticsConnector,
+        () -> mockAnalyticsConnector,
         /* loadGetDefault= */ true);
   }
 
@@ -183,7 +183,7 @@ private RemoteConfigComponent getNewFrcComponentWithoutLoadingDefault() {
         mockFirebaseApp,
         mockFirebaseInstallations,
         mockFirebaseAbt,
-        mockAnalyticsConnector,
+        () -> mockAnalyticsConnector,
         /* loadGetDefault= */ false);
   }
 

firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigFetchHandlerTest.java

@@ -714,7 +714,7 @@ private ConfigFetchHandler getNewFetchHandler(AnalyticsConnector analyticsConnec
         spy(
             new ConfigFetchHandler(
                 mockFirebaseInstallations,
-                analyticsConnector,
+                () -> analyticsConnector,
                 directExecutor,
                 mockClock,
                 mockRandom,

firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/PersonalizationTest.java

@@ -110,7 +110,7 @@ public void setUp() {
         .when(mockAnalyticsConnector)
         .logEvent(eq(ANALYTICS_ORIGIN_PERSONALIZATION), anyString(), any(Bundle.class));
 
-    personalization = new Personalization(mockAnalyticsConnector);
+    personalization = new Personalization(() -> mockAnalyticsConnector);
 
     FAKE_LOGS.clear();
   }