Increase usage count on appropriate operation.

Author: Steven Kirk

src/GitHub.App/Services/UsageTracker.cs

@@ -25,18 +25,17 @@ public class UsageTracker : IUsageTracker
         // Whenever you add a counter make sure it gets added to _both_
         // BuildUsageModel and ClearCounters
         const string GHLastSubmissionKey = "GHLastSubmission";
-        const string GHCommitCountKey = "GHCommitCount";
         const string GHCreateCountKey = "GHCreateCountKey";
         const string GHCloneCountKey = "GHCloneCount";
         const string GHPublishCountKey = "GHPublishCountKey";
         const string GHGistCountKey = "GHPublishCountKey";
         const string GHOpenInGitHubCountKey = "GHOpenInGitHubCountKey";
         const string GHLinkToGitHubCountKey = "GHLinkToGitHubCountKey";
+        const string GHUpstreamPullRequestCount = "GHUpstreamPullRequestCount";
         const string GHLoginCountKey = "GHLoginCountKey";
         const string GHLaunchCountKeyDay = "GHLaunchCountDay";
         const string GHLaunchCountKeyWeek = "GHLaunchCountWeek";
         const string GHLaunchCountKeyMonth = "GHLaunchCountMonth";
-        const string GHUpstreamPullRequestCount = "GHUpstreamPullRequestCount";
 
         static readonly NLog.Logger log = NLog.LogManager.GetCurrentClassLogger();
 
@@ -132,15 +131,14 @@ IObservable<Unit> ClearCounters(bool weekly, bool monthly)
         {
             var standardCounters = new[] {
                 GHLaunchCountKeyDay,
-                GHUpstreamPullRequestCount,
                 GHCloneCountKey,
                 GHCreateCountKey,
                 GHPublishCountKey,
-                GHCommitCountKey,
                 GHGistCountKey,
                 GHOpenInGitHubCountKey,
                 GHLinkToGitHubCountKey,
                 GHLoginCountKey,
+                GHUpstreamPullRequestCount,
             };
 
             var counters = standardCounters
@@ -194,14 +192,14 @@ IObservable<UsageModel> BuildUsageModel(bool weekly, bool monthly)
                 GetCounter(GHLaunchCountKeyDay).Do(x => model.NumberOfStartups = x),
                 GetCounter(GHLaunchCountKeyWeek).Do(x => model.NumberOfStartupsWeek = x),
                 GetCounter(GHLaunchCountKeyMonth).Do(x => model.NumberOfStartupsMonth = x),
-                GetCounter(GHUpstreamPullRequestCount).Do(x => model.NumberOfUpstreamPullRequests = x),
                 GetCounter(GHCloneCountKey).Do(x => model.NumberOfClones = x),
                 GetCounter(GHCreateCountKey).Do(x => model.NumberOfReposCreated = x),
                 GetCounter(GHPublishCountKey).Do(x => model.NumberOfReposPublished = x),
                 GetCounter(GHGistCountKey).Do(x => model.NumberOfGists = x),
                 GetCounter(GHOpenInGitHubCountKey).Do(x => model.NumberOfOpenInGitHub = x),
                 GetCounter(GHLinkToGitHubCountKey).Do(x => model.NumberOfLinkToGitHub = x),
                 GetCounter(GHLoginCountKey).Do(x => model.NumberOfLogins = x),
+                GetCounter(GHUpstreamPullRequestCount).Do(x => model.NumberOfUpstreamPullRequests = x),
             };
 
             if (weekly)
@@ -270,15 +268,15 @@ IObservable<int> IncrementCounter(string key)
             });
         }
 
-        public void IncrementCommitCount()
+        public void IncrementCloneCount()
         {
-            IncrementCounter(GHCommitCountKey)
+            IncrementCounter(GHCloneCountKey)
                 .Subscribe();
         }
 
-        public void IncrementCloneCount()
+        public void IncrementCreateCount()
         {
-            IncrementCounter(GHCloneCountKey)
+            IncrementCounter(GHCreateCountKey)
                 .Subscribe();
         }
 
@@ -290,6 +288,24 @@ public void IncrementLaunchCount()
                 .Subscribe();
         }
 
+        public void IncrementPublishCount()
+        {
+            IncrementCounter(GHPublishCountKey)
+                .Subscribe();
+        }
+
+        public void IncrementOpenInGitHubCount()
+        {
+            IncrementCounter(GHOpenInGitHubCountKey)
+                .Subscribe();
+        }
+
+        public void IncrementLinkToGitHubCount()
+        {
+            IncrementCounter(GHLinkToGitHubCountKey)
+                .Subscribe();
+        }
+
         public void IncrementUpstreamPullRequestCount()
         {
             IncrementCounter(GHUpstreamPullRequestCount)

src/GitHub.App/ViewModels/RepositoryCloneViewModel.cs

@@ -134,10 +134,8 @@ IObservable<Unit> OnCloneRepository(object state)
                 // The following is a noop if the directory already exists.
                 operatingSystem.Directory.CreateDirectory(BaseRepositoryPath);
 
-                // Are we OK doing this here or should we be doing it after the clone succeeds?
-                this.usageTracker.IncrementCloneCount();
-
-                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/RepositoryCreationViewModel.cs

@@ -39,25 +39,29 @@ 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,
-            IAvatarProvider avatarProvider)
-            : this(connectionRepositoryHostMap.CurrentRepositoryHost, operatingSystem, repositoryCreationService, avatarProvider)
+            IAvatarProvider avatarProvider,
+            IUsageTracker usageTracker)
+            : this(connectionRepositoryHostMap.CurrentRepositoryHost, operatingSystem, repositoryCreationService, avatarProvider, usageTracker)
         {}
 
         public RepositoryCreationViewModel(
             IRepositoryHost repositoryHost,
             IOperatingSystem operatingSystem,
             IRepositoryCreationService repositoryCreationService,
-            IAvatarProvider avatarProvider)
+            IAvatarProvider avatarProvider,
+            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;
@@ -278,7 +282,8 @@ IObservable<Unit> OnCreateRepository(object state)
                 newRepository,
                 SelectedAccount,
                 BaseRepositoryPath,
-                repositoryHost.ApiClient);
+                repositoryHost.ApiClient)
+                .Do(_ => usageTracker.IncrementCreateCount());
         }
 
         ReactiveCommand<Unit> InitializeCreateRepositoryCommand()

src/GitHub.App/ViewModels/RepositoryPublishViewModel.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,
@@ -151,6 +154,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 =>
                 {

src/GitHub.Exports.Reactive/Services/IUsageTracker.cs

@@ -2,9 +2,12 @@
 {
     public interface IUsageTracker
     {
-        void IncrementCloneCount();
-        void IncrementCommitCount();
         void IncrementLaunchCount();
+        void IncrementCloneCount();
+        void IncrementCreateCount();
+        void IncrementPublishCount();
+        void IncrementOpenInGitHubCount();
+        void IncrementLinkToGitHubCount();
         void IncrementUpstreamPullRequestCount();
     }
 }

src/GitHub.VisualStudio/Menus/CopyLink.cs

@@ -13,10 +13,13 @@ namespace GitHub.VisualStudio.Menus
     [PartCreationPolicy(CreationPolicy.Shared)]
     public class CopyLink : LinkMenuBase, IDynamicMenuHandler
     {
+        readonly IUsageTracker usageTracker;
+
         [ImportingConstructor]
-        public CopyLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
+        public CopyLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider, IUsageTracker usageTracker)
             : base(serviceProvider)
         {
+            this.usageTracker = usageTracker;
         }
 
         public Guid Guid => GuidList.guidContextMenuSet;
@@ -35,6 +38,7 @@ public void Activate([AllowNull]object data = null)
                 Clipboard.SetText(link);
                 var ns = ServiceProvider.GetExportedValue<IStatusBarNotificationService>();
                 ns?.ShowMessage(Resources.LinkCopiedToClipboardMessage);
+                this.usageTracker.IncrementLinkToGitHubCount();
             }
             catch
             {

src/GitHub.VisualStudio/Menus/OpenLink.cs

@@ -11,10 +11,13 @@ namespace GitHub.VisualStudio.Menus
     [PartCreationPolicy(CreationPolicy.Shared)]
     public class OpenLink: LinkMenuBase, IDynamicMenuHandler
     {
+        readonly IUsageTracker usageTracker;
+
         [ImportingConstructor]
-        public OpenLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
+        public OpenLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider, IUsageTracker usageTracker)
             : base(serviceProvider)
         {
+            this.usageTracker = usageTracker;
         }
 
         public Guid Guid => GuidList.guidContextMenuSet;
@@ -30,6 +33,8 @@ public void Activate([AllowNull]object data = null)
                 return;
             var browser = ServiceProvider.GetExportedValue<IVisualStudioBrowser>();
             browser?.OpenUrl(link.ToUri());
+
+            usageTracker.IncrementOpenInGitHubCount();
         }
 
         public bool CanShow()

src/UnitTests/GitHub.App/ViewModels/RepositoryCreationViewModelTests.cs

@@ -32,8 +32,9 @@ static IRepositoryCreationViewModel GetMeAViewModel(
         creationService = creationService ?? provider.GetRepositoryCreationService();
         var avatarProvider = provider.GetAvatarProvider();
         var connection = provider.GetConnection();
+        var usageTracker = Substitute.For<IUsageTracker>();
 
-        return new RepositoryCreationViewModel(repositoryHost, os, creationService, avatarProvider);
+        return new RepositoryCreationViewModel(repositoryHost, os, creationService, avatarProvider, usageTracker);
     }
 
     public class TheSafeRepositoryNameProperty : TestBaseClass
@@ -334,7 +335,8 @@ public void IsPopulatedByTheRepositoryHost()
                 repositoryHost,
                 Substitute.For<IOperatingSystem>(),
                 Substitute.For<IRepositoryCreationService>(),
-                Substitute.For<IAvatarProvider>());
+                Substitute.For<IAvatarProvider>(),
+                Substitute.For<IUsageTracker>());
 
             Assert.Equal(vm.Accounts[0], vm.SelectedAccount);
             Assert.Equal(2, vm.Accounts.Count);