Make sure we always call UsageTracker off the main thread

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -47,7 +47,7 @@ protected void Initialize()
             ApplicationConfiguration.WebTimeout = UserSettings.Get(Constants.WebTimeoutKey, ApplicationConfiguration.WebTimeout);
             Platform.Initialize(ProcessManager, TaskManager);
             progress.OnProgress += progressReporter.UpdateProgress;
-            UsageTracker = new UsageTracker(UserSettings, Environment, InstanceId.ToString());
+            UsageTracker = new UsageTracker(TaskManager, UserSettings, Environment, InstanceId.ToString());
 
 #if ENABLE_METRICS
             var metricsService = new MetricsService(ProcessManager,
@@ -64,12 +64,16 @@ public void Run()
             isBusy = true;
             progress.UpdateProgress(0, 100, "Initializing...");
 
+            if (firstRun)
+            {
+                UsageTracker.IncrementNumberOfStartups();
+            }
+
             var thread = new Thread(() =>
             {
                 GitInstallationState state = new GitInstallationState();
                 try
                 {
-                    SetupMetrics();
                     if (Environment.IsMac)
                     {
                         var getEnvPath = new SimpleProcessTask(TaskManager.Token, "bash".ToNPath(), "-c \"/usr/libexec/path_helper\"")
@@ -256,7 +260,6 @@ public void InitializeRepository()
                     GitClient.Commit("Initial commit", null).RunWithReturn(true);
                     progress.UpdateProgress(70, 100, "Initializing...");
                     Environment.InitializeRepository();
-                    UsageTracker.IncrementProjectsInitialized();
                 }
                 catch (Exception ex)
                 {
@@ -270,6 +273,7 @@ public void InitializeRepository()
                     progress.UpdateProgress(90, 100, "Initializing...");
                     RestartRepository();
                     TaskManager.RunInUI(InitializeUI);
+                    UsageTracker.IncrementProjectsInitialized();
                     progress.UpdateProgress(100, 100, "Initialized");
                 }
                 isBusy = false;
@@ -342,14 +346,6 @@ public void RestartRepository()
             Logger.Trace($"Got a repository? {(Environment.Repository != null ? Environment.Repository.LocalPath : "null")}");
         }
 
-        protected void SetupMetrics()
-        {
-            if (firstRun)
-            {
-                UsageTracker.IncrementNumberOfStartups();
-            }
-        }
-
         protected abstract void InitializeUI();
         protected abstract void InitializationComplete();
 

src/GitHub.Api/Metrics/UsageTracker.cs

@@ -6,7 +6,7 @@
 
 namespace GitHub.Unity
 {
-    class UsageTracker : IUsageTracker
+    class UsageTrackerSync : IUsageTracker
     {
         private static ILogging Logger { get; } = LogHelper.GetLogger<UsageTracker>();
 
@@ -22,16 +22,7 @@ class UsageTracker : IUsageTracker
 
         public IMetricsService MetricsService { get; set; }
 
-        public UsageTracker(ISettings userSettings,
-            IEnvironment environment, string instanceId)
-                : this(userSettings, 
-                    new UsageLoader(environment.UserCachePath.Combine(Constants.UsageFile)),
-                    environment.UnityVersion, instanceId)
-        {
-        }
-
-        public UsageTracker(ISettings userSettings,
-            IUsageLoader usageLoader,
+        public UsageTrackerSync(ISettings userSettings, IUsageLoader usageLoader,
             string unityVersion, string instanceId)
         {
             this.userSettings = userSettings;
@@ -123,7 +114,7 @@ private void SendUsage()
             }
         }
 
-        public void IncrementNumberOfStartups()
+        public virtual void IncrementNumberOfStartups()
         {
             lock (_lock)
             {
@@ -134,7 +125,7 @@ public void IncrementNumberOfStartups()
             }
         }
 
-        public void IncrementProjectsInitialized()
+        public virtual void IncrementProjectsInitialized()
         {
             lock (_lock)
             {
@@ -145,7 +136,7 @@ public void IncrementProjectsInitialized()
             }
         }
 
-        public void IncrementChangesViewButtonCommit()
+        public virtual void IncrementChangesViewButtonCommit()
         {
             lock (_lock)
             {
@@ -156,7 +147,7 @@ public void IncrementChangesViewButtonCommit()
             }
         }
 
-        public void IncrementHistoryViewToolbarFetch()
+        public virtual void IncrementHistoryViewToolbarFetch()
         {
             lock (_lock)
             {
@@ -167,7 +158,7 @@ public void IncrementHistoryViewToolbarFetch()
             }
         }
 
-        public void IncrementHistoryViewToolbarPush()
+        public virtual void IncrementHistoryViewToolbarPush()
         {
             lock (_lock)
             {
@@ -178,7 +169,7 @@ public void IncrementHistoryViewToolbarPush()
             }
         }
 
-        public void IncrementHistoryViewToolbarPull()
+        public virtual void IncrementHistoryViewToolbarPull()
         {
             lock (_lock)
             {
@@ -189,7 +180,7 @@ public void IncrementHistoryViewToolbarPull()
             }
         }
 
-        public void IncrementBranchesViewButtonCreateBranch()
+        public virtual void IncrementBranchesViewButtonCreateBranch()
         {
             lock (_lock)
             {
@@ -200,7 +191,7 @@ public void IncrementBranchesViewButtonCreateBranch()
             }
         }
 
-        public void IncrementBranchesViewButtonDeleteBranch()
+        public virtual void IncrementBranchesViewButtonDeleteBranch()
         {
             lock (_lock)
             {
@@ -211,7 +202,7 @@ public void IncrementBranchesViewButtonDeleteBranch()
             }
         }
 
-        public void IncrementBranchesViewButtonCheckoutLocalBranch()
+        public virtual void IncrementBranchesViewButtonCheckoutLocalBranch()
         {
             lock (_lock)
             {
@@ -222,7 +213,7 @@ public void IncrementBranchesViewButtonCheckoutLocalBranch()
             }
         }
 
-        public void IncrementBranchesViewButtonCheckoutRemoteBranch()
+        public virtual void IncrementBranchesViewButtonCheckoutRemoteBranch()
         {
             lock (_lock)
             {
@@ -233,7 +224,7 @@ public void IncrementBranchesViewButtonCheckoutRemoteBranch()
             }
         }
 
-        public void IncrementSettingsViewButtonLfsUnlock()
+        public virtual void IncrementSettingsViewButtonLfsUnlock()
         {
             lock (_lock)
             {
@@ -244,7 +235,7 @@ public void IncrementSettingsViewButtonLfsUnlock()
             }
         }
 
-        public void IncrementAuthenticationViewButtonAuthentication()
+        public virtual void IncrementAuthenticationViewButtonAuthentication()
         {
             lock (_lock)
             {
@@ -255,7 +246,7 @@ public void IncrementAuthenticationViewButtonAuthentication()
             }
         }
 
-        public void IncrementUnityProjectViewContextLfsLock()
+        public virtual void IncrementUnityProjectViewContextLfsLock()
         {
             lock (_lock)
             {
@@ -266,7 +257,7 @@ public void IncrementUnityProjectViewContextLfsLock()
             }
         }
 
-        public void IncrementUnityProjectViewContextLfsUnlock()
+        public virtual void IncrementUnityProjectViewContextLfsUnlock()
         {
             lock (_lock)
             {
@@ -277,7 +268,7 @@ public void IncrementUnityProjectViewContextLfsUnlock()
             }
         }
 
-        public void IncrementPublishViewButtonPublish()
+        public virtual void IncrementPublishViewButtonPublish()
         {
             lock (_lock)
             {
@@ -288,7 +279,7 @@ public void IncrementPublishViewButtonPublish()
             }
         }
 
-        public void IncrementApplicationMenuMenuItemCommandLine()
+        public virtual void IncrementApplicationMenuMenuItemCommandLine()
         {
             lock (_lock)
             {
@@ -299,18 +290,24 @@ public void IncrementApplicationMenuMenuItemCommandLine()
             }
         }
 
-        public void UpdateRepoSize(int kilobytes)
+        public virtual void UpdateRepoSize(int kilobytes)
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId).GitRepoSize = kilobytes;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId).GitRepoSize = kilobytes;
+                usageLoader.Save(usage);
+            }
         }
 
-        public void UpdateLfsDiskUsage(int kilobytes)
+        public virtual void UpdateLfsDiskUsage(int kilobytes)
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId).LfsDiskUsage = kilobytes;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId).LfsDiskUsage = kilobytes;
+                usageLoader.Save(usage);
+            }
         }
 
         public bool Enabled
@@ -337,6 +334,39 @@ public bool Enabled
         }
     }
 
+    class UsageTracker : UsageTrackerSync
+    {
+        public UsageTracker(ITaskManager taskManager, ISettings userSettings,
+            IEnvironment environment, string instanceId)
+            : base(userSettings,
+                   new UsageLoader(environment.UserCachePath.Combine(Constants.UsageFile)),
+                   environment.UnityVersion, instanceId)
+        {
+            TaskManager = taskManager;
+        }
+
+        public override void IncrementApplicationMenuMenuItemCommandLine() => TaskManager.Run(base.IncrementApplicationMenuMenuItemCommandLine);
+        public override void IncrementAuthenticationViewButtonAuthentication() => TaskManager.Run(base.IncrementAuthenticationViewButtonAuthentication);
+        public override void IncrementBranchesViewButtonCheckoutLocalBranch() => TaskManager.Run(base.IncrementBranchesViewButtonCheckoutLocalBranch);
+        public override void IncrementBranchesViewButtonCheckoutRemoteBranch() => TaskManager.Run(base.IncrementBranchesViewButtonCheckoutRemoteBranch);
+        public override void IncrementBranchesViewButtonCreateBranch() => TaskManager.Run(base.IncrementBranchesViewButtonCreateBranch);
+        public override void IncrementBranchesViewButtonDeleteBranch() => TaskManager.Run(base.IncrementBranchesViewButtonDeleteBranch);
+        public override void IncrementChangesViewButtonCommit() => TaskManager.Run(base.IncrementChangesViewButtonCommit);
+        public override void IncrementHistoryViewToolbarFetch() => TaskManager.Run(base.IncrementHistoryViewToolbarFetch);
+        public override void IncrementHistoryViewToolbarPull() => TaskManager.Run(base.IncrementHistoryViewToolbarPull);
+        public override void IncrementHistoryViewToolbarPush() => TaskManager.Run(base.IncrementHistoryViewToolbarPush);
+        public override void IncrementNumberOfStartups() => TaskManager.Run(base.IncrementNumberOfStartups);
+        public override void IncrementProjectsInitialized() => TaskManager.Run(base.IncrementProjectsInitialized);
+        public override void IncrementPublishViewButtonPublish() => TaskManager.Run(base.IncrementPublishViewButtonPublish);
+        public override void IncrementSettingsViewButtonLfsUnlock() => TaskManager.Run(base.IncrementSettingsViewButtonLfsUnlock);
+        public override void IncrementUnityProjectViewContextLfsLock() => TaskManager.Run(base.IncrementUnityProjectViewContextLfsLock);
+        public override void IncrementUnityProjectViewContextLfsUnlock() => TaskManager.Run(base.IncrementUnityProjectViewContextLfsUnlock);
+        public override void UpdateLfsDiskUsage(int kilobytes) => TaskManager.Run(() => base.UpdateLfsDiskUsage(kilobytes));
+        public override void UpdateRepoSize(int kilobytes) => TaskManager.Run(() => base.UpdateRepoSize(kilobytes));
+
+        protected ITaskManager TaskManager { get; }
+    }
+
     interface IUsageLoader
     {
         UsageStore Load(string userId);

src/GitHub.Api/Tasks/ITaskManager.cs

@@ -13,8 +13,8 @@ public interface ITaskManager : IDisposable
 
         T Schedule<T>(T task) where T : ITask;
         Task Wait();
-        ITask Run(Action action, string message);
+        ITask Run(Action action, string message = null);
         ITask RunInUI(Action action);
         event Action<IProgress> OnProgress;
     }
-}
+}

src/GitHub.Api/Tasks/TaskManager.cs

@@ -58,7 +58,7 @@ public static TaskScheduler GetScheduler(TaskAffinity affinity)
             }
         }
 
-        public ITask Run(Action action, string message)
+        public ITask Run(Action action, string message = null)
         {
             return new ActionTask(Token, action) { Message = message }.Start();
         }
@@ -167,4 +167,4 @@ public void Dispose()
             Dispose(true);
         }
     }
-}
+}

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/AuthenticationView.cs

@@ -209,7 +209,7 @@ private void DoResult(bool success, string msg)
             isBusy = false;
             if (success)
             {
-                TaskManager.Run(UsageTracker.IncrementAuthenticationViewButtonAuthentication, null);
+                UsageTracker.IncrementAuthenticationViewButtonAuthentication();
 
                 Clear();
                 Finish(true);

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs

@@ -319,7 +319,7 @@ private void OnButtonBarGUI()
                             {
                                 if (success)
                                 {
-                                    TaskManager.Run(UsageTracker.IncrementBranchesViewButtonCreateBranch, null);
+                                    UsageTracker.IncrementBranchesViewButtonCreateBranch();
                                     Redraw();
                                 }
                                 else
@@ -489,7 +489,7 @@ private void CheckoutRemoteBranch(string branch)
                         {
                             if (success)
                             {
-                                TaskManager.Run(UsageTracker.IncrementBranchesViewButtonCheckoutRemoteBranch, null);
+                                UsageTracker.IncrementBranchesViewButtonCheckoutRemoteBranch();
                                 Redraw();
                             }
                             else
@@ -512,7 +512,7 @@ private void SwitchBranch(string branch)
                     {
                         if (success)
                         {
-                            TaskManager.Run(UsageTracker.IncrementBranchesViewButtonCheckoutLocalBranch, null);
+                            UsageTracker.IncrementBranchesViewButtonCheckoutLocalBranch();
                             Redraw();
                         }
                         else
@@ -530,7 +530,7 @@ private void DeleteLocalBranch(string branch)
             if (EditorUtility.DisplayDialog(DeleteBranchTitle, dialogMessage, DeleteBranchButton, CancelButtonLabel))
             {
                 Repository.DeleteBranch(branch, true)
-                    .Then(UsageTracker.IncrementBranchesViewButtonDeleteBranch)
+                    .Finally(s => { if (s) UsageTracker.IncrementBranchesViewButtonDeleteBranch(); } )
                     .Start();
             }
         }

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs

@@ -405,7 +405,7 @@ private void Commit()
                     {
                         if (success)
                         {
-                            TaskManager.Run(UsageTracker.IncrementChangesViewButtonCommit, null);
+                            UsageTracker.IncrementChangesViewButtonCommit();
 
                             commitMessage = "";
                             commitBody = "";