Remove the identical methods in PerfSession

Author: tejasd

firebase-perf/src/main/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilder.java

@@ -224,7 +224,7 @@ public NetworkRequestMetricBuilder setCustomAttributes(Map<String, String> attri
    * point depending upon the current {@link PerfSession} verbosity.
    *
    * @see GaugeManager#collectGaugeMetricOnce(Timer)
-   * @see PerfSession#isGaugeAndEventCollectionEnabled()
+   * @see PerfSession#isVerbose()
    */
   public NetworkRequestMetricBuilder setRequestStartTimeMicros(long time) {
     SessionManager sessionManager = SessionManager.getInstance();
@@ -234,7 +234,7 @@ public NetworkRequestMetricBuilder setRequestStartTimeMicros(long time) {
     builder.setClientStartTimeUs(time);
     updateSession(perfSession);
 
-    if (perfSession.isGaugeAndEventCollectionEnabled()) {
+    if (perfSession.isVerbose()) {
       gaugeManager.collectGaugeMetricOnce(perfSession.getTimer());
     }
 
@@ -265,12 +265,12 @@ public long getTimeToResponseInitiatedMicros() {
    * point depending upon the current {@link PerfSession} Verbosity.
    *
    * @see GaugeManager#collectGaugeMetricOnce(Timer)
-   * @see PerfSession#isGaugeAndEventCollectionEnabled()
+   * @see PerfSession#isVerbose()
    */
   public NetworkRequestMetricBuilder setTimeToResponseCompletedMicros(long time) {
     builder.setTimeToResponseCompletedUs(time);
 
-    if (SessionManager.getInstance().perfSession().isGaugeAndEventCollectionEnabled()) {
+    if (SessionManager.getInstance().perfSession().isVerbose()) {
       gaugeManager.collectGaugeMetricOnce(SessionManager.getInstance().perfSession().getTimer());
     }
 

firebase-perf/src/main/java/com/google/firebase/perf/metrics/Trace.java

@@ -233,7 +233,7 @@ public void start() {
 
     updateSession(perfSession);
 
-    if (perfSession.isGaugeAndEventCollectionEnabled()) {
+    if (perfSession.isVerbose()) {
       gaugeManager.collectGaugeMetricOnce(perfSession.getTimer());
     }
   }
@@ -259,7 +259,7 @@ public void stop() {
       if (!name.isEmpty()) {
         transportManager.log(new TraceMetricBuilder(this).build(), getAppState());
 
-        if (SessionManager.getInstance().perfSession().isGaugeAndEventCollectionEnabled()) {
+        if (SessionManager.getInstance().perfSession().isVerbose()) {
           gaugeManager.collectGaugeMetricOnce(
               SessionManager.getInstance().perfSession().getTimer());
         }

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

@@ -76,16 +76,10 @@ public Timer getTimer() {
    * Enables/Disables the gauge and event collection for the system.
    */
   public void setGaugeAndEventCollectionEnabled(boolean enabled) {
+    // TODO(b/394127311): Explore deleting this method.
     isGaugeAndEventCollectionEnabled = enabled;
   }
 
-  /*
-   * Returns if gauge and event collection is enabled for the system.
-   */
-  public boolean isGaugeAndEventCollectionEnabled() {
-    return isGaugeAndEventCollectionEnabled;
-  }
-
   /** Returns if the current session is verbose or not. */
   public boolean isVerbose() {
     return isGaugeAndEventCollectionEnabled;

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

@@ -21,7 +21,6 @@
 import com.google.firebase.perf.application.AppStateMonitor;
 import com.google.firebase.perf.logging.FirebaseSessionsEnforcementCheck;
 import com.google.firebase.perf.session.gauges.GaugeManager;
-import com.google.firebase.perf.v1.ApplicationProcessState;
 import com.google.firebase.perf.v1.GaugeMetadata;
 import com.google.firebase.perf.v1.GaugeMetric;
 import java.lang.ref.WeakReference;
@@ -37,7 +36,6 @@ public class SessionManager {
   private static final SessionManager instance = new SessionManager();
 
   private final GaugeManager gaugeManager;
-  private final AppStateMonitor appStateMonitor;
   private final Set<WeakReference<SessionAwareObject>> clients = new HashSet<>();
 
   private PerfSession perfSession;
@@ -50,22 +48,21 @@ public static SessionManager getInstance() {
   /** Returns the currently active PerfSession. */
   public final PerfSession perfSession() {
     FirebaseSessionsEnforcementCheck.checkSession(
-        perfSession, "Access perf session from manger without aqs ready");
+        perfSession, "PerfSession.perfSession()");
 
     return perfSession;
   }
 
   private SessionManager() {
     // session should quickly updated by session subscriber.
-    this(GaugeManager.getInstance(), PerfSession.createWithId(null), AppStateMonitor.getInstance());
+    this(GaugeManager.getInstance(), PerfSession.createWithId(null));
   }
 
   @VisibleForTesting
   public SessionManager(
-      GaugeManager gaugeManager, PerfSession perfSession, AppStateMonitor appStateMonitor) {
+      GaugeManager gaugeManager, PerfSession perfSession) {
     this.gaugeManager = gaugeManager;
     this.perfSession = perfSession;
-    this.appStateMonitor = appStateMonitor;
   }
 
   /**
@@ -84,7 +81,7 @@ public void setApplicationContext(final Context appContext) {
   public void stopGaugeCollectionIfSessionRunningTooLong() {
     FirebaseSessionsEnforcementCheck.checkSession(
         perfSession,
-        "Session is not ready while trying to stopGaugeCollectionIfSessionRunningTooLong");
+        "SessionManager.stopGaugeCollectionIfSessionRunningTooLong");
 
     if (perfSession.isSessionRunningTooLong()) {
       gaugeManager.stopCollectingGauges();
@@ -123,7 +120,7 @@ public void updatePerfSession(PerfSession perfSession) {
     }
 
     // Start of stop the gauge data collection.
-    startOrStopCollectingGauges(appStateMonitor.getAppState());
+    startOrStopCollectingGauges();
   }
 
   /**
@@ -133,7 +130,7 @@ public void updatePerfSession(PerfSession perfSession) {
    * this does not reset the perfSession.
    */
   public void initializeGaugeCollection() {
-    startOrStopCollectingGauges(ApplicationProcessState.FOREGROUND);
+    startOrStopCollectingGauges();
   }
 
   /**
@@ -160,11 +157,11 @@ public void unregisterForSessionUpdates(WeakReference<SessionAwareObject> client
     }
   }
 
-  private void startOrStopCollectingGauges(ApplicationProcessState appState) {
+  private void startOrStopCollectingGauges() {
     FirebaseSessionsEnforcementCheck.checkSession(
-        perfSession, "Session is not ready while trying to startOrStopCollectingGauges");
+        perfSession, "startOrStopCollectingGauges");
 
-    if (perfSession.isGaugeAndEventCollectionEnabled()) {
+    if (perfSession.isVerbose()) {
       gaugeManager.startCollectingGauges(perfSession);
     } else {
       gaugeManager.stopCollectingGauges();

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

@@ -102,12 +102,11 @@ public void initializeGaugeMetadataManager(Context appContext) {
   public void onUpdateAppState(ApplicationProcessState applicationProcessState) {
     this.applicationProcessState = applicationProcessState;
 
-    if (session == null) {
-      // If the session is null, it means there's no gauges being collected.
+    if (session == null || !session.isVerbose()) {
       return;
     }
 
-    stopCollectingGauges();
+    // If it's a verbose session, start collecting gauges for the new app state.
     startCollectingGauges(this.applicationProcessState, session.getTimer());
   }
 

firebase-perf/src/test/java/com/google/firebase/perf/session/PerfSessionTest.java

@@ -178,21 +178,21 @@ public void testPerfSessionConversionWithoutVerbosity() {
   public void testPerfSessionsCreateDisabledGaugeCollectionWhenVerboseSessionForceDisabled() {
     forceNonVerboseSession();
     PerfSession testPerfSession = createTestSession(1);
-    assertThat(testPerfSession.isGaugeAndEventCollectionEnabled()).isFalse();
+    assertThat(testPerfSession.isVerbose()).isFalse();
   }
 
   @Test
   public void testPerfSessionsCreateDisabledGaugeCollectionWhenSessionsFeatureDisabled() {
     forceSessionsFeatureDisabled();
     PerfSession testPerfSession = createTestSession(1);
-    assertThat(testPerfSession.isGaugeAndEventCollectionEnabled()).isFalse();
+    assertThat(testPerfSession.isVerbose()).isFalse();
   }
 
   @Test
   public void testPerfSessionsCreateEnablesGaugeCollectionWhenVerboseSessionForceEnabled() {
     forceVerboseSession();
     PerfSession testPerfSession = PerfSession.createWithId(testSessionId(1));
-    assertThat(testPerfSession.isGaugeAndEventCollectionEnabled()).isTrue();
+    assertThat(testPerfSession.isVerbose()).isTrue();
   }
 
   @Test

firebase-perf/src/test/java/com/google/firebase/perf/session/SessionManagerTest.java

@@ -73,7 +73,7 @@ public void testInstanceCreation() {
   @Test
   public void setApplicationContext_initializeGaugeMetadataManager()
       throws ExecutionException, InterruptedException {
-    when(mockPerfSession.isGaugeAndEventCollectionEnabled()).thenReturn(true);
+    when(mockPerfSession.isVerbose()).thenReturn(true);
     InOrder inOrder = Mockito.inOrder(mockGaugeManager);
     SessionManager testSessionManager =
         new SessionManager(mockGaugeManager, mockPerfSession, mockAppStateMonitor);