Added IUsageTracker.IncrementCounter

grokys · grokys · commit 91d86ab01ed2 · 2017-08-10T16:35:55.000+02:00
Instead of having a separate method for each usage metric, use a generialized method that takes an expression describing the metric to increment.
diff --git a/src/GitHub.App/Models/RepositoryHost.cs b/src/GitHub.App/Models/RepositoryHost.cs
@@ -78,7 +78,8 @@ public IObservable<AuthenticationResult> LogInFromCache()
                 {
                     var user = await loginManager.LoginFromCache(Address, ApiClient.GitHubClient);
                     var accountCacheItem = new AccountCacheItem(user);
-                    usage.IncrementLoginCount().Forget();
+
+                    await usage.IncrementCounter(x => x.NumberOfLogins);
                     await ModelService.InsertUser(accountCacheItem);
 
                     if (user != unverifiedUser.User)
@@ -109,7 +110,8 @@ public IObservable<AuthenticationResult> LogIn(string usernameOrEmail, string pa
             {
                 var user = await loginManager.Login(Address, ApiClient.GitHubClient, usernameOrEmail, password);
                 var accountCacheItem = new AccountCacheItem(user);
-                usage.IncrementLoginCount().Forget();
+
+                await usage.IncrementCounter(x => x.NumberOfLogins);
                 await ModelService.InsertUser(accountCacheItem);
 
                 if (user != unverifiedUser.User)
@@ -165,7 +167,7 @@ IObservable<AuthenticationResult> LoginWithApiUser(UserAndScopes userAndScopes)
                     if (result.IsSuccess())
                     {
                         var accountCacheItem = new AccountCacheItem(userAndScopes.User);
-                        usage.IncrementLoginCount().Forget();
+                        usage.IncrementCounter(x => x.NumberOfLogins).Forget();
                         return ModelService.InsertUser(accountCacheItem).Select(_ => result);
                     }
 
diff --git a/src/GitHub.App/Services/PullRequestService.cs b/src/GitHub.App/Services/PullRequestService.cs
@@ -501,7 +501,7 @@ async Task<IPullRequestModel> PushAndCreatePR(IRepositoryHost host,
                 await Task.Delay(TimeSpan.FromSeconds(5));
 
             var ret = await host.ModelService.CreatePullRequest(sourceRepository, targetRepository, sourceBranch, targetBranch, title, body);
-            await usageTracker.IncrementUpstreamPullRequestCount();
+            await usageTracker.IncrementCounter(x => x.NumberOfUpstreamPullRequests);
             return ret;
         }
 
diff --git a/src/GitHub.App/Services/RepositoryCloneService.cs b/src/GitHub.App/Services/RepositoryCloneService.cs
@@ -63,7 +63,7 @@ public async Task CloneRepository(
             try
             {
                 await vsGitServices.Clone(cloneUrl, path, true, progress);
-                await usageTracker.IncrementCloneCount();
+                await usageTracker.IncrementCounter(x => x.NumberOfClones);
             }
             catch (Exception ex)
             {
diff --git a/src/GitHub.App/ViewModels/GistCreationViewModel.cs b/src/GitHub.App/ViewModels/GistCreationViewModel.cs
@@ -90,7 +90,7 @@ IObservable<Gist> OnCreateGist(object unused)
             newGist.Files.Add(FileName, SelectedText);
 
             return gistPublishService.PublishGist(apiClient, newGist)
-                .Do(_ => usageTracker.IncrementCreateGistCount().Forget())
+                .Do(_ => usageTracker.IncrementCounter(x => x.NumberOfGists).Forget())
                 .Catch<Gist, Exception>(ex =>
                 {
                     if (!ex.IsCriticalException())
diff --git a/src/GitHub.App/ViewModels/PullRequestDetailViewModel.cs b/src/GitHub.App/ViewModels/PullRequestDetailViewModel.cs
@@ -450,7 +450,7 @@ public async Task Load(IRemoteRepositoryModel remoteRepository, IPullRequestMode
 
                 if (firstLoad)
                 {
-                    usageTracker.IncrementPullRequestOpened().Forget();
+                    usageTracker.IncrementCounter(x => x.NumberOfPullRequestsOpened).Forget();
                 }
 
                 if (!isInCheckout)
@@ -606,19 +606,37 @@ IObservable<Unit> DoCheckout(object unused)
                         .GetDefaultLocalBranchName(LocalRepository, Model.Number, Model.Title)
                         .SelectMany(x => pullRequestsService.Checkout(LocalRepository, Model, x));
                 }
-            }).Do(_ => usageTracker.IncrementPullRequestCheckOutCount(IsFromFork).Forget());
+            }).Do(_ =>
+            {
+                if (IsFromFork)
+                    usageTracker.IncrementCounter(x => x.NumberOfForkPullRequestsCheckedOut).Forget();
+                else
+                    usageTracker.IncrementCounter(x => x.NumberOfLocalPullRequestsCheckedOut).Forget();
+            });
         }
 
         IObservable<Unit> DoPull(object unused)
         {
             return pullRequestsService.Pull(LocalRepository)
-                .Do(_ => usageTracker.IncrementPullRequestPullCount(IsFromFork).Forget());
+                .Do(_ =>
+                {
+                    if (IsFromFork)
+                        usageTracker.IncrementCounter(x => x.NumberOfForkPullRequestPulls).Forget();
+                    else
+                        usageTracker.IncrementCounter(x => x.NumberOfLocalPullRequestPulls).Forget();
+                });
         }
 
         IObservable<Unit> DoPush(object unused)
         {
             return pullRequestsService.Push(LocalRepository)
-                .Do(_ => usageTracker.IncrementPullRequestPushCount(IsFromFork).Forget());
+                .Do(_ =>
+                {
+                    if (IsFromFork)
+                        usageTracker.IncrementCounter(x => x.NumberOfForkPullRequestPushes).Forget();
+                    else
+                        usageTracker.IncrementCounter(x => x.NumberOfLocalPullRequestPushes).Forget();
+                });
         }
 
         class CheckoutCommandState : IPullRequestCheckoutState
diff --git a/src/GitHub.App/ViewModels/RepositoryCreationViewModel.cs b/src/GitHub.App/ViewModels/RepositoryCreationViewModel.cs
@@ -273,7 +273,7 @@ IObservable<Unit> OnCreateRepository(object state)
                 SelectedAccount,
                 BaseRepositoryPath,
                 repositoryHost.ApiClient)
-                .Do(_ => usageTracker.IncrementCreateCount().Forget());
+                .Do(_ => usageTracker.IncrementCounter(x => x.NumberOfReposCreated).Forget());
         }
 
         ReactiveCommand<Unit> InitializeCreateRepositoryCommand()
diff --git a/src/GitHub.App/ViewModels/RepositoryPublishViewModel.cs b/src/GitHub.App/ViewModels/RepositoryPublishViewModel.cs
@@ -158,7 +158,7 @@ IObservable<ProgressState> OnPublishRepository(object arg)
             var account = SelectedAccount;
 
             return repositoryPublishService.PublishRepository(newRepository, account, SelectedHost.ApiClient)
-                .Do(_ => usageTracker.IncrementPublishCount().Forget())
+                .Do(_ => usageTracker.IncrementCounter(x => x.NumberOfReposPublished).Forget())
                 .Select(_ => ProgressState.Success)
                 .Catch<ProgressState, Exception>(ex =>
                 {
diff --git a/src/GitHub.Exports/Services/IUsageTracker.cs b/src/GitHub.Exports/Services/IUsageTracker.cs
@@ -1,33 +1,15 @@
 ﻿using GitHub.VisualStudio;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using System;
+using System.Linq.Expressions;
+using GitHub.Models;
 
 namespace GitHub.Services
 {
     [Guid(Guids.UsageTrackerId)]
     public interface IUsageTracker
     {
-        Task IncrementLaunchCount();
-        Task IncrementCloneCount();
-        Task IncrementCreateCount();
-        Task IncrementPublishCount();
-        Task IncrementOpenInGitHubCount();
-        Task IncrementLinkToGitHubCount();
-        Task IncrementCreateGistCount();
-        Task IncrementUpstreamPullRequestCount();
-        Task IncrementLoginCount();
-        Task IncrementPullRequestCheckOutCount(bool fork);
-        Task IncrementPullRequestPullCount(bool fork);
-        Task IncrementPullRequestPushCount(bool fork);
-        Task IncrementPullRequestOpened();
-        Task IncrementWelcomeDocsClicks();
-        Task IncrementWelcomeTrainingClicks();
-        Task IncrementGitHubPaneHelpClicks();
-        Task IncrementPRDetailsViewChanges();
-        Task IncrementPRDetailsViewFile();
-        Task IncrementPRDetailsCompareWithSolution();
-        Task IncrementPRDetailsOpenFileInSolution();
-        Task IncrementPRReviewDiffViewInlineCommentOpen();
-        Task IncrementPRReviewDiffViewInlineCommentPost();
+        Task IncrementCounter(Expression<Func<UsageModel, int>> counter);
     }
 }
diff --git a/src/GitHub.InlineReviews/Services/InlineCommentPeekService.cs b/src/GitHub.InlineReviews/Services/InlineCommentPeekService.cs
@@ -160,7 +160,7 @@ Tuple<ITextSnapshotLine, ITrackingPoint> GetLineAndTrackingPoint(ITextView textV
             ExpandCollapsedRegions(textView, line.Extent);
             peekBroker.TriggerPeekSession(textView, trackingPoint, InlineCommentPeekRelationship.Instance.Name);
 
-            usageTracker.IncrementPRReviewDiffViewInlineCommentOpen().Forget();
+            usageTracker.IncrementCounter(x => x.NumberOfPRReviewDiffViewInlineCommentOpen).Forget();
 
             return Tuple.Create(line, trackingPoint);
         }
diff --git a/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs b/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs
@@ -156,7 +156,7 @@ public async Task<IPullRequestReviewCommentModel> PostReviewComment(
                 path,
                 position);
 
-            await usageTracker.IncrementPRReviewDiffViewInlineCommentPost();
+            await usageTracker.IncrementCounter(x => x.NumberOfPRReviewDiffViewInlineCommentPost);
 
             return new PullRequestReviewCommentModel
             {
@@ -191,7 +191,7 @@ public async Task<IPullRequestReviewCommentModel> PostReviewComment(
                 body,
                 inReplyTo);
 
-            await usageTracker.IncrementPRReviewDiffViewInlineCommentPost();
+            await usageTracker.IncrementCounter(x => x.NumberOfPRReviewDiffViewInlineCommentPost);
 
             return new PullRequestReviewCommentModel
             {
diff --git a/src/GitHub.TeamFoundation.14/Home/GitHubHomeSection.cs b/src/GitHub.TeamFoundation.14/Home/GitHubHomeSection.cs
@@ -154,11 +154,11 @@ void ShowWelcomeMessage()
                     {
                         case "show-training":
                             visualStudioBrowser.OpenUrl(new Uri(TrainingUrl));
-                            usageTracker.IncrementWelcomeTrainingClicks().Forget();
+                            usageTracker.IncrementCounter(x => x.NumberOfWelcomeTrainingClicks).Forget();
                             break;
                         case "show-docs":
                             visualStudioBrowser.OpenUrl(new Uri(GitHubUrls.Documentation));
-                            usageTracker.IncrementWelcomeDocsClicks().Forget();
+                            usageTracker.IncrementCounter(x => x.NumberOfWelcomeDocsClicks).Forget();
                             break;
                         case "dont-show-again":
                             teamExplorerServices.HideNotification(welcomeMessageGuid);
diff --git a/src/GitHub.VisualStudio/Menus/BlameLink.cs b/src/GitHub.VisualStudio/Menus/BlameLink.cs
@@ -30,7 +30,7 @@ public async void Activate(object data = null)
             var browser = ServiceProvider.TryGetService<IVisualStudioBrowser>();
             browser?.OpenUrl(link.ToUri());
 
-            await UsageTracker.IncrementOpenInGitHubCount();
+            await UsageTracker.IncrementCounter(x => x.NumberOfOpenInGitHub);
         }
     }
 }
diff --git a/src/GitHub.VisualStudio/Menus/CopyLink.cs b/src/GitHub.VisualStudio/Menus/CopyLink.cs
@@ -32,7 +32,7 @@ public async void Activate(object data = null)
                 Clipboard.SetText(link);
                 var ns = ServiceProvider.TryGetService<IStatusBarNotificationService>();
                 ns?.ShowMessage(Resources.LinkCopiedToClipboardMessage);
-                await UsageTracker.IncrementLinkToGitHubCount();
+                await UsageTracker.IncrementCounter(x => x.NumberOfLinkToGitHub);
             }
             catch
             {
diff --git a/src/GitHub.VisualStudio/Menus/OpenLink.cs b/src/GitHub.VisualStudio/Menus/OpenLink.cs
@@ -28,7 +28,7 @@ public async void Activate(object data = null)
             var browser = ServiceProvider.TryGetService<IVisualStudioBrowser>();
             browser?.OpenUrl(link.ToUri());
 
-            await UsageTracker.IncrementOpenInGitHubCount();
+            await UsageTracker.IncrementCounter(x => x.NumberOfOpenInGitHub);
         }
     }
 }
diff --git a/src/GitHub.VisualStudio/Services/UsageTracker.cs b/src/GitHub.VisualStudio/Services/UsageTracker.cs
diff --git a/src/GitHub.VisualStudio/Services/UsageTrackerDispatcher.cs b/src/GitHub.VisualStudio/Services/UsageTrackerDispatcher.cs
diff --git a/src/GitHub.VisualStudio/UI/Views/GitHubPaneViewModel.cs b/src/GitHub.VisualStudio/UI/Views/GitHubPaneViewModel.cs
diff --git a/src/GitHub.VisualStudio/UI/Views/PullRequestDetailView.xaml.cs b/src/GitHub.VisualStudio/UI/Views/PullRequestDetailView.xaml.cs
diff --git a/src/UnitTests/GitHub.App/Models/RepositoryHostTests.cs b/src/UnitTests/GitHub.App/Models/RepositoryHostTests.cs
diff --git a/src/UnitTests/GitHub.App/Services/RepositoryCloneServiceTests.cs b/src/UnitTests/GitHub.App/Services/RepositoryCloneServiceTests.cs
diff --git a/src/UnitTests/GitHub.VisualStudio/Services/UsageTrackerTests.cs b/src/UnitTests/GitHub.VisualStudio/Services/UsageTrackerTests.cs

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,8 @@ public IObservable<AuthenticationResult> LogInFromCache()`
`78`	`78`	`{`
`79`	`79`	`var user = await loginManager.LoginFromCache(Address, ApiClient.GitHubClient);`
`80`	`80`	`var accountCacheItem = new AccountCacheItem(user);`
`81`		`- usage.IncrementLoginCount().Forget();`
	`81`	`+`
	`82`	`+ await usage.IncrementCounter(x => x.NumberOfLogins);`
`82`	`83`	`await ModelService.InsertUser(accountCacheItem);`
`83`	`84`
`84`	`85`	`if (user != unverifiedUser.User)`
`@@ -109,7 +110,8 @@ public IObservable<AuthenticationResult> LogIn(string usernameOrEmail, string pa`
`109`	`110`	`{`
`110`	`111`	`var user = await loginManager.Login(Address, ApiClient.GitHubClient, usernameOrEmail, password);`
`111`	`112`	`var accountCacheItem = new AccountCacheItem(user);`
`112`		`- usage.IncrementLoginCount().Forget();`
	`113`	`+`
	`114`	`+ await usage.IncrementCounter(x => x.NumberOfLogins);`
`113`	`115`	`await ModelService.InsertUser(accountCacheItem);`
`114`	`116`
`115`	`117`	`if (user != unverifiedUser.User)`
`@@ -165,7 +167,7 @@ IObservable<AuthenticationResult> LoginWithApiUser(UserAndScopes userAndScopes)`
`165`	`167`	`if (result.IsSuccess())`
`166`	`168`	`{`
`167`	`169`	`var accountCacheItem = new AccountCacheItem(userAndScopes.User);`
`168`		`- usage.IncrementLoginCount().Forget();`
	`170`	`+ usage.IncrementCounter(x => x.NumberOfLogins).Forget();`
`169`	`171`	`return ModelService.InsertUser(accountCacheItem).Select(_ => result);`
`170`	`172`	`}`
`171`	`173`
Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ async Task<IPullRequestModel> PushAndCreatePR(IRepositoryHost host,`
`501`	`501`	`await Task.Delay(TimeSpan.FromSeconds(5));`
`502`	`502`
`503`	`503`	`var ret = await host.ModelService.CreatePullRequest(sourceRepository, targetRepository, sourceBranch, targetBranch, title, body);`
`504`		`- await usageTracker.IncrementUpstreamPullRequestCount();`
	`504`	`+ await usageTracker.IncrementCounter(x => x.NumberOfUpstreamPullRequests);`
`505`	`505`	`return ret;`
`506`	`506`	`}`
`507`	`507`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public async Task CloneRepository(`
`63`	`63`	`try`
`64`	`64`	`{`
`65`	`65`	`await vsGitServices.Clone(cloneUrl, path, true, progress);`
`66`		`- await usageTracker.IncrementCloneCount();`
	`66`	`+ await usageTracker.IncrementCounter(x => x.NumberOfClones);`
`67`	`67`	`}`
`68`	`68`	`catch (Exception ex)`
`69`	`69`	`{`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ IObservable<Gist> OnCreateGist(object unused)`
`90`	`90`	`newGist.Files.Add(FileName, SelectedText);`
`91`	`91`
`92`	`92`	`return gistPublishService.PublishGist(apiClient, newGist)`
`93`		`- .Do(_ => usageTracker.IncrementCreateGistCount().Forget())`
	`93`	`+ .Do(_ => usageTracker.IncrementCounter(x => x.NumberOfGists).Forget())`
`94`	`94`	`.Catch<Gist, Exception>(ex =>`
`95`	`95`	`{`
`96`	`96`	`if (!ex.IsCriticalException())`
Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,7 @@ public async Task Load(IRemoteRepositoryModel remoteRepository, IPullRequestMode`
`450`	`450`
`451`	`451`	`if (firstLoad)`
`452`	`452`	`{`
`453`		`- usageTracker.IncrementPullRequestOpened().Forget();`
	`453`	`+ usageTracker.IncrementCounter(x => x.NumberOfPullRequestsOpened).Forget();`
`454`	`454`	`}`
`455`	`455`
`456`	`456`	`if (!isInCheckout)`
`@@ -606,19 +606,37 @@ IObservable<Unit> DoCheckout(object unused)`
`606`	`606`	`.GetDefaultLocalBranchName(LocalRepository, Model.Number, Model.Title)`
`607`	`607`	`.SelectMany(x => pullRequestsService.Checkout(LocalRepository, Model, x));`
`608`	`608`	`}`
`609`		`- }).Do(_ => usageTracker.IncrementPullRequestCheckOutCount(IsFromFork).Forget());`
	`609`	`+ }).Do(_ =>`
	`610`	`+ {`
	`611`	`+ if (IsFromFork)`
	`612`	`+ usageTracker.IncrementCounter(x => x.NumberOfForkPullRequestsCheckedOut).Forget();`
	`613`	`+ else`
	`614`	`+ usageTracker.IncrementCounter(x => x.NumberOfLocalPullRequestsCheckedOut).Forget();`
	`615`	`+ });`
`610`	`616`	`}`
`611`	`617`
`612`	`618`	`IObservable<Unit> DoPull(object unused)`
`613`	`619`	`{`
`614`	`620`	`return pullRequestsService.Pull(LocalRepository)`
`615`		`- .Do(_ => usageTracker.IncrementPullRequestPullCount(IsFromFork).Forget());`
	`621`	`+ .Do(_ =>`
	`622`	`+ {`
	`623`	`+ if (IsFromFork)`
	`624`	`+ usageTracker.IncrementCounter(x => x.NumberOfForkPullRequestPulls).Forget();`
	`625`	`+ else`
	`626`	`+ usageTracker.IncrementCounter(x => x.NumberOfLocalPullRequestPulls).Forget();`
	`627`	`+ });`
`616`	`628`	`}`
`617`	`629`
`618`	`630`	`IObservable<Unit> DoPush(object unused)`
`619`	`631`	`{`
`620`	`632`	`return pullRequestsService.Push(LocalRepository)`
`621`		`- .Do(_ => usageTracker.IncrementPullRequestPushCount(IsFromFork).Forget());`
	`633`	`+ .Do(_ =>`
	`634`	`+ {`
	`635`	`+ if (IsFromFork)`
	`636`	`+ usageTracker.IncrementCounter(x => x.NumberOfForkPullRequestPushes).Forget();`
	`637`	`+ else`
	`638`	`+ usageTracker.IncrementCounter(x => x.NumberOfLocalPullRequestPushes).Forget();`
	`639`	`+ });`
`622`	`640`	`}`
`623`	`641`
`624`	`642`	`class CheckoutCommandState : IPullRequestCheckoutState`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ IObservable<Unit> OnCreateRepository(object state)`
`273`	`273`	`SelectedAccount,`
`274`	`274`	`BaseRepositoryPath,`
`275`	`275`	`repositoryHost.ApiClient)`
`276`		`- .Do(_ => usageTracker.IncrementCreateCount().Forget());`
	`276`	`+ .Do(_ => usageTracker.IncrementCounter(x => x.NumberOfReposCreated).Forget());`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`ReactiveCommand<Unit> InitializeCreateRepositoryCommand()`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ IObservable<ProgressState> OnPublishRepository(object arg)`
`158`	`158`	`var account = SelectedAccount;`
`159`	`159`
`160`	`160`	`return repositoryPublishService.PublishRepository(newRepository, account, SelectedHost.ApiClient)`
`161`		`- .Do(_ => usageTracker.IncrementPublishCount().Forget())`
	`161`	`+ .Do(_ => usageTracker.IncrementCounter(x => x.NumberOfReposPublished).Forget())`
`162`	`162`	`.Select(_ => ProgressState.Success)`
`163`	`163`	`.Catch<ProgressState, Exception>(ex =>`
`164`	`164`	`{`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ Tuple<ITextSnapshotLine, ITrackingPoint> GetLineAndTrackingPoint(ITextView textV`
`160`	`160`	`ExpandCollapsedRegions(textView, line.Extent);`
`161`	`161`	`peekBroker.TriggerPeekSession(textView, trackingPoint, InlineCommentPeekRelationship.Instance.Name);`
`162`	`162`
`163`		`- usageTracker.IncrementPRReviewDiffViewInlineCommentOpen().Forget();`
	`163`	`+ usageTracker.IncrementCounter(x => x.NumberOfPRReviewDiffViewInlineCommentOpen).Forget();`
`164`	`164`
`165`	`165`	`return Tuple.Create(line, trackingPoint);`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public async Task<IPullRequestReviewCommentModel> PostReviewComment(`
`156`	`156`	`path,`
`157`	`157`	`position);`
`158`	`158`
`159`		`- await usageTracker.IncrementPRReviewDiffViewInlineCommentPost();`
	`159`	`+ await usageTracker.IncrementCounter(x => x.NumberOfPRReviewDiffViewInlineCommentPost);`
`160`	`160`
`161`	`161`	`return new PullRequestReviewCommentModel`
`162`	`162`	`{`
`@@ -191,7 +191,7 @@ public async Task<IPullRequestReviewCommentModel> PostReviewComment(`
`191`	`191`	`body,`
`192`	`192`	`inReplyTo);`
`193`	`193`
`194`		`- await usageTracker.IncrementPRReviewDiffViewInlineCommentPost();`
	`194`	`+ await usageTracker.IncrementCounter(x => x.NumberOfPRReviewDiffViewInlineCommentPost);`
`195`	`195`
`196`	`196`	`return new PullRequestReviewCommentModel`
`197`	`197`	`{`