Merge branch 'master' of github.com:firebase/firebase-android-sdk into perfPackageNetworkBuilder

Author: visumickey

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

@@ -29,12 +29,12 @@
 import com.google.firebase.inject.Provider;
 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.internal.PerfMetricValidator;
-import com.google.firebase.perf.internal.RemoteConfigManager;
 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.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/config/ConfigResolver.java

@@ -39,7 +39,6 @@
 import com.google.firebase.perf.config.ConfigurationConstants.TraceEventCountBackground;
 import com.google.firebase.perf.config.ConfigurationConstants.TraceEventCountForeground;
 import com.google.firebase.perf.config.ConfigurationConstants.TraceSamplingRate;
-import com.google.firebase.perf.internal.RemoteConfigManager;
 import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.util.ImmutableBundle;
 import com.google.firebase.perf.util.Optional;

firebase-perf/src/main/java/com/google/firebase/perf/internal/RemoteConfigManager.java renamed to firebase-perf/src/main/java/com/google/firebase/perf/config/RemoteConfigManager.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.config;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;

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

@@ -21,8 +21,8 @@
 import com.google.firebase.installations.FirebaseInstallationsApi;
 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.internal.RemoteConfigManager;
 import com.google.firebase.remoteconfig.RemoteConfigComponent;
 import dagger.Module;
 import dagger.Provides;

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

@@ -19,8 +19,8 @@
 import com.google.firebase.perf.FirebasePerformance.HttpMethod;
 import com.google.firebase.perf.FirebasePerformanceAttributable;
 import com.google.firebase.perf.config.ConfigResolver;
-import com.google.firebase.perf.internal.PerfMetricValidator;
 import com.google.firebase.perf.logging.AndroidLogger;
+import com.google.firebase.perf.metrics.validator.PerfMetricValidator;
 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

@@ -25,11 +25,11 @@
 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.PerfMetricValidator;
 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.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/internal/FirebasePerfApplicationInfoValidator.java renamed to firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/FirebasePerfApplicationInfoValidator.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.validator;
 
 import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.v1.ApplicationInfo;

firebase-perf/src/main/java/com/google/firebase/perf/internal/FirebasePerfGaugeMetricValidator.java renamed to firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/FirebasePerfGaugeMetricValidator.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.validator;
 
 import com.google.firebase.perf.v1.GaugeMetric;
 import com.google.firebase.perf.v1.PerfMetric;

firebase-perf/src/main/java/com/google/firebase/perf/internal/FirebasePerfNetworkValidator.java renamed to firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/FirebasePerfNetworkValidator.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.validator;
 
 import android.content.Context;
 import androidx.annotation.NonNull;

firebase-perf/src/main/java/com/google/firebase/perf/internal/FirebasePerfTraceValidator.java renamed to firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/FirebasePerfTraceValidator.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.validator;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

firebase-perf/src/main/java/com/google/firebase/perf/internal/PerfMetricValidator.java renamed to firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/PerfMetricValidator.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.validator;
 
 import android.content.Context;
 import androidx.annotation.NonNull;
@@ -83,6 +83,7 @@ public static boolean isValid(@NonNull PerfMetric perfMetric, @NonNull Context c
    * @return null if the string can be used as Trace name, if not, an error string explaining why it
    *     can't be used.
    */
+  @Nullable
   public static String validateTraceName(@Nullable String str) {
     if (str == null) {
       return "Trace name must not be null";
@@ -112,6 +113,7 @@ public static String validateTraceName(@Nullable String str) {
    * @return null if the string can be used as Counter name, if not, an error string explaining why
    *     it can't be used.
    */
+  @Nullable
   public static String validateMetricName(@Nullable String str) {
     if (str == null) {
       return "Metric name must not be null";
@@ -137,6 +139,7 @@ public static String validateMetricName(@Nullable String str) {
    * @return null if the entry can be used as an Attribute, if not, an error string explaining why
    *     it can't be used.
    */
+  @Nullable
   public static String validateAttribute(@NonNull Map.Entry<String, String> attribute) {
     String key = attribute.getKey();
     String value = attribute.getValue();

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

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

@@ -34,9 +34,9 @@
 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.PerfMetricValidator;
 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.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

@@ -34,8 +34,8 @@
 import com.google.firebase.installations.FirebaseInstallationsApi;
 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.internal.RemoteConfigManager;
 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/config/ConfigResolverTest.java

@@ -31,7 +31,6 @@
 import androidx.test.core.app.ApplicationProvider;
 import com.google.firebase.perf.BuildConfig;
 import com.google.firebase.perf.FirebasePerformanceTestBase;
-import com.google.firebase.perf.internal.RemoteConfigManager;
 import com.google.firebase.perf.util.ImmutableBundle;
 import com.google.firebase.perf.util.Optional;
 import org.junit.Before;

firebase-perf/src/test/java/com/google/firebase/perf/internal/RemoteConfigManagerTest.java renamed to firebase-perf/src/test/java/com/google/firebase/perf/config/RemoteConfigManagerTest.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.config;
 
 import static com.google.common.truth.Truth.assertThat;
 import static java.nio.charset.StandardCharsets.UTF_8;

firebase-perf/src/test/java/com/google/firebase/perf/internal/FirebasePerfApplicationInfoValidatorTest.java renamed to firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfApplicationInfoValidatorTest.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.validator;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -23,7 +23,10 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-/** Unit tests for {@link FirebasePerfApplicationInfoValidator}. */
+/**
+ * Unit tests for {@link
+ * com.google.firebase.perf.metrics.validator.FirebasePerfApplicationInfoValidator}.
+ */
 @RunWith(RobolectricTestRunner.class)
 public class FirebasePerfApplicationInfoValidatorTest {
   @Test

firebase-perf/src/test/java/com/google/firebase/perf/internal/FirebasePerfGaugeManagerValidatorTest.java renamed to firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfGaugeManagerValidatorTest.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.validator;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -27,7 +27,10 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-/** Unit tests for {@link com.google.firebase.perf.internal.FirebasePerfGaugeMetricValidator}. */
+/**
+ * Unit tests for {@link
+ * com.google.firebase.perf.metrics.validator.FirebasePerfGaugeMetricValidator}.
+ */
 @RunWith(RobolectricTestRunner.class)
 public final class FirebasePerfGaugeManagerValidatorTest {
 

firebase-perf/src/test/java/com/google/firebase/perf/internal/FirebasePerfNetworkValidatorTest.java renamed to firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfNetworkValidatorTest.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.validator;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertFalse;
@@ -29,7 +29,9 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-/** Unit tests for {@link FirebasePerfNetworkValidator}. */
+/**
+ * Unit tests for {@link com.google.firebase.perf.metrics.validator.FirebasePerfNetworkValidator}.
+ */
 @RunWith(RobolectricTestRunner.class)
 public class FirebasePerfNetworkValidatorTest extends FirebasePerformanceTestBase {
   private final FirebasePerfNetworkValidator validator =