Adding locks to the UsageTracker

Author: StanleyGoldman

script

@@ -8,6 +8,6 @@ interface IMetricsService
         /// <summary>
         /// Posts the provided usage model.
         /// </summary>
-        Task PostUsage(List<Usage> model);
+        void PostUsage(List<Usage> model);
     }
 }

src/GitHub.Api/Metrics/IMetricsService.cs

@@ -12,6 +12,8 @@ class UsageTracker : IUsageTracker
     {
         private static ILogging Logger { get; } = LogHelper.GetLogger<UsageTracker>();
 
+        private static object _lock = new object();
+
         private readonly ISettings userSettings;
         private readonly IUsageLoader usageLoader;
         private readonly IMetricsService metricsService;
@@ -23,7 +25,7 @@ class UsageTracker : IUsageTracker
 
         public UsageTracker(IMetricsService metricsService, ISettings userSettings,
             IEnvironment environment, string userId, string unityVersion, string instanceId)
-                : this(metricsService, userSettings, 
+                : this(metricsService, userSettings,
                       new UsageLoader(environment.UserCachePath.Combine(Constants.UsageFile)),
                       userId, unityVersion, instanceId)
         {
@@ -43,23 +45,23 @@ public UsageTracker(IMetricsService metricsService, ISettings userSettings,
 
             Logger.Trace("userId:{0} instanceId:{1}", userId, instanceId);
             if (Enabled)
-                RunTimer(3*60);
+                RunTimer(3 * 60);
         }
 
         private void RunTimer(int seconds)
         {
-            timer = new Timer(async _ =>
+            timer = new Timer(_ =>
             {
                 try
                 {
                     timer.Dispose();
-                    await SendUsage();
+                    SendUsage();
                 }
-                catch {}
+                catch { }
             }, null, seconds * 1000, Timeout.Infinite);
         }
 
-        private async Task SendUsage()
+        private void SendUsage()
         {
             var usageStore = usageLoader.Load(userId);
 
@@ -69,13 +71,16 @@ private async Task SendUsage()
                 return;
             }
 
-            if (usageStore.LastUpdated.Date != DateTimeOffset.UtcNow.Date)
+            var currentTimeOffset = DateTimeOffset.UtcNow;
+            if (usageStore.LastUpdated.Date == currentTimeOffset)
             {
-                var currentTimeOffset = DateTimeOffset.UtcNow;
-                var beforeDate = currentTimeOffset.Date;
+                return;
+            }
 
+            lock (_lock)
+            {
                 var success = false;
-                var extractReports = usageStore.Model.SelectReports(beforeDate);
+                var extractReports = usageStore.Model.SelectReports(currentTimeOffset.Date);
                 if (!extractReports.Any())
                 {
                     Logger.Trace("No items to send");
@@ -90,7 +95,7 @@ private async Task SendUsage()
 
                     try
                     {
-                        await metricsService.PostUsage(extractReports);
+                        metricsService.PostUsage(extractReports);
                         success = true;
                     }
                     catch (Exception ex)
@@ -101,7 +106,7 @@ private async Task SendUsage()
 
                 if (success)
                 {
-                    usageStore.Model.RemoveReports(beforeDate);
+                    usageStore.Model.RemoveReports(currentTimeOffset.Date);
                     usageStore.LastUpdated = currentTimeOffset;
                     usageLoader.Save(usageStore);
                 }
@@ -110,130 +115,178 @@ private async Task SendUsage()
 
         public void IncrementNumberOfStartups()
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
-                .NumberOfStartups++;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
+                    .NumberOfStartups++;
+                usageLoader.Save(usage);
+            }
         }
 
         public void IncrementProjectsInitialized()
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
-                .ProjectsInitialized++;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
+                    .ProjectsInitialized++;
+                usageLoader.Save(usage);
+            }
         }
 
         public void IncrementChangesViewButtonCommit()
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
-                .ChangesViewButtonCommit++;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
+                    .ChangesViewButtonCommit++;
+                usageLoader.Save(usage);
+            }
         }
 
         public void IncrementHistoryViewToolbarFetch()
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
-                .HistoryViewToolbarFetch++;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
+                    .HistoryViewToolbarFetch++;
+                usageLoader.Save(usage);
+            }
         }
 
         public void IncrementHistoryViewToolbarPush()
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
-                .HistoryViewToolbarPush++;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
+                    .HistoryViewToolbarPush++;
+                usageLoader.Save(usage);
+            }
         }
 
         public void IncrementHistoryViewToolbarPull()
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
-                .HistoryViewToolbarPull++;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
+                    .HistoryViewToolbarPull++;
+                usageLoader.Save(usage);
+            }
         }
 
         public void IncrementBranchesViewButtonCreateBranch()
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
-                .BranchesViewButtonCreateBranch++;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
+                    .BranchesViewButtonCreateBranch++;
+                usageLoader.Save(usage);
+            }
         }
 
         public void IncrementBranchesViewButtonDeleteBranch()
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
-                .BranchesViewButtonDeleteBranch++;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
+                    .BranchesViewButtonDeleteBranch++;
+                usageLoader.Save(usage);
+            }
         }
 
         public void IncrementBranchesViewButtonCheckoutLocalBranch()
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
-                .BranchesViewButtonCheckoutLocalBranch++;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
+                    .BranchesViewButtonCheckoutLocalBranch++;
+                usageLoader.Save(usage);
+            }
         }
 
         public void IncrementBranchesViewButtonCheckoutRemoteBranch()
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
-                .BranchesViewButtonCheckoutRemoteBranch++;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
+                    .BranchesViewButtonCheckoutRemoteBranch++;
+                usageLoader.Save(usage);
+            }
         }
 
         public void IncrementSettingsViewButtonLfsUnlock()
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
-                .SettingsViewButtonLfsUnlock++;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
+                    .SettingsViewButtonLfsUnlock++;
+                usageLoader.Save(usage);
+            }
         }
 
         public void IncrementAuthenticationViewButtonAuthentication()
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
-                .AuthenticationViewButtonAuthentication++;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
+                    .AuthenticationViewButtonAuthentication++;
+                usageLoader.Save(usage);
+            }
         }
 
         public void IncrementUnityProjectViewContextLfsLock()
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
-                .UnityProjectViewContextLfsLock++;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
+                    .UnityProjectViewContextLfsLock++;
+                usageLoader.Save(usage);
+            }
         }
 
         public void IncrementUnityProjectViewContextLfsUnlock()
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
-                .UnityProjectViewContextLfsUnlock++;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
+                    .UnityProjectViewContextLfsUnlock++;
+                usageLoader.Save(usage);
+            }
         }
 
         public void IncrementPublishViewButtonPublish()
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
-                 .PublishViewButtonPublish++;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
+                     .PublishViewButtonPublish++;
+                usageLoader.Save(usage);
+            }
         }
 
         public void IncrementApplicationMenuMenuItemCommandLine()
         {
-            var usage = usageLoader.Load(userId);
-            usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
-                 .ApplicationMenuMenuItemCommandLine++;
-            usageLoader.Save(usage);
+            lock (_lock)
+            {
+                var usage = usageLoader.Load(userId);
+                usage.GetCurrentMeasures(appVersion, unityVersion, instanceId)
+                     .ApplicationMenuMenuItemCommandLine++;
+                usageLoader.Save(usage);
+            }
         }
 
         public bool Enabled
@@ -293,7 +346,7 @@ public UsageStore Load(string userId)
                     {
                         path.DeleteIfExists();
                     }
-                    catch {}
+                    catch { }
                 }
             }