Populate DataCollectionStatus for Crashlytics and Perf in Sessions (#5205)

Author: mrober

firebase-sessions/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 * [fixed] Fixed NPE when no version name is
   set ([#5195](//github.com/firebase/firebase-android-sdk/issues/5195)).
+* [fixed] Populate DataCollectionStatus fields for Crashlytics and Perf.
 
 # 1.0.0
 

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessions.kt

@@ -139,7 +139,7 @@ internal constructor(
     }
 
     sessionCoordinator.attemptLoggingSessionEvent(
-      SessionEvents.startSession(firebaseApp, sessionDetails, sessionSettings)
+      SessionEvents.startSession(firebaseApp, sessionDetails, sessionSettings, subscribers)
     )
   }
 

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionEvent.kt

@@ -72,8 +72,8 @@ internal data class SessionInfo(
 
 /** Contains the data collection state for all dependent SDKs and sampling info */
 internal data class DataCollectionStatus(
-  val performance: DataCollectionState = DataCollectionState.COLLECTION_ENABLED,
-  val crashlytics: DataCollectionState = DataCollectionState.COLLECTION_ENABLED,
+  val performance: DataCollectionState = DataCollectionState.COLLECTION_SDK_NOT_INSTALLED,
+  val crashlytics: DataCollectionState = DataCollectionState.COLLECTION_SDK_NOT_INSTALLED,
   val sessionSamplingRate: Double = 1.0,
 )
 

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionEvents.kt

@@ -20,6 +20,7 @@ import android.os.Build
 import com.google.firebase.FirebaseApp
 import com.google.firebase.encoders.DataEncoder
 import com.google.firebase.encoders.json.JsonDataEncoderBuilder
+import com.google.firebase.sessions.api.SessionSubscriber
 import com.google.firebase.sessions.settings.SessionsSettings
 
 /** Contains functions for [SessionEvent]s. */
@@ -40,6 +41,7 @@ internal object SessionEvents {
     firebaseApp: FirebaseApp,
     sessionDetails: SessionDetails,
     sessionsSettings: SessionsSettings,
+    subscribers: Map<SessionSubscriber.Name, SessionSubscriber> = emptyMap(),
   ) =
     SessionEvent(
       eventType = EventType.SESSION_START,
@@ -49,7 +51,11 @@ internal object SessionEvents {
           sessionDetails.firstSessionId,
           sessionDetails.sessionIndex,
           eventTimestampUs = sessionDetails.sessionStartTimestampUs,
-          DataCollectionStatus(sessionSamplingRate = sessionsSettings.samplingRate),
+          DataCollectionStatus(
+            performance = toDataCollectionState(subscribers[SessionSubscriber.Name.PERFORMANCE]),
+            crashlytics = toDataCollectionState(subscribers[SessionSubscriber.Name.CRASHLYTICS]),
+            sessionSamplingRate = sessionsSettings.samplingRate,
+          ),
         ),
       applicationInfo = getApplicationInfo(firebaseApp)
     )
@@ -81,4 +87,13 @@ internal object SessionEvents {
         )
     )
   }
+
+  private fun toDataCollectionState(subscriber: SessionSubscriber?): DataCollectionState =
+    if (subscriber == null) {
+      DataCollectionState.COLLECTION_SDK_NOT_INSTALLED
+    } else if (subscriber.isDataCollectionEnabled) {
+      DataCollectionState.COLLECTION_ENABLED
+    } else {
+      DataCollectionState.COLLECTION_DISABLED
+    }
 }

firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionEventEncoderTest.kt

@@ -21,8 +21,10 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import com.google.firebase.FirebaseApp
 import com.google.firebase.sessions.SessionEvents.SESSION_EVENT_ENCODER
+import com.google.firebase.sessions.api.SessionSubscriber
 import com.google.firebase.sessions.settings.SessionsSettings
 import com.google.firebase.sessions.testing.FakeFirebaseApp
+import com.google.firebase.sessions.testing.FakeSessionSubscriber
 import com.google.firebase.sessions.testing.FakeSettingsProvider
 import com.google.firebase.sessions.testing.TestSessionEventData
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -51,6 +53,15 @@ class SessionEventEncoderTest {
           localOverrideSettings = FakeSettingsProvider(),
           remoteSettings = FakeSettingsProvider(),
         ),
+        subscribers =
+          mapOf(
+            SessionSubscriber.Name.CRASHLYTICS to FakeSessionSubscriber(),
+            SessionSubscriber.Name.PERFORMANCE to
+              FakeSessionSubscriber(
+                isDataCollectionEnabled = false,
+                sessionSubscriberName = SessionSubscriber.Name.PERFORMANCE,
+              ),
+          ),
       )
 
     val json = SESSION_EVENT_ENCODER.encode(sessionEvent)
@@ -66,7 +77,7 @@ class SessionEventEncoderTest {
               "sessionIndex":3,
               "eventTimestampUs":12340000,
               "dataCollectionStatus":{
-                "performance":2,
+                "performance":3,
                 "crashlytics":2,
                 "sessionSamplingRate":1.0
               },
@@ -133,8 +144,8 @@ class SessionEventEncoderTest {
               "sessionIndex":0,
               "eventTimestampUs":0,
               "dataCollectionStatus":{
-                "performance":2,
-                "crashlytics":2,
+                "performance":1,
+                "crashlytics":1,
                 "sessionSamplingRate":1.0
               },
               "firebaseInstallationId":""

firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/TestSessionEventData.kt

@@ -43,8 +43,8 @@ internal object TestSessionEventData {
 
   val TEST_DATA_COLLECTION_STATUS =
     DataCollectionStatus(
-      performance = DataCollectionState.COLLECTION_ENABLED,
-      crashlytics = DataCollectionState.COLLECTION_ENABLED,
+      performance = DataCollectionState.COLLECTION_SDK_NOT_INSTALLED,
+      crashlytics = DataCollectionState.COLLECTION_SDK_NOT_INSTALLED,
       sessionSamplingRate = 1.0
     )