Grab unity version and access ApplicationCache only on the main thread

ApplicationCache is not threadsafe, if it gets instantiated on the wrong
thread Unity will throw.

Author: shana

src/GitHub.Api/ApplicationManagerBase.cs

@@ -147,6 +147,32 @@ private async Task<NPath> LookForGitInstallationPath()
             return await GitClient.FindGitInstallation().SafeAwait();
         }
 
+        protected void SetupMetrics(string unityVersion, bool firstRun)
+        {
+            Logger.Trace("Setup metrics");
+
+            var usagePath = Environment.UserCachePath.Combine("usage.json");
+
+            string id;
+            if (!UserSettings.Exists("Id"))
+            {
+                id = Guid.NewGuid().ToString();
+                UserSettings.Set("Id", id);
+            }
+            else
+            {
+                id = UserSettings.Get("Id");
+            }
+
+            UsageTracker = new UsageTracker(usagePath, id, unityVersion);
+            UsageTracker.Enabled = UserSettings.Get("MetricsEnabled", true);
+
+            if (firstRun)
+            {
+                UsageTracker.IncrementLaunchCount();
+            }
+        }
+
         private bool disposed = false;
         protected virtual void Dispose(bool disposing)
         {

src/GitHub.Api/Metrics/UsageTracker.cs

@@ -13,18 +13,19 @@ class UsageTracker : IUsageTracker
         private static IMetricsService metricsService;
 
         private readonly NPath storePath;
-        private readonly string userTrackingId;
+        private readonly string id;
+        private readonly string unityVersion;
 
         private bool firstRun = true;
         private Timer timer;
 
-        public UsageTracker(NPath storePath, string userTrackingId)
+        public UsageTracker(NPath storePath, string id, string unityVersion)
         {
-            this.userTrackingId = userTrackingId;
-            Logger.Trace("Tracking Id:{0}", userTrackingId);
-
+            this.id = id;
             this.storePath = storePath;
+            this.unityVersion = unityVersion;
 
+            Logger.Trace("id:{0}", id);
             RunTimer();
         }
 

src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationManager.cs

@@ -31,9 +31,6 @@ public override ITask Run()
             Utility.Initialize();
 
             return base.Run()
-                .Then(_ => {
-                    SetupUserTracking();
-                })
                 .ThenInUI(_ =>
                 {
                     Logger.Debug("Run");
@@ -45,8 +42,10 @@ public override ITask Run()
                     if (view != null)
                         view.Initialize(this);
 
-                    //logger.Debug("Application Restarted");
-                }).Start();
+                    return new { Version = Application.unityVersion, FirstRun = ApplicationCache.Instance.FirstRun };
+                })
+                .Then((s, x) => SetupMetrics(x.Version, x.FirstRun))
+                .Start();
         }
 
 
@@ -142,32 +141,6 @@ protected override void Dispose(bool disposing)
             }
         }
 
-        private void SetupUserTracking()
-        {
-            Logger.Trace("Setup User Tracking");
-
-            var usagePath = Environment.UserCachePath.Combine("github-unity-usage.json");
-
-            string userTrackingId;
-            if (!UserSettings.Exists("UserTrackingId"))
-            {
-                userTrackingId = Guid.NewGuid().ToString();
-                UserSettings.Set("UserTrackingId", userTrackingId);
-            }
-            else
-            {
-                userTrackingId = UserSettings.Get("UserTrackingId");
-            }
-
-            UsageTracker = new UsageTracker(usagePath, userTrackingId);
-            UsageTracker.Enabled = UserSettings.Get("UserTrackingEnabled", true);
-
-            if (ApplicationCache.Instance.FirstRun)
-            {
-                UsageTracker.IncrementLaunchCount();
-            }
-        }
-
         public override IProcessEnvironment GitEnvironment { get { return Platform.GitEnvironment; } }
     }
 }