Switch to a singleton Fireperf session subscriber

Author: tejasd

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

@@ -202,8 +202,7 @@ public static FirebasePerformance getInstance() {
                   firebaseApp.getOptions().getProjectId(), appContext.getPackageName())));
     }
 
-    SessionManagerKt sessionSubscriber = new SessionManagerKt(isPerformanceCollectionEnabled());
-    FirebaseSessionsDependencies.register(sessionSubscriber);
+    FirebaseSessionsDependencies.register(SessionManagerKt.Companion.getInstance());
   }
 
   /**

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

@@ -20,13 +20,10 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import com.google.firebase.perf.config.ConfigResolver;
-import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.util.Clock;
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.v1.SessionVerbosity;
-import com.google.firebase.sessions.api.SessionSubscriber;
 import java.util.List;
-import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
@@ -50,7 +47,7 @@ public static PerfSession createNewSession() {
     // SessionManagerKt verifies if this is an active session, and sets the AQS session ID.
     // The assumption is that new PerfSessions *should* be limited to either App Start, or through
     // AQS.
-    SessionManagerKt.Companion.getPerfSessionToAqs().put(prunedSessionId, null);
+    SessionManagerKt.Companion.getInstance().reportPerfSession(prunedSessionId);
 
     return session;
   }
@@ -71,12 +68,8 @@ private PerfSession(@NonNull Parcel in) {
 
   /** Returns the sessionId of the object. */
   public String sessionId() {
-    // TODO(b/394127311): Verify edge cases.
-    SessionSubscriber.SessionDetails sessionDetails =
-        SessionManagerKt.Companion.getPerfSessionToAqs().get(internalSessionId);
-    AndroidLogger.getInstance()
-        .debug("AQS for " + this.internalSessionId + " is " + sessionDetails);
-    return Objects.requireNonNull(sessionDetails).getSessionId();
+    return SessionManagerKt.Companion.getInstance()
+        .getAqsMappedToPerfSession(this.internalSessionId);
   }
 
   @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)

firebase-perf/src/main/java/com/google/firebase/perf/session/SessionManagerKt.kt

@@ -1,9 +1,13 @@
 package com.google.firebase.perf.session
 
+import com.google.firebase.perf.config.ConfigResolver
 import com.google.firebase.perf.logging.AndroidLogger
 import com.google.firebase.sessions.api.SessionSubscriber
 
-class SessionManagerKt(val dataCollectionEnabled: Boolean) : SessionSubscriber {
+class SessionManagerKt(private val dataCollectionEnabled: Boolean) : SessionSubscriber {
+  private val perfSessionToAqs: MutableMap<String, SessionSubscriber.SessionDetails?> =
+    mutableMapOf()
+
   override val isDataCollectionEnabled: Boolean
     get() = dataCollectionEnabled
 
@@ -25,9 +29,19 @@ class SessionManagerKt(val dataCollectionEnabled: Boolean) : SessionSubscriber {
     }
   }
 
+  fun reportPerfSession(perfSessionId: String) {
+    perfSessionToAqs[perfSessionId] = null
+  }
+
+  fun getAqsMappedToPerfSession(perfSessionId: String): String {
+    AndroidLogger.getInstance()
+      .debug("AQS for perf session $perfSessionId is ${perfSessionToAqs[perfSessionId]?.sessionId}")
+    return perfSessionToAqs[perfSessionId]?.sessionId ?: perfSessionId
+  }
+
   companion object {
-    val perfSessionToAqs: MutableMap<String, SessionSubscriber.SessionDetails?> by lazy {
-      mutableMapOf()
+    val instance: SessionManagerKt by lazy {
+      SessionManagerKt(ConfigResolver.getInstance().isPerformanceMonitoringEnabled)
     }
   }
 }

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

@@ -23,9 +23,9 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.perf.config.ConfigResolver;
-import com.google.firebase.perf.session.PerfSession;
-import com.google.firebase.perf.session.SessionManager;
+import com.google.firebase.perf.session.SessionManagerKt;
 import com.google.firebase.perf.util.ImmutableBundle;
+import com.google.firebase.sessions.api.SessionSubscriber;
 import org.junit.After;
 import org.junit.Before;
 import org.robolectric.shadows.ShadowPackageManager;
@@ -72,6 +72,7 @@ public void setUpFirebaseApp() {
             .setProjectId(FAKE_FIREBASE_PROJECT_ID)
             .build();
     FirebaseApp.initializeApp(appContext, options);
+    FirebasePerformance.getInstance();
   }
 
   @After
@@ -98,6 +99,7 @@ private static void forceVerboseSessionWithSamplingPercentage(long samplingPerce
     bundle.putFloat("sessions_sampling_percentage", samplingPercentage);
     ConfigResolver.getInstance().setMetadataBundle(new ImmutableBundle(bundle));
 
-    SessionManager.getInstance().setPerfSession(PerfSession.createNewSession());
+    SessionManagerKt.Companion.getInstance()
+        .onSessionChanged(new SessionSubscriber.SessionDetails("sessionId"));
   }
 }