Skip to content

Commit 8d2ee97

Browse files
antonisclaude
andauthored
fix(android): Restore enableLogs option mapping (#6967)
* fix(android): Restore enableLogs option mapping Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Link PR in changelog Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 699168c commit 8d2ee97

3 files changed

Lines changed: 41 additions & 0 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
> make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
77
<!-- prettier-ignore-end -->
88
9+
## Unreleased
10+
11+
### Fixes
12+
13+
- Enable native logs on Android when `enableLogs` is set ([#6967](https://github.com/getsentry/sentry-react-native/pull/6967))
14+
915
## 8.33.0
1016

1117
### Changes

‎packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryStartTest.kt‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,38 @@ class RNSentryStartTest {
314314
assertFalse("Tombstone should be disabled by default", options.isTombstoneEnabled)
315315
}
316316

317+
@Test
318+
fun `when enableLogs is true, logs are enabled`() {
319+
val rnOptions = JavaOnlyMap.of("enableLogs", true)
320+
val options = SentryAndroidOptions()
321+
322+
RNSentryStart.getSentryAndroidOptions(options, rnOptions, logger)
323+
324+
assertTrue("Logs should be enabled", options.logs.isEnabled)
325+
}
326+
327+
@Test
328+
fun `when enableLogs is false, logs are disabled`() {
329+
val rnOptions = JavaOnlyMap.of("enableLogs", false)
330+
val options = SentryAndroidOptions()
331+
options.logs.isEnabled = true
332+
333+
RNSentryStart.getSentryAndroidOptions(options, rnOptions, logger)
334+
335+
assertFalse("Logs should be disabled", options.logs.isEnabled)
336+
}
337+
338+
@Test
339+
fun `when enableLogs is not set, logs remain at the native default`() {
340+
val rnOptions = JavaOnlyMap()
341+
val options = SentryAndroidOptions()
342+
val defaultValue = options.logs.isEnabled
343+
344+
RNSentryStart.getSentryAndroidOptions(options, rnOptions, logger)
345+
346+
assertEquals("Logs should remain at the native default", defaultValue, options.logs.isEnabled)
347+
}
348+
317349
@Test
318350
fun `when enableHistoricalTombstoneReporting is true, historical tombstone reporting is enabled`() {
319351
val rnOptions = JavaOnlyMap.of("enableHistoricalTombstoneReporting", true)

‎packages/core/android/src/main/java/io/sentry/react/RNSentryStart.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@ static void getSentryAndroidOptions(
169169
if (rnOptions.hasKey("enableNdk")) {
170170
options.setEnableNdk(rnOptions.getBoolean("enableNdk"));
171171
}
172+
if (rnOptions.hasKey("enableLogs")) {
173+
options.getLogs().setEnabled(rnOptions.getBoolean("enableLogs"));
174+
}
172175
if (rnOptions.hasKey("enableTombstone")) {
173176
options.setTombstoneEnabled(rnOptions.getBoolean("enableTombstone"));
174177
}

0 commit comments

Comments
 (0)