Skip to content
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

Add meta option to attach ANR thread dumps #3791

Merged
merged 3 commits into from
Oct 14, 2024
Merged
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,10 @@

## Unreleased

### Features

- Add meta option to attach ANR thread dumps ([#3791](https://github.com/getsentry/sentry-java/pull/3791))

### Fixes

- Deprecate `enableTracing` option ([#3777](https://github.com/getsentry/sentry-java/pull/3777))
Original file line number Diff line number Diff line change
@@ -26,8 +26,8 @@ final class ManifestMetadataReader {
static final String SAMPLE_RATE = "io.sentry.sample-rate";
static final String ANR_ENABLE = "io.sentry.anr.enable";
static final String ANR_REPORT_DEBUG = "io.sentry.anr.report-debug";

static final String ANR_TIMEOUT_INTERVAL_MILLIS = "io.sentry.anr.timeout-interval-millis";
static final String ANR_ATTACH_THREAD_DUMPS = "io.sentry.anr.attach-thread-dumps";

static final String AUTO_INIT = "io.sentry.auto-init";
static final String NDK_ENABLE = "io.sentry.ndk.enable";
@@ -176,6 +176,9 @@ static void applyMetadata(
ANR_TIMEOUT_INTERVAL_MILLIS,
options.getAnrTimeoutIntervalMillis()));

options.setAttachAnrThreadDump(
readBool(metadata, logger, ANR_ATTACH_THREAD_DUMPS, options.isAttachAnrThreadDump()));

final String dsn = readString(metadata, logger, DSN, options.getDsn());
final boolean enabled = readBool(metadata, logger, ENABLE_SENTRY, options.isEnabled());

Original file line number Diff line number Diff line change
@@ -246,6 +246,31 @@ class ManifestMetadataReaderTest {
assertEquals(5000.toLong(), fixture.options.anrTimeoutIntervalMillis)
}

@Test
fun `applyMetadata reads anr attach thread dump to options`() {
// Arrange
val bundle = bundleOf(ManifestMetadataReader.ANR_ATTACH_THREAD_DUMPS to true)
val context = fixture.getContext(metaData = bundle)

// Act
ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)

// Assert
assertEquals(true, fixture.options.isAttachAnrThreadDump)
}

@Test
fun `applyMetadata reads anr attach thread dump to options and keeps default`() {
// Arrange
val context = fixture.getContext()

// Act
ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)

// Assert
assertEquals(false, fixture.options.isAttachAnrThreadDump)
}

@Test
fun `applyMetadata reads activity breadcrumbs to options`() {
// Arrange