Skip to content

Commit 2557f1a

Browse files
authored
fix(android): Handle default-package ANR frame modules (JAVA-696) (#5979)
Updates `ThreadDumpParser` so ANR frames for classes in Java's default package are emitted with the correct module name. Prior to this commit, when the parser saw a Java or JNI frame whose class has no package, it would reconstruct the frame's module as though a package existed. That turned a class like `MainActivity` into `null.MainActivity`. This commit fixes that by teaching `ThreadDumpParser` to build the module name conditionally: - if a package name is present, emit `package.class` - if no package name is present, emit just `class` The same logic is applied consistently to both Java frames and JNI frames, since both parsing paths share the same optional-package shape.
1 parent c53f0de commit 2557f1a

3 files changed

Lines changed: 60 additions & 2 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### Fixes
66

7+
- Prevents inclusion of `null.` prefix before default-package class names when parsing Java and JNI frames from Android ANR thread dumps ([#5979](https://github.com/getsentry/sentry-java/pull/5979))
78
- Prevent duplicated breadcrumbs on tombstone-merged native crash events ([#5888](https://github.com/getsentry/sentry-java/pull/5888))
89
- Prevent a class of Session Replay deadlocks by confining lifecycle state changes to Android's main thread ([#5965](https://github.com/getsentry/sentry-java/pull/5965))
910
- Symbolicate tombstone native frames for libraries loaded directly from APKs ([#5992](https://github.com/getsentry/sentry-java/pull/5992))

‎sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ private SentryStackTrace parseStacktrace(
275275
final SentryStackFrame frame = new SentryStackFrame();
276276
final String packageName = javaRe.group(1);
277277
final String className = javaRe.group(2);
278-
final String module = String.format("%s.%s", packageName, className);
278+
final String module = toModuleName(packageName, className);
279279
frame.setModule(module);
280280
frame.setFunction(javaRe.group(3));
281281
frame.setFilename(javaRe.group(4));
@@ -312,7 +312,7 @@ private SentryStackTrace parseStacktrace(
312312
final SentryStackFrame frame = new SentryStackFrame();
313313
final String packageName = jniRe.group(1);
314314
final String className = jniRe.group(2);
315-
final String module = String.format("%s.%s", packageName, className);
315+
final String module = toModuleName(packageName, className);
316316
frame.setModule(module);
317317
frame.setFunction(jniRe.group(3));
318318
frame.setInApp(stackTraceFactory.isInApp(module));
@@ -390,6 +390,11 @@ private SentryStackTrace parseStacktrace(
390390
return stackTrace;
391391
}
392392

393+
private @NotNull String toModuleName(
394+
final @Nullable String packageName, final @NotNull String className) {
395+
return packageName == null || packageName.isEmpty() ? className : packageName + "." + className;
396+
}
397+
393398
private void markThreads() {
394399
for (final @NotNull SentryThread thread : threads) {
395400
if (Boolean.TRUE.equals(thread.isMain())) {

‎sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ThreadDumpParserTest.kt‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ package io.sentry.android.core.internal.threaddump
22

33
import io.sentry.SentryLockReason
44
import io.sentry.SentryOptions
5+
import java.io.BufferedReader
56
import java.io.File
7+
import java.io.StringReader
68
import kotlin.test.Test
79
import kotlin.test.assertEquals
810
import kotlin.test.assertNotNull
@@ -219,6 +221,56 @@ class ThreadDumpParserTest {
219221
assertEquals("main", threads.first().name)
220222
}
221223

224+
@Test
225+
fun `uses class name as module when a Java frame has no package`() {
226+
val lines =
227+
Lines.readLines(
228+
BufferedReader(
229+
StringReader(
230+
"""
231+
----- pid 123 at 2023-04-04 22:06:31.064728684+0200 -----
232+
"main" prio=5 tid=1 Runnable
233+
| sysTid=123 nice=-10 cgrp=top-app sched=0/0 handle=0x7deceb74f8
234+
at MainActivity.run(MainActivity.java:177)
235+
"""
236+
.trimIndent()
237+
)
238+
)
239+
)
240+
val parser = ThreadDumpParser(SentryOptions(), false)
241+
242+
parser.parse(lines)
243+
244+
val frame = parser.threads.single().stacktrace!!.frames!!.last()
245+
assertEquals("MainActivity", frame.module)
246+
}
247+
248+
@Test
249+
fun `uses class name as module when a JNI frame has no package`() {
250+
val lines =
251+
Lines.readLines(
252+
BufferedReader(
253+
StringReader(
254+
"""
255+
----- pid 123 at 2023-04-04 22:06:31.064728684+0200 -----
256+
"main" prio=5 tid=1 Runnable
257+
| sysTid=123 nice=-10 cgrp=top-app sched=0/0 handle=0x7deceb74f8
258+
at MainActivity.nativeRun(Native method)
259+
"""
260+
.trimIndent()
261+
)
262+
)
263+
)
264+
val parser = ThreadDumpParser(SentryOptions(), false)
265+
266+
parser.parse(lines)
267+
268+
val frame = parser.threads.single().stacktrace!!.frames!!.last()
269+
assertEquals("MainActivity", frame.module)
270+
assertEquals("nativeRun", frame.function)
271+
assertEquals(true, frame.isNative)
272+
}
273+
222274
@Test
223275
fun `thread dump garbage`() {
224276
val lines = Lines.readLines(File("src/test/resources/thread_dump_bad_data.txt"))

0 commit comments

Comments
 (0)