Add UMA metrics to the site engagement service.

chrome/browser/engagement/site_engagement_service.cc

Index: chrome/browser/engagement/site_engagement_service.cc
diff --git a/chrome/browser/engagement/site_engagement_service.cc b/chrome/browser/engagement/site_engagement_service.cc
index 6e96a592fb04d18a5a24ca1984a0e41374a51198..087a82b301dbe19dfd41e56630dc619d9c4b7e43 100644
--- a/chrome/browser/engagement/site_engagement_service.cc
+++ b/chrome/browser/engagement/site_engagement_service.cc
@@ -22,6 +22,9 @@
 
 namespace {
 
+// Length of time between metrics logging.
+const base::TimeDelta metrics_interval = base::TimeDelta::FromMinutes(60);
+
 // Delta within which to consider scores equal.
 const double kScoreDelta = 0.001;
 
@@ -113,6 +116,15 @@ void SiteEngagementScore::AddPoints(double points) {
   last_engagement_time_ = now;
 }
 
+bool SiteEngagementScore::MaxPointsPerDayAdded() {
+  if (!last_engagement_time_.is_null() &&
+      clock_->Now().LocalMidnight() != last_engagement_time_.LocalMidnight()) {
+    return false;
+  }
+
+  return points_added_today_ == kMaxPointsPerDay;
+}
+
 bool SiteEngagementScore::UpdateScoreDict(base::DictionaryValue* score_dict) {
   double raw_score_orig = 0;
   double points_added_today_orig = 0;
@@ -177,7 +189,7 @@ SiteEngagementService::SiteEngagementService(Profile* profile)
   content::BrowserThread::PostAfterStartupTask(
       FROM_HERE, content::BrowserThread::GetMessageLoopProxyForThread(
                      content::BrowserThread::UI),
-      base::Bind(&SiteEngagementService::CleanupEngagementScores,
+      base::Bind(&SiteEngagementService::AfterStartupTask,
                  weak_factory_.GetWeakPtr()));
 }
 
@@ -186,11 +198,22 @@ SiteEngagementService::~SiteEngagementService() {
 
 void SiteEngagementService::HandleNavigation(const GURL& url,
                                              ui::PageTransition transition) {
+  SiteEngagementMetrics::RecordEngagement(
+      SiteEngagementMetrics::ENGAGEMENT_NAVIGATION);
   AddPoints(url, SiteEngagementScore::kNavigationPoints);
+
+  if (clock_->Now() - last_metrics_time_ >= metrics_interval)
+    RecordMetrics();
 }
 
-void SiteEngagementService::HandleUserInput(const GURL& url) {
+void SiteEngagementService::HandleUserInput(
+    const GURL& url,
+    SiteEngagementMetrics::EngagementType type) {
+  SiteEngagementMetrics::RecordEngagement(type);
   AddPoints(url, SiteEngagementScore::kUserInputPoints);
+
+  if (clock_->Now() - last_metrics_time_ >= metrics_interval)

[benwells, 2015/10/02 01:33:25]

This could happen before the startup stuff. You should make this check handle
last_metrics_time_ being null, and also move the check into RecordMetrics so it
is only done once.

[dominickn, 2015/10/02 04:54:50]

Done.

+    RecordMetrics();
 }
 
 double SiteEngagementService::GetScore(const GURL& url) {
@@ -204,22 +227,12 @@ double SiteEngagementService::GetScore(const GURL& url) {
 }
 
 double SiteEngagementService::GetTotalEngagementPoints() {
-  HostContentSettingsMap* settings_map =
-    HostContentSettingsMapFactory::GetForProfile(profile_);
-  scoped_ptr<ContentSettingsForOneType> engagement_settings =
-      GetEngagementContentSettings(settings_map);
+  std::map<GURL, double> score_map = GetScoreMap();
 
   double total_score = 0;
-  for (const auto& site : *engagement_settings) {
-    GURL origin(site.primary_pattern.ToString());
-    if (!origin.is_valid())
-      continue;
+  for (const auto& value : score_map)
+    total_score += value.second;
 
-    scoped_ptr<base::DictionaryValue> score_dict =
-        GetScoreDictForOrigin(settings_map, origin);
-    SiteEngagementScore score(clock_.get(), *score_dict);
-    total_score += score.Score();
-  }
   return total_score;
 }
 
@@ -268,6 +281,11 @@ void SiteEngagementService::AddPoints(const GURL& url, double points) {
   }
 }
 
+void SiteEngagementService::AfterStartupTask() {
+  CleanupEngagementScores();
+  RecordMetrics();
+}
+
 void SiteEngagementService::CleanupEngagementScores() {
   HostContentSettingsMap* settings_map =
     HostContentSettingsMapFactory::GetForProfile(profile_);
@@ -290,3 +308,64 @@ void SiteEngagementService::CleanupEngagementScores() {
   }
 }
 
+int SiteEngagementService::OriginsWithMaxDailyEngagement() {
+  HostContentSettingsMap* settings_map =
+      HostContentSettingsMapFactory::GetForProfile(profile_);
+  scoped_ptr<ContentSettingsForOneType> engagement_settings =
+      GetEngagementContentSettings(settings_map);
+
+  int total_origins = 0;
+
+  // We cannot call GetScoreMap as we need the score objects, not raw scores.
+  for (const auto& site : *engagement_settings) {
+    GURL origin(site.primary_pattern.ToString());
+    if (!origin.is_valid())
+      continue;
+
+    scoped_ptr<base::DictionaryValue> score_dict =
+        GetScoreDictForOrigin(settings_map, origin);
+    SiteEngagementScore score(clock_.get(), *score_dict);
+    if (score.MaxPointsPerDayAdded())
+      total_origins += 1;

[calamity, 2015/10/02 03:46:29]

nit: ++total_origins

[dominickn, 2015/10/02 04:54:50]

Done.

+  }
+
+  return total_origins;
+}
+
+int SiteEngagementService::OriginsWithMaxEngagement(
+    std::map<GURL, double>& score_map) {
+  int total_origins = 0;
+
+  for (const auto& value : score_map)
+    if (value.second == SiteEngagementScore::kMaxPoints)
+      ++total_origins;
+
+  return total_origins;
+}
+
+void SiteEngagementService::RecordMetrics() {
+  last_metrics_time_ = clock_->Now();
+  std::map<GURL, double> score_map = GetScoreMap();
+
+  int origins_with_max_engagement = OriginsWithMaxEngagement(score_map);
+  int total_origins = score_map.size();
+  int percent_origins_with_max_engagement =
+      (total_origins == 0 ? 0 : (origins_with_max_engagement * 100) /
+                                    total_origins);
+
+  double total_engagement = GetTotalEngagementPoints();
+  double average_engagement =
+      (total_origins == 0 ? 0 : total_engagement / total_origins);
+
+  SiteEngagementMetrics::RecordTotalOriginsEngaged(total_origins);
+  SiteEngagementMetrics::RecordTotalSiteEngagement(total_engagement);
+  SiteEngagementMetrics::RecordAverageEngagement(average_engagement);
+  SiteEngagementMetrics::RecordEngagementScores(score_map);
+
+  SiteEngagementMetrics::RecordOriginsWithMaxDailyEngagement(
+      OriginsWithMaxDailyEngagement());
+  SiteEngagementMetrics::RecordOriginsWithMaxEngagement(
+      origins_with_max_engagement);
+  SiteEngagementMetrics::RecordPercentOriginsWithMaxEngagement(
+      percent_origins_with_max_engagement);
+}