Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ internal fun SentryOptions.toAndroidSentryOptionsCallback(): (SentryAndroidOptio

// Replay options
androidOptions.sessionReplay.maskAllText =
kmpOptions.experimental.sessionReplay.maskAllText
kmpOptions.sessionReplay.maskAllText
androidOptions.sessionReplay.maskAllImages =
kmpOptions.experimental.sessionReplay.maskAllImages
kmpOptions.sessionReplay.maskAllImages
androidOptions.sessionReplay.sessionSampleRate =
kmpOptions.experimental.sessionReplay.sessionSampleRate
kmpOptions.sessionReplay.sessionSampleRate
androidOptions.sessionReplay.onErrorSampleRate =
kmpOptions.experimental.sessionReplay.onErrorSampleRate
kmpOptions.sessionReplay.onErrorSampleRate
androidOptions.sessionReplay.quality =
kmpOptions.experimental.sessionReplay.quality.toAndroidSentryQuality()
kmpOptions.sessionReplay.quality.toAndroidSentryQuality()

// kForEach solves an issue with linter where it thinks forEach is the Java version
// see here: https://stackoverflow.com/questions/44751469/kotlin-extension-functions-suddenly-require-api-level-24/68897591#68897591
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,12 @@ public open class SentryOptions {
*/
public var enableWatchdogTerminationTracking: Boolean = true

/**
* The options for session replay.
* Currently available for **Android** and **iOS**.
*/
public var sessionReplay: SentryReplayOptions = SentryReplayOptions()

/**
* Experimental options for new features, these options are going to be promoted to SentryOptions
* before GA.
Expand All @@ -200,11 +206,5 @@ public open class SentryOptions {
*
* Beware that experimental options can change at any time.
*/
public class ExperimentalOptions {
/**
* Experimental feature. The options for session replay.
* Currently available for **Android** and **iOS**.
*/
public var sessionReplay: SentryReplayOptions = SentryReplayOptions()
}
public class ExperimentalOptions
}
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ class SentryOptionsTest : BaseSentryTest() {
assertEquals(2000L, options.appHangTimeoutIntervalMillis)
assertTrue(options.isAnrEnabled)
assertEquals(5000L, options.anrTimeoutIntervalMillis)
assertNull(options.experimental.sessionReplay.onErrorSampleRate)
assertNull(options.experimental.sessionReplay.sessionSampleRate)
assertTrue(options.experimental.sessionReplay.maskAllText)
assertTrue(options.experimental.sessionReplay.maskAllImages)
assertEquals(SentryReplayOptions.Quality.MEDIUM, options.experimental.sessionReplay.quality)
assertNull(options.sessionReplay.onErrorSampleRate)
assertNull(options.sessionReplay.sessionSampleRate)
assertTrue(options.sessionReplay.maskAllText)
assertTrue(options.sessionReplay.maskAllImages)
assertEquals(SentryReplayOptions.Quality.MEDIUM, options.sessionReplay.quality)
assertTrue(options.enableWatchdogTerminationTracking)
}

Expand All @@ -158,11 +158,11 @@ class SentryOptionsTest : BaseSentryTest() {
isAnrEnabled = false
anrTimeoutIntervalMillis = 1000L
enableWatchdogTerminationTracking = false
experimental.sessionReplay.onErrorSampleRate = 0.5
experimental.sessionReplay.sessionSampleRate = 0.5
experimental.sessionReplay.maskAllText = false
experimental.sessionReplay.maskAllImages = false
experimental.sessionReplay.quality = SentryReplayOptions.Quality.LOW
sessionReplay.onErrorSampleRate = 0.5
sessionReplay.sessionSampleRate = 0.5
sessionReplay.maskAllText = false
sessionReplay.maskAllImages = false
sessionReplay.quality = SentryReplayOptions.Quality.LOW
}

val platformOptions = createPlatformOptions()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ internal fun SentryOptions.toIosOptionsConfiguration(): (CocoaSentryOptions?) ->
dictionary = mapOf(
// Setting the onErrorSampleRate like this, using setOnErrorSampleRate
// crashes on compose multiplatform for some unknown reason
"errorSampleRate" to kmpOptions.experimental.sessionReplay.onErrorSampleRate?.toFloat()
"errorSampleRate" to kmpOptions.sessionReplay.onErrorSampleRate?.toFloat()
)
).apply {
setMaskAllText(kmpOptions.experimental.sessionReplay.maskAllText)
setMaskAllImages(kmpOptions.experimental.sessionReplay.maskAllImages)
kmpOptions.experimental.sessionReplay.sessionSampleRate?.let { setSessionSampleRate(it.toFloat()) }
setQuality(kmpOptions.experimental.sessionReplay.quality.ordinal.toLong())
setMaskAllText(kmpOptions.sessionReplay.maskAllText)
setMaskAllImages(kmpOptions.sessionReplay.maskAllImages)
kmpOptions.sessionReplay.sessionSampleRate?.let { setSessionSampleRate(it.toFloat()) }
setQuality(kmpOptions.sessionReplay.quality.ordinal.toLong())
}
cocoaOptions.setSessionReplay(replayOptions)
} ?: run {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ actual fun ApplePlatformOptions.assertApplePlatformSpecificOptions(options: Sent
assertEquals(attachViewHierarchy, options.attachViewHierarchy)
assertEquals(enableAppHangTracking, options.enableAppHangTracking)
assertEquals(appHangTimeoutIntervalMillis, options.appHangTimeoutIntervalMillis)
assertEquals(sessionReplay.maskAllText(), options.experimental.sessionReplay.maskAllText)
assertEquals(sessionReplay.maskAllImages(), options.experimental.sessionReplay.maskAllImages)
assertEquals(sessionReplay.onErrorSampleRate().toDouble(), options.experimental.sessionReplay.onErrorSampleRate)
assertEquals(sessionReplay.sessionSampleRate().toDouble(), options.experimental.sessionReplay.sessionSampleRate)
assertEquals(sessionReplay.quality(), options.experimental.sessionReplay.quality.ordinal.toLong())
assertEquals(sessionReplay.maskAllText(), options.sessionReplay.maskAllText)
assertEquals(sessionReplay.maskAllImages(), options.sessionReplay.maskAllImages)
assertEquals(sessionReplay.onErrorSampleRate().toDouble(), options.sessionReplay.onErrorSampleRate)
assertEquals(sessionReplay.sessionSampleRate().toDouble(), options.sessionReplay.sessionSampleRate)
assertEquals(sessionReplay.quality(), options.sessionReplay.quality.ordinal.toLong())
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ private fun optionsConfiguration(): OptionsConfiguration {
it.debug = true
it.failedRequestStatusCodes = listOf(HttpStatusCodeRange(400, 599))
it.failedRequestTargets = listOf("httpbin.org")
it.experimental.sessionReplay.onErrorSampleRate = 1.0
it.experimental.sessionReplay.sessionSampleRate = 1.0
it.sessionReplay.onErrorSampleRate = 1.0
it.sessionReplay.sessionSampleRate = 1.0
it.beforeBreadcrumb = { breadcrumb ->
breadcrumb.message = "Add message before every breadcrumb"
breadcrumb
Expand Down
Loading