Add a SessionSubscriber

Author: tejasd

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

@@ -30,6 +30,9 @@
 import com.google.firebase.perf.injection.modules.FirebasePerformanceModule;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import com.google.firebase.remoteconfig.RemoteConfigComponent;
+import com.google.firebase.sessions.api.FirebaseSessionsDependencies;
+import com.google.firebase.sessions.api.SessionSubscriber;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Executor;
@@ -47,6 +50,11 @@ public class FirebasePerfRegistrar implements ComponentRegistrar {
   private static final String LIBRARY_NAME = "fire-perf";
   private static final String EARLY_LIBRARY_NAME = "fire-perf-early";
 
+  static {
+    // Add Firebase Performance as a dependency of Sessions when this class is loaded into memory.
+    FirebaseSessionsDependencies.addDependency(SessionSubscriber.Name.PERFORMANCE);
+  }
+
   @Override
   @Keep
   public List<Component<?>> getComponents() {

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

@@ -36,12 +36,15 @@
 import com.google.firebase.perf.logging.ConsoleUrlGenerator;
 import com.google.firebase.perf.metrics.HttpMetric;
 import com.google.firebase.perf.metrics.Trace;
+import com.google.firebase.perf.session.FirebasePerformanceSessionSubscriber;
 import com.google.firebase.perf.session.SessionManager;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.ImmutableBundle;
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.remoteconfig.RemoteConfigComponent;
+import com.google.firebase.sessions.api.FirebaseSessionsDependencies;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.net.URL;
@@ -52,6 +55,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+
 /**
  * The Firebase Performance Monitoring API.
  *
@@ -92,7 +96,7 @@ public class FirebasePerformance implements FirebasePerformanceAttributable {
   // once during initialization and cache it.
   private final ImmutableBundle mMetadataBundle;
 
-  /** Valid HttpMethods for manual network APIs */
+    /** Valid HttpMethods for manual network APIs */
   @StringDef({
     HttpMethod.GET,
     HttpMethod.PUT,
@@ -136,12 +140,7 @@ public static FirebasePerformance getInstance() {
   // to false if it's been force disabled or it is set to null if neither.
   @Nullable private Boolean mPerformanceCollectionForceEnabledState = null;
 
-  private final FirebaseApp firebaseApp;
-  private final Provider<RemoteConfigComponent> firebaseRemoteConfigProvider;
-  private final FirebaseInstallationsApi firebaseInstallationsApi;
-  private final Provider<TransportFactory> transportFactoryProvider;
-
-  /**
+    /**
    * Constructs the FirebasePerformance class and allows injecting dependencies.
    *
    * <p>TODO(b/172007278): Initialize SDK components in a background thread to avoid cases of cyclic
@@ -166,11 +165,6 @@ public static FirebasePerformance getInstance() {
       ConfigResolver configResolver,
       SessionManager sessionManager) {
 
-    this.firebaseApp = firebaseApp;
-    this.firebaseRemoteConfigProvider = firebaseRemoteConfigProvider;
-    this.firebaseInstallationsApi = firebaseInstallationsApi;
-    this.transportFactoryProvider = transportFactoryProvider;
-
     if (firebaseApp == null) {
       this.mPerformanceCollectionForceEnabledState = false;
       this.configResolver = configResolver;
@@ -191,6 +185,8 @@ public static FirebasePerformance getInstance() {
     sessionManager.setApplicationContext(appContext);
 
     mPerformanceCollectionForceEnabledState = configResolver.getIsPerformanceCollectionEnabled();
+    FirebaseSessionsDependencies.register(new FirebasePerformanceSessionSubscriber(isPerformanceCollectionEnabled()));
+
     if (logger.isLogcatEnabled() && isPerformanceCollectionEnabled()) {
       logger.info(
           String.format(
@@ -281,7 +277,7 @@ public synchronized void setPerformanceCollectionEnabled(@Nullable Boolean enabl
       return;
     }
 
-    if (configResolver.getIsPerformanceCollectionDeactivated()) {
+    if (Boolean.TRUE.equals(configResolver.getIsPerformanceCollectionDeactivated())) {
       logger.info("Firebase Performance is permanently disabled");
       return;
     }

firebase-perf/src/main/java/com/google/firebase/perf/config/ConfigResolver.java

@@ -116,7 +116,7 @@ public void setMetadataBundle(ImmutableBundle bundle) {
   /** Default API to call for whether performance monitoring is currently silent. */
   public boolean isPerformanceMonitoringEnabled() {
     Boolean isPerformanceCollectionEnabled = getIsPerformanceCollectionEnabled();
-    return (isPerformanceCollectionEnabled == null || isPerformanceCollectionEnabled == true)
+    return (isPerformanceCollectionEnabled == null || isPerformanceCollectionEnabled)
         && getIsServiceCollectionEnabled();
   }
 
@@ -131,7 +131,7 @@ public Boolean getIsPerformanceCollectionEnabled() {
     // return developer config.
     // 4. Else, return null. Because Firebase Performance will read highlevel Firebase flag in this
     // case.
-    if (getIsPerformanceCollectionDeactivated()) {
+    if (Boolean.TRUE.equals(getIsPerformanceCollectionDeactivated())) {
       // 1. If developer has deactivated Firebase Performance in Manifest, return false.
       return false;
     }
@@ -186,7 +186,7 @@ public void setIsPerformanceCollectionEnabled(Boolean isEnabled) {
     // 2. Otherwise, save this configuration in device cache.
 
     // If collection is deactivated, skip the action to save user configuration.
-    if (getIsPerformanceCollectionDeactivated()) {
+    if (Boolean.TRUE.equals(getIsPerformanceCollectionDeactivated())) {
       return;
     }
 

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

@@ -0,0 +1,31 @@
+package com.google.firebase.perf.session
+
+import com.google.firebase.perf.logging.AndroidLogger
+import com.google.firebase.perf.session.gauges.GaugeManager
+import com.google.firebase.perf.v1.ApplicationProcessState
+import com.google.firebase.sessions.api.SessionSubscriber
+import java.util.UUID
+
+class FirebasePerformanceSessionSubscriber(private val dataCollectionEnabled: Boolean) : SessionSubscriber {
+    override val isDataCollectionEnabled: Boolean
+        get() = dataCollectionEnabled
+
+    override val sessionSubscriberName: SessionSubscriber.Name
+        get() = SessionSubscriber.Name.PERFORMANCE
+
+    override fun onSessionChanged(sessionDetails: SessionSubscriber.SessionDetails) {
+        val currentPerfSession = SessionManager.getInstance().perfSession()
+
+        // A [PerfSession] was created before a session was started.
+        if (currentPerfSession.aqsSessionId() == null) {
+            currentPerfSession.setAQSId(sessionDetails)
+            GaugeManager.getInstance().logGaugeMetadata(currentPerfSession.aqsSessionId(), ApplicationProcessState.FOREGROUND)
+            return
+        }
+
+        val updatedSession = PerfSession.createWithId(UUID.randomUUID().toString());
+        updatedSession.setAQSId(sessionDetails)
+        SessionManager.getInstance().updatePerfSession(updatedSession)
+        GaugeManager.getInstance().logGaugeMetadata(updatedSession.aqsSessionId(), ApplicationProcessState.FOREGROUND)
+    }
+}

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

@@ -23,6 +23,8 @@
 import com.google.firebase.perf.util.Clock;
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.v1.SessionVerbosity;
+import com.google.firebase.sessions.api.SessionSubscriber;
+
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -31,6 +33,7 @@ public class PerfSession implements Parcelable {
 
   private final String sessionId;
   private final Timer creationTime;
+  @Nullable private String aqsSessionId;
 
   private boolean isGaugeAndEventCollectionEnabled = false;
 
@@ -59,11 +62,23 @@ private PerfSession(@NonNull Parcel in) {
     creationTime = in.readParcelable(Timer.class.getClassLoader());
   }
 
-  /** Returns the sessionId of the object. */
+  /** Returns the sessionId of the session. */
   public String sessionId() {
     return sessionId;
   }
 
+  /** Returns the AQS sessionId for the given session. */
+  public String aqsSessionId() {
+    return aqsSessionId;
+  }
+
+  /** Returns the AQS sessionId for the given session. */
+  public void setAQSId(SessionSubscriber.SessionDetails aqs) {
+    if (aqsSessionId == null) {
+      aqsSessionId = aqs.getSessionId();
+    }
+  }
+
   /**
    * Returns a timer object that has been seeded with the system time at which the session began.
    */

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

@@ -79,14 +79,7 @@ public SessionManager(
    * (currently that is before onResume finishes) to ensure gauge collection starts on time.
    */
   public void setApplicationContext(final Context appContext) {
-    // TODO(b/258263016): Migrate to go/firebase-android-executors
-    @SuppressLint("ThreadPoolCreation")
-    ExecutorService executorService = Executors.newSingleThreadExecutor();
-    syncInitFuture =
-        executorService.submit(
-            () -> {
-              gaugeManager.initializeGaugeMetadataManager(appContext);
-            });
+    gaugeManager.initializeGaugeMetadataManager(appContext);
   }
 
   @Override