style

Author: tejasd

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

@@ -20,11 +20,10 @@
 import com.google.firebase.StartupTime;
 import com.google.firebase.perf.application.AppStateMonitor;
 import com.google.firebase.perf.config.ConfigResolver;
+import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.metrics.AppStartTrace;
 import com.google.firebase.perf.session.SessionManager;
 import java.util.concurrent.Executor;
-import com.google.firebase.perf.logging.AndroidLogger;
-import com.google.firebase.perf.session.SessionManagerKt;
 
 /**
  * The Firebase Performance early initialization.

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

@@ -30,10 +30,8 @@
 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.FirebaseSessions;
 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;

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 java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.net.URL;

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

@@ -24,9 +24,7 @@
 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.SessionDetails;
 import com.google.firebase.sessions.api.SessionSubscriber;
-
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
@@ -50,7 +48,8 @@ public static PerfSession createNewSession() {
 
     // 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.
+    // The assumption is that new PerfSessions *should* be limited to either App Start, or through
+    // AQS.
     SessionManagerKt.Companion.getPerfSessionToAqs().put(prunedSessionId, null);
 
     return session;
@@ -73,8 +72,10 @@ private PerfSession(@NonNull Parcel in) {
   /** Returns the sessionId of the object. */
   public String sessionId() {
     // TODO(b/394127311): Verify edge cases.
-    SessionSubscriber.SessionDetails sessionDetails = SessionManagerKt.Companion.getPerfSessionToAqs().get(internalSessionId);
-    AndroidLogger.getInstance().debug("AQS for " + this.internalSessionId + " is " + sessionDetails);
+    SessionSubscriber.SessionDetails sessionDetails =
+        SessionManagerKt.Companion.getPerfSessionToAqs().get(internalSessionId);
+    AndroidLogger.getInstance()
+        .debug("AQS for " + this.internalSessionId + " is " + sessionDetails);
     return Objects.requireNonNull(sessionDetails).getSessionId();
   }
 

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

@@ -19,7 +19,6 @@
 import androidx.annotation.Keep;
 import androidx.annotation.VisibleForTesting;
 import com.google.firebase.perf.application.AppStateMonitor;
-import com.google.firebase.perf.application.AppStateUpdateHandler;
 import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.session.gauges.GaugeManager;
 import com.google.firebase.perf.v1.ApplicationProcessState;
@@ -62,10 +61,7 @@ public final PerfSession perfSession() {
 
   private SessionManager() {
     // Generate a new sessionID for every cold start.
-    this(
-        GaugeManager.getInstance(),
-        PerfSession.createNewSession(),
-        AppStateMonitor.getInstance());
+    this(GaugeManager.getInstance(), PerfSession.createNewSession(), AppStateMonitor.getInstance());
   }
 
   @VisibleForTesting
@@ -119,7 +115,8 @@ 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.getInternalSessionId(), this.perfSession.getInternalSessionId())) {
+    if (Objects.equals(
+        perfSession.getInternalSessionId(), this.perfSession.getInternalSessionId())) {
       return;
     }
 

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

@@ -1,32 +1,33 @@
 package com.google.firebase.perf.session
 
-import com.google.firebase.sessions.api.SessionSubscriber
 import com.google.firebase.perf.logging.AndroidLogger
+import com.google.firebase.sessions.api.SessionSubscriber
 
+class SessionManagerKt(val dataCollectionEnabled: Boolean) : SessionSubscriber {
+  override val isDataCollectionEnabled: Boolean
+    get() = dataCollectionEnabled
 
-class SessionManagerKt(val dataCollectionEnabled: Boolean): SessionSubscriber {
-    override val isDataCollectionEnabled: Boolean
-        get() = dataCollectionEnabled
-
-    override val sessionSubscriberName: SessionSubscriber.Name
-        get() = SessionSubscriber.Name.PERFORMANCE
+  override val sessionSubscriberName: SessionSubscriber.Name
+    get() = SessionSubscriber.Name.PERFORMANCE
 
-    override fun onSessionChanged(sessionDetails: SessionSubscriber.SessionDetails) {
-        AndroidLogger.getInstance().debug("AQS Session Changed: $sessionDetails")
-        val currentInternalSessionId = SessionManager.getInstance().perfSession().internalSessionId
+  override fun onSessionChanged(sessionDetails: SessionSubscriber.SessionDetails) {
+    AndroidLogger.getInstance().debug("AQS Session Changed: $sessionDetails")
+    val currentInternalSessionId = SessionManager.getInstance().perfSession().internalSessionId
 
-        // There can be situations where a new [PerfSession] was created, but an AQS wasn't
-        // available (during cold start).
-        if (perfSessionToAqs[currentInternalSessionId] == null) {
-            perfSessionToAqs[currentInternalSessionId] = sessionDetails
-        } else {
-            val newSession = PerfSession.createNewSession()
-            SessionManager.getInstance().updatePerfSession(newSession)
-            perfSessionToAqs[newSession.internalSessionId] = sessionDetails
-        }
+    // There can be situations where a new [PerfSession] was created, but an AQS wasn't
+    // available (during cold start).
+    if (perfSessionToAqs[currentInternalSessionId] == null) {
+      perfSessionToAqs[currentInternalSessionId] = sessionDetails
+    } else {
+      val newSession = PerfSession.createNewSession()
+      SessionManager.getInstance().updatePerfSession(newSession)
+      perfSessionToAqs[newSession.internalSessionId] = sessionDetails
     }
+  }
 
-    companion object {
-        val perfSessionToAqs: MutableMap<String, SessionSubscriber.SessionDetails?> by lazy {  mutableMapOf() }
+  companion object {
+    val perfSessionToAqs: MutableMap<String, SessionSubscriber.SessionDetails?> by lazy {
+      mutableMapOf()
     }
-}
+  }
+}

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

@@ -225,8 +225,7 @@ public void testOnUpdateAppStateMakesGaugeManagerStopCollectingGaugesWhenSession
     forceSessionsFeatureDisabled();
 
     SessionManager testSessionManager =
-        new SessionManager(
-            mockGaugeManager, PerfSession.createNewSession(), mockAppStateMonitor);
+        new SessionManager(mockGaugeManager, PerfSession.createNewSession(), mockAppStateMonitor);
     testSessionManager.updatePerfSession(PerfSession.createNewSession());
 
     verify(mockGaugeManager).stopCollectingGauges();
@@ -239,8 +238,7 @@ public void testGaugeMetadataIsFlushedOnlyWhenNewVerboseSessionIsCreated() {
     // Start with a non verbose session
     forceNonVerboseSession();
     SessionManager testSessionManager =
-        new SessionManager(
-            mockGaugeManager, PerfSession.createNewSession(), mockAppStateMonitor);
+        new SessionManager(mockGaugeManager, PerfSession.createNewSession(), mockAppStateMonitor);
 
     verify(mockGaugeManager, times(0))
         .logGaugeMetadata(