Remove the logging of GaugeMetadata based on AppStart

Author: tejasd

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

@@ -182,7 +182,6 @@ public static FirebasePerformance getInstance() {
         .initialize(firebaseApp, firebaseInstallationsApi, transportFactoryProvider);
 
     Context appContext = firebaseApp.getApplicationContext();
-    // TODO(b/110178816): Explore moving off of main thread.
     mMetadataBundle = extractMetadata(appContext);
 
     remoteConfigManager.setFirebaseRemoteConfigProvider(firebaseRemoteConfigProvider);

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

@@ -79,20 +79,13 @@ public SessionManager(
    * (currently that is before onResume finishes) to ensure gauge collection starts on time.
    */
   public void setApplicationContext(final Context appContext) {
-    // Get PerfSession in main thread first, because it is possible that app changes fg/bg state
-    // which creates a new perfSession, before the following is executed in background thread
-    final PerfSession appStartSession = perfSession;
     // TODO(b/258263016): Migrate to go/firebase-android-executors
     @SuppressLint("ThreadPoolCreation")
     ExecutorService executorService = Executors.newSingleThreadExecutor();
     syncInitFuture =
         executorService.submit(
             () -> {
               gaugeManager.initializeGaugeMetadataManager(appContext);
-              if (appStartSession.isGaugeAndEventCollectionEnabled()) {
-                gaugeManager.logGaugeMetadata(
-                    appStartSession.sessionId(), ApplicationProcessState.FOREGROUND);
-              }
             });
   }
 
@@ -164,9 +157,6 @@ public void updatePerfSession(PerfSession perfSession) {
       }
     }
 
-    // Log the gauge metadata event if data collection is enabled.
-    logGaugeMetadataIfCollectionEnabled(appStateMonitor.getAppState());
-
     // Start of stop the gauge data collection.
     startOrStopCollectingGauges(appStateMonitor.getAppState());
   }
@@ -178,7 +168,6 @@ public void updatePerfSession(PerfSession perfSession) {
    * this does not reset the perfSession.
    */
   public void initializeGaugeCollection() {
-    logGaugeMetadataIfCollectionEnabled(ApplicationProcessState.FOREGROUND);
     startOrStopCollectingGauges(ApplicationProcessState.FOREGROUND);
   }
 
@@ -206,12 +195,6 @@ public void unregisterForSessionUpdates(WeakReference<SessionAwareObject> client
     }
   }
 
-  private void logGaugeMetadataIfCollectionEnabled(ApplicationProcessState appState) {
-    if (perfSession.isGaugeAndEventCollectionEnabled()) {
-      gaugeManager.logGaugeMetadata(perfSession.sessionId(), appState);
-    }
-  }
-
   private void startOrStopCollectingGauges(ApplicationProcessState appState) {
     if (perfSession.isGaugeAndEventCollectionEnabled()) {
       gaugeManager.startCollectingGauges(perfSession, appState);

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

@@ -17,8 +17,6 @@
 import static android.system.Os.sysconf;
 
 import android.annotation.SuppressLint;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.system.OsConstants;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
@@ -163,7 +161,7 @@ private synchronized void scheduleCpuMetricCollectionWithRate(
     this.cpuMetricCollectionRateMs = cpuMetricCollectionRate;
     try {
       cpuMetricCollectorJob =
-          cpuMetricCollectorExecutor.scheduleAtFixedRate(
+          cpuMetricCollectorExecutor.scheduleWithFixedDelay(
               () -> {
                 CpuMetricReading currCpuReading = syncCollectCpuMetric(referenceTime);
                 if (currCpuReading != null) {
@@ -181,7 +179,7 @@ private synchronized void scheduleCpuMetricCollectionWithRate(
   private synchronized void scheduleCpuMetricCollectionOnce(Timer referenceTime) {
     try {
       @SuppressWarnings("FutureReturnValueIgnored")
-      ScheduledFuture unusedFuture =
+      ScheduledFuture<?> unusedFuture =
           cpuMetricCollectorExecutor.schedule(
               () -> {
                 CpuMetricReading currCpuReading = syncCollectCpuMetric(referenceTime);
@@ -227,12 +225,7 @@ private CpuMetricReading syncCollectCpuMetric(Timer referenceTime) {
   }
 
   private long getClockTicksPerSecond() {
-    if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
-      return sysconf(OsConstants._SC_CLK_TCK);
-    } else {
-      // TODO(b/110779408): Figure out how to collect this info for Android API 20 and below.
-      return INVALID_SC_PER_CPU_CLOCK_TICK;
-    }
+    return sysconf(OsConstants._SC_CLK_TCK);
   }
 
   private long convertClockTicksToMicroseconds(long clockTicks) {

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

@@ -72,16 +72,16 @@ private GaugeManager() {
         TransportManager.getInstance(),
         ConfigResolver.getInstance(),
         null,
-        new Lazy<>(() -> new CpuGaugeCollector()),
-        new Lazy<>(() -> new MemoryGaugeCollector()));
+        new Lazy<>(CpuGaugeCollector::new),
+        new Lazy<>(MemoryGaugeCollector::new));
   }
 
   @VisibleForTesting
   GaugeManager(
       Lazy<ScheduledExecutorService> gaugeManagerExecutor,
       TransportManager transportManager,
       ConfigResolver configResolver,
-      GaugeMetadataManager gaugeMetadataManager,
+      @Nullable GaugeMetadataManager gaugeMetadataManager,
       Lazy<CpuGaugeCollector> cpuGaugeCollector,
       Lazy<MemoryGaugeCollector> memoryGaugeCollector) {
 
@@ -140,7 +140,7 @@ public void startCollectingGauges(
       gaugeManagerDataCollectionJob =
           gaugeManagerExecutor
               .get()
-              .scheduleAtFixedRate(
+              .scheduleWithFixedDelay(
                   () -> {
                     syncFlush(sessionIdForScheduledTask, applicationProcessStateForScheduledTask);
                   },

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

@@ -17,8 +17,6 @@
 import android.app.ActivityManager;
 import android.app.ActivityManager.MemoryInfo;
 import android.content.Context;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import androidx.annotation.VisibleForTesting;
 import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.util.StorageUnit;
@@ -41,7 +39,6 @@ class GaugeMetadataManager {
   private final Runtime runtime;
   private final ActivityManager activityManager;
   private final MemoryInfo memoryInfo;
-  private final Context appContext;
 
   GaugeMetadataManager(Context appContext) {
     this(Runtime.getRuntime(), appContext);
@@ -50,7 +47,6 @@ class GaugeMetadataManager {
   @VisibleForTesting
   GaugeMetadataManager(Runtime runtime, Context appContext) {
     this.runtime = runtime;
-    this.appContext = appContext;
     this.activityManager = (ActivityManager) appContext.getSystemService(Context.ACTIVITY_SERVICE);
     memoryInfo = new ActivityManager.MemoryInfo();
     activityManager.getMemoryInfo(memoryInfo);
@@ -75,11 +71,7 @@ public int getMaxEncouragedAppJavaHeapMemoryKb() {
 
   /** Returns the total memory (in kilobytes) accessible by the kernel (called the RAM size). */
   public int getDeviceRamSizeKb() {
-    if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN) {
-      return Utils.saturatedIntCast(StorageUnit.BYTES.toKilobytes(memoryInfo.totalMem));
-    }
-
-    return readTotalRAM(/* procFileName= */ "/proc/meminfo");
+    return Utils.saturatedIntCast(StorageUnit.BYTES.toKilobytes(memoryInfo.totalMem));
   }
 
   /** Returns the total ram size of the device (in kilobytes) by reading the "proc/meminfo" file. */

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

@@ -50,7 +50,7 @@ public class MemoryGaugeCollector {
   public final ConcurrentLinkedQueue<AndroidMemoryReading> memoryMetricReadings;
   private final Runtime runtime;
 
-  @Nullable private ScheduledFuture memoryMetricCollectorJob = null;
+  @Nullable private ScheduledFuture<?> memoryMetricCollectorJob = null;
   private long memoryMetricCollectionRateMs = UNSET_MEMORY_METRIC_COLLECTION_RATE;
 
   // TODO(b/258263016): Migrate to go/firebase-android-executors
@@ -124,7 +124,7 @@ private synchronized void scheduleMemoryMetricCollectionWithRate(
 
     try {
       memoryMetricCollectorJob =
-          memoryMetricCollectorExecutor.scheduleAtFixedRate(
+          memoryMetricCollectorExecutor.scheduleWithFixedDelay(
               () -> {
                 AndroidMemoryReading memoryReading = syncCollectMemoryMetric(referenceTime);
                 if (memoryReading != null) {
@@ -142,7 +142,7 @@ private synchronized void scheduleMemoryMetricCollectionWithRate(
   private synchronized void scheduleMemoryMetricCollectionOnce(Timer referenceTime) {
     try {
       @SuppressWarnings("FutureReturnValueIgnored")
-      ScheduledFuture unusedFuture =
+      ScheduledFuture<?> unusedFuture =
           memoryMetricCollectorExecutor.schedule(
               () -> {
                 AndroidMemoryReading memoryReading = syncCollectMemoryMetric(referenceTime);