From 14c4f0cd833b01c0b3bb72f2dcd7c576bdf79755 Mon Sep 17 00:00:00 2001
From: Lauri Alanko <ext-lauri.alanko@supercell.com>
Date: Fri, 17 Jan 2025 21:22:51 +0200
Subject: [PATCH 01/11] Add native ANR button to sentry-samples-android

Add a button to trigger ANR by holding a lock too long in native
code. This can be used to test native stack frames in ANR events.
---
 .../src/main/cpp/native-sample.cpp            | 25 +++++++++++++++++++
 .../sentry/samples/android/MainActivity.java  | 25 +++++++++++++++++++
 .../sentry/samples/android/NativeSample.java  |  3 +++
 .../src/main/res/layout/activity_main.xml     |  6 +++++
 .../src/main/res/values/strings.xml           |  1 +
 5 files changed, 60 insertions(+)

diff --git a/sentry-samples/sentry-samples-android/src/main/cpp/native-sample.cpp b/sentry-samples/sentry-samples-android/src/main/cpp/native-sample.cpp
index 2a31e6c6e50..de1f0f0d3e1 100644
--- a/sentry-samples/sentry-samples-android/src/main/cpp/native-sample.cpp
+++ b/sentry-samples/sentry-samples-android/src/main/cpp/native-sample.cpp
@@ -22,4 +22,29 @@ JNIEXPORT void JNICALL Java_io_sentry_samples_android_NativeSample_message(JNIEn
     sentry_capture_event(event);
 }
 
+[[gnu::noinline]]
+static void idle_pointlessly() {
+    static const volatile int x = 42;
+    (void)x;
+}
+
+[[gnu::noinline]]
+static void loop_eternally() {
+    while (true) {
+        idle_pointlessly();
+    }
+}
+
+[[gnu::noinline]]
+static void keep_object_locked(JNIEnv* env, jobject obj) {
+    env->MonitorEnter(obj);
+    loop_eternally();
+    env->MonitorExit(obj);
+}
+
+JNIEXPORT void JNICALL Java_io_sentry_samples_android_NativeSample_freezeMysteriously(JNIEnv *env, jclass cls, jobject obj) {
+    __android_log_print(ANDROID_LOG_WARN, TAG, "About to lock object eternally.");
+    keep_object_locked(env, obj);
+}
+
 }
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java
index da52c72a68d..e881612bd80 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java
@@ -210,6 +210,31 @@ public void run() {
                   1000);
         });
 
+    binding.nativeAnr.setOnClickListener(
+        view -> {
+          new Thread(
+                  new Runnable() {
+                    @Override
+                    public void run() {
+                      NativeSample.freezeMysteriously(mutex);
+                    }
+                  })
+              .start();
+
+          new Handler()
+              .postDelayed(
+                  new Runnable() {
+                    @Override
+                    public void run() {
+                      synchronized (mutex) {
+                        // Shouldn't happen
+                        throw new IllegalStateException();
+                      }
+                    }
+                  },
+                  1000);
+        });
+
     binding.openSecondActivity.setOnClickListener(
         view -> {
           // finishing so its completely destroyed
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/NativeSample.java b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/NativeSample.java
index bde645c6e31..064818ad4e0 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/NativeSample.java
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/NativeSample.java
@@ -5,6 +5,9 @@ public class NativeSample {
 
   public static native void message();
 
+  // Named to demonstrate the value of native stack frames during ANR
+  public static native void freezeMysteriously(Object obj);
+
   static {
     System.loadLibrary("native-sample");
   }
diff --git a/sentry-samples/sentry-samples-android/src/main/res/layout/activity_main.xml b/sentry-samples/sentry-samples-android/src/main/res/layout/activity_main.xml
index 6fb8d028637..b8a47c6bd59 100644
--- a/sentry-samples/sentry-samples-android/src/main/res/layout/activity_main.xml
+++ b/sentry-samples/sentry-samples-android/src/main/res/layout/activity_main.xml
@@ -64,6 +64,12 @@
       android:layout_height="wrap_content"
       android:text="@string/anr" />
 
+    <Button
+      android:id="@+id/native_anr"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/native_anr" />
+
     <Button
       android:id="@+id/out_of_memory"
       android:layout_width="wrap_content"
diff --git a/sentry-samples/sentry-samples-android/src/main/res/values/strings.xml b/sentry-samples/sentry-samples-android/src/main/res/values/strings.xml
index 41c6f038824..1c54c4cf0ba 100644
--- a/sentry-samples/sentry-samples-android/src/main/res/values/strings.xml
+++ b/sentry-samples/sentry-samples-android/src/main/res/values/strings.xml
@@ -14,6 +14,7 @@
   <string name="crash_from_native">Crash from native (segfault)</string>
   <string name="capture_from_native">Capture event from native</string>
   <string name="anr">ANR</string>
+  <string name="native_anr">ANR (native)</string>
   <string name="do_request">Do Request</string>
   <string name="open_second_activity">Open Second Activity</string>
   <string name="open_sample_fragment">Open Sample Fragment</string>

From 3448e7d2d37077327d318586b39ece8ad3dec1a2 Mon Sep 17 00:00:00 2001
From: Lauri Alanko <ext-lauri.alanko@supercell.com>
Date: Fri, 17 Jan 2025 11:53:49 +0200
Subject: [PATCH 02/11] Improve native stack frame parsing

Handle offsets and deleted files, recognize "???" as a marker for
unknown functions. Use named capturing groups for better readability
and editability.
---
 .../internal/threaddump/ThreadDumpParser.java | 39 ++++++++++++-------
 .../threaddump/ThreadDumpParserTest.kt        | 29 +++++++++++++-
 2 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
index 43d729b78b6..5b190b0019d 100644
--- a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
+++ b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
@@ -42,12 +42,28 @@ public class ThreadDumpParser {
   private static final Pattern BEGIN_UNMANAGED_NATIVE_THREAD_RE =
       Pattern.compile("\"(.*)\" (.*) ?sysTid=(\\d+)");
 
+  // For reference, see native_stack_dump.cc and tombstone_proto_to_text.cpp in Android sources
   private static final Pattern NATIVE_RE =
       Pattern.compile(
-          " *(?:native: )?#\\d+ \\S+ [0-9a-fA-F]+\\s+(.*?)\\s+\\((.*)\\+(\\d+)\\)(?: \\(.*\\))?");
-  private static final Pattern NATIVE_NO_LOC_RE =
-      Pattern.compile(
-          " *(?:native: )?#\\d+ \\S+ [0-9a-fA-F]+\\s+(.*)\\s*\\(?(.*)\\)?(?: \\(.*\\))?");
+          // "  native: #12 pc 0xabcd1234"
+          " *(?:native: )?#(?<index>\\d+) \\S+ (?<pc>[0-9a-fA-F]+)"
+          // The map info includes a filename and an optional offset into the file
+          + ("\\s+(?<mapinfo>"
+             // "/path/to/file.ext",
+             + "(?<filename>.*?)"
+             // optional " (deleted)" suffix (deleted files) needed here to bias regex correctly
+             + "(?:\\s+\\(deleted\\))?"
+             // " (offset 0xabcd1234)", if the mapping is not into the beginning of the file
+             + "(?:\\s+\\(offset (?<mapoffset>.*?)\\))?"
+             + ")")
+          // Optional function
+          + ("(?:\\s+\\((?:"
+             + "\\?\\?\\?" // " (???) marks a missing function, so don't capture it in a group
+             + "|(?<function>.*?)(?:\\+(?<fnoffset>\\d+))?" // " (func+1234)", offset is optional
+             + ")\\))?")
+          // Optional " (BuildId: abcd1234abcd1234abcd1234abcd1234abcd1234)"
+          + "(?:\\s+\\(BuildId: (?<buildid>.*?)\\))?");
+
   private static final Pattern JAVA_RE =
       Pattern.compile(" *at (?:(.+)\\.)?([^.]+)\\.([^.]+)\\((.*):([\\d-]+)\\)");
   private static final Pattern JNI_RE =
@@ -176,7 +192,6 @@ private SentryStackTrace parseStacktrace(
     SentryStackFrame lastJavaFrame = null;
 
     final Matcher nativeRe = NATIVE_RE.matcher("");
-    final Matcher nativeNoLocRe = NATIVE_NO_LOC_RE.matcher("");
     final Matcher javaRe = JAVA_RE.matcher("");
     final Matcher jniRe = JNI_RE.matcher("");
     final Matcher lockedRe = LOCKED_RE.matcher("");
@@ -196,15 +211,9 @@ private SentryStackTrace parseStacktrace(
       final String text = line.text;
       if (matches(nativeRe, text)) {
         final SentryStackFrame frame = new SentryStackFrame();
-        frame.setPackage(nativeRe.group(1));
-        frame.setFunction(nativeRe.group(2));
-        frame.setLineno(getInteger(nativeRe, 3, null));
-        frames.add(frame);
-        lastJavaFrame = null;
-      } else if (matches(nativeNoLocRe, text)) {
-        final SentryStackFrame frame = new SentryStackFrame();
-        frame.setPackage(nativeNoLocRe.group(1));
-        frame.setFunction(nativeNoLocRe.group(2));
+        frame.setPackage(nativeRe.group("mapinfo"));
+        frame.setFunction(nativeRe.group("function"));
+        frame.setLineno(getInteger(nativeRe, "fnoffset", null));
         frames.add(frame);
         lastJavaFrame = null;
       } else if (matches(javaRe, text)) {
@@ -334,7 +343,7 @@ private Long getLong(
 
   @Nullable
   private Integer getInteger(
-      final @NotNull Matcher matcher, final int group, final @Nullable Integer defaultValue) {
+      final @NotNull Matcher matcher, final String group, final @Nullable Integer defaultValue) {
     final String str = matcher.group(group);
     if (str == null || str.length() == 0) {
       return defaultValue;
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
index 19de2e4935d..a6d22bc435d 100644
--- a/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
+++ b/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
@@ -90,11 +90,38 @@ class ThreadDumpParserTest {
         assertEquals(false, thread.isCrashed)
         assertEquals(false, thread.isMain)
         assertEquals(false, thread.isCurrent)
-        val lastFrame = thread.stacktrace!!.frames!!.last()
+
+        // Reverse frames so we can index them with the active frame at index 0
+        val frames = thread.stacktrace!!.frames!!.reversed()
+
+        val lastFrame = frames.get(0)
         assertEquals("/apex/com.android.runtime/lib64/bionic/libc.so", lastFrame.`package`)
         assertEquals("syscall", lastFrame.function)
         assertEquals(28, lastFrame.lineno)
         assertNull(lastFrame.isInApp)
+
+	val nosymFrame = frames.get(21)
+	assertEquals("/apex/com.android.art/javalib/core-oj.jar", nosymFrame.`package`)
+	assertNull(nosymFrame.function)
+	assertNull(nosymFrame.lineno)
+
+	val spaceFrame = frames.get(14)
+	assertEquals(
+	    "[anon:dalvik-classes16.dex extracted in memory from /data/app/~~izn1xSZpFlzfVmWi_I0xlQ=="
+	    + "/io.sentry.samples.android-tQSGMNiGA-qdjZm6lPOcNw==/base.apk!classes16.dex]",
+	    spaceFrame.`package`)
+	assertNull(spaceFrame.function)
+	assertNull(spaceFrame.lineno)
+
+	val offsetFrame = frames.get(145)
+	assertEquals("/system/framework/framework.jar (offset 0x12c2000)", offsetFrame.`package`)
+	assertNull(offsetFrame.function)
+	assertNull(offsetFrame.lineno)
+
+	val deletedFrame = frames.get(117)
+	assertEquals("/memfd:jit-cache (deleted) (offset 0x2000000)", deletedFrame.`package`)
+	assertEquals("kotlinx.coroutines.DispatchedTask.run", deletedFrame.function)
+	assertEquals(1816, deletedFrame.lineno)
     }
 
     @Test

From 9240d3f2ee953877171ccdafe819a8ab39345d02 Mon Sep 17 00:00:00 2001
From: Lauri Alanko <ext-lauri.alanko@supercell.com>
Date: Fri, 17 Jan 2025 12:26:55 +0200
Subject: [PATCH 03/11] Add PC value and platform to native stack frames

---
 .../android/core/internal/threaddump/ThreadDumpParser.java | 3 +++
 .../java/io/sentry/android/core/AnrV2IntegrationTest.kt    | 2 ++
 .../core/internal/threaddump/ThreadDumpParserTest.kt       | 7 +++++++
 3 files changed, 12 insertions(+)

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
index 5b190b0019d..22ce97a0ab2 100644
--- a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
+++ b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
@@ -214,6 +214,9 @@ private SentryStackTrace parseStacktrace(
         frame.setPackage(nativeRe.group("mapinfo"));
         frame.setFunction(nativeRe.group("function"));
         frame.setLineno(getInteger(nativeRe, "fnoffset", null));
+        frame.setInstructionAddr("0x" + nativeRe.group("pc"));
+        frame.setPlatform("native");
+
         frames.add(frame);
         lastJavaFrame = null;
       } else if (matches(javaRe, text)) {
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt
index 68339a4b797..4f2438973c7 100644
--- a/sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt
+++ b/sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt
@@ -305,6 +305,8 @@ class AnrV2IntegrationTest {
                 )
                 assertEquals("__start_thread", firstFrame.function)
                 assertEquals(64, firstFrame.lineno)
+		assertEquals("0x00000000000530b8", firstFrame.instructionAddr)
+		assertEquals("native", firstFrame.platform)
             },
             argThat<Hint> {
                 val hint = HintUtils.getSentrySdkHint(this)
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
index a6d22bc435d..6961fa08823 100644
--- a/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
+++ b/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
@@ -99,11 +99,14 @@ class ThreadDumpParserTest {
         assertEquals("syscall", lastFrame.function)
         assertEquals(28, lastFrame.lineno)
         assertNull(lastFrame.isInApp)
+	assertEquals("0x000000000004c35c", lastFrame.instructionAddr)
+	assertEquals("native", lastFrame.platform)
 
 	val nosymFrame = frames.get(21)
 	assertEquals("/apex/com.android.art/javalib/core-oj.jar", nosymFrame.`package`)
 	assertNull(nosymFrame.function)
 	assertNull(nosymFrame.lineno)
+	assertEquals("0x00000000000ec474", nosymFrame.instructionAddr)
 
 	val spaceFrame = frames.get(14)
 	assertEquals(
@@ -112,16 +115,20 @@ class ThreadDumpParserTest {
 	    spaceFrame.`package`)
 	assertNull(spaceFrame.function)
 	assertNull(spaceFrame.lineno)
+	assertEquals("0x00000000000306f0", spaceFrame.instructionAddr)
 
 	val offsetFrame = frames.get(145)
 	assertEquals("/system/framework/framework.jar (offset 0x12c2000)", offsetFrame.`package`)
 	assertNull(offsetFrame.function)
 	assertNull(offsetFrame.lineno)
+	assertEquals("0x00000000002c8e18", offsetFrame.instructionAddr)
+	assertNull(offsetFrame.addrMode)
 
 	val deletedFrame = frames.get(117)
 	assertEquals("/memfd:jit-cache (deleted) (offset 0x2000000)", deletedFrame.`package`)
 	assertEquals("kotlinx.coroutines.DispatchedTask.run", deletedFrame.function)
 	assertEquals(1816, deletedFrame.lineno)
+	assertEquals("0x00000000020b89d8", deletedFrame.instructionAddr)
     }
 
     @Test

From 47f44f023e8f320f57fd8895cced1d0d2e652862 Mon Sep 17 00:00:00 2001
From: Lauri Alanko <ext-lauri.alanko@supercell.com>
Date: Fri, 17 Jan 2025 12:41:41 +0200
Subject: [PATCH 04/11] Mark JNI method frames as "native"

Use the "native" attribute of stack frames to indicate JNI
invocation frames, like SentryStackTraceFactory does.
---
 .../internal/threaddump/ThreadDumpParser.java   |  1 +
 .../internal/threaddump/ThreadDumpParserTest.kt | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
index 22ce97a0ab2..de62861f2e3 100644
--- a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
+++ b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
@@ -239,6 +239,7 @@ private SentryStackTrace parseStacktrace(
         frame.setModule(module);
         frame.setFunction(jniRe.group(3));
         frame.setInApp(stackTraceFactory.isInApp(module));
+        frame.setNative(true);
         frames.add(frame);
         lastJavaFrame = frame;
       } else if (matches(lockedRe, text)) {
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
index 6961fa08823..7ee807fb89e 100644
--- a/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
+++ b/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
@@ -73,6 +73,23 @@ class ThreadDumpParserTest {
         assertEquals("HandlerThread.java", firstFrame.filename)
         assertEquals(67, firstFrame.lineno)
         assertEquals(null, firstFrame.isInApp)
+        assertNull(firstFrame.isNative)
+        assertNull(firstFrame.platform)
+
+        val jniFrame = randomThread.stacktrace!!.frames!!.get(4)
+        assertEquals("android.os.MessageQueue", jniFrame.module)
+        assertEquals("nativePollOnce", jniFrame.function)
+        assertNull(jniFrame.lineno)
+        assertEquals(true, jniFrame.isNative)
+        assertNull(firstFrame.platform)
+
+        val nativeFrame = randomThread.stacktrace!!.frames!!.get(5)
+        assertEquals("/system/lib64/libandroid_runtime.so", nativeFrame.`package`)
+        assertEquals("android::android_os_MessageQueue_nativePollOnce(_JNIEnv*, _jobject*, long, int)",
+                     nativeFrame.function)
+        assertEquals(44, nativeFrame.lineno)
+        assertNull(nativeFrame.isNative) // Confusing, but "isNative" means JVM frame for a JNI method
+        assertEquals("native", nativeFrame.platform)
     }
 
     @Test

From 49e37b381db1bb573c89fd7a7a212b13390e7b5c Mon Sep 17 00:00:00 2001
From: Lauri Alanko <ext-lauri.alanko@supercell.com>
Date: Fri, 17 Jan 2025 16:49:47 +0200
Subject: [PATCH 05/11] Add debug images to ANR events

The images are parsed from the build ids and filenames in the thread
dump's stack frames.
---
 .../sentry/android/core/AnrV2Integration.java | 16 ++++++-
 .../internal/threaddump/ThreadDumpParser.java | 46 +++++++++++++++++++
 .../android/core/AnrV2IntegrationTest.kt      |  6 +++
 .../threaddump/ThreadDumpParserTest.kt        |  7 +++
 4 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java b/sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java
index 6b66106d3f4..622879118c7 100644
--- a/sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java
+++ b/sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java
@@ -23,6 +23,8 @@
 import io.sentry.hints.AbnormalExit;
 import io.sentry.hints.Backfillable;
 import io.sentry.hints.BlockingFlushHint;
+import io.sentry.protocol.DebugImage;
+import io.sentry.protocol.DebugMeta;
 import io.sentry.protocol.Message;
 import io.sentry.protocol.SentryId;
 import io.sentry.protocol.SentryThread;
@@ -40,6 +42,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -267,6 +270,11 @@ private void reportAsSentryEvent(
         event.setMessage(sentryMessage);
       } else if (result.type == ParseResult.Type.DUMP) {
         event.setThreads(result.threads);
+        if (!result.debugImages.isEmpty()) {
+          final DebugMeta debugMeta = new DebugMeta();
+          debugMeta.setImages(new ArrayList<>(result.debugImages.values()));
+          event.setDebugMeta(debugMeta);
+        }
       }
       event.setLevel(SentryLevel.FATAL);
       event.setTimestamp(DateUtils.getDateTime(anrTimestamp));
@@ -319,7 +327,7 @@ private void reportAsSentryEvent(
           // fall back to not reporting them
           return new ParseResult(ParseResult.Type.NO_DUMP);
         }
-        return new ParseResult(ParseResult.Type.DUMP, dump, threads);
+        return new ParseResult(ParseResult.Type.DUMP, dump, threads, threadDumpParser.getDebugImages());
       } catch (Throwable e) {
         options.getLogger().log(SentryLevel.WARNING, "Failed to parse ANR thread dump", e);
         return new ParseResult(ParseResult.Type.ERROR, dump);
@@ -403,24 +411,28 @@ enum Type {
     final Type type;
     final byte[] dump;
     final @Nullable List<SentryThread> threads;
+    final @Nullable Map<String, DebugImage> debugImages;
 
     ParseResult(final @NotNull Type type) {
       this.type = type;
       this.dump = null;
       this.threads = null;
+      this.debugImages = null;
     }
 
     ParseResult(final @NotNull Type type, final byte[] dump) {
       this.type = type;
       this.dump = dump;
       this.threads = null;
+      this.debugImages = null;
     }
 
     ParseResult(
-        final @NotNull Type type, final byte[] dump, final @Nullable List<SentryThread> threads) {
+        final @NotNull Type type, final byte[] dump, final @Nullable List<SentryThread> threads, final @Nullable Map<String, DebugImage> debugImages) {
       this.type = type;
       this.dump = dump;
       this.threads = threads;
+      this.debugImages = debugImages;
     }
   }
 }
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
index de62861f2e3..4cf770a2bb5 100644
--- a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
+++ b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
@@ -22,12 +22,19 @@
 import io.sentry.SentryLockReason;
 import io.sentry.SentryOptions;
 import io.sentry.SentryStackTraceFactory;
+import io.sentry.protocol.DebugImage;
 import io.sentry.protocol.SentryStackFrame;
 import io.sentry.protocol.SentryStackTrace;
 import io.sentry.protocol.SentryThread;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.BufferUnderflowException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -91,10 +98,36 @@ public class ThreadDumpParser {
 
   private final @NotNull SentryStackTraceFactory stackTraceFactory;
 
+  private final @NotNull Map<String, DebugImage> debugImages;
+
   public ThreadDumpParser(final @NotNull SentryOptions options, final boolean isBackground) {
     this.options = options;
     this.isBackground = isBackground;
     this.stackTraceFactory = new SentryStackTraceFactory(options);
+    this.debugImages = new HashMap<String, DebugImage>();
+  }
+
+  @NotNull
+  public Map<String, DebugImage> getDebugImages() {
+    return debugImages;
+  }
+
+  @Nullable
+  private static String buildIdToDebugId(String buildId) {
+    try {
+      // Abuse BigInteger as a hex string parser. Extra byte needed to handle leading zeros.
+      final ByteBuffer buf = ByteBuffer.wrap(new BigInteger("10" + buildId, 16).toByteArray());
+      buf.get();
+      return String.format("%08x-%04x-%04x-%04x-%04x%08x",
+                           buf.order(ByteOrder.LITTLE_ENDIAN).getInt(),
+                           buf.getShort(),
+                           buf.getShort(),
+                           buf.order(ByteOrder.BIG_ENDIAN).getShort(),
+                           buf.getShort(),
+                           buf.getInt());
+    } catch (NumberFormatException | BufferUnderflowException e) {
+      return null;
+    }
   }
 
   @NotNull
@@ -217,6 +250,19 @@ private SentryStackTrace parseStacktrace(
         frame.setInstructionAddr("0x" + nativeRe.group("pc"));
         frame.setPlatform("native");
 
+        final String buildId = nativeRe.group("buildid");
+        final String debugId = buildId == null ? null : buildIdToDebugId(buildId);
+        if (debugId != null) {
+          if (!debugImages.containsKey(debugId)) {
+            final DebugImage debugImage = new DebugImage();
+            debugImage.setDebugId(debugId);
+            debugImage.setType("elf");
+            debugImage.setCodeFile(nativeRe.group("filename"));
+            debugImage.setCodeId(buildId);
+            debugImages.put(debugId, debugImage);
+          }
+        }
+
         frames.add(frame);
         lastJavaFrame = null;
       } else if (matches(javaRe, text)) {
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt
index 4f2438973c7..464580999ac 100644
--- a/sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt
+++ b/sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt
@@ -307,6 +307,12 @@ class AnrV2IntegrationTest {
                 assertEquals(64, firstFrame.lineno)
 		assertEquals("0x00000000000530b8", firstFrame.instructionAddr)
 		assertEquals("native", firstFrame.platform)
+
+		val image = it.debugMeta?.images?.find {
+		    it.debugId == "741f3301-bbb0-b92c-58bd-c15282b8ec7b"
+		}
+		assertNotNull(image)
+		assertEquals("/apex/com.android.runtime/lib64/bionic/libc.so", image.codeFile)
             },
             argThat<Hint> {
                 val hint = HintUtils.getSentrySdkHint(this)
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
index 7ee807fb89e..df5ea156701 100644
--- a/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
+++ b/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
@@ -146,6 +146,13 @@ class ThreadDumpParserTest {
 	assertEquals("kotlinx.coroutines.DispatchedTask.run", deletedFrame.function)
 	assertEquals(1816, deletedFrame.lineno)
 	assertEquals("0x00000000020b89d8", deletedFrame.instructionAddr)
+
+	val debugImages = parser.debugImages
+	val image = debugImages["499d48ba-c085-17cf-3209-da67405662f9"]
+	assertNotNull(image)
+	assertEquals("499d48ba-c085-17cf-3209-da67405662f9", image.debugId)
+	assertEquals("/apex/com.android.runtime/lib64/bionic/libc.so", image.codeFile)
+	assertEquals("ba489d4985c0cf173209da67405662f9", image.codeId)
     }
 
     @Test

From 7f465d959482732d1a77b17d72da4eed89ac47a7 Mon Sep 17 00:00:00 2001
From: Lauri Alanko <ext-lauri.alanko@supercell.com>
Date: Thu, 16 Jan 2025 11:41:37 +0200
Subject: [PATCH 06/11] Add addr_mode attributes to ANR stack frames

The instruction addresses of native stack frames in thread dumps are
relative to the image file from which the code is loaded, and there
are no absolute mapping addresses of images available. So explicitly
inform the Sentry server about the correct images by using a relative
"addr_mode" attribute.

Also add the attribute to the SentryStackFrame class since it was not
yet supported by it. The field documentation is converted from
event.schema.json in the sentry server repo.
---
 .../internal/threaddump/ThreadDumpParser.java |  2 +
 .../android/core/AnrV2IntegrationTest.kt      | 17 ++--
 .../threaddump/ThreadDumpParserTest.kt        | 78 ++++++++++---------
 .../io/sentry/protocol/SentryStackFrame.java  | 29 +++++++
 .../SentryStackFrameSerializationTest.kt      |  1 +
 .../resources/json/sentry_stack_frame.json    |  1 +
 6 files changed, 83 insertions(+), 45 deletions(-)

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
index 4cf770a2bb5..f7628821748 100644
--- a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
+++ b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
@@ -261,6 +261,8 @@ private SentryStackTrace parseStacktrace(
             debugImage.setCodeId(buildId);
             debugImages.put(debugId, debugImage);
           }
+          // The addresses in the thread dump are relative to the image
+          frame.setAddrMode("rel:" + debugId);
         }
 
         frames.add(frame);
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt
index 464580999ac..ddc15542535 100644
--- a/sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt
+++ b/sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt
@@ -305,14 +305,15 @@ class AnrV2IntegrationTest {
                 )
                 assertEquals("__start_thread", firstFrame.function)
                 assertEquals(64, firstFrame.lineno)
-		assertEquals("0x00000000000530b8", firstFrame.instructionAddr)
-		assertEquals("native", firstFrame.platform)
-
-		val image = it.debugMeta?.images?.find {
-		    it.debugId == "741f3301-bbb0-b92c-58bd-c15282b8ec7b"
-		}
-		assertNotNull(image)
-		assertEquals("/apex/com.android.runtime/lib64/bionic/libc.so", image.codeFile)
+                assertEquals("0x00000000000530b8", firstFrame.instructionAddr)
+                assertEquals("native", firstFrame.platform)
+                assertEquals("rel:741f3301-bbb0-b92c-58bd-c15282b8ec7b", firstFrame.addrMode)
+
+                val image = it.debugMeta?.images?.find {
+                    it.debugId == "741f3301-bbb0-b92c-58bd-c15282b8ec7b"
+                }
+                assertNotNull(image)
+                assertEquals("/apex/com.android.runtime/lib64/bionic/libc.so", image.codeFile)
             },
             argThat<Hint> {
                 val hint = HintUtils.getSentrySdkHint(this)
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
index df5ea156701..ddfc0e36646 100644
--- a/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
+++ b/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
@@ -116,43 +116,47 @@ class ThreadDumpParserTest {
         assertEquals("syscall", lastFrame.function)
         assertEquals(28, lastFrame.lineno)
         assertNull(lastFrame.isInApp)
-	assertEquals("0x000000000004c35c", lastFrame.instructionAddr)
-	assertEquals("native", lastFrame.platform)
-
-	val nosymFrame = frames.get(21)
-	assertEquals("/apex/com.android.art/javalib/core-oj.jar", nosymFrame.`package`)
-	assertNull(nosymFrame.function)
-	assertNull(nosymFrame.lineno)
-	assertEquals("0x00000000000ec474", nosymFrame.instructionAddr)
-
-	val spaceFrame = frames.get(14)
-	assertEquals(
-	    "[anon:dalvik-classes16.dex extracted in memory from /data/app/~~izn1xSZpFlzfVmWi_I0xlQ=="
-	    + "/io.sentry.samples.android-tQSGMNiGA-qdjZm6lPOcNw==/base.apk!classes16.dex]",
-	    spaceFrame.`package`)
-	assertNull(spaceFrame.function)
-	assertNull(spaceFrame.lineno)
-	assertEquals("0x00000000000306f0", spaceFrame.instructionAddr)
-
-	val offsetFrame = frames.get(145)
-	assertEquals("/system/framework/framework.jar (offset 0x12c2000)", offsetFrame.`package`)
-	assertNull(offsetFrame.function)
-	assertNull(offsetFrame.lineno)
-	assertEquals("0x00000000002c8e18", offsetFrame.instructionAddr)
-	assertNull(offsetFrame.addrMode)
-
-	val deletedFrame = frames.get(117)
-	assertEquals("/memfd:jit-cache (deleted) (offset 0x2000000)", deletedFrame.`package`)
-	assertEquals("kotlinx.coroutines.DispatchedTask.run", deletedFrame.function)
-	assertEquals(1816, deletedFrame.lineno)
-	assertEquals("0x00000000020b89d8", deletedFrame.instructionAddr)
-
-	val debugImages = parser.debugImages
-	val image = debugImages["499d48ba-c085-17cf-3209-da67405662f9"]
-	assertNotNull(image)
-	assertEquals("499d48ba-c085-17cf-3209-da67405662f9", image.debugId)
-	assertEquals("/apex/com.android.runtime/lib64/bionic/libc.so", image.codeFile)
-	assertEquals("ba489d4985c0cf173209da67405662f9", image.codeId)
+        assertEquals("0x000000000004c35c", lastFrame.instructionAddr)
+        assertEquals("rel:499d48ba-c085-17cf-3209-da67405662f9", lastFrame.addrMode)
+        assertEquals("native", lastFrame.platform)
+
+        val nosymFrame = frames.get(21)
+        assertEquals("/apex/com.android.art/javalib/core-oj.jar", nosymFrame.`package`)
+        assertNull(nosymFrame.function)
+        assertNull(nosymFrame.lineno)
+        assertEquals("0x00000000000ec474", nosymFrame.instructionAddr)
+        assertNull(nosymFrame.addrMode)
+
+        val spaceFrame = frames.get(14)
+        assertEquals(
+            "[anon:dalvik-classes16.dex extracted in memory from /data/app/~~izn1xSZpFlzfVmWi_I0xlQ=="
+            + "/io.sentry.samples.android-tQSGMNiGA-qdjZm6lPOcNw==/base.apk!classes16.dex]",
+            spaceFrame.`package`)
+        assertNull(spaceFrame.function)
+        assertNull(spaceFrame.lineno)
+        assertEquals("0x00000000000306f0", spaceFrame.instructionAddr)
+        assertNull(spaceFrame.addrMode)
+
+        val offsetFrame = frames.get(145)
+        assertEquals("/system/framework/framework.jar (offset 0x12c2000)", offsetFrame.`package`)
+        assertNull(offsetFrame.function)
+        assertNull(offsetFrame.lineno)
+        assertEquals("0x00000000002c8e18", offsetFrame.instructionAddr)
+        assertNull(offsetFrame.addrMode)
+
+        val deletedFrame = frames.get(117)
+        assertEquals("/memfd:jit-cache (deleted) (offset 0x2000000)", deletedFrame.`package`)
+        assertEquals("kotlinx.coroutines.DispatchedTask.run", deletedFrame.function)
+        assertEquals(1816, deletedFrame.lineno)
+        assertEquals("0x00000000020b89d8", deletedFrame.instructionAddr)
+        assertNull(deletedFrame.addrMode)
+
+        val debugImages = parser.debugImages
+        val image = debugImages["499d48ba-c085-17cf-3209-da67405662f9"]
+        assertNotNull(image)
+        assertEquals("499d48ba-c085-17cf-3209-da67405662f9", image.debugId)
+        assertEquals("/apex/com.android.runtime/lib64/bionic/libc.so", image.codeFile)
+        assertEquals("ba489d4985c0cf173209da67405662f9", image.codeId)
     }
 
     @Test
diff --git a/sentry/src/main/java/io/sentry/protocol/SentryStackFrame.java b/sentry/src/main/java/io/sentry/protocol/SentryStackFrame.java
index 03d64e2172f..96a3b0f0eec 100644
--- a/sentry/src/main/java/io/sentry/protocol/SentryStackFrame.java
+++ b/sentry/src/main/java/io/sentry/protocol/SentryStackFrame.java
@@ -93,6 +93,20 @@ public final class SentryStackFrame implements JsonUnknown, JsonSerializable {
    * take place.
    */
   private @Nullable String instructionAddr;
+  /**
+   * Defines the addressing mode for addresses.
+   *
+   * <p>This can be:
+   *
+   * <ul>
+   *   <li><code>"abs"</code> (the default): <code>instruction_addr</code> is absolute.
+   *   <li><code>"rel:$idx"</code>: <code>instruction_addr</code> is relative to the
+   *       <code>debug_meta.image</code> identified by its index in the list.
+   *   <li><code>"rel:$uuid"</code>: <code>instruction_addr</code> is relative to the
+   *       <code>debug_meta.image</code> identified by its <code>debug_id</code>.
+   * </ul>
+   */
+  private @Nullable String addrMode;
 
   /**
    * Potentially mangled name of the symbol as it appears in an executable.
@@ -263,6 +277,14 @@ public void setInstructionAddr(final @Nullable String instructionAddr) {
     this.instructionAddr = instructionAddr;
   }
 
+  public @Nullable String getAddrMode() {
+    return addrMode;
+  }
+
+  public void setAddrMode(final @Nullable String addrMode) {
+      this.addrMode = addrMode;
+  }
+
   public @Nullable Boolean isNative() {
     return _native;
   }
@@ -325,6 +347,7 @@ public static final class JsonKeys {
     public static final String IMAGE_ADDR = "image_addr";
     public static final String SYMBOL_ADDR = "symbol_addr";
     public static final String INSTRUCTION_ADDR = "instruction_addr";
+    public static final String ADDR_MODE = "addr_mode";
     public static final String RAW_FUNCTION = "raw_function";
     public static final String SYMBOL = "symbol";
     public static final String LOCK = "lock";
@@ -376,6 +399,9 @@ public void serialize(final @NotNull ObjectWriter writer, final @NotNull ILogger
     if (instructionAddr != null) {
       writer.name(JsonKeys.INSTRUCTION_ADDR).value(instructionAddr);
     }
+    if (addrMode != null) {
+      writer.name(JsonKeys.ADDR_MODE).value(addrMode);
+    }
     if (rawFunction != null) {
       writer.name(JsonKeys.RAW_FUNCTION).value(rawFunction);
     }
@@ -447,6 +473,9 @@ public static final class Deserializer implements JsonDeserializer<SentryStackFr
           case JsonKeys.INSTRUCTION_ADDR:
             sentryStackFrame.instructionAddr = reader.nextStringOrNull();
             break;
+          case JsonKeys.ADDR_MODE:
+            sentryStackFrame.addrMode = reader.nextStringOrNull();
+            break;
           case JsonKeys.RAW_FUNCTION:
             sentryStackFrame.rawFunction = reader.nextStringOrNull();
             break;
diff --git a/sentry/src/test/java/io/sentry/protocol/SentryStackFrameSerializationTest.kt b/sentry/src/test/java/io/sentry/protocol/SentryStackFrameSerializationTest.kt
index af15629b1d6..fa0e0373211 100644
--- a/sentry/src/test/java/io/sentry/protocol/SentryStackFrameSerializationTest.kt
+++ b/sentry/src/test/java/io/sentry/protocol/SentryStackFrameSerializationTest.kt
@@ -32,6 +32,7 @@ class SentryStackFrameSerializationTest {
             imageAddr = "27ec1be5-e8a1-485c-b020-f4d9f80a6624"
             symbolAddr = "180e12cd-1fa8-405d-8dd8-e87b33fa2eb0"
             instructionAddr = "19864a78-2466-461f-9f0b-93a5c9ae7622"
+            addrMode = "49d415f3-1be5-422c-b877-b82b4e4c2990"
             rawFunction = "f33035a4-0cf0-453d-b6f4-d7c27e9af924"
             symbol = "d9807ffe-d517-11ed-afa1-0242ac120002"
             lock = SentryLockReason().apply {
diff --git a/sentry/src/test/resources/json/sentry_stack_frame.json b/sentry/src/test/resources/json/sentry_stack_frame.json
index a86181a80f3..50bb42e4ca0 100644
--- a/sentry/src/test/resources/json/sentry_stack_frame.json
+++ b/sentry/src/test/resources/json/sentry_stack_frame.json
@@ -13,6 +13,7 @@
     "image_addr": "27ec1be5-e8a1-485c-b020-f4d9f80a6624",
     "symbol_addr": "180e12cd-1fa8-405d-8dd8-e87b33fa2eb0",
     "instruction_addr": "19864a78-2466-461f-9f0b-93a5c9ae7622",
+    "addr_mode": "49d415f3-1be5-422c-b877-b82b4e4c2990",
     "raw_function": "f33035a4-0cf0-453d-b6f4-d7c27e9af924",
     "symbol": "d9807ffe-d517-11ed-afa1-0242ac120002",
     "lock": {

From 79216e29bfc426168575753187eda15f9de30fc2 Mon Sep 17 00:00:00 2001
From: Lauri Alanko <ext-lauri.alanko@supercell.com>
Date: Fri, 17 Jan 2025 22:43:30 +0200
Subject: [PATCH 07/11] Add ChangeLog entry for ANR native symbolication

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d89f0ae0542..394a0bce7d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## Unreleased
+
+### Features
+
+- Add native stack frame address information and debug image metadata to ANR events ([#4061](https://github.com/getsentry/sentry-java/pull/4061))
+  - This enables symbolication for stripped native code in ANRs
+
 ## 8.1.0
 
 ### Features

From 4ae20df4791299ba2a27ef8c5397e03c558d756b Mon Sep 17 00:00:00 2001
From: Markus Hintersteiner <markus.hintersteiner@sentry.io>
Date: Wed, 22 Jan 2025 10:12:52 +0100
Subject: [PATCH 08/11] Fix code formatting, make API 21 level compatible,
 minor improvements

---
 .../sentry/android/core/AnrV2Integration.java |  20 ++-
 .../internal/threaddump/ThreadDumpParser.java | 130 ++++++++++--------
 .../threaddump/ThreadDumpParserTest.kt        |  25 ++--
 .../io/sentry/protocol/SentryStackFrame.java  |  10 +-
 4 files changed, 106 insertions(+), 79 deletions(-)

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java b/sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java
index 622879118c7..c6d47cadcb4 100644
--- a/sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java
+++ b/sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java
@@ -42,7 +42,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -270,9 +269,9 @@ private void reportAsSentryEvent(
         event.setMessage(sentryMessage);
       } else if (result.type == ParseResult.Type.DUMP) {
         event.setThreads(result.threads);
-        if (!result.debugImages.isEmpty()) {
+        if (result.debugImages != null) {
           final DebugMeta debugMeta = new DebugMeta();
-          debugMeta.setImages(new ArrayList<>(result.debugImages.values()));
+          debugMeta.setImages(result.debugImages);
           event.setDebugMeta(debugMeta);
         }
       }
@@ -319,7 +318,11 @@ private void reportAsSentryEvent(
         final Lines lines = Lines.readLines(reader);
 
         final ThreadDumpParser threadDumpParser = new ThreadDumpParser(options, isBackground);
-        final List<SentryThread> threads = threadDumpParser.parse(lines);
+        threadDumpParser.parse(lines);
+
+        final @NotNull List<SentryThread> threads = threadDumpParser.getThreads();
+        final @NotNull List<DebugImage> debugImages = threadDumpParser.getDebugImages();
+
         if (threads.isEmpty()) {
           // if the list is empty this means the system failed to capture a proper thread dump of
           // the android threads, and only contains kernel-level threads and statuses, those ANRs
@@ -327,7 +330,7 @@ private void reportAsSentryEvent(
           // fall back to not reporting them
           return new ParseResult(ParseResult.Type.NO_DUMP);
         }
-        return new ParseResult(ParseResult.Type.DUMP, dump, threads, threadDumpParser.getDebugImages());
+        return new ParseResult(ParseResult.Type.DUMP, dump, threads, debugImages);
       } catch (Throwable e) {
         options.getLogger().log(SentryLevel.WARNING, "Failed to parse ANR thread dump", e);
         return new ParseResult(ParseResult.Type.ERROR, dump);
@@ -411,7 +414,7 @@ enum Type {
     final Type type;
     final byte[] dump;
     final @Nullable List<SentryThread> threads;
-    final @Nullable Map<String, DebugImage> debugImages;
+    final @Nullable List<DebugImage> debugImages;
 
     ParseResult(final @NotNull Type type) {
       this.type = type;
@@ -428,7 +431,10 @@ enum Type {
     }
 
     ParseResult(
-        final @NotNull Type type, final byte[] dump, final @Nullable List<SentryThread> threads, final @Nullable Map<String, DebugImage> debugImages) {
+        final @NotNull Type type,
+        final byte[] dump,
+        final @Nullable List<SentryThread> threads,
+        final @Nullable List<DebugImage> debugImages) {
       this.type = type;
       this.dump = dump;
       this.threads = threads;
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
index f7628821748..28ac60baafb 100644
--- a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
+++ b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
@@ -27,14 +27,12 @@
 import io.sentry.protocol.SentryStackTrace;
 import io.sentry.protocol.SentryThread;
 import java.math.BigInteger;
+import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.nio.BufferUnderflowException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -50,26 +48,38 @@ public class ThreadDumpParser {
       Pattern.compile("\"(.*)\" (.*) ?sysTid=(\\d+)");
 
   // For reference, see native_stack_dump.cc and tombstone_proto_to_text.cpp in Android sources
+  // Groups
+  // 0:entire regex
+  // 1:index
+  // 2:pc
+  // 3:mapinfo
+  // 4:filename
+  // 5:mapoffset
+  // 6:function
+  // 7:fnoffset
+  // 7:buildid
   private static final Pattern NATIVE_RE =
       Pattern.compile(
           // "  native: #12 pc 0xabcd1234"
-          " *(?:native: )?#(?<index>\\d+) \\S+ (?<pc>[0-9a-fA-F]+)"
-          // The map info includes a filename and an optional offset into the file
-          + ("\\s+(?<mapinfo>"
-             // "/path/to/file.ext",
-             + "(?<filename>.*?)"
-             // optional " (deleted)" suffix (deleted files) needed here to bias regex correctly
-             + "(?:\\s+\\(deleted\\))?"
-             // " (offset 0xabcd1234)", if the mapping is not into the beginning of the file
-             + "(?:\\s+\\(offset (?<mapoffset>.*?)\\))?"
-             + ")")
-          // Optional function
-          + ("(?:\\s+\\((?:"
-             + "\\?\\?\\?" // " (???) marks a missing function, so don't capture it in a group
-             + "|(?<function>.*?)(?:\\+(?<fnoffset>\\d+))?" // " (func+1234)", offset is optional
-             + ")\\))?")
-          // Optional " (BuildId: abcd1234abcd1234abcd1234abcd1234abcd1234)"
-          + "(?:\\s+\\(BuildId: (?<buildid>.*?)\\))?");
+          " *(?:native: )?#(\\d+) \\S+ ([0-9a-fA-F]+)"
+              // The map info includes a filename and an optional offset into the file
+              + ("\\s+("
+                  // "/path/to/file.ext",
+                  + "(.*?)"
+                  // optional " (deleted)" suffix (deleted files) needed here to bias regex
+                  // correctly
+                  + "(?:\\s+\\(deleted\\))?"
+                  // " (offset 0xabcd1234)", if the mapping is not into the beginning of the file
+                  + "(?:\\s+\\(offset (.*?)\\))?"
+                  + ")")
+              // Optional function
+              + ("(?:\\s+\\((?:"
+                  + "\\?\\?\\?" // " (???) marks a missing function, so don't capture it in a group
+                  + "|(.*?)(?:\\+(\\d+))?" // " (func+1234)", offset is
+                  // optional
+                  + ")\\))?")
+              // Optional " (BuildId: abcd1234abcd1234abcd1234abcd1234abcd1234)"
+              + "(?:\\s+\\(BuildId: (.*?)\\))?");
 
   private static final Pattern JAVA_RE =
       Pattern.compile(" *at (?:(.+)\\.)?([^.]+)\\.([^.]+)\\((.*):([\\d-]+)\\)");
@@ -100,16 +110,24 @@ public class ThreadDumpParser {
 
   private final @NotNull Map<String, DebugImage> debugImages;
 
+  private final @NotNull List<SentryThread> threads;
+
   public ThreadDumpParser(final @NotNull SentryOptions options, final boolean isBackground) {
     this.options = options;
     this.isBackground = isBackground;
     this.stackTraceFactory = new SentryStackTraceFactory(options);
-    this.debugImages = new HashMap<String, DebugImage>();
+    this.debugImages = new HashMap<>();
+    this.threads = new ArrayList<>();
+  }
+
+  @NotNull
+  public List<DebugImage> getDebugImages() {
+    return new ArrayList<>(debugImages.values());
   }
 
   @NotNull
-  public Map<String, DebugImage> getDebugImages() {
-    return debugImages;
+  public List<SentryThread> getThreads() {
+    return threads;
   }
 
   @Nullable
@@ -118,21 +136,20 @@ private static String buildIdToDebugId(String buildId) {
       // Abuse BigInteger as a hex string parser. Extra byte needed to handle leading zeros.
       final ByteBuffer buf = ByteBuffer.wrap(new BigInteger("10" + buildId, 16).toByteArray());
       buf.get();
-      return String.format("%08x-%04x-%04x-%04x-%04x%08x",
-                           buf.order(ByteOrder.LITTLE_ENDIAN).getInt(),
-                           buf.getShort(),
-                           buf.getShort(),
-                           buf.order(ByteOrder.BIG_ENDIAN).getShort(),
-                           buf.getShort(),
-                           buf.getInt());
+      return String.format(
+          "%08x-%04x-%04x-%04x-%04x%08x",
+          buf.order(ByteOrder.LITTLE_ENDIAN).getInt(),
+          buf.getShort(),
+          buf.getShort(),
+          buf.order(ByteOrder.BIG_ENDIAN).getShort(),
+          buf.getShort(),
+          buf.getInt());
     } catch (NumberFormatException | BufferUnderflowException e) {
       return null;
     }
   }
 
-  @NotNull
-  public List<SentryThread> parse(final @NotNull Lines lines) {
-    final List<SentryThread> sentryThreads = new ArrayList<>();
+  public void parse(final @NotNull Lines lines) {
 
     final Matcher beginManagedThreadRe = BEGIN_MANAGED_THREAD_RE.matcher("");
     final Matcher beginUnmanagedNativeThreadRe = BEGIN_UNMANAGED_NATIVE_THREAD_RE.matcher("");
@@ -141,7 +158,7 @@ public List<SentryThread> parse(final @NotNull Lines lines) {
       final Line line = lines.next();
       if (line == null) {
         options.getLogger().log(SentryLevel.WARNING, "Internal error while parsing thread dump.");
-        return sentryThreads;
+        return;
       }
       final String text = line.text;
       // we only handle managed threads, as unmanaged/not attached do not have the thread id and
@@ -151,11 +168,10 @@ public List<SentryThread> parse(final @NotNull Lines lines) {
 
         final SentryThread thread = parseThread(lines);
         if (thread != null) {
-          sentryThreads.add(thread);
+          threads.add(thread);
         }
       }
     }
-    return sentryThreads;
   }
 
   private SentryThread parseThread(final @NotNull Lines lines) {
@@ -242,22 +258,34 @@ private SentryStackTrace parseStacktrace(
         break;
       }
       final String text = line.text;
-      if (matches(nativeRe, text)) {
+      if (matches(javaRe, text)) {
+        final SentryStackFrame frame = new SentryStackFrame();
+        final String packageName = javaRe.group(1);
+        final String className = javaRe.group(2);
+        final String module = String.format("%s.%s", packageName, className);
+        frame.setModule(module);
+        frame.setFunction(javaRe.group(3));
+        frame.setFilename(javaRe.group(4));
+        frame.setLineno(getUInteger(javaRe, 5, null));
+        frame.setInApp(stackTraceFactory.isInApp(module));
+        frames.add(frame);
+        lastJavaFrame = frame;
+      } else if (matches(nativeRe, text)) {
         final SentryStackFrame frame = new SentryStackFrame();
-        frame.setPackage(nativeRe.group("mapinfo"));
-        frame.setFunction(nativeRe.group("function"));
-        frame.setLineno(getInteger(nativeRe, "fnoffset", null));
-        frame.setInstructionAddr("0x" + nativeRe.group("pc"));
+        frame.setPackage(nativeRe.group(3));
+        frame.setFunction(nativeRe.group(6));
+        frame.setLineno(getInteger(nativeRe, 7, null));
+        frame.setInstructionAddr("0x" + nativeRe.group(2));
         frame.setPlatform("native");
 
-        final String buildId = nativeRe.group("buildid");
+        final String buildId = nativeRe.group(8);
         final String debugId = buildId == null ? null : buildIdToDebugId(buildId);
         if (debugId != null) {
           if (!debugImages.containsKey(debugId)) {
             final DebugImage debugImage = new DebugImage();
             debugImage.setDebugId(debugId);
             debugImage.setType("elf");
-            debugImage.setCodeFile(nativeRe.group("filename"));
+            debugImage.setCodeFile(nativeRe.group(4));
             debugImage.setCodeId(buildId);
             debugImages.put(debugId, debugImage);
           }
@@ -267,18 +295,6 @@ private SentryStackTrace parseStacktrace(
 
         frames.add(frame);
         lastJavaFrame = null;
-      } else if (matches(javaRe, text)) {
-        final SentryStackFrame frame = new SentryStackFrame();
-        final String packageName = javaRe.group(1);
-        final String className = javaRe.group(2);
-        final String module = String.format("%s.%s", packageName, className);
-        frame.setModule(module);
-        frame.setFunction(javaRe.group(3));
-        frame.setFilename(javaRe.group(4));
-        frame.setLineno(getUInteger(javaRe, 5, null));
-        frame.setInApp(stackTraceFactory.isInApp(module));
-        frames.add(frame);
-        lastJavaFrame = frame;
       } else if (matches(jniRe, text)) {
         final SentryStackFrame frame = new SentryStackFrame();
         final String packageName = jniRe.group(1);
@@ -395,8 +411,8 @@ private Long getLong(
 
   @Nullable
   private Integer getInteger(
-      final @NotNull Matcher matcher, final String group, final @Nullable Integer defaultValue) {
-    final String str = matcher.group(group);
+      final @NotNull Matcher matcher, final int groupIndex, final @Nullable Integer defaultValue) {
+    final String str = matcher.group(groupIndex);
     if (str == null || str.length() == 0) {
       return defaultValue;
     } else {
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
index ddfc0e36646..b5e7adb896a 100644
--- a/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
+++ b/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt
@@ -18,7 +18,8 @@ class ThreadDumpParserTest {
             SentryOptions().apply { addInAppInclude("io.sentry.samples") },
             false
         )
-        val threads = parser.parse(lines)
+        parser.parse(lines)
+        val threads = parser.threads
         // just verifying a few important threads, as there are many
         val main = threads.find { it.name == "main" }
         assertEquals(1, main!!.id)
@@ -85,8 +86,10 @@ class ThreadDumpParserTest {
 
         val nativeFrame = randomThread.stacktrace!!.frames!!.get(5)
         assertEquals("/system/lib64/libandroid_runtime.so", nativeFrame.`package`)
-        assertEquals("android::android_os_MessageQueue_nativePollOnce(_JNIEnv*, _jobject*, long, int)",
-                     nativeFrame.function)
+        assertEquals(
+            "android::android_os_MessageQueue_nativePollOnce(_JNIEnv*, _jobject*, long, int)",
+            nativeFrame.function
+        )
         assertEquals(44, nativeFrame.lineno)
         assertNull(nativeFrame.isNative) // Confusing, but "isNative" means JVM frame for a JNI method
         assertEquals("native", nativeFrame.platform)
@@ -99,7 +102,8 @@ class ThreadDumpParserTest {
             SentryOptions().apply { addInAppInclude("io.sentry.samples") },
             false
         )
-        val threads = parser.parse(lines)
+        parser.parse(lines)
+        val threads = parser.threads
         // just verifying a few important threads, as there are many
         val thread = threads.find { it.name == "samples.android" }
         assertEquals(9955, thread!!.id)
@@ -129,9 +133,10 @@ class ThreadDumpParserTest {
 
         val spaceFrame = frames.get(14)
         assertEquals(
-            "[anon:dalvik-classes16.dex extracted in memory from /data/app/~~izn1xSZpFlzfVmWi_I0xlQ=="
-            + "/io.sentry.samples.android-tQSGMNiGA-qdjZm6lPOcNw==/base.apk!classes16.dex]",
-            spaceFrame.`package`)
+            "[anon:dalvik-classes16.dex extracted in memory from /data/app/~~izn1xSZpFlzfVmWi_I0xlQ==" +
+                "/io.sentry.samples.android-tQSGMNiGA-qdjZm6lPOcNw==/base.apk!classes16.dex]",
+            spaceFrame.`package`
+        )
         assertNull(spaceFrame.function)
         assertNull(spaceFrame.lineno)
         assertEquals("0x00000000000306f0", spaceFrame.instructionAddr)
@@ -152,7 +157,7 @@ class ThreadDumpParserTest {
         assertNull(deletedFrame.addrMode)
 
         val debugImages = parser.debugImages
-        val image = debugImages["499d48ba-c085-17cf-3209-da67405662f9"]
+        val image = debugImages.first { image -> image.debugId == "499d48ba-c085-17cf-3209-da67405662f9" }
         assertNotNull(image)
         assertEquals("499d48ba-c085-17cf-3209-da67405662f9", image.debugId)
         assertEquals("/apex/com.android.runtime/lib64/bionic/libc.so", image.codeFile)
@@ -166,7 +171,7 @@ class ThreadDumpParserTest {
             SentryOptions().apply { addInAppInclude("io.sentry.samples") },
             false
         )
-        val threads = parser.parse(lines)
-        assertTrue(threads.isEmpty())
+        parser.parse(lines)
+        assertTrue(parser.threads.isEmpty())
     }
 }
diff --git a/sentry/src/main/java/io/sentry/protocol/SentryStackFrame.java b/sentry/src/main/java/io/sentry/protocol/SentryStackFrame.java
index 96a3b0f0eec..667938d8da0 100644
--- a/sentry/src/main/java/io/sentry/protocol/SentryStackFrame.java
+++ b/sentry/src/main/java/io/sentry/protocol/SentryStackFrame.java
@@ -100,10 +100,10 @@ public final class SentryStackFrame implements JsonUnknown, JsonSerializable {
    *
    * <ul>
    *   <li><code>"abs"</code> (the default): <code>instruction_addr</code> is absolute.
-   *   <li><code>"rel:$idx"</code>: <code>instruction_addr</code> is relative to the
-   *       <code>debug_meta.image</code> identified by its index in the list.
-   *   <li><code>"rel:$uuid"</code>: <code>instruction_addr</code> is relative to the
-   *       <code>debug_meta.image</code> identified by its <code>debug_id</code>.
+   *   <li><code>"rel:$idx"</code>: <code>instruction_addr</code> is relative to the <code>
+   *       debug_meta.image</code> identified by its index in the list.
+   *   <li><code>"rel:$uuid"</code>: <code>instruction_addr</code> is relative to the <code>
+   *       debug_meta.image</code> identified by its <code>debug_id</code>.
    * </ul>
    */
   private @Nullable String addrMode;
@@ -282,7 +282,7 @@ public void setInstructionAddr(final @Nullable String instructionAddr) {
   }
 
   public void setAddrMode(final @Nullable String addrMode) {
-      this.addrMode = addrMode;
+    this.addrMode = addrMode;
   }
 
   public @Nullable Boolean isNative() {

From cb6f40efcc826bdd817aac95bc54e181e90813ea Mon Sep 17 00:00:00 2001
From: Lauri Alanko <ext-lauri.alanko@supercell.com>
Date: Wed, 22 Jan 2025 11:47:41 +0200
Subject: [PATCH 09/11] Add ADDR_MODE entries to sentry.api

---
 sentry/api/sentry.api | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
index ecf75c6b7b5..ab7b4e1cd30 100644
--- a/sentry/api/sentry.api
+++ b/sentry/api/sentry.api
@@ -5164,6 +5164,7 @@ public final class io/sentry/protocol/SentrySpan$JsonKeys {
 public final class io/sentry/protocol/SentryStackFrame : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
 	public fun <init> ()V
 	public fun getAbsPath ()Ljava/lang/String;
+	public fun getAddrMode ()Ljava/lang/String;
 	public fun getColno ()Ljava/lang/Integer;
 	public fun getContextLine ()Ljava/lang/String;
 	public fun getFilename ()Ljava/lang/String;
@@ -5187,6 +5188,7 @@ public final class io/sentry/protocol/SentryStackFrame : io/sentry/JsonSerializa
 	public fun isNative ()Ljava/lang/Boolean;
 	public fun serialize (Lio/sentry/ObjectWriter;Lio/sentry/ILogger;)V
 	public fun setAbsPath (Ljava/lang/String;)V
+	public fun setAddrMode (Ljava/lang/String;)V
 	public fun setColno (Ljava/lang/Integer;)V
 	public fun setContextLine (Ljava/lang/String;)V
 	public fun setFilename (Ljava/lang/String;)V
@@ -5218,6 +5220,7 @@ public final class io/sentry/protocol/SentryStackFrame$Deserializer : io/sentry/
 
 public final class io/sentry/protocol/SentryStackFrame$JsonKeys {
 	public static final field ABS_PATH Ljava/lang/String;
+	public static final field ADDR_MODE Ljava/lang/String;
 	public static final field COLNO Ljava/lang/String;
 	public static final field CONTEXT_LINE Ljava/lang/String;
 	public static final field FILENAME Ljava/lang/String;

From b553c0955188f4c7cd90396110753869ca6f84fc Mon Sep 17 00:00:00 2001
From: Roman Zavarnitsyn <rom4ek93@gmail.com>
Date: Fri, 14 Mar 2025 16:18:11 +0100
Subject: [PATCH 10/11] Update
 sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java

---
 .../android/core/internal/threaddump/ThreadDumpParser.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
index 28ac60baafb..c4ab17ec00a 100644
--- a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
+++ b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
@@ -57,7 +57,7 @@ public class ThreadDumpParser {
   // 5:mapoffset
   // 6:function
   // 7:fnoffset
-  // 7:buildid
+  // 8:buildid
   private static final Pattern NATIVE_RE =
       Pattern.compile(
           // "  native: #12 pc 0xabcd1234"

From fcce7b2aabaae3b72928dde35570f610a366e8aa Mon Sep 17 00:00:00 2001
From: Roman Zavarnitsyn <rom4ek93@gmail.com>
Date: Fri, 14 Mar 2025 16:20:34 +0100
Subject: [PATCH 11/11] Update
 sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java

---
 .../android/core/internal/threaddump/ThreadDumpParser.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
index c4ab17ec00a..922828c2075 100644
--- a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
+++ b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java
@@ -131,7 +131,7 @@ public List<SentryThread> getThreads() {
   }
 
   @Nullable
-  private static String buildIdToDebugId(String buildId) {
+  private static String buildIdToDebugId(final @NotNull String buildId) {
     try {
       // Abuse BigInteger as a hex string parser. Extra byte needed to handle leading zeros.
       final ByteBuffer buf = ByteBuffer.wrap(new BigInteger("10" + buildId, 16).toByteArray());