Skip to content

Fix cold starts incorrectly using the previous firstSessionId #7047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 19, 2025
Merged

Fix cold starts incorrectly using the previous firstSessionId #7047

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e37763
Fix cold start resetting first session id
mrober Jun 19, 2025
342eb44
Remove debugging line
mrober Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SharedSessionRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ constructor(
CoroutineScope(backgroundDispatcher).launch {
try {
sessionDataStore.updateData {
// TODO(mrober): Double check time makes sense?
sessionData.copy(backgroundTime = timeProvider.currentTime())
}
} catch (ex: Exception) {
Expand All @@ -125,6 +124,9 @@ constructor(
val isSessionExpired = isSessionExpired(currentSessionData)
val isColdStart = isColdStart(currentSessionData)
val isMyProcessStale = isMyProcessStale(currentSessionData)
println(
"isSessionExpired: $isSessionExpired isColdStart: $isColdStart isMyProcessStale: $isMyProcessStale"
)

val newProcessDataMap =
if (isColdStart) {
Expand All @@ -138,10 +140,17 @@ constructor(
currentSessionData.processDataMap
}

val currentSession =
if (isColdStart) {
// For a cold start, do not keep the current session
null
} else {
currentSessionData.sessionDetails
}

// This is an expression, and returns the updated session data
if (isSessionExpired || isColdStart) {
val newSessionDetails =
sessionGenerator.generateNewSession(currentSessionData.sessionDetails)
val newSessionDetails = sessionGenerator.generateNewSession(currentSession)
sessionFirelogPublisher.mayLogSession(sessionDetails = newSessionDetails)
processDataManager.onSessionGenerated()
currentSessionData.copy(
Expand Down
4 changes: 1 addition & 3 deletions ...base-sessions/src/test/kotlin/com/google/firebase/sessions/SharedSessionRepositoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,7 @@ class SharedSessionRepositoryTest {
fakeDataStore.close()

assertThat(sharedSessionRepository.localSessionData.sessionDetails)
.isEqualTo(
SessionDetails(SESSION_ID_1, SESSION_ID_INIT, 1, fakeTimeProvider.currentTime().us)
)
.isEqualTo(SessionDetails(SESSION_ID_1, SESSION_ID_1, 0, fakeTimeProvider.currentTime().us))
}

@Test
Expand Down
Loading