commit ab22c166ccfb33fd99169bee645d67306ae26ced
author Arman Uguray <armansito@chromium.org> Mon Oct 08 19:08:38 2012 -0700
committer Gerrit <chrome-bot@google.com> Fri Oct 19 18:35:55 2012 -0700
tree 8046b7ec179b9654a695120ded976d9b0fb93557
parent 87fc23e2f38def031f702780c4648c3f92285bd3

shill: Add metrics for recording termination/suspend time

Added the following metrics:

 - Network.Shill.TerminationActionResult.OnSuspend,
 - Network.Shill.TerminationActionResult.OnTerminate,

which log success/failure;

 - Network.Shill.TerminationActionTime.OnSuspend,
 - Network.Shill.TerminationActionTime.OnTerminate,

which measure the time it takes to complete the termination actions.

BUG=chromium-os:35029
TEST=Manually suspended machine and terminated shill on separate
occasions and observed the output on chrome://histograms

Change-Id: I5183d7c3dd5d4633f661598b7a0cacab6d205d8b
Reviewed-on: https://gerrit.chromium.org/gerrit/34975
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Ready: Arman Uguray <armansito@chromium.org>
Tested-by: Arman Uguray <armansito@chromium.org>

metrics.cc

diff --git a/metrics.cc b/metrics.cc
index 578f596..2d59720 100644
--- a/metrics.cc
+++ b/metrics.cc
@@ -87,8 +87,16 @@
 
 const char Metrics::kMetricPortalResult[] = "Network.Shill.%s.PortalResult";
 
-const char Metrics::kMetricTerminationActionResult[] =
-    "Network.Shill.TerminationActionResult";
+const char Metrics::kMetricTerminationActionTimeOnTerminate[] =
+    "Network.Shill.TerminationActionTime.OnTerminate";
+const char Metrics::kMetricTerminationActionResultOnTerminate[] =
+    "Network.Shill.TerminationActionResult.OnTerminate";
+const char Metrics::kMetricTerminationActionTimeOnSuspend[] =
+    "Network.Shill.TerminationActionTime.OnSuspend";
+const char Metrics::kMetricTerminationActionResultOnSuspend[] =
+    "Network.Shill.TerminationActionResult.OnSuspend";
+const int Metrics::kMetricTerminationActionTimeMillisecondsMax = 10000;
+const int Metrics::kMetricTerminationActionTimeMillisecondsMin = 1;
 
 // static
 const uint16 Metrics::kWiFiBandwidth5MHz = 5;
@@ -151,6 +159,7 @@
       time_online_timer_(new chromeos_metrics::Timer),
       time_to_drop_timer_(new chromeos_metrics::Timer),
       time_resume_to_ready_timer_(new chromeos_metrics::Timer),
+      time_termination_actions_timer(new chromeos_metrics::Timer),
       collect_bootstats_(true) {
   metrics_library_.Init();
   chromeos_metrics::TimerReporter::set_metrics_lib(library_);
@@ -421,6 +430,47 @@
   }
 }
 
+void Metrics::NotifyTerminationActionsStarted(
+    TerminationActionReason /*reason*/) {
+  if (time_termination_actions_timer->HasStarted())
+    return;
+  time_termination_actions_timer->Start();
+}
+
+void Metrics::NotifyTerminationActionsCompleted(
+    TerminationActionReason reason, bool success) {
+  if (!time_termination_actions_timer->HasStarted())
+    return;
+
+  int result = success ? kTerminationActionResultSuccess :
+                         kTerminationActionResultFailure;
+
+  base::TimeDelta elapsed_time;
+  time_termination_actions_timer->GetElapsedTime(&elapsed_time);
+  time_termination_actions_timer->Reset();
+  string time_metric, result_metric;
+  switch (reason) {
+  case kTerminationActionReasonSuspend:
+    time_metric = kMetricTerminationActionTimeOnSuspend;
+    result_metric = kMetricTerminationActionResultOnSuspend;
+    break;
+  case kTerminationActionReasonTerminate:
+    time_metric = kMetricTerminationActionTimeOnTerminate;
+    result_metric = kMetricTerminationActionResultOnTerminate;
+    break;
+  }
+
+  SendToUMA(time_metric,
+            elapsed_time.InMilliseconds(),
+            kMetricTerminationActionTimeMillisecondsMin,
+            kMetricTerminationActionTimeMillisecondsMax,
+            kTimerHistogramNumBuckets);
+
+  SendEnumToUMA(result_metric,
+                result,
+                kTerminationActionResultMax);
+}
+
 void Metrics::NotifyLinkMonitorFailure(
     Technology::Identifier technology,
     LinkMonitorFailure failure,