Create a separate package for Application Handlers

firebase-perf/ktx/src/test/kotlin/com/google/firebase/perf/ktx/PerformanceTests.kt

@@ -22,7 +22,7 @@ import com.google.firebase.ktx.app
 import com.google.firebase.ktx.initialize
 import com.google.firebase.perf.FirebasePerformance
 import com.google.firebase.perf.FirebasePerformance.HttpMethod
-import com.google.firebase.perf.internal.AppStateMonitor
+import com.google.firebase.perf.application.AppStateMonitor
 import com.google.firebase.perf.metrics.HttpMetric
 import com.google.firebase.perf.metrics.Trace
 import com.google.firebase.perf.metrics.getTraceCounter

firebase-perf/src/main/java/com/google/firebase/perf/internal/AppStateMonitor.java → firebase-perf/src/main/java/com/google/firebase/perf/application/AppStateMonitor.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.application;
 
 import android.app.Activity;
 import android.app.Application;
@@ -25,6 +25,7 @@
 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.transport.TransportManager;
@@ -468,7 +469,7 @@ Timer getResumeTime() {
   }
 
   @VisibleForTesting
-  void setIsColdStart(boolean isColdStart) {
+  public void setIsColdStart(boolean isColdStart) {
     mIsColdStart = isColdStart;
   }
 }

firebase-perf/src/main/java/com/google/firebase/perf/internal/AppStateUpdateHandler.java → firebase-perf/src/main/java/com/google/firebase/perf/application/AppStateUpdateHandler.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.application;
 
 import androidx.annotation.NonNull;
-import com.google.firebase.perf.internal.AppStateMonitor.AppStateCallback;
+import com.google.firebase.perf.application.AppStateMonitor.AppStateCallback;
 import com.google.firebase.perf.v1.ApplicationProcessState;
 import java.lang.ref.WeakReference;
 

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

@@ -0,0 +1,17 @@
+// 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.application;

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

@@ -17,6 +17,8 @@
 import android.annotation.SuppressLint;
 import androidx.annotation.Keep;
 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.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/metrics/NetworkRequestMetricBuilder.java

@@ -18,8 +18,8 @@
 
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-import com.google.firebase.perf.internal.AppStateMonitor;
-import com.google.firebase.perf.internal.AppStateUpdateHandler;
+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;

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

@@ -21,9 +21,9 @@
 import androidx.annotation.Nullable;
 import com.google.android.gms.common.util.VisibleForTesting;
 import com.google.firebase.perf.FirebasePerformanceAttributable;
+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.AppStateMonitor;
-import com.google.firebase.perf.internal.AppStateUpdateHandler;
 import com.google.firebase.perf.internal.GaugeManager;
 import com.google.firebase.perf.internal.PerfSession;
 import com.google.firebase.perf.internal.SessionAwareObject;

firebase-perf/src/main/java/com/google/firebase/perf/internal/ResourceType.java → firebase-perf/src/main/java/com/google/firebase/perf/metrics/resource/ResourceType.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.metrics.resource;
 
 import androidx.annotation.StringDef;
 import java.lang.annotation.Retention;
@@ -21,6 +21,7 @@
 /** Annotates various resource types in Firebase Performance. */
 @StringDef({ResourceType.TRACE, ResourceType.NETWORK})
 @Retention(RetentionPolicy.RUNTIME)
+/** @hide */
 public @interface ResourceType {
   String TRACE = "Trace";
   String NETWORK = "Network";

firebase-perf/src/main/java/com/google/firebase/perf/metrics/resource/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.metrics.resource;
+

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

@@ -28,8 +28,8 @@
 import androidx.annotation.Nullable;
 import com.google.android.gms.common.internal.Preconditions;
 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.AppStateMonitor;
 import com.google.firebase.perf.internal.SessionManager;
 import com.google.firebase.perf.metrics.AppStartTrace;
 import com.google.firebase.perf.util.Clock;

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

@@ -14,15 +14,15 @@
 
 package com.google.firebase.perf.transport;
 
-import static com.google.firebase.perf.internal.ResourceType.NETWORK;
-import static com.google.firebase.perf.internal.ResourceType.TRACE;
+import static com.google.firebase.perf.metrics.resource.ResourceType.NETWORK;
+import static com.google.firebase.perf.metrics.resource.ResourceType.TRACE;
 
 import android.content.Context;
 import androidx.annotation.NonNull;
 import com.google.android.gms.common.util.VisibleForTesting;
 import com.google.firebase.perf.config.ConfigResolver;
-import com.google.firebase.perf.internal.ResourceType;
 import com.google.firebase.perf.logging.AndroidLogger;
+import com.google.firebase.perf.metrics.resource.ResourceType;
 import com.google.firebase.perf.util.Clock;
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.Timer;

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

@@ -31,9 +31,9 @@
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.perf.BuildConfig;
 import com.google.firebase.perf.FirebasePerformance;
+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.AppStateMonitor;
-import com.google.firebase.perf.internal.AppStateMonitor.AppStateCallback;
 import com.google.firebase.perf.internal.SessionManager;
 import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.metrics.validator.PerfMetricValidator;

firebase-perf/src/test/java/com/google/firebase/perf/internal/AppStateMonitorTest.java → firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.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.application;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.firebase.perf.v1.ApplicationProcessState.FOREGROUND_BACKGROUND;
@@ -35,6 +35,7 @@
 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.transport.TransportManager;
@@ -60,7 +61,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.android.controller.ActivityController;
 
-/** Unit tests for {@link AppStateMonitor}. */
+/** Unit tests for {@link com.google.firebase.perf.application.AppStateMonitor}. */
 @RunWith(RobolectricTestRunner.class)
 public class AppStateMonitorTest extends FirebasePerformanceTestBase {
 

firebase-perf/src/test/java/com/google/firebase/perf/internal/SessionManagerTest.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
@@ -26,6 +26,7 @@
 import static org.mockito.MockitoAnnotations.initMocks;
 
 import com.google.firebase.perf.FirebasePerformanceTestBase;
+import com.google.firebase.perf.application.AppStateMonitor;
 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/metrics/NetworkRequestMetricBuilderTest.java

@@ -21,7 +21,7 @@
 import static org.mockito.MockitoAnnotations.initMocks;
 
 import com.google.firebase.perf.FirebasePerformanceTestBase;
-import com.google.firebase.perf.internal.AppStateMonitor;
+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;

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

@@ -18,7 +18,7 @@
 import static org.mockito.MockitoAnnotations.initMocks;
 
 import com.google.firebase.perf.FirebasePerformanceTestBase;
-import com.google.firebase.perf.internal.AppStateMonitor;
+import com.google.firebase.perf.application.AppStateMonitor;
 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/TraceTest.java

@@ -29,9 +29,9 @@
 import android.content.Context;
 import android.os.Parcel;
 import com.google.firebase.perf.FirebasePerformanceTestBase;
+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.AppStateMonitor;
 import com.google.firebase.perf.internal.GaugeManager;
 import com.google.firebase.perf.internal.PerfSession;
 import com.google.firebase.perf.internal.SessionManager;

firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfTraceValidatorTest.java

@@ -21,7 +21,7 @@
 import static org.mockito.MockitoAnnotations.initMocks;
 
 import com.google.firebase.perf.FirebasePerformanceTestBase;
-import com.google.firebase.perf.internal.AppStateMonitor;
+import com.google.firebase.perf.application.AppStateMonitor;
 import com.google.firebase.perf.metrics.Trace;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Clock;

firebase-perf/src/test/java/com/google/firebase/perf/transport/RateLimiterTest.java

@@ -15,8 +15,8 @@
 package com.google.firebase.perf.transport;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.firebase.perf.internal.ResourceType.NETWORK;
-import static com.google.firebase.perf.internal.ResourceType.TRACE;
+import static com.google.firebase.perf.metrics.resource.ResourceType.NETWORK;
+import static com.google.firebase.perf.metrics.resource.ResourceType.TRACE;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;

firebase-perf/src/test/java/com/google/firebase/perf/transport/TransportManagerTest.java

@@ -32,8 +32,8 @@
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.perf.FirebasePerformance;
 import com.google.firebase.perf.FirebasePerformanceTestBase;
+import com.google.firebase.perf.application.AppStateMonitor;
 import com.google.firebase.perf.config.ConfigResolver;
-import com.google.firebase.perf.internal.AppStateMonitor;
 import com.google.firebase.perf.internal.SessionManager;
 import com.google.firebase.perf.shadows.ShadowPreconditions;
 import com.google.firebase.perf.util.Clock;