Merge branch 'master' into fixes/project-window-interface-initialized

Author: StanleyGoldman

octorun/src/bin/app-usage.js

@@ -44,9 +44,6 @@ if (fileContents && host) {
             'Content-Type': 'application/json'
         }
     };
-    if (config.token) {
-        options.headers['Authorization'] = 'token ' + config.token;
-    }
 
     var req = https.request(options, function (res) {
         var success = res.statusCode == 200;

octorun/version

@@ -1 +1 @@
-f497f7aa3d
+bd66a20a

script

@@ -205,7 +205,7 @@ public void ContinueLogin(LoginResult loginResult, string code)
                 .Start();
         }
 
-        private GitHubUser GetCurrentUser()
+        public GitHubUser GetCurrentUser()
         {
             var keychainConnection = keychain.Connections.FirstOrDefault(x => x.Host == OriginalUrl);
             if (keychainConnection == null)

src/GitHub.Api/Application/ApiClient.cs

@@ -48,7 +48,7 @@ protected void Initialize()
             ApplicationConfiguration.GitTimeout = UserSettings.Get(Constants.GitTimeoutKey, ApplicationConfiguration.GitTimeout);
             Platform.Initialize(ProcessManager, TaskManager);
             progress.OnProgress += progressReporter.UpdateProgress;
-            UsageTracker = new UsageTracker(TaskManager, GitClient, ProcessManager, UserSettings, Environment, InstanceId.ToString());
+            UsageTracker = new UsageTracker(TaskManager, GitClient, ProcessManager, UserSettings, Environment, Platform.Keychain, InstanceId.ToString());
 
 #if ENABLE_METRICS
             var metricsService = new MetricsService(ProcessManager,

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -35,7 +35,7 @@
     <DefineConstants>TRACE;$(BuildDefs);NET_4_6</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <BuildConfid>Release</BuildConfid>
+    <BuildConfig>Release</BuildConfig>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>

src/GitHub.Api/GitHub.Api.45.csproj

@@ -35,7 +35,7 @@
     <DefineConstants>TRACE;$(BuildDefs)</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <BuildConfid>Release</BuildConfid>
+    <BuildConfig>Release</BuildConfig>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>

src/GitHub.Api/GitHub.Api.csproj

@@ -85,7 +85,7 @@ public class OctorunInstallDetails
             public const string DefaultZipMd5Url = "http://github-vs.s3.amazonaws.com/unity/octorun/octorun.zip.md5";
             public const string DefaultZipUrl = "http://github-vs.s3.amazonaws.com/unity/octorun/octorun.zip";
 
-            public const string PackageVersion = "f497f7aa3d";
+            public const string PackageVersion = "bd66a20a";
             private const string PackageName = "octorun";
             private const string zipFile = "octorun.zip";
 

src/GitHub.Api/Installer/OctorunInstaller.cs

@@ -22,6 +22,7 @@ public class Dimensions
         public string UnityVersion { get; set; }
         public string Lang { get; set; }
         public string CurrentLang { get; set; }
+        public string GitHubUser { get; set; }
     }
 
     public class Measures

src/GitHub.Api/Metrics/UsageModel.cs

@@ -8,6 +8,13 @@ namespace GitHub.Unity
 {
     class UsageTrackerSync : IUsageTracker
     {
+
+#if DEVELOPER_BUILD
+        protected internal const int MetrisReportTimeout = 30;
+#else
+        protected internal const int MetrisReportTimeout = 3 * 60;
+#endif
+
         private static ILogging Logger { get; } = LogHelper.GetLogger<UsageTracker>();
 
         private static object _lock = new object();
@@ -44,7 +51,7 @@ public UsageTrackerSync(ISettings userSettings, IUsageLoader usageLoader,
 
             Logger.Trace("userId:{0} instanceId:{1}", userId, instanceId);
             if (Enabled)
-                RunTimer(3 * 60);
+                RunTimer(MetrisReportTimeout);
         }
 
         private void RunTimer(int seconds)
@@ -94,6 +101,11 @@ private void SendUsage()
                 return;
             }
 
+            var username = GetUsername();
+            if (!String.IsNullOrEmpty(username)) {
+                extractReports.ForEach(x => x.Dimensions.GitHubUser = username);
+            }
+
             try
             {
                 MetricsService.PostUsage(extractReports);
@@ -316,6 +328,11 @@ public virtual void UpdateLfsDiskUsage(int kilobytes)
             }
         }
 
+        protected virtual string GetUsername()
+        {
+            return "";
+        }
+
         public bool Enabled
         {
             get
@@ -344,7 +361,9 @@ class UsageTracker : UsageTrackerSync
     {
         public UsageTracker(ITaskManager taskManager, IGitClient gitClient, IProcessManager processManager,
             ISettings userSettings,
-            IEnvironment environment, string instanceId)
+            IEnvironment environment,
+            IKeychain keychain,
+            string instanceId)
             : base(userSettings,
                    new UsageLoader(environment.UserCachePath.Combine(Constants.UsageFile)),
                    environment.UnityVersion, instanceId)
@@ -353,6 +372,7 @@ public UsageTracker(ITaskManager taskManager, IGitClient gitClient, IProcessMana
             Environment = environment;
             GitClient = gitClient;
             ProcessManager = processManager;
+            Keychain = keychain;
         }
 
         protected override void CaptureRepoSize()
@@ -377,6 +397,18 @@ protected override void CaptureRepoSize()
             catch {}
         }
 
+        protected override string GetUsername()
+        {
+            string username = "";
+            try {
+                var apiClient = new ApiClient("", Keychain, ProcessManager, TaskManager, Environment);
+                var user = apiClient.GetCurrentUser();
+                username = user.Login;
+            } catch {
+            }
+            return username;
+        }
+
         public override void IncrementApplicationMenuMenuItemCommandLine() => TaskManager.Run(base.IncrementApplicationMenuMenuItemCommandLine);
         public override void IncrementAuthenticationViewButtonAuthentication() => TaskManager.Run(base.IncrementAuthenticationViewButtonAuthentication);
         public override void IncrementBranchesViewButtonCheckoutLocalBranch() => TaskManager.Run(base.IncrementBranchesViewButtonCheckoutLocalBranch);
@@ -400,6 +432,7 @@ protected override void CaptureRepoSize()
         protected IEnvironment Environment { get; }
         protected IGitClient GitClient { get; }
         public IProcessManager ProcessManager { get; }
+        protected IKeychain Keychain { get; }
     }
 
     interface IUsageLoader

src/GitHub.Api/Metrics/UsageTracker.cs

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7287864b7d86835175494c3743832f47a10481ab7fb1c257f871b808744e448
-size 1399629
+oid sha256:95a82d30f9e3a3f1eaec7d4a382983748d35320b87a2ec91134beb5d75738af3
+size 1399526

src/GitHub.Api/Resources/octorun.zip

@@ -1 +1 @@
-a41ad2fd5ceaacb20574a0fc2841e82d
+f6865e64072e9b65fa31ac9087fe1363

src/GitHub.Api/Resources/octorun.zip.md5

@@ -8,6 +8,7 @@
 using System.Net.Sockets;
 using System.Text;
 using System.Threading;
+using Newtonsoft.Json;
 
 namespace TestWebServer
 {
@@ -106,6 +107,18 @@ private void Process(HttpListenerContext context)
 
             if (context.Request.Url.AbsolutePath == "/api/usage/unity")
             {
+                var streamReader = new StreamReader(context.Request.InputStream);
+                string body = null;
+                using (streamReader)
+                {
+                    body = streamReader.ReadToEnd();
+                }
+                
+                var parsedJson = JsonConvert.DeserializeObject(body);
+                var formattedJson = JsonConvert.SerializeObject(parsedJson, Formatting.Indented);
+
+                Logger.Info(formattedJson);
+
                 var json = new { result = "Cool unity usage" }.ToJson();
                 context.Response.StatusCode = (int)HttpStatusCode.OK;
                 context.Response.ContentLength64 = json.Length;

src/tests/TestWebServer/HttpServer.cs

@@ -31,6 +31,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -81,6 +84,7 @@
     <None Include="files\unity\releases\github-for-unity-99.2.0-beta1.unitypackage">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\GitHub.Api\GitHub.Api.csproj">

src/tests/TestWebServer/TestWebServer.csproj

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net35" />
+</packages>