Attempt to simplify AQS session usage

Author: tejasd

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

@@ -30,6 +30,7 @@
 /** Details of a session including a unique Id and related information. */
 public class PerfSession implements Parcelable {
 
+  private static final String SESSION_ID_PREFIX = "fireperf-session";
   private final String sessionId;
   private final Timer creationTime;
 
@@ -39,16 +40,9 @@ public class PerfSession implements Parcelable {
    * Creates a PerfSession object and decides what metrics to collect.
    */
   public static PerfSession createNewSession() {
-    String prunedSessionId = UUID.randomUUID().toString().replace("-", "");
+    String prunedSessionId = SESSION_ID_PREFIX + UUID.randomUUID().toString().replace("-", "");
     PerfSession session = new PerfSession(prunedSessionId, new Clock());
     session.setGaugeAndEventCollectionEnabled(shouldCollectGaugesAndEvents());
-
-    // Every time a PerfSession is created, it sets the AQS to null. Once an AQS is received,
-    // 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.
-    FirebasePerformanceSessionSubscriber.Companion.getInstance().reportPerfSession(prunedSessionId);
-
     return session;
   }
 
@@ -57,6 +51,11 @@ public static PerfSession createNewSession() {
   public PerfSession(String sessionId, Clock clock) {
     this.sessionId = sessionId;
     creationTime = clock.getTime();
+    // Every time a PerfSession is created, it sets the AQS to null. Once an AQS is received,
+    // 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.
+    FirebasePerformanceSessionSubscriber.Companion.getInstance().reportPerfSession(sessionId);
   }
 
   private PerfSession(@NonNull Parcel in) {
@@ -71,6 +70,11 @@ public String sessionId() {
     return this.sessionId;
   }
 
+  private String aqsSessionId() {
+    return FirebasePerformanceSessionSubscriber.Companion.getInstance()
+        .getAqsMappedToPerfSession(this.sessionId);
+  }
+
   /**
    * Returns a timer object that has been seeded with the system time at which the session began.
    */
@@ -121,7 +125,7 @@ public boolean isSessionRunningTooLong() {
   /** Creates and returns the proto object for PerfSession object. */
   public com.google.firebase.perf.v1.PerfSession build() {
     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/main/java/com/google/firebase/perf/session/SessionManager.java

@@ -113,8 +113,7 @@ public void stopGaugeCollectionIfSessionRunningTooLong() {
    */
   public void updatePerfSession(PerfSession perfSession) {
     // Do not update the perf session if it is the exact same sessionId.
-    if (Objects.equals(
-        perfSession.sessionId(), this.perfSession.sessionId())) {
+    if (Objects.equals(perfSession.sessionId(), this.perfSession.sessionId())) {
       return;
     }
 

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

@@ -22,6 +22,7 @@
 import com.google.firebase.components.Lazy;
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.logging.AndroidLogger;
+import com.google.firebase.perf.session.FirebasePerformanceSessionSubscriber;
 import com.google.firebase.perf.session.PerfSession;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Timer;
@@ -242,7 +243,10 @@ private void syncFlush(String sessionId, ApplicationProcessState appState) {
     }
 
     // Adding Session ID info.
-    gaugeMetricBuilder.setSessionId(sessionId);
+    String aqsSessionId =
+        FirebasePerformanceSessionSubscriber.Companion.getInstance()
+            .getAqsMappedToPerfSession(sessionId);
+    gaugeMetricBuilder.setSessionId(aqsSessionId);
 
     transportManager.log(gaugeMetricBuilder.build(), appState);
   }
@@ -256,10 +260,13 @@ private void syncFlush(String sessionId, ApplicationProcessState appState) {
    * @return true if GaugeMetadata was logged, false otherwise.
    */
   public boolean logGaugeMetadata(String sessionId, ApplicationProcessState appState) {
+    String aqsSessionId =
+        FirebasePerformanceSessionSubscriber.Companion.getInstance()
+            .getAqsMappedToPerfSession(sessionId);
     if (gaugeMetadataManager != null) {
       GaugeMetric gaugeMetric =
           GaugeMetric.newBuilder()
-              .setSessionId(sessionId)
+              .setSessionId(aqsSessionId)
               .setGaugeMetadata(getGaugeMetadata())
               .build();
       transportManager.log(gaugeMetric, appState);