Save the language and assembly info too, rename id to guid

Author: shana

script

@@ -7,13 +7,13 @@ namespace GitHub.Unity
 {
     class ApiClient : IApiClient
     {
-        public static IApiClient Create(UriString repositoryUrl, IKeychain keychain, IAppConfiguration appConfiguration)
+        public static IApiClient Create(UriString repositoryUrl, IKeychain keychain)
         {
             var credentialStore = keychain.Connect(repositoryUrl);
             var hostAddress = HostAddress.Create(repositoryUrl);
 
             return new ApiClient(repositoryUrl, keychain,
-                new GitHubClient(appConfiguration.ProductHeader, credentialStore, hostAddress.ApiUri));
+                new GitHubClient(AppConfiguration.ProductHeader, credentialStore, hostAddress.ApiUri));
         }
 
         private static readonly Unity.ILogging logger = Unity.Logging.GetLogger<ApiClient>();

src/GitHub.Api/Api/ApiClient.cs

@@ -3,9 +3,9 @@
 
 namespace GitHub.Unity
 {
-    class AppConfiguration : IAppConfiguration
+    static class AppConfiguration
     {
-        public AppConfiguration()
+        static AppConfiguration()
         {
             var executingAssembly = typeof(AppConfiguration).Assembly;
             AssemblyName = executingAssembly.GetName();
@@ -15,11 +15,11 @@ public AppConfiguration()
         /// <summary>
         /// The currently executing assembly.
         /// </summary>
-        public AssemblyName AssemblyName { get; private set; }
+        public static AssemblyName AssemblyName { get; private set; }
 
         /// <summary>
         /// The product header used in the user agent.
         /// </summary>
-        public ProductHeaderValue ProductHeader { get; private set; }
+        public static ProductHeaderValue ProductHeader { get; private set; }
     }
 }

src/GitHub.Api/AppConfiguration.cs

@@ -219,7 +219,6 @@
     <Compile Include="Guard.cs" />
     <Compile Include="Authentication\ICredentialManager.cs" />
     <Compile Include="IEnvironment.cs" />
-    <Compile Include="IAppConfiguration.cs" />
     <Compile Include="Primitives\HostAddress.cs" />
     <Compile Include="Primitives\StringEquivalent.cs" />
     <Compile Include="Primitives\UriString.cs" />

src/GitHub.Api/GitHub.Api.csproj

@@ -6,7 +6,7 @@ namespace GitHub.Unity
 {
     class Usage
     {
-        public string Id { get; set; }
+        public string Guid { get; set; }
         public DateTime Date { get; set; }
         public string AppVersion { get; set; }
         public string UnityVersion { get; set; }
@@ -17,28 +17,27 @@ class Usage
     class UsageModel
     {
         public List<Usage> Reports { get; set; } = new List<Usage>();
-        public string Id { get; set; }
+        public string Guid { get; set; }
 
         private Usage currentUsage;
 
         public Usage GetCurrentUsage()
         {
             var date = DateTime.UtcNow.Date;
-            if (currentUsage != null)
+            if (currentUsage == null)
             {
-                if (currentUsage.Date == date)
-                {
-                    return currentUsage;
-                }
-
-                currentUsage = null;
+                currentUsage = Reports.FirstOrDefault(usage => usage.Date == date);
             }
 
-            currentUsage = Reports.FirstOrDefault(usage => usage.Date == date);
-
-            if (currentUsage == null)
+            if (currentUsage?.Date == date)
+            {
+                // update any fields that might be missing, if we've changed the format
+                if (currentUsage.Guid != Guid)
+                    currentUsage.Guid = Guid;
+            }
+            else
             {
-                currentUsage = new Usage { Date = date, Id = Id };
+                currentUsage = new Usage { Date = date, Guid = Guid };
                 Reports.Add(currentUsage);
             }
 

src/GitHub.Api/IAppConfiguration.cs

@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using System.Timers;
 using Rackspace.Threading;
+using System.Globalization;
 
 namespace GitHub.Unity
 {
@@ -13,19 +14,19 @@ class UsageTracker : IUsageTracker
         private static IMetricsService metricsService;
 
         private readonly NPath storePath;
-        private readonly string id;
+        private readonly string guid;
         private readonly string unityVersion;
 
         private bool firstRun = true;
         private Timer timer;
 
-        public UsageTracker(NPath storePath, string id, string unityVersion)
+        public UsageTracker(NPath storePath, string guid, string unityVersion)
         {
-            this.id = id;
+            this.guid = guid;
             this.storePath = storePath;
             this.unityVersion = unityVersion;
 
-            Logger.Trace("id:{0}", id);
+            Logger.Trace("guid:{0}", guid);
             RunTimer();
         }
 
@@ -60,15 +61,8 @@ private UsageStore LoadUsage()
             if (result == null)
             {
                 result = new UsageStore();
-                result.Model.Id = id;
+                result.Model.Guid = guid;
             }
-            //TODO: Figure out these values
-            //result.Model.Lang = CultureInfo.InstalledUICulture.IetfLanguageTag;
-            //result.Model.AppVersion = AssemblyVersionInformation.Version;
-
-            //TODO: Get Unity Version
-            //result.Model.UnityVersion
-            //result.Model.VSVersion = vsservices.VSVersion;
 
             return result;
         }
@@ -196,6 +190,8 @@ public void IncrementLaunchCount()
             var usage = usageStore.Model.GetCurrentUsage();
             usage.NumberOfStartups++;
             usage.UnityVersion = unityVersion;
+            usage.Lang = CultureInfo.InstalledUICulture.IetfLanguageTag;
+            usage.AppVersion = AppConfiguration.AssemblyName.Version.ToString();
 
             Logger.Trace("IncrementLaunchCount Date:{0} NumberOfStartups:{1}", usage.Date, usage.NumberOfStartups);
 

src/GitHub.Api/Metrics/UsageModel.cs

@@ -5,15 +5,13 @@ namespace GitHub.Unity
 {
     class AuthenticationService
     {
-        private readonly IAppConfiguration appConfiguration;
         private readonly IApiClient client;
 
         private LoginResult loginResultData;
 
-        public AuthenticationService(UriString host, IAppConfiguration appConfiguration, IKeychain keychain)
+        public AuthenticationService(UriString host, IKeychain keychain)
         {
-            this.appConfiguration = appConfiguration;
-            client = ApiClient.Create(host, keychain, appConfiguration);
+            client = ApiClient.Create(host, keychain);
         }
 
         public void Login(string username, string password, Action<string> twofaRequired, Action<bool, string> authResult)

src/GitHub.Api/Metrics/UsageTracker.cs

@@ -45,7 +45,7 @@ private AuthenticationService AuthenticationService
                         host = UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri);
                     }
 
-                    AuthenticationService = new AuthenticationService(host, new AppConfiguration(), Platform.Keychain);
+                    AuthenticationService = new AuthenticationService(host, Platform.Keychain);
                 }
                 return authenticationService;
             }

src/UnityExtension/Assets/Editor/GitHub.Unity/Services/AuthenticationService.cs

@@ -234,7 +234,7 @@ private void SignOut(object obj)
                 host = UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri);
             }
 
-            var apiClient = ApiClient.Create(host, Platform.Keychain, new AppConfiguration());
+            var apiClient = ApiClient.Create(host, Platform.Keychain);
             apiClient.Logout(host);
         }