Tying in metrics

Author: StanleyGoldman

src/GitHub.App/GitHub.App.csproj

@@ -259,6 +259,7 @@
     <Compile Include="ViewModels\GitHubPane\NavigationViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\GitHubPaneViewModel.cs" />
     <Compile Include="SampleData\PullRequestCheckViewModelDesigner.cs" />
+    <Compile Include="ViewModels\GitHubPane\PullRequestCheckType.cs" />
     <Compile Include="ViewModels\GitHubPane\PullRequestFilesViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\PullRequestListItemViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\PullRequestListViewModel.cs" />
@@ -416,8 +417,8 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources.en-US.resx">
-	    <DependentUpon>Resources.resx</DependentUpon>
-		</EmbeddedResource>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

src/GitHub.App/ViewModels/GitHubPane/PullRequestCheckType.cs

@@ -0,0 +1,8 @@
+namespace GitHub.ViewModels.GitHubPane
+{
+    public enum PullRequestCheckType
+    {
+        StatusApi,
+        ChecksApi
+    }
+}

src/GitHub.App/ViewModels/GitHubPane/PullRequestCheckViewModel.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Reactive;
 using System.Reactive.Linq;
 using System.Windows.Media.Imaging;
@@ -43,6 +44,7 @@ public static IEnumerable<IPullRequestCheckViewModel> Build(IViewViewModelFactor
                 }
 
                 var pullRequestCheckViewModel = (PullRequestCheckViewModel) viewViewModelFactory.CreateViewModel<IPullRequestCheckViewModel>();
+                pullRequestCheckViewModel.CheckType = PullRequestCheckType.StatusApi;
                 pullRequestCheckViewModel.Title = model.Context;
                 pullRequestCheckViewModel.Description = model.Description;
                 pullRequestCheckViewModel.Status = checkStatus;
@@ -92,6 +94,7 @@ public static IEnumerable<IPullRequestCheckViewModel> Build(IViewViewModelFactor
                     }
 
                     var pullRequestCheckViewModel = (PullRequestCheckViewModel)viewViewModelFactory.CreateViewModel<IPullRequestCheckViewModel>();
+                    pullRequestCheckViewModel.CheckType = PullRequestCheckType.ChecksApi;
                     pullRequestCheckViewModel.Title = model.Name;
                     pullRequestCheckViewModel.Description = model.Summary;
                     pullRequestCheckViewModel.Status = checkStatus;
@@ -112,13 +115,25 @@ public PullRequestCheckViewModel(IUsageTracker usageTracker)
 
         private void DoOpenDetailsUrl(object obj)
         {
-            usageTracker.IncrementCounter(x => x.NumberOfPRCheckStatusesOpenInGitHub).Forget();
+            Expression<Func<UsageModel.MeasuresModel, int>> expression;
+            if (CheckType == PullRequestCheckType.StatusApi)
+            {
+                expression = x => x.NumberOfPRStatusesOpenInGitHub;
+            }
+            else
+            {
+                expression = x => x.NumberOfPRChecksOpenInGitHub;
+            }
+
+            usageTracker.IncrementCounter(expression).Forget();
         }
 
         public string Title { get; private set; }
 
         public string Description { get; private set; }
 
+        public PullRequestCheckType CheckType { get; private set; }
+
         public PullRequestCheckStatus Status{ get; private set; }
 
         public Uri DetailsUrl { get; private set; }

src/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModel.cs

@@ -125,10 +125,16 @@ public PullRequestDetailViewModel(
             SyncSubmodules.Subscribe(_ => Refresh().ToObservable());
             SubscribeOperationError(SyncSubmodules);
 
-            OpenOnGitHub = ReactiveCommand.Create();
+            OpenOnGitHub = ReactiveCommand.Create().OnExecuteCompleted(DoOpenDetailsUrl);
+        
             ShowReview = ReactiveCommand.Create().OnExecuteCompleted(DoShowReview);
         }
 
+        private void DoOpenDetailsUrl(object obj)
+        {
+            usageTracker.IncrementCounter(measuresModel => measuresModel.NumberOfPRDetailsOpenInGitHub).Forget();
+        }
+
         /// <summary>
         /// Gets the underlying pull request model.
         /// </summary>

src/GitHub.Exports/Models/UsageModel.cs

@@ -59,7 +59,8 @@ public class MeasuresModel
             public int NumberOfWelcomeTrainingClicks { get; set; }
             public int NumberOfGitHubPaneHelpClicks { get; set; }
             public int NumberOfPRDetailsOpenInGitHub { get; set; }
-            public int NumberOfPRCheckStatusesOpenInGitHub { get; set; }
+            public int NumberOfPRStatusesOpenInGitHub { get; set; }
+            public int NumberOfPRChecksOpenInGitHub { get; set; }
             public int NumberOfPRDetailsViewChanges { get; set; }
             public int NumberOfPRDetailsViewFile { get; set; }
             public int NumberOfPRDetailsCompareWithSolution { get; set; }