diff --git a/CHANGELOG.md b/CHANGELOG.md
index 353beefb7e..3a18cecaab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,14 @@
## Unreleased
+### Features
+
+- Report main-thread hangs that recover as non-fatal ANR events, from Android 11 (API 30). Enable it with `options.nonFatalAnrSampleRate` (manifest: `io.sentry.anr.non-fatal.sample-rate`), and set the minimum hang duration with `options.nonFatalAnrThresholdMs` (default 700 ms, manifest: `io.sentry.anr.non-fatal.threshold-ms`). A fatal ANR that was already reported as a non-fatal ANR is not reported a second time ([#6726](https://github.com/getsentry/sentry-java/pull/6726))
+
+### Behavioral Changes
+
+- ANR profiling: `anrProfilingSampleRate` is now drawn once per SDK init instead of at each hang, and the main thread is sampled from 300 ms instead of 1 s ([#6725](https://github.com/getsentry/sentry-java/pull/6725))
+
### Fixes
- Kotlin now sees `Attachment.getBytes()`, `Device.getArchs()`, `Spring.getActiveProfiles()` and `JsonSerializationUtils.bytesFrom(...)` as nullable, because `@Nullable` now annotates the returned array instead of its elements ([#6558](https://github.com/getsentry/sentry-java/pull/6558))
diff --git a/sentry-android-integration-tests/sentry-samples-android/src/main/AndroidManifest.xml b/sentry-android-integration-tests/sentry-samples-android/src/main/AndroidManifest.xml
index 3a8c263e0f..678d01b2f3 100644
--- a/sentry-android-integration-tests/sentry-samples-android/src/main/AndroidManifest.xml
+++ b/sentry-android-integration-tests/sentry-samples-android/src/main/AndroidManifest.xml
@@ -375,6 +375,9 @@
+
diff --git a/sentry-android-integration-tests/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.kt b/sentry-android-integration-tests/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.kt
index 743178ae6b..6423174732 100644
--- a/sentry-android-integration-tests/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.kt
+++ b/sentry-android-integration-tests/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.kt
@@ -414,6 +414,19 @@ fun ErrorsScreen() {
}
}
}
+ item {
+ SentryTraced("non_fatal_anr") {
+ OutlinedButton(
+ onClick = {
+ tagSampleAction("non_fatal_anr")
+ Thread.sleep(2000)
+ },
+ modifier = Modifier,
+ ) {
+ Text("Non-fatal ANR (2 s)", maxLines = 2, overflow = TextOverflow.Ellipsis)
+ }
+ }
+ }
item {
SentryTraced("native_anr") {
OutlinedButton(
diff --git a/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/NonFatalAnrTest.kt b/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/NonFatalAnrTest.kt
new file mode 100644
index 0000000000..125fc3a212
--- /dev/null
+++ b/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/NonFatalAnrTest.kt
@@ -0,0 +1,40 @@
+package io.sentry.uitest.android
+
+import androidx.test.core.app.launchActivity
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SdkSuppress
+import io.sentry.SentryLevel
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@SdkSuppress(minSdkVersion = 30)
+class NonFatalAnrTest : BaseUiTest() {
+ @Test
+ fun blockingMainThreadSendsOneNonFatalAnrEvent() {
+ initSentry(true) { it.nonFatalAnrSampleRate = 1.0 }
+ relayIdlingResource.increment()
+
+ launchActivity().onActivity { Thread.sleep(2000) }
+
+ relay.assert {
+ assertFirstEnvelope {
+ val event = it.assertEvent()
+ it.assertNoOtherItems()
+
+ assertEquals(SentryLevel.ERROR, event.level)
+ val mechanismTypes = event.exceptions?.mapNotNull { e -> e.mechanism?.type }
+ assertTrue(mechanismTypes?.contains("NonFatalANR") == true, "mechanisms: $mechanismTypes")
+ assertTrue(event.exceptions!!.all { e -> e.mechanism?.isHandled == true })
+
+ val context = event.contexts["non_fatal_anr"] as Map<*, *>
+ val durationMs = assertNotNull(context["duration_ms"] as? Number)
+ assertTrue(durationMs.toLong() >= 700, "duration_ms: $durationMs")
+ }
+ assertNoOtherEnvelopes()
+ }
+ }
+}