Attach user to sentry later in startup flow

Lawtrohux · May 10, 2022 · 3338bff · 3338bff
1 parent a5b454e
commit 3338bff
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
@@ -258,6 +258,8 @@ private void load()
         {
             dependencies.CacheAs(this);
 
+            SentryLogger.AttachUser(API.LocalUser);
+
             dependencies.Cache(osuLogo = new OsuLogo { Alpha = 0 });
 
             // bind config int to database RulesetInfo

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
@@ -125,7 +125,7 @@ public virtual string Version
 
         protected MusicController MusicController { get; private set; }
 
-        protected internal IAPIProvider API { get; protected set; }
+        protected IAPIProvider API { get; set; }
 
         protected Storage Storage { get; set; }
 

diff --git a/osu.Game/Utils/SentryLogger.cs b/osu.Game/Utils/SentryLogger.cs
@@ -1,10 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable enable
+
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Net;
-using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Online.API.Requests.Responses;
@@ -19,10 +21,9 @@ public class SentryLogger : IDisposable
     {
         private SentryClient sentry;
         private Scope sentryScope;
-        private Exception lastException;
+        private Exception? lastException;
 
-        [UsedImplicitly]
-        private readonly IBindable<APIUser> localUser;
+        private IBindable<APIUser>? localUser;
 
         public SentryLogger(OsuGame game)
         {
@@ -40,16 +41,21 @@ public SentryLogger(OsuGame game)
             sentryScope = new Scope(options);
 
             Logger.NewEntry += processLogEntry;
+        }
+
+        public void AttachUser(IBindable<APIUser> user)
+        {
+            Debug.Assert(localUser == null);
 
-            localUser = game.API.LocalUser.GetBoundCopy();
-            localUser.BindValueChanged(user =>
+            localUser = user.GetBoundCopy();
+            localUser.BindValueChanged(u =>
             {
                 sentryScope.User = new User
                 {
-                    Username = user.NewValue.Username,
-                    Id = user.NewValue.Id.ToString(),
+                    Username = u.NewValue.Username,
+                    Id = u.NewValue.Id.ToString(),
                 };
-            });
+            }, true);
         }
 
         private void processLogEntry(LogEntry entry)
@@ -137,8 +143,6 @@ public void Dispose()
         protected virtual void Dispose(bool isDisposing)
         {
             Logger.NewEntry -= processLogEntry;
-            sentry = null;
-            sentryScope = null;
         }
 
         #endregion