Move all the gauges related classes to its own package. (#2534)

Author: visumickey

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

@@ -34,7 +34,7 @@
 import com.google.firebase.perf.metrics.HttpMetric;
 import com.google.firebase.perf.metrics.Trace;
 import com.google.firebase.perf.metrics.validator.PerfMetricValidator;
-import com.google.firebase.perf.session.GaugeManager;
+import com.google.firebase.perf.session.gauges.GaugeManager;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.ImmutableBundle;

firebase-perf/src/main/java/com/google/firebase/perf/injection/modules/FirebasePerformanceModule.java

@@ -22,7 +22,7 @@
 import com.google.firebase.perf.FirebasePerformance;
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.config.RemoteConfigManager;
-import com.google.firebase.perf.session.GaugeManager;
+import com.google.firebase.perf.session.gauges.GaugeManager;
 import com.google.firebase.remoteconfig.RemoteConfigComponent;
 import dagger.Module;
 import dagger.Provides;

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

@@ -21,10 +21,10 @@
 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.GaugeManager;
 import com.google.firebase.perf.session.PerfSession;
 import com.google.firebase.perf.session.SessionAwareObject;
 import com.google.firebase.perf.session.SessionManager;
+import com.google.firebase.perf.session.gauges.GaugeManager;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.Timer;

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

@@ -26,10 +26,10 @@
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.metrics.validator.PerfMetricValidator;
-import com.google.firebase.perf.session.GaugeManager;
 import com.google.firebase.perf.session.PerfSession;
 import com.google.firebase.perf.session.SessionAwareObject;
 import com.google.firebase.perf.session.SessionManager;
+import com.google.firebase.perf.session.gauges.GaugeManager;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Clock;
 import com.google.firebase.perf.util.Constants;

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

@@ -19,6 +19,7 @@
 import com.google.android.gms.common.util.VisibleForTesting;
 import com.google.firebase.perf.application.AppStateMonitor;
 import com.google.firebase.perf.application.AppStateUpdateHandler;
+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;

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

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.session.collectors;
+package com.google.firebase.perf.session.gauges;
 
 import static android.system.Os.sysconf;
 

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

@@ -12,16 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.session;
+package com.google.firebase.perf.session.gauges;
 
 import android.content.Context;
 import androidx.annotation.Keep;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.logging.AndroidLogger;
-import com.google.firebase.perf.session.collectors.CpuGaugeCollector;
-import com.google.firebase.perf.session.collectors.MemoryGaugeCollector;
+import com.google.firebase.perf.session.PerfSession;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.v1.AndroidMemoryReading;
@@ -253,7 +252,7 @@ private void syncFlush(String sessionId, ApplicationProcessState appState) {
    * @param appState The {@link ApplicationProcessState} for which these gauges are collected.
    * @return true if GaugeMetadata was logged, false otherwise.
    */
-  boolean logGaugeMetadata(String sessionId, ApplicationProcessState appState) {
+  public boolean logGaugeMetadata(String sessionId, ApplicationProcessState appState) {
     if (gaugeMetadataManager != null) {
       GaugeMetric gaugeMetric =
           GaugeMetric.newBuilder()

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

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.session;
+package com.google.firebase.perf.session.gauges;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.MemoryInfo;

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

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.session.collectors;
+package com.google.firebase.perf.session.gauges;
 
 import android.annotation.SuppressLint;
 import androidx.annotation.Nullable;

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

@@ -0,0 +1,18 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/** @hide */
+/** @hide */
+package com.google.firebase.perf.session.gauges;
+

firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTest.java

@@ -35,7 +35,7 @@
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.config.DeviceCacheManager;
 import com.google.firebase.perf.config.RemoteConfigManager;
-import com.google.firebase.perf.session.GaugeManager;
+import com.google.firebase.perf.session.gauges.GaugeManager;
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.ImmutableBundle;
 import com.google.firebase.remoteconfig.RemoteConfigComponent;

firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.java

@@ -37,7 +37,7 @@
 import com.google.firebase.perf.config.DeviceCacheManager;
 import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.metrics.Trace;
-import com.google.firebase.perf.session.GaugeManager;
+import com.google.firebase.perf.session.gauges.GaugeManager;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Clock;
 import com.google.firebase.perf.util.Constants;

firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java

@@ -22,9 +22,9 @@
 
 import com.google.firebase.perf.FirebasePerformanceTestBase;
 import com.google.firebase.perf.application.AppStateMonitor;
-import com.google.firebase.perf.session.GaugeManager;
 import com.google.firebase.perf.session.PerfSession;
 import com.google.firebase.perf.session.SessionManager;
+import com.google.firebase.perf.session.gauges.GaugeManager;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.Timer;

firebase-perf/src/test/java/com/google/firebase/perf/metrics/TraceTest.java

@@ -32,9 +32,9 @@
 import com.google.firebase.perf.application.AppStateMonitor;
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.config.DeviceCacheManager;
-import com.google.firebase.perf.session.GaugeManager;
 import com.google.firebase.perf.session.PerfSession;
 import com.google.firebase.perf.session.SessionManager;
+import com.google.firebase.perf.session.gauges.GaugeManager;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Clock;
 import com.google.firebase.perf.util.Constants;

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

@@ -27,6 +27,7 @@
 
 import com.google.firebase.perf.FirebasePerformanceTestBase;
 import com.google.firebase.perf.application.AppStateMonitor;
+import com.google.firebase.perf.session.gauges.GaugeManager;
 import com.google.firebase.perf.v1.ApplicationProcessState;
 import java.lang.ref.WeakReference;
 import org.junit.Before;

firebase-perf/src/test/java/com/google/firebase/perf/session/collectors/CpuGaugeCollectorTest.java renamed to firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/CpuGaugeCollectorTest.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.session.collectors;
+package com.google.firebase.perf.session.gauges;
 
 import static com.google.common.truth.Truth.assertThat;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -34,7 +34,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.shadows.ShadowEnvironment;
 
-/** Unit tests for {@link com.google.firebase.perf.session.collectors.CpuGaugeCollector} */
+/** Unit tests for {@link com.google.firebase.perf.session.gauges.CpuGaugeCollector} */
 @RunWith(RobolectricTestRunner.class)
 public final class CpuGaugeCollectorTest {
   private static final long MICROSECONDS_PER_SECOND = TimeUnit.SECONDS.toMicros(1);

firebase-perf/src/test/java/com/google/firebase/perf/session/GaugeManagerTest.java renamed to firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeManagerTest.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.session;
+package com.google.firebase.perf.session.gauges;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
@@ -28,8 +28,7 @@
 
 import com.google.firebase.perf.FirebasePerformanceTestBase;
 import com.google.firebase.perf.config.ConfigResolver;
-import com.google.firebase.perf.session.collectors.CpuGaugeCollector;
-import com.google.firebase.perf.session.collectors.MemoryGaugeCollector;
+import com.google.firebase.perf.session.PerfSession;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Clock;
 import com.google.firebase.perf.util.Timer;
@@ -48,7 +47,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-/** Unit tests for {@link GaugeManager} */
+/** Unit tests for {@link com.google.firebase.perf.session.gauges.GaugeManager} */
 @RunWith(RobolectricTestRunner.class)
 public final class GaugeManagerTest extends FirebasePerformanceTestBase {
 

firebase-perf/src/test/java/com/google/firebase/perf/session/GaugeMetadataManagerTest.java renamed to firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeMetadataManagerTest.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.session;
+package com.google.firebase.perf.session.gauges;
 
 import static com.google.common.truth.Truth.assertThat;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -41,7 +41,7 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.shadows.ShadowEnvironment;
 
-/** Unit tests for {@link com.google.firebase.perf.session.GaugeMetadataManager} */
+/** Unit tests for {@link com.google.firebase.perf.session.gauges.GaugeMetadataManager} */
 @RunWith(RobolectricTestRunner.class)
 public class GaugeMetadataManagerTest extends FirebasePerformanceTestBase {
 

firebase-perf/src/test/java/com/google/firebase/perf/session/collectors/MemoryGaugeCollectorTest.java renamed to firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/MemoryGaugeCollectorTest.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.session.collectors;
+package com.google.firebase.perf.session.gauges;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.MockitoAnnotations.initMocks;
@@ -29,7 +29,7 @@
 import org.mockito.Mock;
 import org.robolectric.RobolectricTestRunner;
 
-/** Unit tests for {@link com.google.firebase.perf.session.collectors.MemoryGaugeCollector} */
+/** Unit tests for {@link com.google.firebase.perf.session.gauges.MemoryGaugeCollector} */
 @RunWith(RobolectricTestRunner.class)
 public class MemoryGaugeCollectorTest {