Add new metrics.
The current metrics (Installer.* namespace) have several shortcomings,
for example it's not immediately clear when and how frequent each
metric is reported. This CL introduces new metrics that addresses this
and other problems. The new metrics are all in the UpdateEngine.*
namespace and fall into five categories
UpdateEngine.Daily.* Reported daily.
UpdateEngine.Check.* On every check.
UpdateEngine.Attempt.* On every attempt.
UpdateEngine.SuccessfulUpdate.* With every successful update.
UpdateEngine.* Miscellaneous
Most of the new metrics mimic existing metrics and also leverage the
existing code, book-keeping and unit tests. The plan is to remove the
Installer.* metrics once we're happy with the new ones.
I've also tested this manually by performing updates and verifying
that chrome://histograms looks correct.
BUG=chromium:355745
TEST=New unit tests + unit tests pass + manual testing.
Change-Id: I7a3f68d75910384b116c7e4664776e25d3997584
Reviewed-on: https://chromium-review.googlesource.com/191314
Reviewed-by: David Zeuthen <zeuthen@chromium.org>
Tested-by: David Zeuthen <zeuthen@chromium.org>
Commit-Queue: David Zeuthen <zeuthen@chromium.org>
diff --git a/payload_state_unittest.cc b/payload_state_unittest.cc
index f804599..a6d6d83 100644
--- a/payload_state_unittest.cc
+++ b/payload_state_unittest.cc
@@ -307,6 +307,11 @@
EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(_, _, _, _, _))
+ .Times(AnyNumber());
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
+ .Times(AnyNumber());
+
// The first response doesn't send an abandoned event.
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
"Installer.UpdatesAbandonedEventCount", 0, _, _, _)).Times(0);
@@ -881,6 +886,8 @@
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(_, _, _, _, _))
.Times(AnyNumber());
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
+ .Times(AnyNumber());
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
"Installer.SuccessfulMBsDownloadedFromHttpServer",
http_chunk / kNumBytesInOneMiB, _, _, _));
@@ -903,9 +910,15 @@
"Installer.UpdateURLSwitches",
3, _, _, _));
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ metrics::kMetricSuccessfulUpdateUrlSwitchCount,
+ 3, _, _, _));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
"Installer.UpdateDurationMinutes",
_, _, _, _));
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ metrics::kMetricSuccessfulUpdateTotalDurationMinutes,
+ _, _, _, _));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
"Installer.UpdateDurationUptimeMinutes",
_, _, _, _));
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
@@ -915,10 +928,20 @@
_, _, _));
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
"Installer.DownloadOverheadPercentage", 318, _, _, _));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ metrics::kMetricSuccessfulUpdateDownloadOverheadPercentage,
+ 314, _, _, _));
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
"Installer.PayloadFormat", kPayloadTypeFull, kNumPayloadTypes));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ metrics::kMetricAttemptPayloadType, kPayloadTypeFull, kNumPayloadTypes));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ metrics::kMetricSuccessfulUpdatePayloadType, kPayloadTypeFull,
+ kNumPayloadTypes));
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
"Installer.AttemptsCount.Total", 1, _, _, _));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ metrics::kMetricSuccessfulUpdateAttemptCount, 1, _, _, _));
payload_state.UpdateSucceeded();
@@ -959,6 +982,10 @@
"Installer.DownloadSourcesUsed",
(1 << kDownloadSourceHttpServer),
_, _, _));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ metrics::kMetricSuccessfulUpdateDownloadSourcesUsed,
+ (1 << kDownloadSourceHttpServer),
+ _, _, _));
payload_state.UpdateSucceeded();
}
@@ -1161,6 +1188,9 @@
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
"Installer.TimeToRebootMinutes",
7, _, _, _));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ metrics::kMetricTimeToRebootMinutes,
+ 7, _, _, _));
EXPECT_CALL(mock_system_state, system_rebooted())
.WillRepeatedly(Return(true));
@@ -1282,8 +1312,15 @@
// Simulate a successful download and update.
payload_state.DownloadComplete();
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
+ .Times(AnyNumber());
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
"Installer.PayloadFormat", kPayloadTypeDelta, kNumPayloadTypes));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ metrics::kMetricAttemptPayloadType, kPayloadTypeDelta, kNumPayloadTypes));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ metrics::kMetricSuccessfulUpdatePayloadType, kPayloadTypeDelta,
+ kNumPayloadTypes));
payload_state.UpdateSucceeded();
// Mock the request to a request where the delta was disabled but Omaha sends
@@ -1299,6 +1336,12 @@
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
"Installer.PayloadFormat", kPayloadTypeDelta, kNumPayloadTypes));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ metrics::kMetricAttemptPayloadType, kPayloadTypeDelta,
+ kNumPayloadTypes));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ metrics::kMetricSuccessfulUpdatePayloadType, kPayloadTypeDelta,
+ kNumPayloadTypes));
payload_state.UpdateSucceeded();
}
@@ -1319,8 +1362,16 @@
// Simulate a successful download and update.
payload_state.DownloadComplete();
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
+ .Times(AnyNumber());
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
"Installer.PayloadFormat", kPayloadTypeForcedFull, kNumPayloadTypes));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ metrics::kMetricAttemptPayloadType, kPayloadTypeForcedFull,
+ kNumPayloadTypes));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ metrics::kMetricSuccessfulUpdatePayloadType, kPayloadTypeForcedFull,
+ kNumPayloadTypes));
payload_state.UpdateSucceeded();
}
@@ -1342,8 +1393,16 @@
// Simulate a successful download and update.
payload_state.DownloadComplete();
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(_, _, _))
+ .Times(AnyNumber());
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
"Installer.PayloadFormat", kPayloadTypeFull, kNumPayloadTypes));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ metrics::kMetricAttemptPayloadType, kPayloadTypeFull,
+ kNumPayloadTypes));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendEnumToUMA(
+ metrics::kMetricSuccessfulUpdatePayloadType, kPayloadTypeFull,
+ kNumPayloadTypes));
payload_state.UpdateSucceeded();
}
@@ -1374,6 +1433,8 @@
// Reboot into the same environment to get an UMA metric with a value of 1.
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
"Installer.RebootToNewPartitionAttempt", 1, _, _, _));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ metrics::kMetricFailedUpdateCount, 1, _, _, _));
payload_state.ReportFailedBootIfNeeded();
Mock::VerifyAndClearExpectations(mock_system_state.mock_metrics_lib());
@@ -1383,6 +1444,8 @@
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
"Installer.RebootToNewPartitionAttempt", 2, _, _, _));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ metrics::kMetricFailedUpdateCount, 2, _, _, _));
payload_state.ReportFailedBootIfNeeded();
Mock::VerifyAndClearExpectations(mock_system_state.mock_metrics_lib());
@@ -1391,6 +1454,8 @@
payload_state.ExpectRebootInNewVersion("Version:3141592");
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
"Installer.RebootToNewPartitionAttempt", 1, _, _, _));
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ metrics::kMetricFailedUpdateCount, 1, _, _, _));
payload_state.ReportFailedBootIfNeeded();
Mock::VerifyAndClearExpectations(mock_system_state.mock_metrics_lib());
@@ -1427,6 +1492,9 @@
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
"Installer.RebootToNewPartitionAttempt", _, _, _, _))
.Times(0);
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ metrics::kMetricFailedUpdateCount, _, _, _, _))
+ .Times(0);
payload_state.ReportFailedBootIfNeeded();
// A second reboot in eiher partition should not send a metric.
@@ -1461,6 +1529,9 @@
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
"Installer.RebootToNewPartitionAttempt", _, _, _, _))
.Times(0);
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ metrics::kMetricFailedUpdateCount, _, _, _, _))
+ .Times(0);
// Cancel the applied update.
payload_state.ResetUpdateStatus();
@@ -1488,6 +1559,9 @@
EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
"Installer.RebootToNewPartitionAttempt", _, _, _, _))
.Times(0);
+ EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
+ metrics::kMetricFailedUpdateCount, _, _, _, _))
+ .Times(0);
// Simulate a reboot in this environment.
payload_state.ReportFailedBootIfNeeded();