Merge pull request #349 from github/feature/metrics

Add metrics

Author: shana

.gitignore

@@ -20,6 +20,7 @@ build/
 
 # Roslyn cache directories
 *.ide/
+.vs/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/

GitHubVS.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25029.0
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio", "src\GitHub.VisualStudio\GitHub.VisualStudio.csproj", "{11569514-5AE5-4B5B-92A2-F10B0967DE5F}"
 EndProject

script

@@ -14,7 +14,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
-    <BuildType Condition="Exists('..\..\script\ApiClientConfiguration.cs')">Internal</BuildType>
+    <BuildType Condition="Exists('..\..\script\src\ApiClientConfiguration.cs')">Internal</BuildType>
     <OutputPath>bin\$(Configuration)\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

src/CredentialManagement/CredentialManagement.csproj

@@ -11,7 +11,7 @@
     <AssemblyName>GitHub.Api</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <BuildType Condition="Exists('..\..\script\ApiClientConfiguration.cs')">Internal</BuildType>
+    <BuildType Condition="Exists('..\..\script\src\ApiClientConfiguration.cs')">Internal</BuildType>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <TargetFrameworkProfile />
   </PropertyGroup>

src/GitHub.Api/GitHub.Api.csproj

@@ -19,7 +19,7 @@
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <BuildType Condition="Exists('..\..\script\ApiClientConfiguration.cs')">Internal</BuildType>
+    <BuildType Condition="Exists('..\..\script\src\ApiClientConfiguration.cs')">Internal</BuildType>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -151,7 +151,7 @@
     <Compile Include="..\common\SolutionInfo.cs">
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
-    <Compile Include="..\..\script\ApiClientConfiguration.cs" Condition="$(Buildtype) == 'Internal'">
+    <Compile Include="..\..\script\src\ApiClientConfiguration.cs" Condition="$(Buildtype) == 'Internal'">
       <Link>Api\ApiClientConfiguration.cs</Link>
     </Compile>
     <Compile Include="Api\ApiClientConfiguration.cs" Condition="$(Buildtype) != 'Internal'" />

src/GitHub.App/GitHub.App.csproj

@@ -25,26 +25,30 @@ public class GistCreationViewModel : BaseViewModel, IGistCreationViewModel
         readonly ObservableAsPropertyHelper<IAccount> account;
         readonly IGistPublishService gistPublishService;
         readonly INotificationService notificationService;
+        readonly IUsageTracker usageTracker;
 
         [ImportingConstructor]
         GistCreationViewModel(
             IConnectionRepositoryHostMap connectionRepositoryHostMap,
             ISelectedTextProvider selectedTextProvider,
             IGistPublishService gistPublishService,
-            INotificationService notificationService)
-            : this(connectionRepositoryHostMap.CurrentRepositoryHost, selectedTextProvider, gistPublishService)
+            INotificationService notificationService,
+            IUsageTracker usageTracker)
+            : this(connectionRepositoryHostMap.CurrentRepositoryHost, selectedTextProvider, gistPublishService, usageTracker)
         {
             this.notificationService = notificationService;
         }
 
         public GistCreationViewModel(
             IRepositoryHost repositoryHost,
             ISelectedTextProvider selectedTextProvider,
-            IGistPublishService gistPublishService)
+            IGistPublishService gistPublishService,
+            IUsageTracker usageTracker)
         {
             Title = Resources.CreateGistTitle;
             apiClient = repositoryHost.ApiClient;
             this.gistPublishService = gistPublishService;
+            this.usageTracker = usageTracker;
 
             FileName = VisualStudio.Services.GetFileNameFromActiveDocument() ?? Resources.DefaultGistFileName;
             SelectedText = selectedTextProvider.GetSelectedText();
@@ -74,6 +78,7 @@ IObservable<Gist> OnCreateGist(object unused)
             newGist.Files.Add(FileName, SelectedText);
 
             return gistPublishService.PublishGist(apiClient, newGist)
+                .Do(_ => usageTracker.IncrementCreateGistCount())
                 .Catch<Gist, Exception>(ex =>
                 {
                     if (!ex.IsCriticalException())

src/GitHub.App/ViewModels/GistCreationViewModel.cs

@@ -32,6 +32,7 @@ public class RepositoryCloneViewModel : BaseViewModel, IRepositoryCloneViewModel
         readonly IRepositoryCloneService cloneService;
         readonly IOperatingSystem operatingSystem;
         readonly INotificationService notificationService;
+        readonly IUsageTracker usageTracker;
         readonly IReactiveCommand<IReadOnlyList<IRepositoryModel>> loadRepositoriesCommand;
         readonly ReactiveCommand<object> browseForDirectoryCommand = ReactiveCommand.Create();
         readonly ObservableAsPropertyHelper<bool> isLoading;
@@ -45,20 +46,23 @@ public class RepositoryCloneViewModel : BaseViewModel, IRepositoryCloneViewModel
             IConnectionRepositoryHostMap connectionRepositoryHostMap,
             IRepositoryCloneService repositoryCloneService,
             IOperatingSystem operatingSystem,
-            INotificationService notificationService)
-            : this(connectionRepositoryHostMap.CurrentRepositoryHost, repositoryCloneService, operatingSystem, notificationService)
+            INotificationService notificationService,
+            IUsageTracker usageTracker)
+            : this(connectionRepositoryHostMap.CurrentRepositoryHost, repositoryCloneService, operatingSystem, notificationService, usageTracker)
         { }
 
         public RepositoryCloneViewModel(
             IRepositoryHost repositoryHost,
             IRepositoryCloneService cloneService,
             IOperatingSystem operatingSystem,
-            INotificationService notificationService)
+            INotificationService notificationService,
+            IUsageTracker usageTracker)
         {
             this.repositoryHost = repositoryHost;
             this.cloneService = cloneService;
             this.operatingSystem = operatingSystem;
             this.notificationService = notificationService;
+            this.usageTracker = usageTracker;
 
             Title = string.Format(CultureInfo.CurrentCulture, Resources.CloneTitle, repositoryHost.Title);
             Repositories = new ReactiveList<IRepositoryModel>();
@@ -139,9 +143,12 @@ IObservable<Unit> OnCloneRepository(object state)
                     notificationService.ShowError(Resources.RepositoryCloneFailedNoSelectedRepo);
                     return Observable.Return(Unit.Default);
                 }
+                
                 // The following is a noop if the directory already exists.
                 operatingSystem.Directory.CreateDirectory(BaseRepositoryPath);
-                return cloneService.CloneRepository(repository.CloneUrl, repository.Name, BaseRepositoryPath);
+
+                return cloneService.CloneRepository(repository.CloneUrl, repository.Name, BaseRepositoryPath)
+                    .Do(_ => this.usageTracker.IncrementCloneCount());
             })
             .SelectMany(_ => _)
             .Catch<Unit, Exception>(e =>

src/GitHub.App/ViewModels/RepositoryCloneViewModel.cs

@@ -39,23 +39,27 @@ public class RepositoryCreationViewModel : RepositoryFormViewModel, IRepositoryC
         readonly ObservableAsPropertyHelper<bool> isCreating;
         readonly ObservableAsPropertyHelper<bool> canKeepPrivate;
         readonly IOperatingSystem operatingSystem;
+        readonly IUsageTracker usageTracker;
 
         [ImportingConstructor]
         RepositoryCreationViewModel(
             IConnectionRepositoryHostMap connectionRepositoryHostMap,
             IOperatingSystem operatingSystem,
-            IRepositoryCreationService repositoryCreationService)
-            : this(connectionRepositoryHostMap.CurrentRepositoryHost, operatingSystem, repositoryCreationService)
+            IRepositoryCreationService repositoryCreationService,
+            IUsageTracker usageTracker)
+            : this(connectionRepositoryHostMap.CurrentRepositoryHost, operatingSystem, repositoryCreationService, usageTracker)
         {}
 
         public RepositoryCreationViewModel(
             IRepositoryHost repositoryHost,
             IOperatingSystem operatingSystem,
-            IRepositoryCreationService repositoryCreationService)
+            IRepositoryCreationService repositoryCreationService,
+            IUsageTracker usageTracker)
         {
             this.repositoryHost = repositoryHost;
             this.operatingSystem = operatingSystem;
             this.repositoryCreationService = repositoryCreationService;
+            this.usageTracker = usageTracker;
 
             Title = string.Format(CultureInfo.CurrentCulture, Resources.CreateTitle, repositoryHost.Title);
             SelectedGitIgnoreTemplate = GitIgnoreItem.None;
@@ -268,7 +272,8 @@ IObservable<Unit> OnCreateRepository(object state)
                 newRepository,
                 SelectedAccount,
                 BaseRepositoryPath,
-                repositoryHost.ApiClient);
+                repositoryHost.ApiClient)
+                .Do(_ => usageTracker.IncrementCreateCount());
         }
 
         ReactiveCommand<Unit> InitializeCreateRepositoryCommand()

src/GitHub.App/ViewModels/RepositoryCreationViewModel.cs

@@ -33,16 +33,19 @@ public class RepositoryPublishViewModel : RepositoryFormViewModel, IRepositoryPu
         readonly ObservableAsPropertyHelper<bool> canKeepPrivate;
         readonly ObservableAsPropertyHelper<bool> isPublishing;
         readonly ObservableAsPropertyHelper<string> title;
+        readonly IUsageTracker usageTracker;
 
         [ImportingConstructor]
         public RepositoryPublishViewModel(
             IRepositoryHosts hosts,
             IRepositoryPublishService repositoryPublishService,
             INotificationService notificationService,
-            IConnectionManager connectionManager)
+            IConnectionManager connectionManager,
+            IUsageTracker usageTracker)
         {
             this.notificationService = notificationService;
             this.hosts = hosts;
+            this.usageTracker = usageTracker;
 
             title = this.WhenAny(
                 x => x.SelectedHost,
@@ -150,6 +153,7 @@ IObservable<ProgressState> OnPublishRepository(object arg)
             var account = SelectedAccount;
 
             return repositoryPublishService.PublishRepository(newRepository, account, SelectedHost.ApiClient)
+                .Do(_ => usageTracker.IncrementPublishCount())
                 .Select(_ => ProgressState.Success)
                 .Catch<ProgressState, Exception>(ex =>
                 {