-
Notifications
You must be signed in to change notification settings - Fork 626
Add SessionMaintainerFollower
and create in FirebaseSessions
when…
#5368
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.
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
Open
jrothfeder
wants to merge
9
commits into
session-maintainer
Choose a base branch
from
session-maintainer-follower
base: session-maintainer
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
b9f0e1d
Automatically add NO_RELEASE_CHANGE to mergeback (#5366)
daymxn 57e01ea
Add `SessionMaintainerFollower` and create in `FirebaseSessions` when…
c8f87ae
Add copyright.
b9937d5
Add copyright
1e04fe1
PR feedback
d2b5ddb
Merge branch 'master' into session-maintainer-follower
b3945b9
Move tests to the leader package
5c4ceee
Restore FirebaseSessions
2300e61
Change the name of the sessions data repo
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
...ssions/src/main/kotlin/com/google/firebase/sessions/follower/SessionMaintainerFollower.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
/* | ||
* Copyright 2023 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.sessions.follower | ||
|
||
import android.util.Log | ||
import com.google.firebase.sessions.SessionMaintainer | ||
import com.google.firebase.sessions.api.FirebaseSessionsDependencies | ||
import com.google.firebase.sessions.api.SessionSubscriber | ||
import kotlinx.coroutines.CoroutineDispatcher | ||
import kotlinx.coroutines.CoroutineScope | ||
import kotlinx.coroutines.launch | ||
|
||
internal class SessionMaintainerFollower( | ||
private val sessionsDataRepository: SessionsDataRepository | ||
) : SessionMaintainer { | ||
val tag = "SessionMaintainerFollow" | ||
|
||
override fun register(subscriber: SessionSubscriber) = Unit | ||
|
||
override fun start(backgroundDispatcher: CoroutineDispatcher) { | ||
CoroutineScope(backgroundDispatcher).launch { | ||
sessionsDataRepository.firebaseSessionDataFlow.collect { | ||
if (it.sessionId == null) { | ||
Log.d( | ||
tag, | ||
"No session data available in shared storage." + " subscribers will not be notified." | ||
) | ||
} else { | ||
Log.d( | ||
tag, | ||
"Follower process has observed a change to the repository and will notify subscribers. New session id is ${it.sessionId}" | ||
) | ||
notifySubscribers(it.sessionId) | ||
} | ||
} | ||
} | ||
} | ||
|
||
private suspend fun notifySubscribers(sessionId: String) { | ||
val subscribers = FirebaseSessionsDependencies.getRegisteredSubscribers() | ||
if (subscribers.isEmpty()) { | ||
Log.d(tag, "Sessions SDK did not have any subscribers. Events will not be sent.") | ||
} else { | ||
subscribers.values.forEach { subscriber -> | ||
// Notify subscribers, irregardless ;) of sampling and data collection state. | ||
Log.d(tag, "Sending session id $sessionId to subscriber $subscriber.") | ||
subscriber.onSessionChanged(SessionSubscriber.SessionDetails(sessionId)) | ||
} | ||
} | ||
} | ||
} |
60 changes: 60 additions & 0 deletions
60
...-sessions/src/main/kotlin/com/google/firebase/sessions/follower/SessionsDataRepository.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
/* | ||
* Copyright 2023 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.sessions.follower | ||
|
||
import android.content.Context | ||
import android.util.Log | ||
import androidx.datastore.core.DataStore | ||
import androidx.datastore.preferences.core.Preferences | ||
import androidx.datastore.preferences.core.edit | ||
import androidx.datastore.preferences.core.emptyPreferences | ||
import androidx.datastore.preferences.core.stringPreferencesKey | ||
import androidx.datastore.preferences.preferencesDataStore | ||
import kotlinx.coroutines.flow.Flow | ||
import kotlinx.coroutines.flow.catch | ||
import kotlinx.coroutines.flow.map | ||
|
||
internal data class FirebaseSessionsData(val sessionId: String?) | ||
|
||
/** Persists session data that needs to be synchronized across processes */ | ||
internal class SessionsDataRepository(private val context: Context) { | ||
private val tag = "FirebaseSessionsRepo" | ||
|
||
private object FirebaseSessionDataKeys { | ||
val SESSION_ID = stringPreferencesKey("session_id") | ||
} | ||
|
||
val firebaseSessionDataFlow: Flow<FirebaseSessionsData> = | ||
context.dataStore.data | ||
.catch { exception -> | ||
Log.e(tag, "Error reading stored session data.", exception) | ||
emit(emptyPreferences()) | ||
} | ||
.map { preferences -> mapSessionsData(preferences) } | ||
|
||
suspend fun updateSessionId(sessionId: String) { | ||
context.dataStore.edit { preferences -> | ||
preferences[FirebaseSessionDataKeys.SESSION_ID] = sessionId | ||
} | ||
} | ||
|
||
private fun mapSessionsData(preferences: Preferences): FirebaseSessionsData = | ||
FirebaseSessionsData(preferences[FirebaseSessionDataKeys.SESSION_ID]) | ||
} | ||
|
||
private val Context.dataStore: DataStore<Preferences> by | ||
preferencesDataStore(name = "firebase_session_data_repository") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can this be something like
.map(::mapSessionsData)
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that didn't work