Fixes symbolication for net9.0-android applications in Release config

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixes
+
+- Fixed symbolication for net9.0-android applications in Release config ([#4221](https://github.com/getsentry/sentry-dotnet/pull/4221))
+
 ### Dependencies
 
 - Bump CLI from v2.45.0 to v2.46.0 ([#4226](https://github.com/getsentry/sentry-dotnet/pull/4226))

src/Sentry.Android.AssemblyReader/V2/AndroidAssemblyDirectoryReaderV2.cs

@@ -12,6 +12,7 @@ public AndroidAssemblyDirectoryReaderV2(string apkPath, IList<string> supportedA
         Logger = logger;
         foreach (var abi in supportedAbis)
         {
+            logger?.Invoke("Adding {0} to supported architectures for Directory Reader", abi);
             SupportedArchitectures.Add(abi.AbiToDeviceArchitecture());
         }
         _archiveAssemblyHelper = new ArchiveAssemblyHelper(apkPath, logger);
@@ -25,11 +26,13 @@ public AndroidAssemblyDirectoryReaderV2(string apkPath, IList<string> supportedA
             var stream = File.OpenRead(name);
             return new PEReader(stream);
         }
+        Logger?.Invoke("File {0} does not exist in the APK", name);
 
         foreach (var arch in SupportedArchitectures)
         {
             if (_archiveAssemblyHelper.ReadEntry($"assemblies/{name}", arch) is not { } memStream)
             {
+                Logger?.Invoke("Couldn't find entry {0} in the APK for the {1} architecture", name, arch);
                 continue;
             }
 
@@ -137,6 +140,7 @@ public ArchiveAssemblyHelper(string archivePath, DebugLogger? logger)
             var potentialEntries = TransformArchiveAssemblyPath(path, arch);
             if (potentialEntries == null || potentialEntries.Count == 0)
             {
+                _logger?.Invoke("No potential entries for path '{0}' with arch '{1}'", path, arch);
                 return null;
             }
 
@@ -145,6 +149,7 @@ public ArchiveAssemblyHelper(string archivePath, DebugLogger? logger)
             {
                 if (zip.GetEntry(assemblyPath) is not { } entry)
                 {
+                    _logger?.Invoke("No entry found for path '{0}' in archive '{1}'", assemblyPath, _archivePath);
                     continue;
                 }
 

src/Sentry.Android.AssemblyReader/V2/AndroidAssemblyStoreReaderV2.cs

@@ -13,16 +13,35 @@ private AndroidAssemblyStoreReaderV2(IList<AssemblyStoreExplorer> explorers, Deb
 
     public static bool TryReadStore(string inputFile, IList<string> supportedAbis, DebugLogger? logger, [NotNullWhen(true)] out AndroidAssemblyStoreReaderV2? reader)
     {
+        List<AssemblyStoreExplorer> supportedExplorers = [];
+
+        // First we check the base.apk for an assembly store
         var (explorers, errorMessage) = AssemblyStoreExplorer.Open(inputFile, logger);
-        if (errorMessage != null)
+        if (explorers is null)
         {
-            logger?.Invoke(errorMessage);
-            reader = null;
-            return false;
-        }
+            logger?.Invoke("Unable to read store information for {0}: {1}", inputFile, errorMessage);
 
-        List<AssemblyStoreExplorer> supportedExplorers = [];
-        if (explorers is not null)
+            // Check for assembly stores in any device specific APKs
+            foreach (var supportedAbi in supportedAbis)
+            {
+                var splitFilePath = inputFile.GetArchivePathForAbi(supportedAbi, logger);
+                if (!File.Exists(splitFilePath))
+                {
+                    logger?.Invoke("No split config detected at: '{0}'", splitFilePath);
+                    continue;
+                }
+                (explorers, errorMessage) = AssemblyStoreExplorer.Open(splitFilePath, logger);
+                if (explorers is not null)
+                {
+                    supportedExplorers.AddRange(explorers); // If the error is null then this is not null
+                }
+                else
+                {
+                    logger?.Invoke("Unable to read store information for {0}: {1}", splitFilePath, errorMessage);
+                }
+            }
+        }
+        else
         {
             foreach (var explorer in explorers)
             {

src/Sentry.Android.AssemblyReader/V2/MonoAndroidHelper.Basic.cs

@@ -89,4 +89,29 @@ public static string MakeZipArchivePath(string part1, ICollection<string>? pathP
     public const string MANGLED_ASSEMBLY_REGULAR_ASSEMBLY_MARKER = "lib_";
     public const string MANGLED_ASSEMBLY_SATELLITE_ASSEMBLY_MARKER = "lib-";
     public const string SATELLITE_CULTURE_END_MARKER_CHAR = "_";
+
+    /// <summary>
+    /// When an AAB file is deployed, the APK is split into multiple APKs so our modules can end up in a companion
+    /// architecture specific APK like split_config.arm64_v8a.apk. This method returns the path to that split_config APK
+    /// if it exists... otherwise we just return the original archive path.
+    /// </summary>
+    internal static string GetArchivePathForArchitecture(this string archivePath, AndroidTargetArch arch, DebugLogger? logger)
+    {
+        return ArchToAbiMap.TryGetValue(arch, out var abi)
+            ? GetArchivePathForAbi(archivePath, abi, logger)
+            : archivePath;
+    }
+
+    /// <summary>
+    /// When an AAB file is deployed, the APK is split into multiple APKs so our modules can end up in a companion
+    /// architecture specific APK like split_config.arm64_v8a.apk. This method returns the path to that split_config APK
+    /// if it exists... otherwise we just return the original archive path.
+    /// </summary>
+    internal static string GetArchivePathForAbi(this string archivePath, string abi, DebugLogger? logger)
+    {
+        var basePath = Path.GetDirectoryName(archivePath) ?? string.Empty;
+        var abiPart = abi.Replace("-", "_");
+        var splitFilePath = Path.Combine(basePath, $"split_config.{abiPart}.apk");
+        return splitFilePath;
+    }
 }

src/Sentry/Internal/DebugStackTrace.cs

@@ -249,6 +249,7 @@ private IEnumerable<SentryStackFrame> CreateFrames(StackTrace stackTrace, bool i
             return null;
         }
 
+        _options.LogDebug("Attempting to get debug image for native AOT Frame");
         var imageAddress = stackFrame.GetNativeImageBase();
         var frame = ParseNativeAOTToString(stackFrame.ToString());
         frame.ImageAddress = imageAddress;