Add Sessions to Crashlytics (#4993)

* Add thread safe FirebaseSessionsDependencies

* Remove debug line

* Format

* Add register api to FirebaseSessions so products can integrate

* Fix Android tests and api txt file

* Add Sessions to Crashlytics

* Address comments

* Address comments

* Rename to getRegisteredSubscribers

* Fix callsite

* Add todo

Author: mrober

build.gradle

@@ -39,6 +39,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "com.ncorti.ktfmt.gradle:plugin:0.11.0"
         classpath 'com.google.firebase:firebase-appdistribution-gradle:3.0.2'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
     }
 }
 

firebase-crashlytics/firebase-crashlytics.gradle

@@ -72,6 +72,7 @@ dependencies {
     runtimeOnly 'com.google.firebase:firebase-installations:17.1.3'
     implementation 'com.google.firebase:firebase-measurement-connector:18.0.2'
     implementation "com.google.android.gms:play-services-tasks:18.0.1"
+    implementation project(':firebase-sessions')
 
     javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
 

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/CrashlyticsRegistrar.java

@@ -24,20 +24,29 @@
 import com.google.firebase.inject.Deferred;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
+import com.google.firebase.sessions.FirebaseSessions;
+import com.google.firebase.sessions.api.FirebaseSessionsDependencies;
+import com.google.firebase.sessions.api.SessionSubscriber;
 import java.util.Arrays;
 import java.util.List;
 
 /** @hide */
 public class CrashlyticsRegistrar implements ComponentRegistrar {
   private static final String LIBRARY_NAME = "fire-cls";
 
+  static {
+    // Add Crashlytics as a dependency of Sessions when this class is loaded into memory.
+    FirebaseSessionsDependencies.INSTANCE.addDependency(SessionSubscriber.Name.CRASHLYTICS);
+  }
+
   @Override
   public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(FirebaseCrashlytics.class)
             .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.required(FirebaseInstallationsApi.class))
+            .add(Dependency.required(FirebaseSessions.class))
             .add(Dependency.deferred(CrashlyticsNativeComponent.class))
             .add(Dependency.deferred(AnalyticsConnector.class))
             .factory(this::buildCrashlytics)
@@ -57,7 +66,9 @@ private FirebaseCrashlytics buildCrashlytics(ComponentContainer container) {
 
     FirebaseInstallationsApi firebaseInstallations = container.get(FirebaseInstallationsApi.class);
 
+    FirebaseSessions firebaseSessions = container.get(FirebaseSessions.class);
+
     return FirebaseCrashlytics.init(
-        app, firebaseInstallations, nativeComponent, analyticsConnector);
+        app, firebaseInstallations, firebaseSessions, nativeComponent, analyticsConnector);
   }
 }

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.java

@@ -40,6 +40,8 @@
 import com.google.firebase.crashlytics.internal.settings.SettingsController;
 import com.google.firebase.inject.Deferred;
 import com.google.firebase.installations.FirebaseInstallationsApi;
+import com.google.firebase.sessions.FirebaseSessions;
+import com.google.firebase.sessions.api.SessionSubscriber;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
@@ -62,6 +64,7 @@ public class FirebaseCrashlytics {
   static @Nullable FirebaseCrashlytics init(
       @NonNull FirebaseApp app,
       @NonNull FirebaseInstallationsApi firebaseInstallationsApi,
+      @NonNull FirebaseSessions firebaseSessions,
       @NonNull Deferred<CrashlyticsNativeComponent> nativeComponent,
       @NonNull Deferred<AnalyticsConnector> analyticsConnector) {
 
@@ -176,6 +179,27 @@ public Void call() throws Exception {
           }
         });
 
+    // TODO(mrober): Replace with a real session implementation.
+    firebaseSessions.register(new SessionSubscriber() {
+      @Override
+      public void onSessionChanged(@NonNull SessionDetails sessionDetails) {
+        Logger.getLogger().d("onSessionChanged: " + sessionDetails);
+        // TODO(mrober): Set new field in report and remove this.
+        core.setInternalKey("sessionId", sessionDetails.getSessionId());
+      }
+
+      @Override
+      public boolean isDataCollectionEnabled() {
+        return arbiter.isAutomaticDataCollectionEnabled();
+      }
+
+      @NonNull
+      @Override
+      public SessionSubscriber.Name getSessionSubscriberName() {
+        return SessionSubscriber.Name.CRASHLYTICS;
+      }
+    });
+
     return new FirebaseCrashlytics(core);
   }
 

firebase-sessions/test-app/test-app.gradle.kts

@@ -22,6 +22,7 @@ plugins {
   id("com.android.application")
   id("org.jetbrains.kotlin.android")
   id("com.google.gms.google-services")
+  id("com.google.firebase.crashlytics")
 }
 
 android {
@@ -45,6 +46,7 @@ android {
 
 dependencies {
   // TODO(mrober): Remove when we have configurable deps on Crashlytics and Fireperf.
+  implementation(project(":firebase-crashlytics"))
   implementation(project(":firebase-sessions"))
 
   implementation("androidx.appcompat:appcompat:1.6.1")