Updating the user guid with the rest of the user data

Author: StanleyGoldman

src/GitHub.Exports/Models/UsageModel.cs

@@ -1,4 +1,6 @@
-namespace GitHub.Models
+using System;
+
+namespace GitHub.Models
 {
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes", Justification = "It'll use reflection by default and we're fine with that")]
     public struct UsageModel
@@ -41,9 +43,9 @@ public struct UsageModel
         public int NumberOfPRReviewDiffViewInlineCommentOpen { get; set; }
         public int NumberOfPRReviewDiffViewInlineCommentPost { get; set; }
 
-        public UsageModel Clone(Guid guid, bool includeWeekly, bool includeMonthly)
+        public UsageModel Clone(bool includeWeekly, bool includeMonthly)
         {
-            var result = Create(guid);
+            var result = this;
             if (!includeWeekly)
                 result.NumberOfStartupsWeek = 0;
             if (!includeMonthly)
@@ -66,13 +68,5 @@ public UsageModel ClearCounters(bool clearWeekly, bool clearMonthly)
             result.Lang = Lang;
             return result;
         }
-
-        public static UsageModel Create(Guid guid)
-        {
-            return new UsageModel
-            {
-                Guid = guid
-            };
-        }
     }
 }

src/GitHub.VisualStudio/Services/UsageTracker.cs

@@ -127,7 +127,7 @@ async Task TimerTick()
             // Only send stats once a day.
             if (!service.IsSameDay(usage.LastUpdated))
             {
-                usage.Model = UpdateModelUserData(usage.Model);
+                usage.Model = await UpdateModelUserData(usage.Model);
 
                 await SendUsage(usage.Model, includeWeekly, includeMonthly);
 
@@ -144,13 +144,14 @@ async Task SendUsage(UsageModel usage, bool includeWeekly, bool includeMonthly)
                 throw new GitHubLogicException("SendUsage should not be called when there is no IMetricsService");
             }
 
-            var guid = await service.GetUserGuid();
-            var model = usage.Clone(weekly, monthly);
+            var model = usage.Clone(includeWeekly, includeMonthly);
             await client.PostUsage(model);
         }
 
-        UsageModel UpdateModelUserData(UsageModel model)
+        async Task<UsageModel> UpdateModelUserData(UsageModel model)
         {
+            model.Guid = await service.GetUserGuid();
+
             if (connectionManager.Connections.Any(x => x.HostAddress.IsGitHubDotCom()))
             {
                 model.IsGitHubUser = true;
@@ -160,6 +161,7 @@ UsageModel UpdateModelUserData(UsageModel model)
             {
                 model.IsEnterpriseUser = true;
             }
+
             return model;
         }
     }