Merge branch 'fireperf-aqs' into td/aqs-usage

Author: tejasd

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

@@ -44,7 +44,6 @@
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.remoteconfig.RemoteConfigComponent;
 import com.google.firebase.sessions.api.FirebaseSessionsDependencies;
-import com.google.firebase.sessions.api.SessionSubscriber;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.net.URL;
@@ -95,8 +94,6 @@ public class FirebasePerformance implements FirebasePerformanceAttributable {
   // once during initialization and cache it.
   private final ImmutableBundle mMetadataBundle;
 
-  private final SessionSubscriber sessionSubscriber;
-
   /** Valid HttpMethods for manual network APIs */
   @StringDef({
     HttpMethod.GET,
@@ -170,8 +167,6 @@ public static FirebasePerformance getInstance() {
       this.mPerformanceCollectionForceEnabledState = false;
       this.configResolver = configResolver;
       this.mMetadataBundle = new ImmutableBundle(new Bundle());
-      this.sessionSubscriber = new FirebasePerformanceSessionSubscriber(false);
-      FirebaseSessionsDependencies.register(sessionSubscriber);
       return;
     }
 
@@ -188,8 +183,8 @@ public static FirebasePerformance getInstance() {
     sessionManager.setApplicationContext(appContext);
 
     mPerformanceCollectionForceEnabledState = configResolver.getIsPerformanceCollectionEnabled();
-    sessionSubscriber = new FirebasePerformanceSessionSubscriber(isPerformanceCollectionEnabled());
-    FirebaseSessionsDependencies.register(sessionSubscriber);
+    FirebaseSessionsDependencies.register(
+        new FirebasePerformanceSessionSubscriber(isPerformanceCollectionEnabled()));
 
     if (logger.isLogcatEnabled() && isPerformanceCollectionEnabled()) {
       logger.info(
@@ -465,10 +460,4 @@ private static ImmutableBundle extractMetadata(Context appContext) {
   Boolean getPerformanceCollectionForceEnabledState() {
     return mPerformanceCollectionForceEnabledState;
   }
-
-  @NonNull
-  @VisibleForTesting
-  protected SessionSubscriber getSessionSubscriber() {
-    return sessionSubscriber;
-  }
 }

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

@@ -128,6 +128,7 @@ public boolean isSessionRunningTooLong() {
 
   /** Creates and returns the proto object for PerfSession object. */
   public com.google.firebase.perf.v1.PerfSession build() {
+    // TODO(b/394127311): Switch to using AQS.
     com.google.firebase.perf.v1.PerfSession.Builder sessionMetric =
         com.google.firebase.perf.v1.PerfSession.newBuilder().setSessionId(aqsSessionId);
 

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

@@ -207,6 +207,7 @@ public void stopCollectingGauges() {
       gaugeManagerDataCollectionJob.cancel(false);
     }
 
+    // TODO(b/394127311): Switch to using AQS.
     // Flush any data that was collected for this session one last time.
     @SuppressWarnings("FutureReturnValueIgnored")
     ScheduledFuture<?> unusedFuture =