final IL2CPP symbolication changes (#920)

Author: richardelms

.buildkite/pipeline.yml

@@ -12,6 +12,10 @@ steps:
       UNITY_VERSION: *2021
     commands:
       - rake code:verify
+    retry:
+      automatic:
+        - exit_status: "*"
+          limit: 1
 
   - label: Run Unit Tests
     timeout_in_minutes: 5

.buildkite/unity.2020.yml

@@ -23,7 +23,7 @@ steps:
               - features/fixtures/build_android_apk.log
         command:
               - "bundle install"
-              - "bundle exec maze-runner --os macos features/build/build_android.feature"
+              - "bundle exec maze-runner --os=macos --port=$((MAZE_RUNNER_PORT)) features/build/build_android.feature"
         retry:
           automatic:
             - exit_status: "*"
@@ -49,7 +49,7 @@ steps:
               - features/fixtures/unity.log
         command:
               - "bundle install"
-              - "bundle exec maze-runner --os macos features/build/build_ios.feature"
+              - "bundle exec maze-runner --os=macos --port=$((MAZE_RUNNER_PORT)) features/build/build_ios.feature"
         retry:
           automatic:
             - exit_status: "*"

.buildkite/unity.2021.yml

@@ -21,7 +21,7 @@ steps:
               - features/fixtures/build_android_apk.log
         command:
               - "bundle install"
-              - "bundle exec maze-runner --os macos features/build/build_android.feature"
+              - "bundle exec maze-runner --os=macos --port=$((MAZE_RUNNER_PORT)) features/build/build_android.feature"
         retry:
           automatic:
             - exit_status: "*"
@@ -39,10 +39,11 @@ steps:
               - Bugsnag.unitypackage
             upload:
               - features/fixtures/maze_runner/mazerunner_2021.ipa
+              - features/fixtures/maze_runner/build.xcresult
               - features/fixtures/unity.log
         command:
               - "bundle install"
-              - "bundle exec maze-runner --os macos features/build/build_ios.feature"
+              - "bundle exec maze-runner --os=macos --port=$((MAZE_RUNNER_PORT)) features/build/build_ios.feature"
         retry:
           automatic:
             - exit_status: "*"

.buildkite/unity.2022.yml

@@ -23,7 +23,7 @@ steps:
               - features/fixtures/build_android_apk.log
         command:
               - "bundle install"
-              - "bundle exec maze-runner --os macos features/build/build_android.feature"
+              - "bundle exec maze-runner --os=macos --port=$((MAZE_RUNNER_PORT)) features/build/build_android.feature"
         retry:
           automatic:
             - exit_status: "*"
@@ -44,7 +44,7 @@ steps:
               - features/fixtures/unity.log
         command:
               - "bundle install"
-              - "bundle exec maze-runner --os macos features/build/build_ios.feature"
+              - "bundle exec maze-runner --os=macos --port=$((MAZE_RUNNER_PORT)) features/build/build_ios.feature"
         retry:
           automatic:
             - exit_status: "*"

.buildkite/unity.6000.yml

@@ -23,7 +23,7 @@ steps:
               - features/fixtures/build_android_apk.log
         command:
               - "bundle install"
-              - "bundle exec maze-runner --os macos features/build/build_android.feature"
+              - "bundle exec maze-runner --os=macos --port=$((MAZE_RUNNER_PORT)) features/build/build_android.feature"
         retry:
           automatic:
             - exit_status: "*"
@@ -44,7 +44,7 @@ steps:
               - features/fixtures/unity.log
         command:
               - "bundle install"
-              - "bundle exec maze-runner --os macos features/build/build_ios.feature"
+              - "bundle exec maze-runner --os=macos --port=$((MAZE_RUNNER_PORT)) features/build/build_ios.feature"
         retry:
           automatic:
             - exit_status: "*"

Bugsnag/Assets/Bugsnag/Editor/SymbolUpload/BugsnagCLI.cs

@@ -8,7 +8,7 @@ namespace BugsnagUnity.Editor
 {
     internal class BugsnagCLI
     {
-        private const string DOWNLOADED_CLI_VERSION = "2.9.1";
+        private const string DOWNLOADED_CLI_VERSION = "3.3.1";
         private readonly string DOWNLOADED_CLI_PATH = Path.Combine(Application.dataPath, "../bugsnag/bin/bugsnag_cli");
         private readonly string DOWNLOADED_CLI_URL = $"https://github.com/bugsnag/bugsnag-cli/releases/download/v{DOWNLOADED_CLI_VERSION}/";
         private readonly string _cliExecutablePath;
@@ -50,6 +50,9 @@ public void UploadAndroidSymbols(string buildOutputPath, string apiKey, string v
             {
                 args += $" --application-id={bundleId}";
             }
+#if !UNITY_2021_1_OR_NEWER
+            args += " --no-upload-il2cpp-mapping";
+#endif
             int exitCode = StartProcess(_cliExecutablePath, args, out string output, out string error);
 
             if (exitCode != 0)
@@ -193,7 +196,10 @@ private int StartProcess(string fileName, string arguments, out string standardO
 
         public string GetIosDsymUploadCommand(string apiKey, string uploadEndpoint)
         {
-            var command = $"{_cliExecutablePath} upload xcode-build --api-key={apiKey} $DWARF_DSYM_FOLDER_PATH";
+            var command = $"{_cliExecutablePath} upload unity-ios --api-key={apiKey} --dsym-path=$DWARF_DSYM_FOLDER_PATH --project-root={Application.dataPath} {Application.dataPath.Replace("/Assets", string.Empty)}";
+#if !UNITY_2021_1_OR_NEWER
+            command += " --no-upload-il2cpp-mapping";
+#endif
             if (!string.IsNullOrEmpty(uploadEndpoint))
             {
                 command += $" --upload-api-root-url={uploadEndpoint}";

Bugsnag/Assets/Bugsnag/Runtime/Native/Cocoa/LoadedImages.cs

@@ -45,19 +45,26 @@ public void Refresh(String? mainImageFileName)
 
                 UInt64 mainLoadAddress = 0;
                 var images = new LoadedImage[count];
+
                 for (UInt64 i = 0; i < count; i++)
                 {
                     var nativeImage = nativeImages[i];
-                    var uuid = new byte[16];
-                    Marshal.Copy(nativeImage.UuidBytes, uuid, 0, 16);
-                    var fileName = Marshal.PtrToStringAnsi(nativeImage.FileName);
+
+                    var uuidBytes = new byte[16];
+                    Marshal.Copy(nativeImage.UuidBytes, uuidBytes, 0, 16);
+
+                    var fileName    = Marshal.PtrToStringAnsi(nativeImage.FileName);
                     var isMainImage = fileName == mainImageFileName;
 
+                    // Build canonical RFC-4122 text directly from the 16 bytes (no swapping)
+                    string uuidText = UuidTextFromBigEndianBytes(uuidBytes);
+
                     var image = new LoadedImage(nativeImage.LoadAddress,
                                                 nativeImage.Size,
                                                 fileName,
-                                                new Guid(uuid).ToString(),
+                                                uuidText,
                                                 isMainImage);
+
                     if (isMainImage)
                     {
                         mainLoadAddress = image.LoadAddress;
@@ -122,6 +129,26 @@ int IComparer.Compare(Object x, Object y)
                 return 0;
             }
         }
+        
+        private static string UuidTextFromBigEndianBytes(byte[] b)
+        {
+            if (b == null || b.Length != 16) throw new ArgumentException(nameof(b));
+
+            char[] chars = new char[36];
+            int j = 0;
+            for (int i = 0; i < 16; i++)
+            {
+                if (i == 4 || i == 6 || i == 8 || i == 10)
+                    chars[j++] = '-';
+
+                byte v = b[i];
+                int hi = v >> 4, lo = v & 0xF;
+                chars[j++] = (char)(hi < 10 ? '0' + hi : 'A' + (hi - 10));
+                chars[j++] = (char)(lo < 10 ? '0' + lo : 'A' + (lo - 10));
+            }
+            return new string(chars);
+        }
+
     }
 }
 #endif

Bugsnag/Assets/Bugsnag/Runtime/Native/Cocoa/NativeClient.cs

@@ -509,46 +509,50 @@ private StackTraceLine[] ToStackFrames(System.Exception exception, IntPtr[] nati
                 var address = (UInt64)nativeAddresses[i].ToInt64();
                 var image = loadedImages.FindImageAtAddress(address);
 
-                var trace = new StackTraceLine();
-                trace.FrameAddress = string.Format("0x{0:X}", address);
-                trace.Method = method.ToString();
+                var frame = new StackTraceLine();
+                frame.FrameAddress = string.Format("0x{0:X}", address);
+                frame.Method = method.ToString();
+                frame.Type = "cocoa";
                 if (image != null)
                 {
                     if (address < image.LoadAddress)
                     {
                         // It's a relative address
-                        trace.FrameAddress = string.Format("0x{0:X}", address + image.LoadAddress);
+                        frame.FrameAddress = string.Format("0x{0:X}", address + image.LoadAddress);
                     }
-                    trace.MachoFile = image.FileName;
-                    trace.MachoLoadAddress = string.Format("0x{0:X}", image.LoadAddress);
-                    trace.MachoUuid = image.Uuid;
-                    trace.InProject = image.IsMainImage;
+                    frame.MachoFile = image.FileName;
+                    frame.MachoLoadAddress = string.Format("0x{0:X}", image.LoadAddress);
+                    frame.MachoUuid = FormatImageUuid(image.Uuid);
+                    frame.InProject = image.IsMainImage;
                 }
                 else
                 {
-                    trace.MachoFile = safeMainImageFileName;
-                    trace.MachoLoadAddress = "0x0";
-                    trace.MachoUuid = mainImageFormattedUuid;
-                    trace.InProject = true;
+                    frame.MachoFile = safeMainImageFileName;
+                    frame.MachoLoadAddress = "0x0";
+                    frame.MachoUuid = mainImageFormattedUuid;
+                    frame.InProject = true;
                 }
-                stackFrames[i] = trace;
+                stackFrames[i] = frame;
             }
             return stackFrames;
         }
 
-        private string FormatImageUuid(string imageUuid)
+        private static string FormatImageUuid(string uuid)
         {
-            if (imageUuid == null || imageUuid.Length != 32)
-            {
-                return null;
-            }
+            if (string.IsNullOrEmpty(uuid)) return uuid;
 
-            byte[] mainImageUuidBytes = new byte[16];
-            for (int i = 0; i < 16; i++)
+            string hex = uuid.Replace("-", "").Trim();
+            if (hex.Length != 32) return uuid; // leave unexpected formats alone
+
+            for (int i = 0; i < 32; i++)
             {
-                mainImageUuidBytes[i] = Convert.ToByte(imageUuid.Substring(i * 2, 2), 16);
+                char c = hex[i];
+                bool ok = (c >= '0' && c <= '9') || (c | 0x20) >= 'a' && (c | 0x20) <= 'f';
+                if (!ok) return uuid;
             }
-            return new Guid(mainImageUuidBytes).ToString();
+
+            hex = hex.ToUpperInvariant();
+            return $"{hex.Substring(0,8)}-{hex.Substring(8,4)}-{hex.Substring(12,4)}-{hex.Substring(16,4)}-{hex.Substring(20)}";
         }
 
         public StackTraceLine[] ToStackFrames(System.Exception exception)

Bugsnag/Assets/Bugsnag/Runtime/Payload/Error.cs

@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
-
+using UnityEngine;
 namespace BugsnagUnity.Payload
 {
     /// <summary>
@@ -16,16 +16,6 @@ public class Error : Dictionary<string, object>, IError
 
         internal bool IsAndroidJavaException;
 
-        private const string COMPILATION_PLATFORM =
-#if ENABLE_IL2CPP
-        "il2cpp"
-#elif ENABLE_MONO
-            "mono"
-#else
-        "unknown" 
-#endif
-            ;
-
         private const string ANDROID_JAVA_EXCEPTION_CLASS = "AndroidJavaException";
         private const string ERROR_CLASS_MESSAGE_PATTERN = @"^(?<errorClass>\S+):\s+(?<message>.*)";
         private const string NATIVE_ANDROID_ERROR_CLASS = "java.lang.Error";
@@ -36,6 +26,8 @@ public class Error : Dictionary<string, object>, IError
         private const string STACKTRACE_KEY = "stacktrace";
         private const string ERROR_TYPE_KEY = "type";
 
+        private static string _cachedErrorType;
+
         internal Error(Dictionary<string, object> data)
         {
             foreach (var item in data)
@@ -68,7 +60,7 @@ internal Error(string errorClass, string message, IStackframe[] stackTrace, Hand
             _stacktrace = stackTrace.ToList();
             HandledState = handledState;
             IsAndroidJavaException = isAndroidJavaException;
-            Type = COMPILATION_PLATFORM;
+            Type = GetErrorType();
         }
 
 
@@ -140,5 +132,29 @@ public static bool ShouldSend(UnityLogMessage logMessage)
             match = Regex.Match(logMessage.StackTrace, NATIVE_ANDROID_MESSAGE_PATTERN, RegexOptions.Singleline);
             return !match.Success;
         }
+
+        private static string GetErrorType()
+        {
+            if (_cachedErrorType != null)
+            {
+                return _cachedErrorType;
+            }
+
+#if ENABLE_IL2CPP
+            switch (Application.platform)
+            {
+                case RuntimePlatform.IPhonePlayer:
+                    _cachedErrorType = "cocoa";
+                    break;
+                case RuntimePlatform.Android:
+                    _cachedErrorType = "c";
+                    break;
+                default:
+                    _cachedErrorType = null;
+                    break;
+            }      
+#endif
+            return _cachedErrorType;
+        }
     }
 }

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### Enhancements
+
+- Enable IL2CPP line number symbolication fo riOS and Android via the BugSnag CLI [#920](https://github.com/bugsnag/bugsnag-unity/pull/920)
+
 ## 8.6.2 (2025-07-16)
 
 ### Enhancements