Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
> make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
<!-- prettier-ignore-end -->

## Unreleased

### Fixes

- Enable native logs on Android when `enableLogs` is set ([#6967](https://github.com/getsentry/sentry-react-native/pull/6967))

## 8.33.0

### Changes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,38 @@ class RNSentryStartTest {
assertFalse("Tombstone should be disabled by default", options.isTombstoneEnabled)
}

@Test
fun `when enableLogs is true, logs are enabled`() {
val rnOptions = JavaOnlyMap.of("enableLogs", true)
val options = SentryAndroidOptions()

RNSentryStart.getSentryAndroidOptions(options, rnOptions, logger)

assertTrue("Logs should be enabled", options.logs.isEnabled)
}

@Test
fun `when enableLogs is false, logs are disabled`() {
val rnOptions = JavaOnlyMap.of("enableLogs", false)
val options = SentryAndroidOptions()
options.logs.isEnabled = true

RNSentryStart.getSentryAndroidOptions(options, rnOptions, logger)

assertFalse("Logs should be disabled", options.logs.isEnabled)
}

@Test
fun `when enableLogs is not set, logs remain at the native default`() {
val rnOptions = JavaOnlyMap()
val options = SentryAndroidOptions()
val defaultValue = options.logs.isEnabled

RNSentryStart.getSentryAndroidOptions(options, rnOptions, logger)

assertEquals("Logs should remain at the native default", defaultValue, options.logs.isEnabled)
}

@Test
fun `when enableHistoricalTombstoneReporting is true, historical tombstone reporting is enabled`() {
val rnOptions = JavaOnlyMap.of("enableHistoricalTombstoneReporting", true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@ static void getSentryAndroidOptions(
if (rnOptions.hasKey("enableNdk")) {
options.setEnableNdk(rnOptions.getBoolean("enableNdk"));
}
if (rnOptions.hasKey("enableLogs")) {
options.getLogs().setEnabled(rnOptions.getBoolean("enableLogs"));
}
if (rnOptions.hasKey("enableTombstone")) {
options.setTombstoneEnabled(rnOptions.getBoolean("enableTombstone"));
}
Expand Down
Loading