More changes

Author: tejasd

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

@@ -70,6 +70,11 @@ public String sessionId() {
 
   /** Returns the AQS sessionId for the given session. */
   public String aqsSessionId() {
+    // This is a fallback for if/when the AQS ID is undefined.
+    if (aqsSessionId.equals(Constants.UNDEFINED_AQS_ID)) {
+      // TODO(b/394127311): Explore returning a valid - but different ID.
+      return Constants.UNDEFINED_AQS_ID;
+    }
     return aqsSessionId;
   }
 

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

@@ -111,9 +111,7 @@ public void updateGaugeCollection(ApplicationProcessState applicationProcessStat
       gaugeManagerDataCollectionJob.cancel(false);
     }
 
-    if (session == null
-        || !session.isGaugeAndEventCollectionEnabled()
-        || session.aqsSessionId().equals(Constants.UNDEFINED_AQS_ID)) {
+    if (shouldStopCollectingGauges()) {
       logger.warn("Not starting gauge collection.");
       stopCollectingGauges();
       return;
@@ -433,6 +431,12 @@ private long getMemoryGaugeCollectionFrequencyMs(
     }
   }
 
+  private boolean shouldStopCollectingGauges() {
+    return session == null
+        || !session.isGaugeAndEventCollectionEnabled()
+        || session.aqsSessionId().equals(Constants.UNDEFINED_AQS_ID);
+  }
+
   @VisibleForTesting
   void setApplicationProcessState(ApplicationProcessState applicationProcessState) {
     this.applicationProcessState = applicationProcessState;