Fix more test

Author: mrober

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

@@ -18,10 +18,12 @@
 import androidx.annotation.Nullable;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.StartupTime;
+import com.google.firebase.inject.Provider;
 import com.google.firebase.perf.application.AppStateMonitor;
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.metrics.AppStartTrace;
 import com.google.firebase.perf.session.FirebasePerformanceSessionSubscriber;
+import com.google.firebase.sessions.FirebaseSessions;
 import com.google.firebase.sessions.api.FirebaseSessionsDependencies;
 import java.util.concurrent.Executor;
 
@@ -35,13 +37,16 @@
 public class FirebasePerfEarly {
 
   public FirebasePerfEarly(
-      FirebaseApp app, @Nullable StartupTime startupTime, Executor uiExecutor) {
+      FirebaseApp app, @Nullable StartupTime startupTime, Executor uiExecutor, Provider<FirebaseSessions> firebaseSessions) {
     Context context = app.getApplicationContext();
 
     // Initialize ConfigResolver early for accessing device caching layer.
     ConfigResolver configResolver = ConfigResolver.getInstance();
     configResolver.setApplicationContext(context);
 
+    // Ensure FirebaseSessions was initialized
+    firebaseSessions.get();
+
     // Register FirebasePerformance as a subscriber ASAP - which will start collecting gauges if the
     // FirebaseSession is verbose.
     FirebaseSessionsDependencies.register(new FirebasePerformanceSessionSubscriber(configResolver));

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

@@ -75,19 +75,16 @@ public List<Component<?>> getComponents() {
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.optionalProvider(StartupTime.class))
             .add(Dependency.required(uiExecutor))
-            .add(Dependency.required(FirebaseSessions.class))
+            .add(Dependency.optionalProvider(FirebaseSessions.class))
             .eagerInDefaultApp()
             .factory(
-                container -> {
-                  // Ensure FirebaseSessions was initialized
-                  container.get(FirebaseSessions.class);
-                  return new FirebasePerfEarly(
-                      container.get(FirebaseApp.class),
-                      container.getProvider(StartupTime.class).get(),
-                      container.get(uiExecutor));
-                })
+                container -> new FirebasePerfEarly(
+                    container.get(FirebaseApp.class),
+                    container.getProvider(StartupTime.class).get(),
+                    container.get(uiExecutor),
+                    container.getProvider(FirebaseSessions.class)))
             .build(),
-        /**
+        /*
          * Fireperf SDK is lazily by {@link FirebasePerformanceInitializer} during {@link
          * com.google.firebase.perf.application.AppStateMonitor#onActivityResumed(Activity)}. we use
          * "lazy" dependency for some components that are not required during initialization so as

firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerfRegistrarTest.java

@@ -61,7 +61,7 @@ public void testGetComponents() {
             Dependency.required(Qualified.qualified(UiThread.class, Executor.class)),
             Dependency.required(FirebaseApp.class),
             Dependency.optionalProvider(StartupTime.class),
-            Dependency.required(FirebaseSessions.class));
+            Dependency.optionalProvider(FirebaseSessions.class));
 
     assertThat(firebasePerfEarlyComponent.isLazy()).isFalse();
   }