Add histograms for ExternalDataUseObserver

chrome/browser/android/data_usage/external_data_use_observer.cc

Index: chrome/browser/android/data_usage/external_data_use_observer.cc
diff --git a/chrome/browser/android/data_usage/external_data_use_observer.cc b/chrome/browser/android/data_usage/external_data_use_observer.cc
index 9d317cd924545f90c60e5af607c8a058d9a8cd95..77536802096cb52326152f23bc8627743dae4dda 100644
--- a/chrome/browser/android/data_usage/external_data_use_observer.cc
+++ b/chrome/browser/android/data_usage/external_data_use_observer.cc
@@ -11,6 +11,8 @@
 #include "base/containers/hash_tables.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/field_trial.h"
+#include "base/metrics/histogram_base.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/android/data_usage/data_use_tab_model.h"
 #include "components/data_usage/core/data_use.h"
@@ -25,10 +27,55 @@ using base::android::ToJavaArrayOfStrings;
 
 namespace {
 
+// Record the result of data use report submission. |bytes| is the sum of send
+// and received bytes in the report.
+void RecordDataUsageReportSubmission(
+    chrome::android::ExternalDataUseObserver::DataUsageReportSubmissionResult
+        result,
+    int64_t bytes) {
+  DCHECK_LE(0, bytes);
+  UMA_HISTOGRAM_ENUMERATION("DataUsage.ReportSubmissionResult", result,
+                            chrome::android::ExternalDataUseObserver::
+                                DATAUSAGE_REPORT_SUBMISSION_BOUNDARY);
+  // Cap to the maximum sample value.
+  const int32_t bytes_capped = bytes <= base::HistogramBase::kSampleType_MAX - 1
+                                   ? bytes
+                                   : base::HistogramBase::kSampleType_MAX - 1;
+  switch (result) {
+    case chrome::android::ExternalDataUseObserver::
+        DATAUSAGE_REPORT_SUBMISSION_SUCCESSFUL:
+      UMA_HISTOGRAM_COUNTS("DataUsage.ReportSubmission.Successful.Bytes",
+                           bytes_capped);
+      break;
+    case chrome::android::ExternalDataUseObserver::
+        DATAUSAGE_REPORT_SUBMISSION_FAILED:
+      UMA_HISTOGRAM_COUNTS("DataUsage.ReportSubmission.Failed.Bytes",
+                           bytes_capped);
+      break;
+    case chrome::android::ExternalDataUseObserver::
+        DATAUSAGE_REPORT_SUBMISSION_TIMED_OUT:
+      UMA_HISTOGRAM_COUNTS("DataUsage.ReportSubmission.TimedOut.Bytes",
+                           bytes_capped);
+      break;
+    case chrome::android::ExternalDataUseObserver::
+        DATAUSAGE_REPORT_SUBMISSION_LOST:
+      UMA_HISTOGRAM_COUNTS("DataUsage.ReportSubmission.Lost.Bytes",
+                           bytes_capped);
+      break;
+    default:
+      NOTIMPLEMENTED();
+      break;
+  }
+}
+
 // Default duration after which matching rules are periodically fetched. May be
 // overridden by the field trial.
 const int kDefaultFetchMatchingRulesDurationSeconds = 60 * 15;  // 15 minutes.
 
+// Default duration after which a pending data use report is considered timed
+// out. May be overridden by the field trial.
+const int kDefaultDataUseReportSubmitTimeoutMsec = 60 * 2 * 1000;  // 2 minutes.
+
 // Default value of the minimum number of bytes that should be buffered before
 // a data use report is submitted. May be overridden by the field trial.
 const int64_t kDefaultDataUseReportMinBytes = 100 * 1024;  // 100 KB.
@@ -36,7 +83,7 @@ const int64_t kDefaultDataUseReportMinBytes = 100 * 1024;  // 100 KB.
 // Populates various parameters from the values specified in the field trial.
 int32_t GetFetchMatchingRulesDurationSeconds() {
   int32_t duration_seconds = -1;
-  std::string variation_value = variations::GetVariationParamValue(
+  const std::string variation_value = variations::GetVariationParamValue(
       chrome::android::ExternalDataUseObserver::
           kExternalDataUseObserverFieldTrial,
       "fetch_matching_rules_duration_seconds");
@@ -49,9 +96,24 @@ int32_t GetFetchMatchingRulesDurationSeconds() {
 }
 
 // Populates various parameters from the values specified in the field trial.
+int32_t GetDataReportSubmitTimeoutMsec() {
+  int32_t duration_seconds = -1;
+  const std::string variation_value = variations::GetVariationParamValue(
+      chrome::android::ExternalDataUseObserver::
+          kExternalDataUseObserverFieldTrial,
+      "data_report_submit_timeout_msec");
+  if (!variation_value.empty() &&
+      base::StringToInt(variation_value, &duration_seconds)) {
+    DCHECK_LE(0, duration_seconds);
+    return duration_seconds;
+  }
+  return kDefaultDataUseReportSubmitTimeoutMsec;
+}
+
+// Populates various parameters from the values specified in the field trial.
 int64_t GetMinBytes() {
   int64_t min_bytes = -1;
-  std::string variation_value = variations::GetVariationParamValue(
+  const std::string variation_value = variations::GetVariationParamValue(
       chrome::android::ExternalDataUseObserver::
           kExternalDataUseObserverFieldTrial,
       "data_use_report_min_bytes");
@@ -82,7 +144,8 @@ ExternalDataUseObserver::ExternalDataUseObserver(
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
     : data_use_aggregator_(data_use_aggregator),
       matching_rules_fetch_pending_(false),
-      submit_data_report_pending_(false),
+      last_data_report_submitted_ticks_(base::TimeTicks()),
+      pending_report_bytes_(0),
       registered_as_observer_(false),
       io_task_runner_(io_task_runner),
       ui_task_runner_(ui_task_runner),
@@ -92,11 +155,14 @@ ExternalDataUseObserver::ExternalDataUseObserver(
       fetch_matching_rules_duration_(
           base::TimeDelta::FromSeconds(GetFetchMatchingRulesDurationSeconds())),
       data_use_report_min_bytes_(GetMinBytes()),
+      data_report_submit_timeout_(
+          base::TimeDelta::FromMilliseconds(GetDataReportSubmitTimeoutMsec())),
       io_weak_factory_(this),
       ui_weak_factory_(this) {
   DCHECK(data_use_aggregator_);
   DCHECK(io_task_runner_);
   DCHECK(ui_task_runner_);
+  DCHECK(last_data_report_submitted_ticks_.is_null());
 
   ui_task_runner_->PostTask(
       FROM_HERE,
@@ -205,11 +271,18 @@ base::WeakPtr<ExternalDataUseObserver> ExternalDataUseObserver::GetUIWeakPtr() {
 
 void ExternalDataUseObserver::OnReportDataUseDoneOnIOThread(bool success) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(submit_data_report_pending_);
+  DCHECK(!last_data_report_submitted_ticks_.is_null());
 
-  // TODO(tbansal): If not successful, record UMA.
+  if (success) {
+    RecordDataUsageReportSubmission(DATAUSAGE_REPORT_SUBMISSION_SUCCESSFUL,
+                                    pending_report_bytes_);
+  } else {
+    RecordDataUsageReportSubmission(DATAUSAGE_REPORT_SUBMISSION_FAILED,
+                                    pending_report_bytes_);
+  }
 
-  submit_data_report_pending_ = false;
+  last_data_report_submitted_ticks_ = base::TimeTicks();
+  pending_report_bytes_ = 0;
 
   SubmitBufferedDataUseReport();
 }
@@ -254,7 +327,7 @@ void ExternalDataUseObserver::BufferDataUseReport(
   DCHECK(!label.empty());
   DCHECK_LE(0, data_use.rx_bytes);
   DCHECK_LE(0, data_use.tx_bytes);
-  if (data_use.rx_bytes < 0 || data_use.tx_bytes < 0)
+  if (data_use.rx_bytes == 0 && data_use.tx_bytes == 0)

[sclittle, 2015/12/08 00:36:21]

nit: add a comment like "don't submit empty reports" or something

[tbansal1, 2015/12/08 02:01:25]

Done.

     return;
 
   DataUseReportKey data_use_report_key =
@@ -269,7 +342,8 @@ void ExternalDataUseObserver::BufferDataUseReport(
   if (it == buffered_data_reports_.end()) {
     // Limit the buffer size.
     if (buffered_data_reports_.size() == kMaxBufferSize) {
-      // TODO(tbansal): Add UMA to track impact of lost reports.
+      RecordDataUsageReportSubmission(DATAUSAGE_REPORT_SUBMISSION_LOST,
+                                      data_use.rx_bytes + data_use.tx_bytes);
       return;
     }
     buffered_data_reports_.insert(std::make_pair(data_use_report_key, report));
@@ -286,29 +360,51 @@ void ExternalDataUseObserver::BufferDataUseReport(
   }
   total_bytes_buffered_ += (data_use.rx_bytes + data_use.tx_bytes);
 
+  DCHECK_LT(0U, buffered_data_reports_.size());
   DCHECK_LE(buffered_data_reports_.size(), kMaxBufferSize);
 }
 
 void ExternalDataUseObserver::SubmitBufferedDataUseReport() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  if (submit_data_report_pending_ || buffered_data_reports_.empty())
+  const base::TimeTicks ticks_now = base::TimeTicks::Now();
+
+  // Return if a data use report has been pending for less than
+  // |data_report_submit_timeout_| duration.
+  if (!last_data_report_submitted_ticks_.is_null() &&
+      ticks_now - last_data_report_submitted_ticks_ <
+          data_report_submit_timeout_) {
+    return;
+  }
+
+  if (buffered_data_reports_.empty())
     return;
 
   if (total_bytes_buffered_ < data_use_report_min_bytes_)
     return;
 
+  if (!last_data_report_submitted_ticks_.is_null()) {
+    // Mark the pending DataUsage report as timed out.

[sclittle, 2015/12/08 00:36:21]

Can you make it clear somewhere, maybe also in the Java ExternalDataUseObserver
or something, that submitting a new report while another is already in progress
should cancel the previous submission?

[tbansal1, 2015/12/08 02:01:25]

Added more comments in Java code.

+    RecordDataUsageReportSubmission(DATAUSAGE_REPORT_SUBMISSION_TIMED_OUT,
+                                    pending_report_bytes_);
+    pending_report_bytes_ = 0;
+    last_data_report_submitted_ticks_ = base::TimeTicks();
+  }
+
   // Send one data use report.
   DataUseReports::iterator it = buffered_data_reports_.begin();
   DataUseReportKey key = it->first;
   DataUseReport report = it->second;
 
+  DCHECK_EQ(0, pending_report_bytes_);
+  DCHECK(last_data_report_submitted_ticks_.is_null());
+  pending_report_bytes_ = report.bytes_downloaded + report.bytes_uploaded;
+  last_data_report_submitted_ticks_ = ticks_now;
+
   // Remove the entry from the map.
   buffered_data_reports_.erase(it);
   total_bytes_buffered_ -= (report.bytes_downloaded + report.bytes_uploaded);
 
-  submit_data_report_pending_ = true;
-
   ui_task_runner_->PostTask(
       FROM_HERE, base::Bind(&ExternalDataUseObserver::ReportDataUseOnUIThread,
                             GetIOWeakPtr(), key, report));