Unify the constructors for FirebasePerformance.

Author: visumickey

firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerformance.java

@@ -138,26 +138,6 @@ public static FirebasePerformance getInstance() {
   private FirebaseInstallationsApi firebaseInstallationsApi;
   private Provider<TransportFactory> transportFactoryProvider;
 
-  @Inject
-  FirebasePerformance(
-      @NonNull FirebaseApp firebaseApp,
-      @NonNull Provider<RemoteConfigComponent> firebaseRemoteConfigProvider,
-      @NonNull FirebaseInstallationsApi firebaseInstallationsApi,
-      @NonNull Provider<TransportFactory> transportFactoryProvider) {
-    this(
-        firebaseApp,
-        firebaseRemoteConfigProvider,
-        firebaseInstallationsApi,
-        transportFactoryProvider,
-        RemoteConfigManager.getInstance(),
-        ConfigResolver.getInstance(),
-        GaugeManager.getInstance());
-    this.firebaseApp = firebaseApp;
-    this.firebaseRemoteConfigProvider = firebaseRemoteConfigProvider;
-    this.firebaseInstallationsApi = firebaseInstallationsApi;
-    this.transportFactoryProvider = transportFactoryProvider;
-  }
-
   /**
    * Constructs the FirebasePerformance class and allows injecting dependencies.
    *
@@ -173,6 +153,7 @@ public static FirebasePerformance getInstance() {
    * @param gaugeManager The GaugeManager instance.
    */
   @VisibleForTesting
+  @Inject
   FirebasePerformance(
       FirebaseApp firebaseApp,
       Provider<RemoteConfigComponent> firebaseRemoteConfigProvider,
@@ -182,6 +163,11 @@ public static FirebasePerformance getInstance() {
       ConfigResolver configResolver,
       GaugeManager gaugeManager) {
 
+    this.firebaseApp = firebaseApp;
+    this.firebaseRemoteConfigProvider = firebaseRemoteConfigProvider;
+    this.firebaseInstallationsApi = firebaseInstallationsApi;
+    this.transportFactoryProvider = transportFactoryProvider;
+
     if (firebaseApp == null) {
       this.mPerformanceCollectionForceEnabledState = false;
       this.configResolver = configResolver;

firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerformanceModule.java

@@ -19,6 +19,9 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
+import com.google.firebase.perf.config.ConfigResolver;
+import com.google.firebase.perf.internal.GaugeManager;
+import com.google.firebase.perf.internal.RemoteConfigManager;
 import com.google.firebase.remoteconfig.RemoteConfigComponent;
 import dagger.Module;
 import dagger.Provides;
@@ -30,6 +33,10 @@ public class FirebasePerformanceModule {
   private final Provider<RemoteConfigComponent> remoteConfigComponentProvider;
   private final Provider<TransportFactory> transportFactoryProvider;
 
+  //  private final RemoteConfigManager remoteConfigManager;
+  //  private final ConfigResolver configResolver;
+  //  private final GaugeManager gaugeManager;
+
   public FirebasePerformanceModule(
       @NonNull FirebaseApp firebaseApp,
       @NonNull FirebaseInstallationsApi firebaseInstallations,
@@ -39,6 +46,10 @@ public FirebasePerformanceModule(
     this.firebaseInstallations = firebaseInstallations;
     this.remoteConfigComponentProvider = remoteConfigComponentProvider;
     this.transportFactoryProvider = transportFactoryProvider;
+
+    //    this.remoteConfigManager = RemoteConfigManager.getInstance();
+    //    this.configResolver = ConfigResolver.getInstance();
+    //    this.gaugeManager = GaugeManager.getInstance();
   }
 
   @Provides
@@ -60,4 +71,19 @@ Provider<RemoteConfigComponent> providesRemoteConfigComponent() {
   Provider<TransportFactory> providesTransportFactoryProvider() {
     return transportFactoryProvider;
   }
+
+  @Provides
+  RemoteConfigManager providesRemoteConfigManager() {
+    return RemoteConfigManager.getInstance();
+  }
+
+  @Provides
+  ConfigResolver providesConfigResolver() {
+    return ConfigResolver.getInstance();
+  }
+
+  @Provides
+  GaugeManager providesGaugeManager() {
+    return GaugeManager.getInstance();
+  }
 }