reuse existing codeId -> debugId conversion instead of adding a new converter

Author: supervacuus

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

@@ -22,14 +22,11 @@
 import io.sentry.SentryLockReason;
 import io.sentry.SentryOptions;
 import io.sentry.SentryStackTraceFactory;
+import io.sentry.android.core.internal.util.NativeEventUtils;
 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.BufferUnderflowException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -130,25 +127,6 @@ public List<SentryThread> getThreads() {
     return threads;
   }
 
-  @Nullable
-  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());
-      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;
-    }
-  }
-
   public void parse(final @NotNull Lines lines) {
 
     final Matcher beginManagedThreadRe = BEGIN_MANAGED_THREAD_RE.matcher("");
@@ -279,7 +257,7 @@ private SentryStackTrace parseStacktrace(
         frame.setPlatform("native");
 
         final String buildId = nativeRe.group(8);
-        final String debugId = buildId == null ? null : buildIdToDebugId(buildId);
+        final String debugId = buildId == null ? null : NativeEventUtils.buildIdToDebugId(buildId);
         if (debugId != null) {
           if (!debugImages.containsKey(debugId)) {
             final DebugImage debugImage = new DebugImage();

sentry-android-core/src/main/java/io/sentry/android/core/internal/tombstone/OleGuidFormatter.java

@@ -3,6 +3,7 @@
 import androidx.annotation.NonNull;
 import io.sentry.SentryEvent;
 import io.sentry.SentryLevel;
+import io.sentry.android.core.internal.util.NativeEventUtils;
 import io.sentry.protocol.DebugImage;
 import io.sentry.protocol.DebugMeta;
 import io.sentry.protocol.Mechanism;
@@ -196,9 +197,13 @@ private DebugMeta createDebugMeta(@NonNull final TombstoneProtos.Tombstone tombs
         continue;
       }
       final DebugImage image = new DebugImage();
-      image.setCodeId(module.getBuildId());
+      final String codeId = module.getBuildId();
+      image.setCodeId(codeId);
       image.setCodeFile(module.getMappingName());
-      image.setDebugId(OleGuidFormatter.convert(module.getBuildId()));
+
+      final String debugId = NativeEventUtils.buildIdToDebugId(codeId);
+      image.setDebugId(debugId != null ? debugId : codeId);
+
       image.setImageAddr(formatHex(module.getBeginAddress()));
       image.setImageSize(module.getEndAddress() - module.getBeginAddress());
       image.setType("elf");

sentry-android-core/src/main/java/io/sentry/android/core/internal/tombstone/TombstoneParser.java

@@ -0,0 +1,29 @@
+package io.sentry.android.core.internal.util;
+
+import java.math.BigInteger;
+import java.nio.BufferUnderflowException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class NativeEventUtils {
+  @Nullable
+  public 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());
+      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;
+    }
+  }
+}

sentry-android-core/src/main/java/io/sentry/android/core/internal/util/NativeEventUtils.java

@@ -1,5 +1,6 @@
 package io.sentry.android.core.internal.tombstone
 
+import java.io.ByteArrayInputStream
 import java.io.File
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -108,4 +109,70 @@ class TombstoneParserTest {
       assert(image.imageSize!! > 0)
     }
   }
+
+  @Test
+  fun `debugId falls back to codeId when OleGuidFormatter conversion fails`() {
+    // Create a tombstone with a memory mapping that has an invalid buildId
+    // (contains 'ZZ' which are not valid hex characters)
+    val invalidBuildId = "ZZ00112233445566778899aabbccddeeff00112233"
+    val validBuildId = "f1c3bcc0279865fe3058404b2831d9e64135386c"
+
+    val tombstone =
+      TombstoneProtos.Tombstone.newBuilder()
+        .setPid(1234)
+        .setTid(1234)
+        .setSignalInfo(
+          TombstoneProtos.Signal.newBuilder()
+            .setNumber(11)
+            .setName("SIGSEGV")
+            .setCode(1)
+            .setCodeName("SEGV_MAPERR")
+        )
+        .addMemoryMappings(
+          TombstoneProtos.MemoryMapping.newBuilder()
+            .setBuildId(invalidBuildId)
+            .setMappingName("/system/lib64/libc.so")
+            .setBeginAddress(0x7000000000)
+            .setEndAddress(0x7000001000)
+            .setExecute(true)
+        )
+        .addMemoryMappings(
+          TombstoneProtos.MemoryMapping.newBuilder()
+            .setBuildId(validBuildId)
+            .setMappingName("/system/lib64/libm.so")
+            .setBeginAddress(0x7000002000)
+            .setEndAddress(0x7000003000)
+            .setExecute(true)
+        )
+        .putThreads(
+          1234,
+          TombstoneProtos.Thread.newBuilder()
+            .setId(1234)
+            .setName("main")
+            .addCurrentBacktrace(
+              TombstoneProtos.BacktraceFrame.newBuilder()
+                .setPc(0x7000000100)
+                .setFunctionName("crash")
+                .setFileName("/system/lib64/libc.so")
+            )
+            .build(),
+        )
+        .build()
+
+    val parser = TombstoneParser(ByteArrayInputStream(tombstone.toByteArray()))
+    val event = parser.parse()
+
+    val images = event.debugMeta!!.images!!
+    assertEquals(2, images.size)
+
+    // First image has invalid buildId - debugId should fall back to codeId
+    val invalidImage = images.find { it.codeFile == "/system/lib64/libc.so" }!!
+    assertEquals(invalidBuildId, invalidImage.codeId)
+    assertEquals(invalidBuildId, invalidImage.debugId)
+
+    // Second image has valid buildId - debugId should be converted
+    val validImage = images.find { it.codeFile == "/system/lib64/libm.so" }!!
+    assertEquals(validBuildId, validImage.codeId)
+    assertEquals("c0bcc3f1-9827-fe65-3058-404b2831d9e6", validImage.debugId)
+  }
 }