OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/arc/metrics/arc_metrics_service.h" | 5 #include "components/arc/metrics/arc_metrics_service.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/metrics/histogram_macros.h" | 11 #include "base/metrics/histogram_macros.h" |
12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
13 #include "chromeos/dbus/dbus_thread_manager.h" | 13 #include "chromeos/dbus/dbus_thread_manager.h" |
14 #include "chromeos/dbus/session_manager_client.h" | 14 #include "chromeos/dbus/session_manager_client.h" |
15 #include "components/arc/arc_bridge_service.h" | 15 #include "components/arc/arc_bridge_service.h" |
16 | 16 |
17 #define RECORD_ARC_UMA(suffix, elapsed_time, max_seconds) \ | |
Ilya Sherman
2017/05/25 22:32:08
Why are you defining this as a macro rather than a
Yusuke Sato
2017/05/25 22:48:00
Since HISTOGRAM_POINTER_USE in base/metrics/histog
Yusuke Sato
2017/05/25 23:18:42
Done. Replaced it with base::UmaHistogramCustomTim
Ilya Sherman
2017/05/25 23:48:57
Yeah, it's subtle. It needs to be a runtime-const
| |
18 do { \ | |
19 UMA_HISTOGRAM_CUSTOM_TIMES("Arc.AndroidBootTime" suffix, (elapsed_time), \ | |
20 base::TimeDelta::FromMilliseconds(1), \ | |
21 base::TimeDelta::FromSeconds(max_seconds), 50); \ | |
22 } while (false) | |
23 | |
24 namespace arc { | |
25 | |
17 namespace { | 26 namespace { |
18 | 27 |
19 const int kRequestProcessListPeriodInMinutes = 5; | 28 constexpr base::TimeDelta kRequestProcessListPeriod = |
20 const char kArcProcessNamePrefix[] = "org.chromium.arc."; | 29 base::TimeDelta::FromMinutes(5); |
21 const char kGmsProcessNamePrefix[] = "com.google.android.gms"; | 30 constexpr char kArcProcessNamePrefix[] = "org.chromium.arc."; |
22 const char kBootProgressEnableScreen[] = "boot_progress_enable_screen"; | 31 constexpr char kGmsProcessNamePrefix[] = "com.google.android.gms"; |
32 constexpr char kBootProgressEnableScreen[] = "boot_progress_enable_screen"; | |
33 | |
34 std::string BootTypeToString(mojom::BootType boot_type) { | |
35 switch (boot_type) { | |
36 case mojom::BootType::UNKNOWN: | |
37 return ""; // for backward compatibility. | |
38 case mojom::BootType::FIRST_BOOT: | |
39 return ".FIRST_BOOT"; | |
40 case mojom::BootType::FIRST_BOOT_AFTER_UPDATE: | |
41 return ".FIRST_BOOT_AFTER_UPDATE"; | |
42 case mojom::BootType::REGULAR_BOOT: | |
43 return ".REGULAR_BOOT"; | |
44 } | |
45 NOTREACHED(); | |
46 return ""; | |
47 } | |
23 | 48 |
24 } // namespace | 49 } // namespace |
25 | 50 |
26 namespace arc { | |
27 | |
28 ArcMetricsService::ArcMetricsService(ArcBridgeService* bridge_service) | 51 ArcMetricsService::ArcMetricsService(ArcBridgeService* bridge_service) |
29 : ArcService(bridge_service), | 52 : ArcService(bridge_service), |
30 binding_(this), | 53 binding_(this), |
31 process_observer_(this), | 54 process_observer_(this), |
32 weak_ptr_factory_(this) { | 55 weak_ptr_factory_(this) { |
33 arc_bridge_service()->metrics()->AddObserver(this); | 56 arc_bridge_service()->metrics()->AddObserver(this); |
34 arc_bridge_service()->process()->AddObserver(&process_observer_); | 57 arc_bridge_service()->process()->AddObserver(&process_observer_); |
35 } | 58 } |
36 | 59 |
37 ArcMetricsService::~ArcMetricsService() { | 60 ArcMetricsService::~ArcMetricsService() { |
(...skipping 19 matching lines...) Expand all Loading... | |
57 | 80 |
58 void ArcMetricsService::OnInstanceClosed() { | 81 void ArcMetricsService::OnInstanceClosed() { |
59 VLOG(2) << "Close metrics service."; | 82 VLOG(2) << "Close metrics service."; |
60 DCHECK(CalledOnValidThread()); | 83 DCHECK(CalledOnValidThread()); |
61 if (binding_.is_bound()) | 84 if (binding_.is_bound()) |
62 binding_.Unbind(); | 85 binding_.Unbind(); |
63 } | 86 } |
64 | 87 |
65 void ArcMetricsService::OnProcessInstanceReady() { | 88 void ArcMetricsService::OnProcessInstanceReady() { |
66 VLOG(2) << "Start updating process list."; | 89 VLOG(2) << "Start updating process list."; |
67 timer_.Start(FROM_HERE, | 90 timer_.Start(FROM_HERE, kRequestProcessListPeriod, this, |
68 base::TimeDelta::FromMinutes(kRequestProcessListPeriodInMinutes), | 91 &ArcMetricsService::RequestProcessList); |
69 this, &ArcMetricsService::RequestProcessList); | |
70 } | 92 } |
71 | 93 |
72 void ArcMetricsService::OnProcessInstanceClosed() { | 94 void ArcMetricsService::OnProcessInstanceClosed() { |
73 VLOG(2) << "Stop updating process list."; | 95 VLOG(2) << "Stop updating process list."; |
74 timer_.Stop(); | 96 timer_.Stop(); |
75 } | 97 } |
76 | 98 |
77 void ArcMetricsService::RequestProcessList() { | 99 void ArcMetricsService::RequestProcessList() { |
78 mojom::ProcessInstance* process_instance = ARC_GET_INSTANCE_FOR_METHOD( | 100 mojom::ProcessInstance* process_instance = ARC_GET_INSTANCE_FOR_METHOD( |
79 arc_bridge_service()->process(), RequestProcessList); | 101 arc_bridge_service()->process(), RequestProcessList); |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
129 if (!binding_.is_bound()) { | 151 if (!binding_.is_bound()) { |
130 mojom::MetricsHostPtr host_ptr; | 152 mojom::MetricsHostPtr host_ptr; |
131 binding_.Bind(mojo::MakeRequest(&host_ptr)); | 153 binding_.Bind(mojo::MakeRequest(&host_ptr)); |
132 instance->Init(std::move(host_ptr)); | 154 instance->Init(std::move(host_ptr)); |
133 } | 155 } |
134 arc_start_time_ = arc_start_time; | 156 arc_start_time_ = arc_start_time; |
135 VLOG(2) << "ARC start @" << arc_start_time_; | 157 VLOG(2) << "ARC start @" << arc_start_time_; |
136 } | 158 } |
137 | 159 |
138 void ArcMetricsService::ReportBootProgress( | 160 void ArcMetricsService::ReportBootProgress( |
139 std::vector<mojom::BootProgressEventPtr> events) { | 161 std::vector<mojom::BootProgressEventPtr> events, |
162 mojom::BootType boot_type) { | |
140 DCHECK(CalledOnValidThread()); | 163 DCHECK(CalledOnValidThread()); |
164 // TODO(yusukes): Return immediately with with LOG(ERROR) when |boot_type| is | |
165 // UNKNOWN. Once the container is updated, we'll never see the boot type. | |
141 int64_t arc_start_time_in_ms = | 166 int64_t arc_start_time_in_ms = |
142 (arc_start_time_ - base::TimeTicks()).InMilliseconds(); | 167 (arc_start_time_ - base::TimeTicks()).InMilliseconds(); |
143 for (const auto& event : events) { | 168 for (const auto& event : events) { |
144 VLOG(2) << "Report boot progress event:" << event->event << "@" | 169 VLOG(2) << "Report boot progress event:" << event->event << "@" |
145 << event->uptimeMillis; | 170 << event->uptimeMillis; |
146 std::string title = "Arc." + event->event; | 171 // TODO(yusukes): Always use 60. |
172 const int max_seconds = (boot_type == mojom::BootType::UNKNOWN) ? 30 : 60; | |
173 std::string title = "Arc." + event->event + BootTypeToString(boot_type); | |
Yusuke Sato
2017/05/25 22:48:00
This is the change for Arc.boot_progress*.
Ilya Sherman
2017/05/25 23:48:57
Ah, got it. Thanks!
| |
147 base::TimeDelta elapsed_time = base::TimeDelta::FromMilliseconds( | 174 base::TimeDelta elapsed_time = base::TimeDelta::FromMilliseconds( |
148 event->uptimeMillis - arc_start_time_in_ms); | 175 event->uptimeMillis - arc_start_time_in_ms); |
149 // Note: This leaks memory, which is expected behavior. | 176 // Note: This leaks memory, which is expected behavior. |
150 base::HistogramBase* histogram = base::Histogram::FactoryTimeGet( | 177 base::HistogramBase* histogram = base::Histogram::FactoryTimeGet( |
151 title, base::TimeDelta::FromMilliseconds(1), | 178 title, base::TimeDelta::FromMilliseconds(1), |
152 base::TimeDelta::FromSeconds(30), 50, | 179 base::TimeDelta::FromSeconds(max_seconds), 50, |
153 base::HistogramBase::kUmaTargetedHistogramFlag); | 180 base::HistogramBase::kUmaTargetedHistogramFlag); |
Ilya Sherman
2017/05/25 22:32:08
nit: Could you use base::UmaHistogramCustomTimes()
Yusuke Sato
2017/05/25 23:18:42
Done.
| |
154 histogram->AddTime(elapsed_time); | 181 histogram->AddTime(elapsed_time); |
155 if (event->event.compare(kBootProgressEnableScreen) == 0) | 182 if (event->event.compare(kBootProgressEnableScreen) != 0) |
156 UMA_HISTOGRAM_CUSTOM_TIMES("Arc.AndroidBootTime", elapsed_time, | 183 continue; |
157 base::TimeDelta::FromMilliseconds(1), | 184 switch (boot_type) { |
158 base::TimeDelta::FromSeconds(30), 50); | 185 case mojom::BootType::UNKNOWN: |
186 // For backward compatibility, use "". | |
187 // TODO(yusukes): Replace this with NOTREACHED(). | |
188 RECORD_ARC_UMA("", elapsed_time, max_seconds); | |
189 break; | |
190 case mojom::BootType::FIRST_BOOT: | |
191 RECORD_ARC_UMA(".FIRST_BOOT", elapsed_time, max_seconds); | |
Ilya Sherman
2017/05/25 22:32:08
nit: Why ALL_CAPS? Typically, UMA histograms use
Yusuke Sato
2017/05/25 23:18:42
Changed it to CamelCase, thanks.
| |
192 break; | |
193 case mojom::BootType::FIRST_BOOT_AFTER_UPDATE: | |
194 RECORD_ARC_UMA(".FIRST_BOOT_AFTER_UPDATE", elapsed_time, max_seconds); | |
195 break; | |
196 case mojom::BootType::REGULAR_BOOT: | |
197 RECORD_ARC_UMA(".REGULAR_BOOT", elapsed_time, max_seconds); | |
198 break; | |
199 } | |
159 } | 200 } |
160 } | 201 } |
161 | 202 |
162 ArcMetricsService::ProcessObserver::ProcessObserver( | 203 ArcMetricsService::ProcessObserver::ProcessObserver( |
163 ArcMetricsService* arc_metrics_service) | 204 ArcMetricsService* arc_metrics_service) |
164 : arc_metrics_service_(arc_metrics_service) {} | 205 : arc_metrics_service_(arc_metrics_service) {} |
165 | 206 |
166 ArcMetricsService::ProcessObserver::~ProcessObserver() = default; | 207 ArcMetricsService::ProcessObserver::~ProcessObserver() = default; |
167 | 208 |
168 void ArcMetricsService::ProcessObserver::OnInstanceReady() { | 209 void ArcMetricsService::ProcessObserver::OnInstanceReady() { |
169 arc_metrics_service_->OnProcessInstanceReady(); | 210 arc_metrics_service_->OnProcessInstanceReady(); |
170 } | 211 } |
171 | 212 |
172 void ArcMetricsService::ProcessObserver::OnInstanceClosed() { | 213 void ArcMetricsService::ProcessObserver::OnInstanceClosed() { |
173 arc_metrics_service_->OnProcessInstanceClosed(); | 214 arc_metrics_service_->OnProcessInstanceClosed(); |
174 } | 215 } |
175 | 216 |
176 } // namespace arc | 217 } // namespace arc |
OLD | NEW |