Switch AQS ID to an always known ID

Author: tejasd

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

@@ -22,7 +22,6 @@
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.metrics.AppStartTrace;
 import com.google.firebase.perf.session.SessionManager;
-
 import java.util.concurrent.Executor;
 
 /**
@@ -55,6 +54,7 @@ public FirebasePerfEarly(
     // In the case of cold start, we create a session and start collecting gauges as early as
     // possible.
     // Uploading the gauges however only starts once AQS is initialized.
+    // TODO(b/394127311): Update this to use changes in AQS initialization,
     SessionManager.getInstance().initializeGaugeCollection();
   }
 }

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

@@ -17,6 +17,7 @@
 package com.google.firebase.perf.session
 
 import com.google.firebase.perf.session.gauges.GaugeManager
+import com.google.firebase.perf.util.Constants
 import com.google.firebase.perf.v1.ApplicationProcessState
 import com.google.firebase.sessions.api.SessionSubscriber
 import java.util.UUID
@@ -27,22 +28,24 @@ class FirebasePerformanceSessionSubscriber(override val isDataCollectionEnabled:
   override val sessionSubscriberName: SessionSubscriber.Name = SessionSubscriber.Name.PERFORMANCE
 
   override fun onSessionChanged(sessionDetails: SessionSubscriber.SessionDetails) {
-    val currentPerfSession = SessionManager.getInstance().perfSession()
+    val sessionManager = SessionManager.getInstance()
+    val currentPerfSession = sessionManager.perfSession()
     val gaugeManager = GaugeManager.getInstance()
 
     // A [PerfSession] was created before a session was started.
-    if (currentPerfSession.aqsSessionId() == null) {
+    if (currentPerfSession.aqsSessionId().equals(Constants.UNDEFINED_AQS_ID)) {
       currentPerfSession.setAQSId(sessionDetails)
-      gaugeManager
-        .logGaugeMetadata(currentPerfSession.aqsSessionId(), ApplicationProcessState.FOREGROUND)
+      gaugeManager.logGaugeMetadata(
+        currentPerfSession.aqsSessionId(),
+        ApplicationProcessState.FOREGROUND
+      )
       gaugeManager.updateGaugeCollection(ApplicationProcessState.FOREGROUND)
       return
     }
 
     val updatedSession = PerfSession.createWithId(UUID.randomUUID().toString())
     updatedSession.setAQSId(sessionDetails)
-    SessionManager.getInstance().updatePerfSession(updatedSession)
-    GaugeManager.getInstance()
-      .logGaugeMetadata(updatedSession.aqsSessionId(), ApplicationProcessState.FOREGROUND)
+    sessionManager.updatePerfSession(updatedSession)
+    gaugeManager.logGaugeMetadata(updatedSession.aqsSessionId(), ApplicationProcessState.FOREGROUND)
   }
 }

firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/GaugeManager.java

@@ -24,6 +24,7 @@
 import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.session.PerfSession;
 import com.google.firebase.perf.transport.TransportManager;
+import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.v1.AndroidMemoryReading;
 import com.google.firebase.perf.v1.ApplicationProcessState;
@@ -112,7 +113,7 @@ public void updateGaugeCollection(ApplicationProcessState applicationProcessStat
 
     if (session == null
         || !session.isGaugeAndEventCollectionEnabled()
-        || session.aqsSessionId() == null) {
+        || session.aqsSessionId().equals(Constants.UNDEFINED_AQS_ID)) {
       logger.warn("Not starting gauge collection.");
       stopCollectingGauges();
       return;
@@ -268,7 +269,6 @@ private void syncFlush(String sessionId, ApplicationProcessState appState) {
     }
 
     // Adding Session ID info.
-    // TODO(b/394127311): Switch to using AQS.
     gaugeMetricBuilder.setSessionId(sessionId);
 
     transportManager.log(gaugeMetricBuilder.build(), appState);