ARC: Add BootType parameter to ReportBootProgress() in metrics.mojom

components/arc/metrics/arc_metrics_service.cc

Index: components/arc/metrics/arc_metrics_service.cc
diff --git a/components/arc/metrics/arc_metrics_service.cc b/components/arc/metrics/arc_metrics_service.cc
index 2f391c598382e16dd158f43f3196667d7627bd53..c97f5bc1dc01046c61075a3920a7061d135f2540 100644
--- a/components/arc/metrics/arc_metrics_service.cc
+++ b/components/arc/metrics/arc_metrics_service.cc
@@ -14,17 +14,40 @@
 #include "chromeos/dbus/session_manager_client.h"
 #include "components/arc/arc_bridge_service.h"
 
+#define RECORD_ARC_UMA(suffix, elapsed_time, max_seconds)                      \
+  do {                                                                         \
+    UMA_HISTOGRAM_CUSTOM_TIMES("Arc.AndroidBootTime" suffix, (elapsed_time),   \
+                               base::TimeDelta::FromMilliseconds(1),           \
+                               base::TimeDelta::FromSeconds(max_seconds), 50); \
+  } while (false)
+
+namespace arc {
+
 namespace {
 
-const int kRequestProcessListPeriodInMinutes = 5;
-const char kArcProcessNamePrefix[] = "org.chromium.arc.";
-const char kGmsProcessNamePrefix[] = "com.google.android.gms";
-const char kBootProgressEnableScreen[] = "boot_progress_enable_screen";
+constexpr base::TimeDelta kRequestProcessListPeriod =
+    base::TimeDelta::FromMinutes(5);
+constexpr char kArcProcessNamePrefix[] = "org.chromium.arc.";
+constexpr char kGmsProcessNamePrefix[] = "com.google.android.gms";
+constexpr char kBootProgressEnableScreen[] = "boot_progress_enable_screen";
+
+std::string BootTypeToString(mojom::BootType boot_type) {
+  switch (boot_type) {
+    case mojom::BootType::UNKNOWN:
+      return "";  // for backward compatibility.
+    case mojom::BootType::FIRST_BOOT:
+      return ".FIRST_BOOT";
+    case mojom::BootType::FIRST_BOOT_AFTER_UPDATE:
+      return ".FIRST_BOOT_AFTER_UPDATE";
+    case mojom::BootType::REGULAR_BOOT:
+      return ".REGULAR_BOOT";
+  }
+  NOTREACHED();
+  return "";
+}
 
 }  // namespace
 
-namespace arc {
-
 ArcMetricsService::ArcMetricsService(ArcBridgeService* bridge_service)
     : ArcService(bridge_service),
       binding_(this),
@@ -64,9 +87,8 @@ void ArcMetricsService::OnInstanceClosed() {
 
 void ArcMetricsService::OnProcessInstanceReady() {
   VLOG(2) << "Start updating process list.";
-  timer_.Start(FROM_HERE,
-               base::TimeDelta::FromMinutes(kRequestProcessListPeriodInMinutes),
-               this, &ArcMetricsService::RequestProcessList);
+  timer_.Start(FROM_HERE, kRequestProcessListPeriod, this,
+               &ArcMetricsService::RequestProcessList);
 }
 
 void ArcMetricsService::OnProcessInstanceClosed() {
@@ -136,26 +158,45 @@ void ArcMetricsService::OnArcStartTimeRetrieved(
 }
 
 void ArcMetricsService::ReportBootProgress(
-    std::vector<mojom::BootProgressEventPtr> events) {
+    std::vector<mojom::BootProgressEventPtr> events,
+    mojom::BootType boot_type) {
   DCHECK(CalledOnValidThread());
+  // TODO(yusukes): Return immediately with with LOG(ERROR) when |boot_type| is
+  // UNKNOWN. Once the container is updated, we'll never see the boot type.
   int64_t arc_start_time_in_ms =
       (arc_start_time_ - base::TimeTicks()).InMilliseconds();
   for (const auto& event : events) {
     VLOG(2) << "Report boot progress event:" << event->event << "@"
             << event->uptimeMillis;
-    std::string title = "Arc." + event->event;
+    // TODO(yusukes): Always use 60.
+    const int max_seconds = (boot_type == mojom::BootType::UNKNOWN) ? 30 : 60;
+    std::string title = "Arc." + event->event + BootTypeToString(boot_type);
     base::TimeDelta elapsed_time = base::TimeDelta::FromMilliseconds(
         event->uptimeMillis - arc_start_time_in_ms);
     // Note: This leaks memory, which is expected behavior.
     base::HistogramBase* histogram = base::Histogram::FactoryTimeGet(
         title, base::TimeDelta::FromMilliseconds(1),
-        base::TimeDelta::FromSeconds(30), 50,
+        base::TimeDelta::FromSeconds(max_seconds), 50,
         base::HistogramBase::kUmaTargetedHistogramFlag);
     histogram->AddTime(elapsed_time);
-    if (event->event.compare(kBootProgressEnableScreen) == 0)
-      UMA_HISTOGRAM_CUSTOM_TIMES("Arc.AndroidBootTime", elapsed_time,
-                                 base::TimeDelta::FromMilliseconds(1),
-                                 base::TimeDelta::FromSeconds(30), 50);
+    if (event->event.compare(kBootProgressEnableScreen) != 0)
+      continue;
+    switch (boot_type) {
+      case mojom::BootType::UNKNOWN:
+        // For backward compatibility, use "".
+        // TODO(yusukes): Replace this with NOTREACHED().
+        RECORD_ARC_UMA("", elapsed_time, max_seconds);
+        break;
+      case mojom::BootType::FIRST_BOOT:
+        RECORD_ARC_UMA(".FIRST_BOOT", elapsed_time, max_seconds);
+        break;
+      case mojom::BootType::FIRST_BOOT_AFTER_UPDATE:
+        RECORD_ARC_UMA(".FIRST_BOOT_AFTER_UPDATE", elapsed_time, max_seconds);
+        break;
+      case mojom::BootType::REGULAR_BOOT:
+        RECORD_ARC_UMA(".REGULAR_BOOT", elapsed_time, max_seconds);
+        break;
+    }
   }
 }