Allow using session subscriber for unit tests

Author: tejasd

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

@@ -44,6 +44,8 @@
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.remoteconfig.RemoteConfigComponent;
 import com.google.firebase.sessions.api.FirebaseSessionsDependencies;
+import com.google.firebase.sessions.api.SessionSubscriber;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.net.URL;
@@ -94,6 +96,8 @@ public class FirebasePerformance implements FirebasePerformanceAttributable {
   // once during initialization and cache it.
   private final ImmutableBundle mMetadataBundle;
 
+  private final SessionSubscriber sessionSubscriber;
+
   /** Valid HttpMethods for manual network APIs */
   @StringDef({
     HttpMethod.GET,
@@ -167,6 +171,8 @@ public static FirebasePerformance getInstance() {
       this.mPerformanceCollectionForceEnabledState = false;
       this.configResolver = configResolver;
       this.mMetadataBundle = new ImmutableBundle(new Bundle());
+      this.sessionSubscriber = new FirebasePerformanceSessionSubscriber(false);
+      FirebaseSessionsDependencies.register(sessionSubscriber);
       return;
     }
 
@@ -183,8 +189,8 @@ public static FirebasePerformance getInstance() {
     sessionManager.setApplicationContext(appContext);
 
     mPerformanceCollectionForceEnabledState = configResolver.getIsPerformanceCollectionEnabled();
-    FirebaseSessionsDependencies.register(
-        new FirebasePerformanceSessionSubscriber(isPerformanceCollectionEnabled()));
+    sessionSubscriber = new FirebasePerformanceSessionSubscriber(isPerformanceCollectionEnabled());
+    FirebaseSessionsDependencies.register(sessionSubscriber);
 
     if (logger.isLogcatEnabled() && isPerformanceCollectionEnabled()) {
       logger.info(
@@ -460,4 +466,9 @@ private static ImmutableBundle extractMetadata(Context appContext) {
   Boolean getPerformanceCollectionForceEnabledState() {
     return mPerformanceCollectionForceEnabledState;
   }
+
+  @VisibleForTesting
+  SessionSubscriber getSessionSubscriber() {
+    return sessionSubscriber;
+  }
 }

firebase-perf/src/main/java/com/google/firebase/perf/session/PerfSession.java

@@ -129,7 +129,7 @@ public boolean isSessionRunningTooLong() {
   public com.google.firebase.perf.v1.PerfSession build() {
     // TODO(b/394127311): Switch to using AQS.
     com.google.firebase.perf.v1.PerfSession.Builder sessionMetric =
-        com.google.firebase.perf.v1.PerfSession.newBuilder().setSessionId(sessionId);
+        com.google.firebase.perf.v1.PerfSession.newBuilder().setSessionId(aqsSessionId);
 
     // If gauge collection is enabled, enable gauge collection verbosity.
     if (isGaugeAndEventCollectionEnabled) {

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

@@ -26,12 +26,15 @@
 import com.google.firebase.perf.session.PerfSession;
 import com.google.firebase.perf.session.SessionManager;
 import com.google.firebase.perf.util.ImmutableBundle;
+import com.google.firebase.sessions.FirebaseSessions;
+import com.google.firebase.sessions.api.FirebaseSessionsDependencies;
+import com.google.firebase.sessions.api.SessionSubscriber;
+
 import org.junit.After;
 import org.junit.Before;
 import org.robolectric.shadows.ShadowPackageManager;
 
 public class FirebasePerformanceTestBase {
-
   /**
    * The following values are needed by Firebase to identify the project and application that all
    * data stored in Firebase databases gets associated with. This is important to determine data
@@ -72,6 +75,7 @@ public void setUpFirebaseApp() {
             .setProjectId(FAKE_FIREBASE_PROJECT_ID)
             .build();
     FirebaseApp.initializeApp(appContext, options);
+    forceAppQualitySession();
   }
 
   @After
@@ -93,11 +97,15 @@ protected static void forceNonVerboseSession() {
     forceVerboseSessionWithSamplingPercentage(0);
   }
 
+  protected static void forceAppQualitySession() {
+    SessionSubscriber sessionSubscriber = FirebasePerformance.getInstance().getSessionSubscriber();
+    sessionSubscriber.onSessionChanged(new SessionSubscriber.SessionDetails("testAqsSession"));
+  }
+
   private static void forceVerboseSessionWithSamplingPercentage(long samplingPercentage) {
     Bundle bundle = new Bundle();
     bundle.putFloat("sessions_sampling_percentage", samplingPercentage);
     ConfigResolver.getInstance().setMetadataBundle(new ImmutableBundle(bundle));
-
-    SessionManager.getInstance().setPerfSession(PerfSession.createWithId("sessionId"));
+    forceAppQualitySession();
   }
 }