Register for sessionID updates much earlier than FirebasePerformance module creation.

Author: visumickey

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

@@ -15,13 +15,17 @@
 package com.google.firebase.perf;
 
 import android.content.Context;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.StartupTime;
 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.PerfSession;
 import com.google.firebase.perf.session.SessionManager;
+import com.google.firebase.sessions.FirebaseSessions;
+import com.google.firebase.sessions.api.SessionSubscriber;
 import java.util.concurrent.Executor;
 
 /**
@@ -34,7 +38,7 @@
 public class FirebasePerfEarly {
 
   public FirebasePerfEarly(
-      FirebaseApp app, @Nullable StartupTime startupTime, Executor uiExecutor) {
+      FirebaseApp app, FirebaseSessions firebaseSessions, @Nullable StartupTime startupTime, Executor uiExecutor) {
     Context context = app.getApplicationContext();
 
     // Initialize ConfigResolver early for accessing device caching layer.
@@ -51,6 +55,27 @@ public FirebasePerfEarly(
       uiExecutor.execute(new AppStartTrace.StartFromBackgroundRunnable(appStartTrace));
     }
 
+    // Register with Firebase sessions to receive updates about session changes.
+    firebaseSessions.register(
+        new SessionSubscriber() {
+          @Override
+          public void onSessionChanged(@NonNull SessionDetails sessionDetails) {
+            PerfSession perfSession = PerfSession.createWithId(sessionDetails.getSessionId());
+            SessionManager.getInstance().updatePerfSession(perfSession);
+          }
+
+          @Override
+          public boolean isDataCollectionEnabled() {
+            return configResolver.isPerformanceMonitoringEnabled();
+          }
+
+          @NonNull
+          @Override
+          public Name getSessionSubscriberName() {
+            return SessionSubscriber.Name.PERFORMANCE;
+          }
+        });
+
     // In the case of cold start, we create a session and start collecting gauges as early as
     // possible.
     // There is code in SessionManager that prevents us from resetting the session twice in case

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

@@ -65,20 +65,21 @@ public List<Component<?>> getComponents() {
             .add(Dependency.requiredProvider(RemoteConfigComponent.class))
             .add(Dependency.required(FirebaseInstallationsApi.class))
             .add(Dependency.requiredProvider(TransportFactory.class))
-            .add(Dependency.required(FirebaseSessions.class))
             .add(Dependency.required(FirebasePerfEarly.class))
             .factory(FirebasePerfRegistrar::providesFirebasePerformance)
             .build(),
         Component.builder(FirebasePerfEarly.class)
             .name(EARLY_LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
+            .add(Dependency.required(FirebaseSessions.class))
             .add(Dependency.optionalProvider(StartupTime.class))
             .add(Dependency.required(uiExecutor))
             .eagerInDefaultApp()
             .factory(
                 container ->
                     new FirebasePerfEarly(
                         container.get(FirebaseApp.class),
+                        container.get(FirebaseSessions.class),
                         container.getProvider(StartupTime.class).get(),
                         container.get(uiExecutor)))
             .build(),
@@ -102,8 +103,7 @@ private static FirebasePerformance providesFirebasePerformance(ComponentContaine
                     container.get(FirebaseApp.class),
                     container.get(FirebaseInstallationsApi.class),
                     container.getProvider(RemoteConfigComponent.class),
-                    container.getProvider(TransportFactory.class),
-                    container.get(FirebaseSessions.class)))
+                    container.getProvider(TransportFactory.class)))
             .build();
 
     return component.getFirebasePerformance();

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

@@ -143,7 +143,6 @@ public static FirebasePerformance getInstance() {
   private final Provider<RemoteConfigComponent> firebaseRemoteConfigProvider;
   private final FirebaseInstallationsApi firebaseInstallationsApi;
   private final Provider<TransportFactory> transportFactoryProvider;
-  private final FirebaseSessions firebaseSessions;
 
   /**
    * Constructs the FirebasePerformance class and allows injecting dependencies.
@@ -167,15 +166,13 @@ public static FirebasePerformance getInstance() {
       FirebaseInstallationsApi firebaseInstallationsApi,
       Provider<TransportFactory> transportFactoryProvider,
       RemoteConfigManager remoteConfigManager,
-      FirebaseSessions firebaseSessions,
       ConfigResolver configResolver,
       SessionManager sessionManager) {
 
     this.firebaseApp = firebaseApp;
     this.firebaseRemoteConfigProvider = firebaseRemoteConfigProvider;
     this.firebaseInstallationsApi = firebaseInstallationsApi;
     this.transportFactoryProvider = transportFactoryProvider;
-    this.firebaseSessions = firebaseSessions;
 
     if (firebaseApp == null) {
       this.mPerformanceCollectionForceEnabledState = false;
@@ -206,27 +203,6 @@ public static FirebasePerformance getInstance() {
               ConsoleUrlGenerator.generateDashboardUrl(
                   firebaseApp.getOptions().getProjectId(), appContext.getPackageName())));
     }
-
-    // Register with Firebase sessions to receive updates about session changes.
-    this.firebaseSessions.register(
-        new SessionSubscriber() {
-          @Override
-          public void onSessionChanged(@NonNull SessionDetails sessionDetails) {
-            PerfSession perfSession = PerfSession.createWithId(sessionDetails.getSessionId());
-            sessionManager.updatePerfSession(perfSession);
-          }
-
-          @Override
-          public boolean isDataCollectionEnabled() {
-            return configResolver.isPerformanceMonitoringEnabled();
-          }
-
-          @NonNull
-          @Override
-          public Name getSessionSubscriberName() {
-            return SessionSubscriber.Name.PERFORMANCE;
-          }
-        });
   }
 
   /**

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

@@ -35,19 +35,16 @@ public class FirebasePerformanceModule {
   private final FirebaseInstallationsApi firebaseInstallations;
   private final Provider<RemoteConfigComponent> remoteConfigComponentProvider;
   private final Provider<TransportFactory> transportFactoryProvider;
-  private final FirebaseSessions firebaseSessions;
 
   public FirebasePerformanceModule(
       @NonNull FirebaseApp firebaseApp,
       @NonNull FirebaseInstallationsApi firebaseInstallations,
       @NonNull Provider<RemoteConfigComponent> remoteConfigComponentProvider,
-      @NonNull Provider<TransportFactory> transportFactoryProvider,
-      @NonNull FirebaseSessions firebaseSessions) {
+      @NonNull Provider<TransportFactory> transportFactoryProvider) {
     this.firebaseApp = firebaseApp;
     this.firebaseInstallations = firebaseInstallations;
     this.remoteConfigComponentProvider = remoteConfigComponentProvider;
     this.transportFactoryProvider = transportFactoryProvider;
-    this.firebaseSessions = firebaseSessions;
   }
 
   @Provides
@@ -84,9 +81,4 @@ ConfigResolver providesConfigResolver() {
   SessionManager providesSessionManager() {
     return SessionManager.getInstance();
   }
-
-  @Provides
-  FirebaseSessions providesFirebaseSessions() {
-    return firebaseSessions;
-  }
 }

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

@@ -50,7 +50,6 @@ public void testGetComponents() {
             Dependency.requiredProvider(RemoteConfigComponent.class),
             Dependency.required(FirebaseInstallationsApi.class),
             Dependency.requiredProvider(TransportFactory.class),
-            Dependency.required(FirebaseSessions.class),
             Dependency.required(FirebasePerfEarly.class));
 
     assertThat(firebasePerfComponent.isLazy()).isTrue();
@@ -61,6 +60,7 @@ public void testGetComponents() {
         .containsExactly(
             Dependency.required(Qualified.qualified(UiThread.class, Executor.class)),
             Dependency.required(FirebaseApp.class),
+            Dependency.required(FirebaseSessions.class),
             Dependency.optionalProvider(StartupTime.class));
 
     assertThat(firebasePerfEarlyComponent.isLazy()).isFalse();

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

@@ -579,7 +579,6 @@ private FirebasePerformance initializeFirebasePerformancePreferences(
         mock(FirebaseInstallationsApi.class),
         transportFactoryProvider,
         spyRemoteConfigManager,
-        mock(FirebaseSessions.class),
         spyConfigResolver,
         spySessionManager);
   }

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

@@ -14,7 +14,10 @@
 
 package com.google.firebase.perf;
 
+import static org.robolectric.Shadows.shadowOf;
+
 import android.content.Context;
+import android.content.pm.PackageInfo;
 import android.os.Bundle;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.firebase.FirebaseApp;
@@ -25,6 +28,7 @@
 import com.google.firebase.perf.util.ImmutableBundle;
 import org.junit.After;
 import org.junit.Before;
+import org.robolectric.shadows.ShadowPackageManager;
 
 public class FirebasePerformanceTestBase {
 
@@ -53,6 +57,13 @@ public class FirebasePerformanceTestBase {
   @Before
   public void setUpFirebaseApp() {
     appContext = ApplicationProvider.getApplicationContext();
+
+    ShadowPackageManager shadowPackageManager = shadowOf(appContext.getPackageManager());
+
+    PackageInfo packageInfo =
+        shadowPackageManager.getInternalMutablePackageInfo(appContext.getPackageName());
+    packageInfo.versionName = "1.0.0";
+
     FirebaseOptions options =
         new FirebaseOptions.Builder()
             .setApplicationId(FAKE_FIREBASE_APPLICATION_ID)