Merge branch 'master' into vk.agp_7.2

Author: vkryachko

.github/workflows/ci_tests_experimental.yml renamed to .github/workflows/ci_tests.yml

@@ -1,4 +1,4 @@
-name: CI Tests (Experimental)
+name: CI Tests
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true

appcheck/firebase-appcheck/ktx/src/main/kotlin/com/google/firebase/appcheck/ktx/FirebaseAppCheck.kt

@@ -14,6 +14,7 @@
 
 package com.google.firebase.appcheck.ktx
 
+import com.google.firebase.BuildConfig
 import com.google.firebase.FirebaseApp
 import com.google.firebase.appcheck.AppCheckToken
 import com.google.firebase.appcheck.FirebaseAppCheck
@@ -43,7 +44,9 @@ operator fun AppCheckToken.component1() = token
  */
 operator fun AppCheckToken.component2() = expireTimeMillis
 
+internal const val LIBRARY_NAME: String = "fire-app-check-ktx"
+
 class FirebaseAppCheckKtxRegistrar : ComponentRegistrar {
     override fun getComponents(): List<Component<*>> =
-        listOf(LibraryVersionComponent.create("fire-app-check-ktx", BuildConfig.VERSION_NAME))
+            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
 }

firebase-common/src/main/java/com/google/firebase/FirebaseApp.java

@@ -51,6 +51,8 @@
 import com.google.firebase.heartbeatinfo.DefaultHeartBeatController;
 import com.google.firebase.inject.Provider;
 import com.google.firebase.internal.DataCollectionConfigStorage;
+import com.google.firebase.tracing.ComponentMonitor;
+import com.google.firebase.tracing.FirebaseTrace;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -415,18 +417,25 @@ protected FirebaseApp(Context applicationContext, String name, FirebaseOptions o
     this.name = Preconditions.checkNotEmpty(name);
     this.options = Preconditions.checkNotNull(options);
 
+    FirebaseTrace.pushTrace("Firebase");
+
+    FirebaseTrace.pushTrace("ComponentDiscovery");
     List<Provider<ComponentRegistrar>> registrars =
         ComponentDiscovery.forContext(applicationContext, ComponentDiscoveryService.class)
             .discoverLazy();
+    FirebaseTrace.popTrace(); // ComponentDiscovery
 
+    FirebaseTrace.pushTrace("Runtime");
     componentRuntime =
         ComponentRuntime.builder(UI_EXECUTOR)
             .addLazyComponentRegistrars(registrars)
             .addComponentRegistrar(new FirebaseCommonRegistrar())
             .addComponent(Component.of(applicationContext, Context.class))
             .addComponent(Component.of(this, FirebaseApp.class))
             .addComponent(Component.of(options, FirebaseOptions.class))
+            .setProcessor(new ComponentMonitor())
             .build();
+    FirebaseTrace.popTrace(); // Runtime
 
     dataCollectionConfigStorage =
         new Lazy<>(
@@ -443,6 +452,8 @@ protected FirebaseApp(Context applicationContext, String name, FirebaseOptions o
             defaultHeartBeatController.get().registerHeartBeat();
           }
         });
+
+    FirebaseTrace.popTrace(); // Firebase
   }
 
   private void checkNotDeleted() {

firebase-common/src/main/java/com/google/firebase/tracing/ComponentMonitor.java

@@ -0,0 +1,48 @@
+// Copyright 2022 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.
+
+package com.google.firebase.tracing;
+
+import com.google.firebase.components.Component;
+import com.google.firebase.components.ComponentRegistrar;
+import com.google.firebase.components.ComponentRegistrarProcessor;
+import java.util.ArrayList;
+import java.util.List;
+
+/** Wraps components to trace their initialization time. */
+public class ComponentMonitor implements ComponentRegistrarProcessor {
+  @Override
+  public List<Component<?>> processRegistrar(ComponentRegistrar registrar) {
+    List<Component<?>> components = new ArrayList<>();
+    for (Component comp : registrar.getComponents()) {
+      String name = comp.getName();
+      if (name != null) {
+        @SuppressWarnings("unchecked")
+        Component<Object> old = (Component<Object>) comp;
+        comp =
+            old.withFactory(
+                c -> {
+                  try {
+                    FirebaseTrace.pushTrace(name);
+                    return old.getFactory().create(c);
+                  } finally {
+                    FirebaseTrace.popTrace();
+                  }
+                });
+      }
+      components.add(comp);
+    }
+    return components;
+  }
+}

firebase-common/src/main/java/com/google/firebase/tracing/FirebaseTrace.java

@@ -0,0 +1,36 @@
+// Copyright 2022 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.
+
+package com.google.firebase.tracing;
+
+import android.os.Build;
+import android.os.Trace;
+
+/** Utility to consistently wrap trace calls with version checking. */
+public final class FirebaseTrace {
+
+  private FirebaseTrace() {}
+
+  public static void pushTrace(String name) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+      Trace.beginSection(name);
+    }
+  }
+
+  public static void popTrace() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+      Trace.endSection();
+    }
+  }
+}

firebase-common/src/main/java/com/google/firebase/tracing/package-info.java

@@ -0,0 +1,16 @@
+// Copyright 2022 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 */
+package com.google.firebase.tracing;

firebase-common/src/test/java/com/google/firebase/tracing/ComponentMonitorTest.java

@@ -0,0 +1,58 @@
+// Copyright 2022 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.
+
+package com.google.firebase.tracing;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.firebase.components.Component;
+import com.google.firebase.components.ComponentContainer;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ComponentMonitorTest {
+
+  @Test
+  public void testComponentMonitorTransformation() {
+    List<Component<?>> list = new ArrayList<Component<?>>();
+    list.add(
+        Component.builder(ComponentHolder.class)
+            .factory(ComponentHolder::new)
+            .name("test")
+            .build());
+    list.add(
+        Component.builder(ComponentHolder.class).factory(ComponentHolder::new).name("foo").build());
+    list.add(
+        Component.builder(ComponentHolder.class).factory(ComponentHolder::new).name("bar").build());
+    ComponentMonitor monitor = new ComponentMonitor();
+    List<Component<?>> transformed = monitor.processRegistrar(() -> list);
+    assertThat(list.size()).isEqualTo(transformed.size());
+    for (int i = 0; i < list.size(); i++) {
+      assertThat(list.get(i).getName()).isEqualTo(transformed.get(i).getName());
+      assertThat(transformed.get(i).getFactory().create(null)).isNotNull();
+    }
+  }
+
+  private static final class ComponentHolder {
+    private final ComponentContainer container;
+
+    public ComponentHolder(ComponentContainer container) {
+      this.container = container;
+    }
+  }
+}

firebase-components/firebase-components.gradle

@@ -44,7 +44,7 @@ android {
 dependencies {
     implementation project(':firebase-annotations')
     implementation 'androidx.annotation:annotation:1.1.0'
-
+    implementation "com.google.errorprone:error_prone_annotations:2.9.0"
     testImplementation 'androidx.test:runner:1.2.0'
     testImplementation 'androidx.test.ext:junit:1.1.1'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"

firebase-components/src/main/java/com/google/firebase/components/Component.java

@@ -17,6 +17,7 @@
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Arrays;
@@ -265,6 +266,7 @@ public Builder<T> name(@NonNull String name) {
     }
 
     /** Add a {@link Dependency} to the {@link Component} being built. */
+    @CanIgnoreReturnValue
     public Builder<T> add(Dependency dependency) {
       Preconditions.checkNotNull(dependency, "Null dependency");
       validateInterface(dependency.getInterface());
@@ -273,21 +275,25 @@ public Builder<T> add(Dependency dependency) {
     }
 
     /** Make the {@link Component} initialize upon startup. */
+    @CanIgnoreReturnValue
     public Builder<T> alwaysEager() {
       return setInstantiation(Instantiation.ALWAYS_EAGER);
     }
 
     /** Make the component initialize upon startup in default app. */
+    @CanIgnoreReturnValue
     public Builder<T> eagerInDefaultApp() {
       return setInstantiation(Instantiation.EAGER_IN_DEFAULT_APP);
     }
 
     /** Make the {@link Component} eligible to publish events of provided eventType. */
+    @CanIgnoreReturnValue
     public Builder<T> publishes(Class<?> eventType) {
       publishedEvents.add(eventType);
       return this;
     }
 
+    @CanIgnoreReturnValue
     private Builder<T> setInstantiation(@Instantiation int instantiation) {
       Preconditions.checkState(
           this.instantiation == Instantiation.LAZY, "Instantiation type has already been set.");
@@ -302,11 +308,13 @@ private void validateInterface(Class<?> anInterface) {
     }
 
     /** Set the factory that will be used to initialize the {@link Component}. */
+    @CanIgnoreReturnValue
     public Builder<T> factory(ComponentFactory<T> value) {
       factory = Preconditions.checkNotNull(value, "Null factory");
       return this;
     }
 
+    @CanIgnoreReturnValue
     private Builder<T> intoSet() {
       type = ComponentType.SET;
       return this;

firebase-components/src/main/java/com/google/firebase/components/ComponentRuntime.java

@@ -18,6 +18,7 @@
 import androidx.annotation.RestrictTo;
 import androidx.annotation.RestrictTo.Scope;
 import androidx.annotation.VisibleForTesting;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.firebase.dynamicloading.ComponentLoader;
 import com.google.firebase.events.Publisher;
 import com.google.firebase.events.Subscriber;
@@ -358,21 +359,25 @@ public static final class Builder {
       this.defaultExecutor = defaultExecutor;
     }
 
+    @CanIgnoreReturnValue
     public Builder addLazyComponentRegistrars(Collection<Provider<ComponentRegistrar>> registrars) {
       this.lazyRegistrars.addAll(registrars);
       return this;
     }
 
+    @CanIgnoreReturnValue
     public Builder addComponentRegistrar(ComponentRegistrar registrar) {
       this.lazyRegistrars.add(() -> registrar);
       return this;
     }
 
+    @CanIgnoreReturnValue
     public Builder addComponent(Component<?> component) {
       this.additionalComponents.add(component);
       return this;
     }
 
+    @CanIgnoreReturnValue
     public Builder setProcessor(ComponentRegistrarProcessor processor) {
       this.componentRegistrarProcessor = processor;
       return this;

firebase-components/src/main/java/com/google/firebase/components/Preconditions.java

@@ -14,6 +14,8 @@
 
 package com.google.firebase.components;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
+
 public final class Preconditions {
 
   public static void checkArgument(boolean expression, String errorMessage) {
@@ -22,13 +24,15 @@ public static void checkArgument(boolean expression, String errorMessage) {
     }
   }
 
+  @CanIgnoreReturnValue
   public static <T> T checkNotNull(T reference) {
     if (reference == null) {
       throw new NullPointerException();
     }
     return reference;
   }
 
+  @CanIgnoreReturnValue
   public static <T> T checkNotNull(T reference, String errorMessage) {
     if (reference == null) {
       throw new NullPointerException(errorMessage);

firebase-inappmessaging-display/src/androidTest/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.google.firebase.inappmessaging.display.test">
 
   <application>