Skip to content

Commit b0cc5e7

Browse files
committed
Update
1 parent de816fd commit b0cc5e7

File tree

8 files changed

+27
-0
lines changed

8 files changed

+27
-0
lines changed

sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/PlatformOptions.android.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ class SentryAndroidOptionsWrapper(private val androidOptions: SentryAndroidOptio
7373
override val sessionReplay: AndroidSentryReplayOptions
7474
get() = androidOptions.sessionReplay
7575

76+
override val sendDefaultPii: Boolean
77+
get() = androidOptions.isSendDefaultPii
78+
7679
override fun applyFromOptions(options: SentryOptions) {
7780
options.toAndroidSentryOptionsCallback().invoke(androidOptions)
7881
}

sentry-kotlin-multiplatform/src/appleMain/kotlin/io/sentry/kotlin/multiplatform/extensions/SentryOptionsExtensions.apple.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ internal fun CocoaSentryOptions.applyCocoaBaseOptions(kmpOptions: SentryOptions)
2323
kmpOptions.environment?.let {
2424
cocoaOptions.environment = it
2525
}
26+
cocoaOptions.sendDefaultPii = kmpOptions.sendDefaultPii
2627
cocoaOptions.releaseName = kmpOptions.release
2728
cocoaOptions.debug = kmpOptions.debug
2829
cocoaOptions.sessionTrackingIntervalMillis = kmpOptions.sessionTrackingIntervalMillis.convert()

sentry-kotlin-multiplatform/src/appleTest/kotlin/io/sentry/kotlin/multiplatform/PlatformOptions.apple.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ open class SentryAppleOptionsWrapper(private val cocoaOptions: CocoaSentryOption
5454
override val diagnosticLevel: SentryLevel
5555
get() = cocoaOptions.diagnosticLevel.toKmpSentryLevel()!!
5656

57+
override val sendDefaultPii: Boolean
58+
get() = cocoaOptions.sendDefaultPii
59+
5760
override fun applyFromOptions(options: SentryOptions) {
5861
options.toCocoaOptionsConfiguration().invoke(cocoaOptions)
5962
}

sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/extensions/SentryOptionsExtensions.jvm.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ internal fun JvmSentryOptions.applyJvmBaseOptions(kmpOptions: SentryOptions) {
2323
jvmOptions.isAttachStacktrace = kmpOptions.attachStackTrace
2424
jvmOptions.dist = kmpOptions.dist
2525
jvmOptions.environment = kmpOptions.environment
26+
jvmOptions.isSendDefaultPii = kmpOptions.sendDefaultPii
2627
jvmOptions.release = kmpOptions.release
2728
jvmOptions.isDebug = kmpOptions.debug
2829
jvmOptions.sessionTrackingIntervalMillis = kmpOptions.sessionTrackingIntervalMillis

sentry-kotlin-multiplatform/src/commonMain/kotlin/io/sentry/kotlin/multiplatform/SentryOptions.kt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,19 @@ public open class SentryOptions {
191191
*/
192192
public var sessionReplay: SentryReplayOptions = SentryReplayOptions()
193193

194+
/**
195+
* If this flag is enabled, certain personally identifiable information (PII) is added by active integrations.
196+
* Among other things, enabling this will enable automatic IP address collection on events.
197+
*
198+
* If you enable this option, be sure to manually remove what you don't want to send using
199+
* our features for managing sensitive data.
200+
*
201+
* For further details, refer to the documentation in the respective native SDKs:
202+
* - [Cocoa](https://docs.sentry.io/platforms/apple/data-management/data-collected/)
203+
* - [Android](https://docs.sentry.io/platforms/android/data-management/data-collected/)
204+
*/
205+
public var sendDefaultPii: Boolean = false
206+
194207
/**
195208
* Experimental options for new features, these options are going to be promoted to SentryOptions
196209
* before GA.

sentry-kotlin-multiplatform/src/commonTest/kotlin/io/sentry/kotlin/multiplatform/PlatformOptions.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ interface CommonPlatformOptions {
1414
val maxAttachmentSize: Long
1515
val sampleRate: Double?
1616
val tracesSampleRate: Double?
17+
val sendDefaultPii: Boolean
1718

1819
fun applyFromOptions(options: SentryOptions)
1920
}

sentry-kotlin-multiplatform/src/commonTest/kotlin/io/sentry/kotlin/multiplatform/SentryOptionsTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ class SentryOptionsTest : BaseSentryTest() {
133133
assertTrue(options.sessionReplay.maskAllImages)
134134
assertEquals(SentryReplayOptions.Quality.MEDIUM, options.sessionReplay.quality)
135135
assertTrue(options.enableWatchdogTerminationTracking)
136+
assertFalse(options.sendDefaultPii)
136137
}
137138

138139
@Test
@@ -163,6 +164,7 @@ class SentryOptionsTest : BaseSentryTest() {
163164
sessionReplay.maskAllText = false
164165
sessionReplay.maskAllImages = false
165166
sessionReplay.quality = SentryReplayOptions.Quality.LOW
167+
sendDefaultPii = true
166168
}
167169

168170
val platformOptions = createPlatformOptions()

sentry-kotlin-multiplatform/src/jvmTest/kotlin/io/sentry/kotlin/multiplatform/PlatformOptions.jvm.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ class SentryJvmOptionsWrapper(private val jvmOptions: JvmSentryOptions) : Platfo
4646
override val diagnosticLevel: SentryLevel
4747
get() = jvmOptions.diagnosticLevel.toKmpSentryLevel()!!
4848

49+
override val sendDefaultPii: Boolean
50+
get() = jvmOptions.isSendDefaultPii
51+
4952
override fun applyFromOptions(options: SentryOptions) {
5053
options.toJvmSentryOptionsCallback().invoke(jvmOptions)
5154
}

0 commit comments

Comments
 (0)