From 64cc6ebddbb090edc7a39bb83415b68dc7f25ece Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 May 2022 14:12:31 +0900
Subject: [PATCH] Add local user tracking to sentry reporting

---
 osu.Game/OsuGameBase.cs        |  2 +-
 osu.Game/Utils/SentryLogger.cs | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 324fcada89..3f0610e9aa 100644
--- 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 IAPIProvider API { get; set; }
+        protected internal IAPIProvider API { get; protected set; }
 
         protected Storage Storage { get; set; }
 
diff --git a/osu.Game/Utils/SentryLogger.cs b/osu.Game/Utils/SentryLogger.cs
index c39d718d62..5cecc4d776 100644
--- a/osu.Game/Utils/SentryLogger.cs
+++ b/osu.Game/Utils/SentryLogger.cs
@@ -4,7 +4,10 @@
 using System;
 using System.IO;
 using System.Net;
+using JetBrains.Annotations;
+using osu.Framework.Bindables;
 using osu.Framework.Logging;
+using osu.Game.Online.API.Requests.Responses;
 using Sentry;
 
 namespace osu.Game.Utils
@@ -18,6 +21,9 @@ public class SentryLogger : IDisposable
         private Scope sentryScope;
         private Exception lastException;
 
+        [UsedImplicitly]
+        private readonly IBindable<APIUser> localUser;
+
         public SentryLogger(OsuGame game)
         {
             if (!game.IsDeployedBuild) return;
@@ -34,6 +40,16 @@ public SentryLogger(OsuGame game)
             sentryScope = new Scope(options);
 
             Logger.NewEntry += processLogEntry;
+
+            localUser = game.API.LocalUser.GetBoundCopy();
+            localUser.BindValueChanged(user =>
+            {
+                sentryScope.User = new User
+                {
+                    Username = user.NewValue.Username,
+                    Id = user.NewValue.Id.ToString(),
+                };
+            });
         }
 
         private void processLogEntry(LogEntry entry)
@@ -50,6 +66,7 @@ private void processLogEntry(LogEntry entry)
                 if (lastException != null && lastException.Message == exception.Message && exception.StackTrace.StartsWith(lastException.StackTrace, StringComparison.Ordinal)) return;
 
                 lastException = exception;
+
                 sentry.CaptureEvent(new SentryEvent(exception)
                 {
                     Message = entry.Message,