Merge pull request ppy#18216 from peppy/sentry-build-suffix

Remove build suffix from version when reporting to sentry
Lawtrohux · May 11, 2022 · 396be1b · 396be1b
2 parents c61d0ff + 533f4b2
commit 396be1b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
@@ -86,6 +86,8 @@ public partial class OsuGameBase : Framework.Game, ICanAcceptFiles
 
         public bool IsDeployedBuild => AssemblyVersion.Major > 0;
 
+        internal const string BUILD_SUFFIX = "lazer";
+
         public virtual string Version
         {
             get
@@ -94,7 +96,7 @@ public virtual string Version
                     return @"local " + (DebugUtils.IsDebugBuild ? @"debug" : @"release");
 
                 var version = AssemblyVersion;
-                return $@"{version.Major}.{version.Minor}.{version.Build}-lazer";
+                return $@"{version.Major}.{version.Minor}.{version.Build}-{BUILD_SUFFIX}";
             }
         }
 

diff --git a/osu.Game/Utils/SentryLogger.cs b/osu.Game/Utils/SentryLogger.cs
@@ -34,7 +34,9 @@ public SentryLogger(OsuGame game)
 
                 options.AutoSessionTracking = true;
                 options.IsEnvironmentUser = false;
-                options.Release = game.Version;
+                // The reported release needs to match release tags on github in order for sentry
+                // to automatically associate and track against releases.
+                options.Release = game.Version.Replace($@"-{OsuGameBase.BUILD_SUFFIX}", string.Empty);
             });
 
             Logger.NewEntry += processLogEntry;