Remove libmetricslogger dependency from update_engine
As we migrate the update_engine's metrics away from Tron, stop reporting
them using libmetricslogger.
Bug: 147776349
Test: unittests pass
Change-Id: Ide355d0125ab33f93b721b0c5abdcb139f339fb1
diff --git a/metrics_reporter_android.cc b/metrics_reporter_android.cc
index 4165c14..9cef43c 100644
--- a/metrics_reporter_android.cc
+++ b/metrics_reporter_android.cc
@@ -22,20 +22,14 @@
#include <string>
#include <android-base/properties.h>
-#include <metricslogger/metrics_logger.h>
#include <statslog.h>
#include "update_engine/common/constants.h"
namespace {
-void LogHistogram(const std::string& metrics, int value) {
- android::metricslogger::LogHistogram(metrics, value);
- LOG(INFO) << "uploading " << value << " to histogram for metric " << metrics;
-}
-
// A number offset adds on top of the enum value. e.g. ErrorCode::SUCCESS will
// be reported as 10000, and AttemptResult::UPDATE_CANCELED will be reported as
-// 10011. The keeps the ordering of update engine's enum definition when statsd
+// 10011. This keeps the ordering of update engine's enum definition when statsd
// atoms reserve the value 0 for unknown state.
constexpr auto kMetricsReporterEnumOffset = 10000;
@@ -48,41 +42,6 @@
namespace metrics {
-// The histograms are defined in:
-// depot/google3/analysis/uma/configs/clearcut/TRON/histograms.xml
-constexpr char kMetricsUpdateEngineAttemptNumber[] =
- "ota_update_engine_attempt_number";
-constexpr char kMetricsUpdateEngineAttemptResult[] =
- "ota_update_engine_attempt_result";
-constexpr char kMetricsUpdateEngineAttemptDurationInMinutes[] =
- "ota_update_engine_attempt_fixed_duration_boottime_in_minutes";
-constexpr char kMetricsUpdateEngineAttemptDurationUptimeInMinutes[] =
- "ota_update_engine_attempt_duration_monotonic_in_minutes";
-constexpr char kMetricsUpdateEngineAttemptErrorCode[] =
- "ota_update_engine_attempt_error_code";
-constexpr char kMetricsUpdateEngineAttemptPayloadSizeMiB[] =
- "ota_update_engine_attempt_payload_size_mib";
-constexpr char kMetricsUpdateEngineAttemptPayloadType[] =
- "ota_update_engine_attempt_payload_type";
-constexpr char kMetricsUpdateEngineAttemptCurrentBytesDownloadedMiB[] =
- "ota_update_engine_attempt_fixed_current_bytes_downloaded_mib";
-
-constexpr char kMetricsUpdateEngineSuccessfulUpdateAttemptCount[] =
- "ota_update_engine_successful_update_attempt_count";
-constexpr char kMetricsUpdateEngineSuccessfulUpdateTotalDurationInMinutes[] =
- "ota_update_engine_successful_update_fixed_total_duration_in_minutes";
-constexpr char kMetricsUpdateEngineSuccessfulUpdatePayloadSizeMiB[] =
- "ota_update_engine_successful_update_payload_size_mib";
-constexpr char kMetricsUpdateEngineSuccessfulUpdatePayloadType[] =
- "ota_update_engine_successful_update_payload_type";
-constexpr char kMetricsUpdateEngineSuccessfulUpdateRebootCount[] =
- "ota_update_engine_successful_update_reboot_count";
-constexpr char kMetricsUpdateEngineSuccessfulUpdateTotalBytesDownloadedMiB[] =
- "ota_update_engine_successful_update_total_bytes_downloaded_mib";
-constexpr char
- kMetricsUpdateEngineSuccessfulUpdateDownloadOverheadPercentage[] =
- "ota_update_engine_successful_update_download_overhead_percentage";
-
std::unique_ptr<MetricsReporterInterface> CreateMetricsReporter() {
return std::make_unique<MetricsReporterAndroid>();
}
@@ -98,23 +57,7 @@
int64_t payload_size,
metrics::AttemptResult attempt_result,
ErrorCode error_code) {
- LogHistogram(metrics::kMetricsUpdateEngineAttemptNumber, attempt_number);
- LogHistogram(metrics::kMetricsUpdateEngineAttemptPayloadType,
- static_cast<int>(payload_type));
- LogHistogram(metrics::kMetricsUpdateEngineAttemptDurationInMinutes,
- duration.InMinutes());
- LogHistogram(metrics::kMetricsUpdateEngineAttemptDurationUptimeInMinutes,
- duration_uptime.InMinutes());
-
int64_t payload_size_mib = payload_size / kNumBytesInOneMiB;
- LogHistogram(metrics::kMetricsUpdateEngineAttemptPayloadSizeMiB,
- payload_size_mib);
-
- LogHistogram(metrics::kMetricsUpdateEngineAttemptResult,
- static_cast<int>(attempt_result));
- LogHistogram(metrics::kMetricsUpdateEngineAttemptErrorCode,
- static_cast<int>(error_code));
-
android::util::stats_write(
android::util::UPDATE_ENGINE_UPDATE_ATTEMPT_REPORTED,
attempt_number,
@@ -133,8 +76,9 @@
DownloadSource /* download_source */,
metrics::DownloadErrorCode /* payload_download_error_code */,
metrics::ConnectionType /* connection_type */) {
- LogHistogram(metrics::kMetricsUpdateEngineAttemptCurrentBytesDownloadedMiB,
- payload_bytes_downloaded / kNumBytesInOneMiB);
+ // TODO(xunchang) add statsd reporting
+ LOG(INFO) << "Current update attempt downloads "
+ << payload_bytes_downloaded / kNumBytesInOneMiB << " bytes data";
}
void MetricsReporterAndroid::ReportSuccessfulUpdateMetrics(
@@ -148,31 +92,11 @@
base::TimeDelta /* total_duration_uptime */,
int reboot_count,
int /* url_switch_count */) {
- LogHistogram(metrics::kMetricsUpdateEngineSuccessfulUpdateAttemptCount,
- attempt_count);
- LogHistogram(metrics::kMetricsUpdateEngineSuccessfulUpdatePayloadType,
- static_cast<int>(payload_type));
-
int64_t payload_size_mib = payload_size / kNumBytesInOneMiB;
- LogHistogram(metrics::kMetricsUpdateEngineSuccessfulUpdatePayloadSizeMiB,
- payload_size_mib);
-
int64_t total_bytes_downloaded = 0;
for (size_t i = 0; i < kNumDownloadSources; i++) {
total_bytes_downloaded += num_bytes_downloaded[i] / kNumBytesInOneMiB;
}
- LogHistogram(
- metrics::kMetricsUpdateEngineSuccessfulUpdateTotalBytesDownloadedMiB,
- total_bytes_downloaded);
- LogHistogram(
- metrics::kMetricsUpdateEngineSuccessfulUpdateDownloadOverheadPercentage,
- download_overhead_percentage);
-
- LogHistogram(
- metrics::kMetricsUpdateEngineSuccessfulUpdateTotalDurationInMinutes,
- total_duration.InMinutes());
- LogHistogram(metrics::kMetricsUpdateEngineSuccessfulUpdateRebootCount,
- reboot_count);
android::util::stats_write(
android::util::UPDATE_ENGINE_SUCCESSFUL_UPDATE_REPORTED,
@@ -188,7 +112,8 @@
void MetricsReporterAndroid::ReportAbnormallyTerminatedUpdateAttemptMetrics() {
int attempt_result =
static_cast<int>(metrics::AttemptResult::kAbnormalTermination);
- LogHistogram(metrics::kMetricsUpdateEngineAttemptResult, attempt_result);
+ // TODO(xunchang) add statsd reporting
+ LOG(INFO) << "Abnormally terminated update attempt result " << attempt_result;
}
}; // namespace chromeos_update_engine