Organize the session package to be self contained. (#2529)

Author: visumickey

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

@@ -30,11 +30,11 @@
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.config.RemoteConfigManager;
-import com.google.firebase.perf.internal.GaugeManager;
 import com.google.firebase.perf.logging.AndroidLogger;
 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.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/application/AppStateMonitor.java

@@ -25,9 +25,9 @@
 import androidx.core.app.FrameMetricsAggregator;
 import com.google.android.gms.common.util.VisibleForTesting;
 import com.google.firebase.perf.config.ConfigResolver;
-import com.google.firebase.perf.internal.SessionManager;
 import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.metrics.Trace;
+import com.google.firebase.perf.session.SessionManager;
 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/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.internal.GaugeManager;
+import com.google.firebase.perf.session.GaugeManager;
 import com.google.firebase.remoteconfig.RemoteConfigComponent;
 import dagger.Module;
 import dagger.Provides;

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

@@ -23,9 +23,9 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.gms.common.util.VisibleForTesting;
-import com.google.firebase.perf.internal.SessionManager;
 import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.provider.FirebasePerfProvider;
+import com.google.firebase.perf.session.SessionManager;
 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/metrics/NetworkRequestMetricBuilder.java

@@ -20,11 +20,11 @@
 import androidx.annotation.VisibleForTesting;
 import com.google.firebase.perf.application.AppStateMonitor;
 import com.google.firebase.perf.application.AppStateUpdateHandler;
-import com.google.firebase.perf.internal.GaugeManager;
-import com.google.firebase.perf.internal.PerfSession;
-import com.google.firebase.perf.internal.SessionAwareObject;
-import com.google.firebase.perf.internal.SessionManager;
 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.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

@@ -24,12 +24,12 @@
 import com.google.firebase.perf.application.AppStateMonitor;
 import com.google.firebase.perf.application.AppStateUpdateHandler;
 import com.google.firebase.perf.config.ConfigResolver;
-import com.google.firebase.perf.internal.GaugeManager;
-import com.google.firebase.perf.internal.PerfSession;
-import com.google.firebase.perf.internal.SessionAwareObject;
-import com.google.firebase.perf.internal.SessionManager;
 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.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/metrics/TraceMetricBuilder.java

@@ -15,7 +15,7 @@
 package com.google.firebase.perf.metrics;
 
 import androidx.annotation.NonNull;
-import com.google.firebase.perf.internal.PerfSession;
+import com.google.firebase.perf.session.PerfSession;
 import com.google.firebase.perf.v1.TraceMetric;
 import java.util.Arrays;
 import java.util.List;

firebase-perf/src/main/java/com/google/firebase/perf/provider/FirebasePerfProvider.java

@@ -30,8 +30,8 @@
 import com.google.android.gms.common.util.VisibleForTesting;
 import com.google.firebase.perf.application.AppStateMonitor;
 import com.google.firebase.perf.config.ConfigResolver;
-import com.google.firebase.perf.internal.SessionManager;
 import com.google.firebase.perf.metrics.AppStartTrace;
+import com.google.firebase.perf.session.SessionManager;
 import com.google.firebase.perf.util.Clock;
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.v1.ApplicationProcessState;

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

@@ -1,9 +1,9 @@
-// Copyright 2020 Google LLC
+// 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
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.internal;
+package com.google.firebase.perf.session;
 
 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.gauges.CpuGaugeCollector;
-import com.google.firebase.perf.gauges.MemoryGaugeCollector;
 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.transport.TransportManager;
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.v1.AndroidMemoryReading;

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

@@ -1,9 +1,9 @@
-// Copyright 2020 Google LLC
+// 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
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.internal;
+package com.google.firebase.perf.session;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.MemoryInfo;

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

@@ -1,9 +1,9 @@
-// Copyright 2020 Google LLC
+// 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
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.internal;
+package com.google.firebase.perf.session;
 
 import android.os.Parcel;
 import android.os.Parcelable;

firebase-perf/src/main/java/com/google/firebase/perf/internal/SessionAwareObject.java renamed to firebase-perf/src/main/java/com/google/firebase/perf/session/SessionAwareObject.java

@@ -1,9 +1,9 @@
-// Copyright 2020 Google LLC
+// 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
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.internal;
+package com.google.firebase.perf.session;
 
 /**
- * Any object that cares about changes in the {@link com.google.firebase.perf.internal.PerfSession}
+ * Any object that cares about changes in the {@link com.google.firebase.perf.session.PerfSession}
  * that is active for the given app. This object is then registered with the {@link SessionManager}
  * which then supplies it with updates as needed.
  *

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

@@ -1,9 +1,9 @@
-// Copyright 2020 Google LLC
+// 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
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.internal;
+package com.google.firebase.perf.session;
 
 import android.annotation.SuppressLint;
 import androidx.annotation.Keep;

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

@@ -1,9 +1,9 @@
-// Copyright 2020 Google LLC
+// 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
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.gauges;
+package com.google.firebase.perf.session.collectors;
 
 import static android.system.Os.sysconf;
 

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

@@ -1,9 +1,9 @@
-// Copyright 2020 Google LLC
+// 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
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.gauges;
+package com.google.firebase.perf.session.collectors;
 
 import android.annotation.SuppressLint;
 import androidx.annotation.Nullable;

firebase-perf/src/main/java/com/google/firebase/perf/internal/package-info.java renamed to firebase-perf/src/main/java/com/google/firebase/perf/session/package-info.java

@@ -1,9 +1,9 @@
-// Copyright 2020 Google LLC
+// 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
@@ -14,5 +14,5 @@
 
 /** @hide */
 /** @hide */
-package com.google.firebase.perf.internal;
+package com.google.firebase.perf.session;
 

firebase-perf/src/main/java/com/google/firebase/perf/transport/TransportManager.java

@@ -34,9 +34,9 @@
 import com.google.firebase.perf.application.AppStateMonitor;
 import com.google.firebase.perf.application.AppStateMonitor.AppStateCallback;
 import com.google.firebase.perf.config.ConfigResolver;
-import com.google.firebase.perf.internal.SessionManager;
 import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.metrics.validator.PerfMetricValidator;
+import com.google.firebase.perf.session.SessionManager;
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.Constants.CounterNames;
 import com.google.firebase.perf.v1.AndroidApplicationInfo;

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.internal.GaugeManager;
+import com.google.firebase.perf.session.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/FirebasePerformanceTestBase.java

@@ -20,8 +20,8 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.perf.config.ConfigResolver;
-import com.google.firebase.perf.internal.PerfSession;
-import com.google.firebase.perf.internal.SessionManager;
+import com.google.firebase.perf.session.PerfSession;
+import com.google.firebase.perf.session.SessionManager;
 import com.google.firebase.perf.util.ImmutableBundle;
 import org.junit.After;
 import org.junit.Before;

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

@@ -35,9 +35,9 @@
 import com.google.firebase.perf.FirebasePerformanceTestBase;
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.config.DeviceCacheManager;
-import com.google.firebase.perf.internal.GaugeManager;
 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.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/AppStartTraceTest.java

@@ -24,8 +24,8 @@
 import android.content.pm.ProviderInfo;
 import android.os.Bundle;
 import com.google.firebase.perf.FirebasePerformanceTestBase;
-import com.google.firebase.perf.internal.SessionManager;
 import com.google.firebase.perf.provider.FirebasePerfProvider;
+import com.google.firebase.perf.session.SessionManager;
 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.internal.GaugeManager;
-import com.google.firebase.perf.internal.PerfSession;
-import com.google.firebase.perf.internal.SessionManager;
+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.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.internal.GaugeManager;
-import com.google.firebase.perf.internal.PerfSession;
-import com.google.firebase.perf.internal.SessionManager;
+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.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/internal/GaugeManagerTest.java renamed to firebase-perf/src/test/java/com/google/firebase/perf/session/GaugeManagerTest.java

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