From 53758501429f1028fb292e83cc736799e3b77f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= Date: Thu, 15 Dec 2022 21:46:33 +0100 Subject: [PATCH] Update logging parameters --- CommonHelpers/Instance.cs | 12 ++++++++++++ CommonHelpers/Log.cs | 9 +++++---- Updater/Program.cs | 5 +++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/CommonHelpers/Instance.cs b/CommonHelpers/Instance.cs index 63372a2..700601e 100644 --- a/CommonHelpers/Instance.cs +++ b/CommonHelpers/Instance.cs @@ -46,6 +46,18 @@ namespace CommonHelpers } } + public static bool IsProductionBuild + { + get + { +#if PRODUCTION_BUILD + return true; +#else + return false; +#endif + } + } + public static void OnUninstall(Action action) { if (Uninstall) diff --git a/CommonHelpers/Log.cs b/CommonHelpers/Log.cs index 022d562..0867b1e 100644 --- a/CommonHelpers/Log.cs +++ b/CommonHelpers/Log.cs @@ -20,17 +20,18 @@ namespace CommonHelpers internal static void SentryOptions(Sentry.SentryOptions o) { + var env = Instance.IsProductionBuild ? "prod" : "dev"; var build = Instance.IsDEBUG ? "debug" : "release"; - var type = File.Exists("Uninstaller.exe") ? "setup" : "zip"; + var deploy = File.Exists("Uninstaller.exe") ? "setup" : "zip"; o.Dsn = Log.SENTRY_DSN; o.TracesSampleRate = 1.0; o.IsGlobalModeEnabled = true; - o.Environment = String.Format("{0}:{1}_{2}", Instance.ApplicationName, build, type); + o.Environment = String.Format("{0}:{1}_{2}", Instance.ApplicationName, build, deploy); o.DefaultTags.Add("App", Instance.ApplicationName); o.DefaultTags.Add("MachineID", Instance.MachineID); - o.DefaultTags.Add("Build", type); - o.DefaultTags.Add("Configuration", build); + o.DefaultTags.Add("Build", build); + o.DefaultTags.Add("Deploy", deploy); var releaseVersion = typeof(Log).Assembly.GetCustomAttributes().FirstOrDefault(); if (releaseVersion is not null) diff --git a/Updater/Program.cs b/Updater/Program.cs index 0e98249..72a5d72 100644 --- a/Updater/Program.cs +++ b/Updater/Program.cs @@ -86,11 +86,12 @@ namespace Updater TrackProcess("SteamController"); var updateURL = String.Format( - "https://steam-deck-tools.ayufan.dev/docs/updates/{0}_{1}.xml?version={2}&machineID={3}", + "https://steam-deck-tools.ayufan.dev/docs/updates/{0}_{1}.xml?version={2}&machineID={3}&env={4}", Instance.IsDEBUG ? "debug" : "release", IsUsingInstaller ? "setup" : "zip", HttpUtility.UrlEncode(Instance.ProductVersion), - HttpUtility.UrlEncode(Instance.MachineID) + HttpUtility.UrlEncode(Instance.MachineID), + Instance.IsProductionBuild ? "prod" : "dev" ); AutoUpdater.Start(updateURL);