Parse all available timing units

markushi · markushi · commit c8f560dbf371 · 2026-05-15T15:49:56.000+02:00
Based on https://cs.android.com/android/platform/superproject/+/android-latest-release:art/libartbase/base/time_utils.cc;l=95-133?q=time_utils.cc
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ArtContextParser.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ArtContextParser.java
@@ -108,16 +108,33 @@ void parseLine(final @NotNull String text) {
     return null;
   }
 
+  /**
+   * Parses ART's PrettyDuration output and converts to milliseconds. Handles "s", "ms", "us", "ns"
+   * suffixes and the bare "0" special case.
+   *
+   * @see <a
+   *     href="https://cs.android.com/android/platform/superproject/+/android-latest-release:art/libartbase/base/time_utils.cc;l=95-133;drc=16e1409f339b1318fe1cdce8462f089b3b0475e8">ART
+   *     PrettyDuration / FormatDuration</a>
+   */
   private static @Nullable Double parseTimeMs(final @NotNull String timeString) {
     final String trimmed = timeString.trim();
-    if (trimmed.endsWith("ms")) {
-      try {
-        // Double.parseDouble is locale-independent (always uses '.' as decimal separator),
-        // which matches the ART runtime output format.
+    try {
+      if (trimmed.equals("0")) {
+        return 0.0;
+      }
+      // Double.parseDouble is locale-independent (always uses '.' as decimal separator),
+      // which matches the ART runtime output format.
+      if (trimmed.endsWith("ms")) {
         return Double.parseDouble(trimmed.substring(0, trimmed.length() - 2));
-      } catch (NumberFormatException e) {
-        return null;
+      } else if (trimmed.endsWith("ns")) {
+        return Double.parseDouble(trimmed.substring(0, trimmed.length() - 2)) / 1_000_000.0;
+      } else if (trimmed.endsWith("us")) {
+        return Double.parseDouble(trimmed.substring(0, trimmed.length() - 2)) / 1_000.0;
+      } else if (trimmed.endsWith("s")) {
+        return Double.parseDouble(trimmed.substring(0, trimmed.length() - 1)) * 1_000.0;
       }
+    } catch (NumberFormatException e) {
+      return null;
     }
     return null;
   }
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ArtContextParserTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/internal/threaddump/ArtContextParserTest.kt
@@ -53,6 +53,34 @@ class ArtContextParserTest {
     assertEquals(11.807, parser.artContext!!.gcTotalTime)
   }
 
+  @Test
+  fun `parses time in seconds`() {
+    val parser = ArtContextParser()
+    parser.parseLine("Total GC time: 2.5s")
+    assertEquals(2500.0, parser.artContext!!.gcTotalTime)
+  }
+
+  @Test
+  fun `parses time in microseconds`() {
+    val parser = ArtContextParser()
+    parser.parseLine("Total GC time: 500us")
+    assertEquals(0.5, parser.artContext!!.gcTotalTime)
+  }
+
+  @Test
+  fun `parses time in nanoseconds`() {
+    val parser = ArtContextParser()
+    parser.parseLine("Total GC time: 1000000ns")
+    assertEquals(1.0, parser.artContext!!.gcTotalTime)
+  }
+
+  @Test
+  fun `parses zero duration`() {
+    val parser = ArtContextParser()
+    parser.parseLine("Total GC time: 0")
+    assertEquals(0.0, parser.artContext!!.gcTotalTime)
+  }
+
   @Test
   fun `parses all memory fields`() {
     val parser = ArtContextParser()
