Various .NET MAUI fixes / improvements (#2403)

* Fix battery level * Set OS architecture * Fix Windows OS version info * Fix in-app frames for Windows * Fix in-app frames for iOS/MacCatalyst * Update CHANGELOG.md
getsentry · Jun 1, 2023 · f551ffe · f551ffe
1 parent 80c3227
commit f551ffe
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@
 
 - SentryHttpMessageHandler added when AddHttpClient is before UseSentry ([#2390](https://github.com/getsentry/sentry-dotnet/pull/2390))
 - Set the native sdk name for Android ([#2389](https://github.com/getsentry/sentry-dotnet/pull/2389))
+- Various .NET MAUI fixes / improvements ([#2403](https://github.com/getsentry/sentry-dotnet/pull/2403))
+  - The battery level was being reported incorrectly due to percentage multiplier.
+  - The device architecture (x64, arm64, etc.) is now reported
+  - On Windows, the OS type is now reported as "Windows" instead of "WinUI".  Additionally, the OS display version (ex, "22H2") is now included.
+  - `UIKit`, `ABI.Microsoft` and `WinRT`  frames are now marked "system" instead of "in app".
 
 ### Dependencies
 

diff --git a/src/Sentry.Maui/Internal/MauiDeviceData.cs b/src/Sentry.Maui/Internal/MauiDeviceData.cs
@@ -32,15 +32,15 @@ public static void ApplyMauiDeviceData(this Device device, IDiagnosticLogger? lo
             // device.Brand ??= ?
             // device.Family ??= ?
             // device.ModelId ??= ?
-            // device.Architecture ??= ?
+            device.Architecture ??= RuntimeInformation.OSArchitecture.ToString();
             // ? = deviceInfo.Platform;
             // ? = deviceInfo.VersionString;
 
             // https://docs.microsoft.com/dotnet/maui/platform-integration/device/battery
             try
             {
                 var battery = Battery.Default;
-                device.BatteryLevel ??= battery.ChargeLevel < 0 ? null : (short)battery.ChargeLevel;
+                device.BatteryLevel ??= battery.ChargeLevel < 0 ? null : (short)(battery.ChargeLevel * 100.0);
                 device.BatteryStatus ??= battery.State.ToString();
                 device.IsCharging ??= battery.State switch
                 {

diff --git a/src/Sentry.Maui/Internal/MauiOsData.cs b/src/Sentry.Maui/Internal/MauiOsData.cs
@@ -1,3 +1,4 @@
+using Microsoft.Win32;
 using Sentry.Extensibility;
 using OperatingSystem = Sentry.Protocol.OperatingSystem;
 
@@ -17,13 +18,24 @@ public static void ApplyMauiOsData(this OperatingSystem os, IDiagnosticLogger? l
                 return;
             }
 
-            os.Name ??= deviceInfo.Platform.ToString();
-            os.Version ??= deviceInfo.VersionString;
+            os.Version = deviceInfo.VersionString;
+
+#if WINDOWS
+            os.Name ??= "Windows";
+
+            using var key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion");
+            if (key?.GetValue("DisplayVersion") is string displayVersion)
+            {
+                os.Build = displayVersion;
+            }
+            else if (key?.GetValue("ReleaseId") is string releaseId)
+            {
+                os.Build = releaseId;
+            }
+#else
+            os.Name = deviceInfo.Platform.ToString();
+#endif
 
-            // TODO: fill in these
-            // os.Build ??= ?
-            // os.KernelVersion ??= ?
-            // os.Rooted ??= ?
         }
         catch (Exception ex)
         {

diff --git a/src/Sentry/SentryOptions.cs b/src/Sentry/SentryOptions.cs
@@ -1054,6 +1054,9 @@ public SentryOptions()
                 "Sentry",
                 "Microsoft",
                 "MS", // MS.Win32, MS.Internal, etc: Desktop apps
+                "ABI.Microsoft", // MAUI
+                "WinRT", // WinRT, UWP, WinUI
+                "UIKit", // iOS / MacCatalyst
                 "Newtonsoft.Json",
                 "FSharp",
                 "Serilog",