feat: Session restarts

src/Sentry.Unity.Android/BreadcrumbExtensions.cs

@@ -17,7 +17,7 @@ public static AndroidJavaObject ToJavaSentryLevel(this BreadcrumbLevel level)
         using var javaSentryLevel = new AndroidJavaClass("io.sentry.SentryLevel");
         return level switch
         {
-            BreadcrumbLevel.Critical => javaSentryLevel.GetStatic<AndroidJavaObject>("FATAL"),
+            BreadcrumbLevel.Fatal => javaSentryLevel.GetStatic<AndroidJavaObject>("FATAL"),
             BreadcrumbLevel.Error => javaSentryLevel.GetStatic<AndroidJavaObject>("ERROR"),
             BreadcrumbLevel.Warning => javaSentryLevel.GetStatic<AndroidJavaObject>("WARNING"),
             BreadcrumbLevel.Debug => javaSentryLevel.GetStatic<AndroidJavaObject>("DEBUG"),

src/Sentry.Unity.iOS/NativeScopeObserver.cs

@@ -42,7 +42,7 @@ internal static int GetBreadcrumbLevel(BreadcrumbLevel breadcrumbLevel) =>
             BreadcrumbLevel.Info => 2,
             BreadcrumbLevel.Warning => 3,
             BreadcrumbLevel.Error => 4,
-            BreadcrumbLevel.Critical => 5,
+            BreadcrumbLevel.Fatal => 5,
             _ => 0
         };
 }

src/Sentry.Unity/Integrations/LifeCycleIntegration.cs

@@ -0,0 +1,52 @@
+using Sentry.Extensibility;
+using Sentry.Integrations;
+
+namespace Sentry.Unity.Integrations;
+
+internal class LifeCycleIntegration : ISdkIntegration
+{
+    private readonly SentryMonoBehaviour _sentryMonoBehaviour;
+    private readonly IApplication _application;
+
+    public LifeCycleIntegration(SentryMonoBehaviour sentryMonoBehaviour, IApplication? application = null)
+    {
+        _sentryMonoBehaviour = sentryMonoBehaviour;
+        _application = application ?? ApplicationAdapter.Instance;
+    }
+
+    public void Register(IHub hub, SentryOptions options)
+    {
+        if (!options.AutoSessionTracking)
+        {
+            return;
+        }
+
+        _sentryMonoBehaviour.ApplicationResuming += () =>
+        {
+            if (hub.IsSessionActive)
+            {
+                options.DiagnosticLogger?.LogDebug("Resuming session.");
+                hub.ResumeSession();
+            }
+            else
+            {
+                options.DiagnosticLogger?.LogDebug("No active session to resume found. Starting a new session.");
+                hub.StartSession();
+            }
+        };
+        _sentryMonoBehaviour.ApplicationPausing += () =>
+        {
+            if (hub.IsSessionActive)
+            {
+                options.DiagnosticLogger?.LogDebug("Pausing session.");
+                hub.PauseSession();
+            }
+            // else
+            // {
+            //     // The SDK captured an unhandled exception and automatically ended the session
+            // }
+        };
+
+        _application.Quitting += () => hub.EndSession();
+    }
+}

src/Sentry.Unity/Integrations/UnityErrorLogException.cs

@@ -54,7 +54,9 @@ public SentryException ToSentryException()
                 Mechanism = new Mechanism
                 {
                     Handled = true,
-                    Type = "unity.log"
+                    Type = "Debug.LogError",
+                    Synthetic = true,
+                    Data = { {Mechanism.TerminalKey, false} }
                 }
             };
         }

src/Sentry.Unity/Integrations/UnityLogHandlerIntegration.cs

@@ -72,8 +72,7 @@ internal void CaptureException(Exception exception, UnityEngine.Object? context)
         // NOTE: This might not be entirely true, as a user could as well call `Debug.LogException`
         // and expect a handled exception but it is not possible for us to differentiate
         // https://docs.sentry.io/platforms/unity/troubleshooting/#unhandled-exceptions---debuglogexception
-        exception.Data[Mechanism.HandledKey] = false;
-        exception.Data[Mechanism.MechanismKey] = "Unity.LogException";
+        exception.SetSentryMechanism("Unity.LogException", handled: false, terminal: false);
         _ = _hub.CaptureException(exception);
     }
 
@@ -97,9 +96,9 @@ private void OnQuitting()
         // 'OnQuitting' is invoked even when an uncaught exception happens in the ART. To make sure the .NET
         // SDK checks with the native layer on restart if the previous run crashed (through the CrashedLastRun callback)
         // we'll just pause sessions on shutdown. On restart they can be closed with the right timestamp and as 'exited'.
-        if (_sentryOptions?.AutoSessionTracking is true)
+        if (_sentryOptions?.AutoSessionTracking is true && _hub?.IsSessionActive is true)
         {
-            _hub?.PauseSession();
+            _hub.PauseSession();
         }
         _hub?.FlushAsync(_sentryOptions?.ShutdownTimeout ?? TimeSpan.FromSeconds(1)).GetAwaiter().GetResult();
     }

src/Sentry.Unity/SentrySdk.Dotnet.cs

@@ -324,27 +324,6 @@ public static void CaptureFeedback(string message, string? contactEmail = null,
         => Sentry.SentrySdk.CaptureFeedback(new SentryFeedback(message, contactEmail, name, replayId, url, associatedEventId),
             scope, hint);
 
-    /// <summary>
-    /// Captures a user feedback.
-    /// </summary>
-    /// <param name="userFeedback">The user feedback to send to Sentry.</param>
-    [DebuggerStepThrough]
-    [Obsolete("Use CaptureFeedback instead.")]
-    public static void CaptureUserFeedback(UserFeedback userFeedback)
-        => Sentry.SentrySdk.CaptureUserFeedback(userFeedback);
-
-    /// <summary>
-    /// Captures a user feedback.
-    /// </summary>
-    /// <param name="eventId">The event Id.</param>
-    /// <param name="email">The user email.</param>
-    /// <param name="comments">The user comments.</param>
-    /// <param name="name">The optional username.</param>
-    [DebuggerStepThrough]
-    [Obsolete("Use CaptureFeedback instead.")]
-    public static void CaptureUserFeedback(SentryId eventId, string email, string comments, string? name = null)
-        => Sentry.SentrySdk.CaptureUserFeedback(new UserFeedback(eventId, name, email, comments));
-
     /// <summary>
     /// Captures a transaction.
     /// </summary>
@@ -531,6 +510,9 @@ public static void PauseSession()
     public static void ResumeSession()
         => Sentry.SentrySdk.ResumeSession();
 
+    /// <inheritdoc cref="IHub.IsSessionActive"/>
+    public static bool IsSessionActive { [DebuggerStepThrough] get => Sentry.SentrySdk.IsSessionActive; }
+
     /// <summary>
     /// Deliberately crashes an application, which is useful for testing and demonstration purposes.
     /// </summary>

src/Sentry.Unity/SentryUnityOptions.cs

@@ -348,7 +348,7 @@ internal SentryUnityOptions(IApplication? application = null,
         AddIntegration(new UnityBeforeSceneLoadIntegration());
         AddIntegration(new SceneManagerIntegration());
         AddIntegration(new SceneManagerTracingIntegration());
-        AddIntegration(new SessionIntegration(behaviour));
+        AddIntegration(new LifeCycleIntegration(behaviour));
         AddIntegration(new TraceGenerationIntegration(behaviour));
 
         AddExceptionFilter(new UnityBadGatewayExceptionFilter());

test/Sentry.Unity.Tests/SessionIntegrationTests.cs → test/Sentry.Unity.Tests/LifeCycleIntegrationTests.cs

@@ -6,7 +6,7 @@
 
 namespace Sentry.Unity.Tests;
 
-public class SessionIntegrationTests
+public class LifeCycleIntegrationTests
 {
     [UnityTest]
     public IEnumerator SessionIntegration_Init_SentryMonoBehaviourCreated()

test/Sentry.Unity.Tests/Stubs/TestHub.cs

@@ -36,12 +36,6 @@ public void CaptureFeedback(SentryFeedback feedback, Scope? scope = null, Sentry
         throw new NotImplementedException();
     }
 
-    [Obsolete("Obsolete")]
-    public void CaptureUserFeedback(UserFeedback userFeedback)
-    {
-        throw new NotImplementedException();
-    }
-
     public void CaptureTransaction(SentryTransaction transaction) =>
         _capturedTransactions.Add(transaction);
 
@@ -181,6 +175,8 @@ public void EndSession(SessionEndStatus status = SessionEndStatus.Exited)
         // TODO: test sessions
     }
 
+    public bool IsSessionActive { get; }
+
     public SentryId CaptureEvent(SentryEvent evt, Action<Scope> configureScope)
     {
         throw new NotImplementedException();

test/Sentry.Unity.iOS.Tests/NativeScopeObserverTests.cs

@@ -22,7 +22,7 @@ public void GetTimestamp_ReturnStringConformsToISO8601()
     [TestCase(BreadcrumbLevel.Info, 2)]
     [TestCase(BreadcrumbLevel.Warning, 3)]
     [TestCase(BreadcrumbLevel.Error, 4)]
-    [TestCase(BreadcrumbLevel.Critical, 5)]
+    [TestCase(BreadcrumbLevel.Fatal, 5)]
     public void GetBreadcrumbLevel_TestCases(BreadcrumbLevel level, int expectedNativeLevel)
     {
         var actualLevel = NativeScopeObserver.GetBreadcrumbLevel(level);