Merge eda1859 into b0bea40

Author: mrober

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

@@ -35,11 +35,11 @@ internal constructor(
   backgroundDispatcher: CoroutineDispatcher,
   transportFactoryProvider: Provider<TransportFactory>,
 ) {
-  private val sessionGenerator = SessionGenerator(collectEvents = true)
+  private val sessionSettings = SessionsSettings(firebaseApp.applicationContext)
+  private val sessionGenerator = SessionGenerator(collectEvents = shouldCollectEvents())
   private val eventGDTLogger = EventGDTLogger(transportFactoryProvider)
   private val sessionCoordinator =
     SessionCoordinator(firebaseInstallations, backgroundDispatcher, eventGDTLogger)
-  private val sessionSettings = SessionsSettings(firebaseApp.applicationContext)
   private val timeProvider: TimeProvider = Time()
 
   init {
@@ -61,12 +61,22 @@ internal constructor(
 
   private fun initiateSessionStart() {
     val sessionDetails = sessionGenerator.generateNewSession()
-    val sessionEvent =
-      SessionEvents.startSession(firebaseApp, sessionDetails, sessionSettings, timeProvider)
 
-    if (sessionDetails.collectEvents) {
-      sessionCoordinator.attemptLoggingSessionEvent(sessionEvent)
+    if (!sessionGenerator.collectEvents) {
+      Log.d(TAG, "Sessions SDK has sampled this session")
+      return
     }
+
+    sessionCoordinator.attemptLoggingSessionEvent(
+      SessionEvents.startSession(firebaseApp, sessionDetails, sessionSettings, timeProvider)
+    )
+  }
+
+  /** Calculate whether we should sample events using [sessionSettings] data. */
+  private fun shouldCollectEvents(): Boolean {
+    // Sampling rate of 1 means we do not sample.
+    val randomValue = Math.random()
+    return randomValue <= sessionSettings.samplingRate
   }
 
   companion object {

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

@@ -26,7 +26,6 @@ import java.util.UUID
 internal data class SessionDetails(
   val sessionId: String,
   val firstSessionId: String,
-  val collectEvents: Boolean,
   val sessionIndex: Int,
 )
 
@@ -37,7 +36,7 @@ internal data class SessionDetails(
  * @hide
  */
 internal class SessionGenerator(
-  private val collectEvents: Boolean,
+  val collectEvents: Boolean,
   private val uuidGenerator: () -> UUID = UUID::randomUUID
 ) {
   private val firstSessionId = generateSessionId()
@@ -54,7 +53,6 @@ internal class SessionGenerator(
       SessionDetails(
         sessionId = if (sessionIndex == 0) firstSessionId else generateSessionId(),
         firstSessionId,
-        collectEvents,
         sessionIndex,
       )
     return currentSession

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

@@ -72,7 +72,6 @@ class SessionGeneratorTest {
         SessionDetails(
           sessionId = SESSION_ID_1,
           firstSessionId = SESSION_ID_1,
-          collectEvents = true,
           sessionIndex = 0,
         )
       )
@@ -94,7 +93,6 @@ class SessionGeneratorTest {
         SessionDetails(
           sessionId = SESSION_ID_1,
           firstSessionId = SESSION_ID_1,
-          collectEvents = true,
           sessionIndex = 0,
         )
       )
@@ -110,7 +108,6 @@ class SessionGeneratorTest {
         SessionDetails(
           sessionId = SESSION_ID_2,
           firstSessionId = SESSION_ID_1,
-          collectEvents = true,
           sessionIndex = 1,
         )
       )
@@ -126,7 +123,6 @@ class SessionGeneratorTest {
         SessionDetails(
           sessionId = SESSION_ID_3,
           firstSessionId = SESSION_ID_1,
-          collectEvents = true,
           sessionIndex = 2,
         )
       )

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

@@ -26,7 +26,6 @@ internal object TestSessionEventData {
     SessionDetails(
       sessionId = "a1b2c3",
       firstSessionId = "a1a1a1",
-      collectEvents = true,
       sessionIndex = 3,
     )