-
Notifications
You must be signed in to change notification settings - Fork 625
Implement local manifest override configs #4877
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
Merged
visumickey
merged 2 commits into
firebase-sessions
from
firebase-session-localoverrides
Apr 10, 2023
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
70 changes: 70 additions & 0 deletions
70
...e-sessions/src/main/kotlin/com/google/firebase/sessions/settings/LocalOverrideSettings.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,70 @@ | ||
/* | ||
* 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.settings | ||
|
||
import android.content.Context | ||
import android.content.pm.PackageManager | ||
import kotlin.time.Duration | ||
import kotlin.time.DurationUnit | ||
import kotlin.time.toDuration | ||
|
||
internal class LocalOverrideSettings(val context: Context) : SettingsProvider { | ||
|
||
private val sessions_metadata_flag_sessionsEnabled = "firebase_sessions_enabled" | ||
private val sessions_metadata_flag_sessionRestartTimeout = | ||
"firebase_sessions_sessions_restart_timeout" | ||
private val sessions_metadata_flag_samplingRate = "firebase_sessions_sampling_rate" | ||
private val metadata = | ||
context.packageManager | ||
.getApplicationInfo(context.packageName, PackageManager.GET_META_DATA) | ||
.metaData | ||
|
||
override val sessionEnabled: Boolean? | ||
get() { | ||
if (metadata != null && metadata.containsKey(sessions_metadata_flag_sessionsEnabled)) { | ||
return metadata.getBoolean(sessions_metadata_flag_sessionsEnabled) | ||
} | ||
return null | ||
} | ||
|
||
override val sessionRestartTimeout: Duration? | ||
get() { | ||
if (metadata != null && metadata.containsKey(sessions_metadata_flag_sessionRestartTimeout)) { | ||
val timeoutInSeconds = metadata.getInt(sessions_metadata_flag_sessionRestartTimeout) | ||
val duration = timeoutInSeconds!!.toDuration(DurationUnit.SECONDS) | ||
return duration | ||
} | ||
return null | ||
} | ||
|
||
override val samplingRate: Double? | ||
get() { | ||
if (metadata != null && metadata.containsKey(sessions_metadata_flag_samplingRate)) { | ||
return metadata.getDouble(sessions_metadata_flag_samplingRate) | ||
} | ||
return null | ||
} | ||
|
||
override fun updateSettings() { | ||
// Nothing to be done here since there is nothing to be updated. | ||
} | ||
|
||
override fun isSettingsStale(): Boolean { | ||
// Settings are never stale since all of these are from Manifest file. | ||
return false | ||
} | ||
} |
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
36 changes: 36 additions & 0 deletions
36
firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SettingsProvider.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,36 @@ | ||
/* | ||
* 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.settings | ||
|
||
import kotlin.time.Duration | ||
|
||
interface SettingsProvider { | ||
// Setting to control if session collection is enabled | ||
val sessionEnabled: Boolean? | ||
|
||
// Setting to represent when to restart a new session after app backgrounding. | ||
val sessionRestartTimeout: Duration? | ||
|
||
// Setting denoting the percentage of the sessions data that should be collected | ||
val samplingRate: Double? | ||
|
||
// Function to initiate refresh of the settings for the provider | ||
fun updateSettings() | ||
|
||
// Function representing if the settings are stale. | ||
fun isSettingsStale(): Boolean | ||
} |
74 changes: 74 additions & 0 deletions
74
firebase-sessions/src/test/kotlin/com/google/firebase/sessions/LocalOverrideSettingsTest.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,74 @@ | ||
/* | ||
* 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 | ||
|
||
import android.os.Bundle | ||
import com.google.common.truth.Truth.assertThat | ||
import com.google.firebase.FirebaseApp | ||
import com.google.firebase.sessions.settings.LocalOverrideSettings | ||
import com.google.firebase.sessions.testing.FakeFirebaseApp | ||
import kotlin.time.Duration.Companion.minutes | ||
import org.junit.After | ||
import org.junit.Test | ||
import org.junit.runner.RunWith | ||
import org.robolectric.RobolectricTestRunner | ||
|
||
@RunWith(RobolectricTestRunner::class) | ||
class LocalOverrideSettingsTest { | ||
|
||
@Test | ||
fun localOverrides_returnsNullByDefault() { | ||
val context = FakeFirebaseApp.fakeFirebaseApp().applicationContext | ||
|
||
val localSettings = LocalOverrideSettings(context) | ||
assertThat(localSettings.sessionEnabled).isNull() | ||
assertThat(localSettings.sessionRestartTimeout).isNull() | ||
assertThat(localSettings.samplingRate).isNull() | ||
} | ||
|
||
@Test | ||
fun localOverrides_validateIfOverrideValuesAreFetchedCorrectly() { | ||
val metadata = Bundle() | ||
metadata.putBoolean("firebase_sessions_enabled", false) | ||
metadata.putDouble("firebase_sessions_sampling_rate", 0.5) | ||
metadata.putInt("firebase_sessions_sessions_restart_timeout", 180) | ||
val context = FakeFirebaseApp.fakeFirebaseApp(metadata).applicationContext | ||
|
||
val localSettings = LocalOverrideSettings(context) | ||
assertThat(localSettings.sessionEnabled).isFalse() | ||
assertThat(localSettings.sessionRestartTimeout).isEqualTo(3.minutes) | ||
assertThat(localSettings.samplingRate).isEqualTo(0.5) | ||
} | ||
|
||
@Test | ||
fun localOverridesForSomeFields_validateIfOverrideValuesAreFetchedCorrectly() { | ||
val metadata = Bundle() | ||
metadata.putBoolean("firebase_sessions_enabled", false) | ||
metadata.putInt("firebase_sessions_sessions_restart_timeout", 180) | ||
val context = FakeFirebaseApp.fakeFirebaseApp(metadata).applicationContext | ||
|
||
val localSettings = LocalOverrideSettings(context) | ||
assertThat(localSettings.sessionEnabled).isFalse() | ||
assertThat(localSettings.sessionRestartTimeout).isEqualTo(3.minutes) | ||
assertThat(localSettings.samplingRate).isNull() | ||
} | ||
|
||
@After | ||
fun cleanUp() { | ||
FirebaseApp.clearInstancesForTest() | ||
} | ||
} |
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
Instead of this pattern and using
!!
, Kotlin has nice syntax for dealing with null like:Elvis if it's just 1 or the other:
get() = localOverrideSettings.sessionEnabled ?: true
There is also this for when we have multiple cases: