Merge branch 'fix/native-bridge-alloc' of https://github.com/getsentry/sentry-unity into fix/native-bridge-alloc

Author: bitsandfoxes

CHANGELOG.md

@@ -10,21 +10,26 @@
 
 - Fixed crashes when adding breadcrumbs on iOS/macOS. This was caused by invalid date parsing and corrupted string data in the native bridge responsible for scope sync ([#2327](https://github.com/getsentry/sentry-unity/pull/2327))
 - Fixed input handling in samples to work with old and new input system ([#2319](https://github.com/getsentry/sentry-unity/pull/2319))
+- The SDK now captures exceptions on WebGL through the logging integration instead of the incompatible log handler, providing better stack trace support . ([#2322](https://github.com/getsentry/sentry-unity/pull/2322))
+- Fixed input handling in samples to work with old and new input system. ([#2319](https://github.com/getsentry/sentry-unity/pull/2319))
 
 ### Dependencies
 
-- Bump Cocoa SDK from v8.55.1 to v8.56.0 ([#2318](https://github.com/getsentry/sentry-unity/pull/2318))
-  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8560)
-  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.55.1...8.56.0)
-- Bump Native SDK from v0.10.1 to v0.11.0 ([#2323](https://github.com/getsentry/sentry-unity/pull/2323))
-  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0110)
-  - [diff](https://github.com/getsentry/sentry-native/compare/0.10.1...0.11.0)
-- Bump CLI from v2.53.0 to v2.54.0 ([#2324](https://github.com/getsentry/sentry-unity/pull/2324))
-  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2540)
-  - [diff](https://github.com/getsentry/sentry-cli/compare/2.53.0...2.54.0)
+- Bump Cocoa SDK from v8.55.1 to v8.56.1 ([#2318](https://github.com/getsentry/sentry-unity/pull/2318), [#2331](https://github.com/getsentry/sentry-unity/pull/2331))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8561)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.55.1...8.56.1)
+- Bump Native SDK from v0.10.1 to v0.11.1 ([#2323](https://github.com/getsentry/sentry-unity/pull/2323), [#2332](https://github.com/getsentry/sentry-unity/pull/2332))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0111)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.10.1...0.11.1)
+- Bump CLI from v2.53.0 to v2.55.0 ([#2324](https://github.com/getsentry/sentry-unity/pull/2324), [#2330](https://github.com/getsentry/sentry-unity/pull/2330))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2550)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/2.53.0...2.55.0)
 - Bump .NET SDK from v5.15.0 to v5.15.1 ([#2326](https://github.com/getsentry/sentry-unity/pull/2326))
   - [changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md#5151)
   - [diff](https://github.com/getsentry/sentry-dotnet/compare/5.15.0...5.15.1)
+- Bump Java SDK from v8.21.1 to v8.22.0 ([#2328](https://github.com/getsentry/sentry-unity/pull/2328))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8220)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.21.1...8.22.0)
 
 ## 4.0.0-beta.2
 

modules/sentry-cli.properties

@@ -1,2 +1,2 @@
-version = 2.54.0
+version = 2.55.0
 repo = https://github.com/getsentry/sentry-cli

modules/sentry-cocoa.properties

@@ -1,2 +1,2 @@
-version = 8.56.0
+version = 8.56.1
 repo = https://github.com/getsentry/sentry-cocoa

modules/sentry-java

@@ -18,15 +18,21 @@ public void OnPreprocessBuild(BuildReport report)
             return;
         }
 
+        var (options, _) = SentryScriptableObject.ConfiguredBuildTimeOptions();
+        if (options?.Enabled is not true)
+        {
+            return;
+        }
+
         if (PlayerSettings.WebGL.exceptionSupport == WebGLExceptionSupport.None)
         {
             throw new BuildFailedException("WebGL exception support is set to None. The Sentry SDK requires exception " +
                 "support to function properly. Please change the WebGL exception support setting in Player Settings " +
                 "or disable the Sentry SDK.");
         }
-        else if (PlayerSettings.WebGL.exceptionSupport != WebGLExceptionSupport.FullWithStacktrace)
+
+        if (PlayerSettings.WebGL.exceptionSupport != WebGLExceptionSupport.FullWithStacktrace)
         {
-            var (options, _) = SentryScriptableObject.ConfiguredBuildTimeOptions();
             var logger = options?.DiagnosticLogger ?? new UnityLogger(options ?? new SentryUnityOptions());
 
             logger.LogWarning("The SDK requires the Exception Support to be set " +

modules/sentry-native

@@ -1,20 +1,24 @@
+using Sentry.Extensibility;
 using Sentry.Integrations;
+using Sentry.Protocol;
 using UnityEngine;
 
 namespace Sentry.Unity.Integrations;
 
 internal class UnityApplicationLoggingIntegration : ISdkIntegration
 {
     private readonly IApplication _application;
+    private readonly bool _captureExceptions;
     private ErrorTimeDebounce? _errorTimeDebounce;
     private LogTimeDebounce? _logTimeDebounce;
     private WarningTimeDebounce? _warningTimeDebounce;
 
     private IHub? _hub;
     private SentryUnityOptions? _options;
 
-    internal UnityApplicationLoggingIntegration(IApplication? application = null)
+    internal UnityApplicationLoggingIntegration(bool captureExceptions = false, IApplication? application = null)
     {
+        _captureExceptions = captureExceptions;
         _application = application ?? ApplicationAdapter.Instance;
     }
 
@@ -49,7 +53,8 @@ internal void OnLogMessageReceived(string message, string stacktrace, LogType lo
         }
 
         // LogType.Exception are getting handled by the UnityLogHandlerIntegration
-        if (logType is LogType.Exception)
+        // Unless we're configured to handle them - i.e. WebGL
+        if (logType is LogType.Exception && !_captureExceptions)
         {
             return;
         }
@@ -58,6 +63,7 @@ internal void OnLogMessageReceived(string message, string stacktrace, LogType lo
         {
             var debounced = logType switch
             {
+                LogType.Exception => _errorTimeDebounce?.Debounced(),
                 LogType.Error or LogType.Assert => _errorTimeDebounce?.Debounced(),
                 LogType.Log => _logTimeDebounce?.Debounced(),
                 LogType.Warning => _warningTimeDebounce?.Debounced(),
@@ -70,14 +76,19 @@ internal void OnLogMessageReceived(string message, string stacktrace, LogType lo
             }
         }
 
-        if (logType is LogType.Error && _options?.CaptureLogErrorEvents is true)
+        if (logType is LogType.Exception)
+        {
+            var ule = new UnityErrorLogException(message, stacktrace, _options);
+            _hub.CaptureException(ule);
+        }
+        else if (logType is LogType.Error && _options?.CaptureLogErrorEvents is true)
         {
             if (_options?.AttachStacktrace is true && !string.IsNullOrEmpty(stacktrace))
             {
                 var ule = new UnityErrorLogException(message, stacktrace, _options);
-                var evt = new SentryEvent(ule) { Level = SentryLevel.Error };
+                var sentryEvent = new SentryEvent(ule) { Level = SentryLevel.Error };
 
-                _hub.CaptureEvent(evt);
+                _hub.CaptureEvent(sentryEvent);
             }
             else
             {

src/Sentry.Unity.Editor/WebGL/BuildPreProcess.cs

@@ -333,8 +333,13 @@ internal SentryUnityOptions(IApplication? application = null,
         AddTransactionProcessor(processor);
         AddExceptionProcessor(new UnityExceptionProcessor());
 
-        AddIntegration(new UnityLogHandlerIntegration(this));
-        AddIntegration(new UnityApplicationLoggingIntegration());
+        // UnityLogHandlerIntegration is not compatible with WebGL, so it's added conditionally
+        if (application.Platform != RuntimePlatform.WebGLPlayer)
+        {
+            AddIntegration(new UnityLogHandlerIntegration(this));
+            AddIntegration(new UnityApplicationLoggingIntegration());
+        }
+
         AddIntegration(new StartupTracingIntegration());
         AddIntegration(new AnrIntegration(behaviour));
         AddIntegration(new UnityScopeIntegration(application, unityInfo));

src/Sentry.Unity/Integrations/UnityApplicationLoggingIntegration.cs

@@ -94,8 +94,17 @@ public SentrySdk.CrashedLastRun CrashedLastRun()
     {
         if (_options.CrashedLastRun is null)
         {
-            _options.DiagnosticLogger?.LogDebug("The SDK does not have a 'CrashedLastRun' set. " +
-                                                "This might be due to a missing or disabled native integration.");
+            if (ApplicationAdapter.Instance.Platform == RuntimePlatform.WebGLPlayer)
+            {
+                _options.DiagnosticLogger?.LogDebug("Currently, the Sentry SDK for Unity provides no native support for WebGL." +
+                                                    "LastRunState is `Unknown`.");
+            }
+            else
+            {
+                _options.DiagnosticLogger?.LogDebug("The SDK does not have a 'CrashedLastRun' set. " +
+                                                    "This might be due to a missing or disabled native integration.");
+            }
+
             return SentrySdk.CrashedLastRun.Unknown;
         }
 

src/Sentry.Unity/SentryUnityOptions.cs

@@ -1,4 +1,5 @@
 using Sentry.Extensibility;
+using Sentry.Unity.Integrations;
 using UnityEngine.Analytics;
 
 namespace Sentry.Unity.WebGL;
@@ -16,6 +17,9 @@ public static void Configure(SentryUnityOptions options)
     {
         options.DiagnosticLogger?.LogDebug("Updating configuration for Unity WebGL.");
 
+        // Due to special exception handling on WebGL we capture these through `LogMessageReceived` too
+        options.AddIntegration(new UnityApplicationLoggingIntegration(captureExceptions: true));
+
         // Note: we need to use a custom background worker which actually doesn't work in the background
         // because Unity doesn't support async (multithreading) yet. This may change in the future so let's watch
         // https://docs.unity3d.com/2019.4/Documentation/ScriptReference/PlayerSettings.WebGL-threadsSupport.html
@@ -26,16 +30,23 @@ public static void Configure(SentryUnityOptions options)
         //    "An abnormal situation has occurred: the PlayerLoop internal function has been called recursively.
         //     Please contact Customer Support with a sample project so that we can reproduce the problem and troubleshoot it."
         // Maybe we could write a file when this error occurs and recognize it on the next start. Like unity-native.
-        options.CrashedLastRun = () => false;
+        options.CrashedLastRun = null;
 
         // Disable async when accessing files (e.g. FileStream(useAsync: true)) because it throws on WebGL.
         options.UseAsyncFileIO = false;
 
         if (options.AttachScreenshot)
         {
             options.AttachScreenshot = false;
-            options.DiagnosticLogger?.LogWarning("Attaching screenshots on WebGL is disabled - " +
-                                                 "it currently produces blank screenshots mid-frame.");
+            options.DiagnosticLogger?.LogWarning("Attaching screenshots is unsupported on WebGL - disabling. " +
+                                                 "Currently, it produces blank screenshots mid-frame.");
+        }
+
+        // On WebGL, the IL2CPP backend does not provide the API required to make the IL2CPP Event Processor work
+        if (options.Il2CppLineNumberSupportEnabled)
+        {
+            options.Il2CppLineNumberSupportEnabled = false;
+            options.DiagnosticLogger?.LogWarning("IL2CPP line number support is unsupported on WebGL - disabling.");
         }
 
         // Use AnalyticsSessionInfo.userId as the default UserID