Move metrics from namespace to class
Add a new metrics reporter interface to handle the current metrics
report for omaha (with metricsd). This helps to add metrics logging
for android phone devices (using other libraries) in the future.
Also change the unit tests accordingly.
Test: unit tests pass for pico
Change-Id: I703c8b6353e4b38bc89d6a71f01623978cf7a549
diff --git a/payload_state.cc b/payload_state.cc
index a1a9d72..1f121b0 100644
--- a/payload_state.cc
+++ b/payload_state.cc
@@ -32,6 +32,7 @@
#include "update_engine/common/prefs.h"
#include "update_engine/common/utils.h"
#include "update_engine/connection_manager_interface.h"
+#include "update_engine/metrics_reporter_interface.h"
#include "update_engine/metrics_utils.h"
#include "update_engine/omaha_request_params.h"
#include "update_engine/payload_consumer/install_plan.h"
@@ -235,8 +236,8 @@
break;
case AttemptType::kRollback:
- metrics::ReportRollbackMetrics(system_state_,
- metrics::RollbackResult::kSuccess);
+ system_state_->metrics_reporter()->ReportRollbackMetrics(
+ metrics::RollbackResult::kSuccess);
break;
}
attempt_error_code_ = ErrorCode::kSuccess;
@@ -270,8 +271,8 @@
break;
case AttemptType::kRollback:
- metrics::ReportRollbackMetrics(system_state_,
- metrics::RollbackResult::kFailed);
+ system_state_->metrics_reporter()->ReportRollbackMetrics(
+ metrics::RollbackResult::kFailed);
break;
}
@@ -635,19 +636,20 @@
break;
}
- metrics::ReportUpdateAttemptMetrics(system_state_,
- attempt_number,
- payload_type,
- duration,
- duration_uptime,
- payload_size,
- payload_bytes_downloaded,
- payload_download_speed_bps,
- download_source,
- attempt_result,
- internal_error_code,
- payload_download_error_code,
- attempt_connection_type_);
+ system_state_->metrics_reporter()->ReportUpdateAttemptMetrics(
+ system_state_,
+ attempt_number,
+ payload_type,
+ duration,
+ duration_uptime,
+ payload_size,
+ payload_bytes_downloaded,
+ payload_download_speed_bps,
+ download_source,
+ attempt_result,
+ internal_error_code,
+ payload_download_error_code,
+ attempt_connection_type_);
}
void PayloadState::PersistAttemptMetrics() {
@@ -672,7 +674,8 @@
if (!attempt_in_progress)
return;
- metrics::ReportAbnormallyTerminatedUpdateAttemptMetrics(system_state_);
+ system_state_->metrics_reporter()
+ ->ReportAbnormallyTerminatedUpdateAttemptMetrics();
ClearPersistedAttemptMetrics();
}
@@ -734,16 +737,16 @@
int updates_abandoned_count = num_responses_seen_ - 1;
- metrics::ReportSuccessfulUpdateMetrics(system_state_,
- attempt_count,
- updates_abandoned_count,
- payload_type,
- payload_size,
- total_bytes_by_source,
- download_overhead_percentage,
- duration,
- reboot_count,
- url_switch_count);
+ system_state_->metrics_reporter()->ReportSuccessfulUpdateMetrics(
+ attempt_count,
+ updates_abandoned_count,
+ payload_type,
+ payload_size,
+ total_bytes_by_source,
+ download_overhead_percentage,
+ duration,
+ reboot_count,
+ url_switch_count);
}
void PayloadState::UpdateNumReboots() {
@@ -1232,14 +1235,8 @@
void PayloadState::BootedIntoUpdate(TimeDelta time_to_reboot) {
// Send |time_to_reboot| as a UMA stat.
- string metric = metrics::kMetricTimeToRebootMinutes;
- system_state_->metrics_lib()->SendToUMA(metric,
- time_to_reboot.InMinutes(),
- 0, // min: 0 minute
- 30*24*60, // max: 1 month (approx)
- kNumDefaultUmaBuckets);
- LOG(INFO) << "Uploading " << utils::FormatTimeDelta(time_to_reboot)
- << " for metric " << metric;
+ system_state_->metrics_reporter()->ReportTimeToReboot(
+ time_to_reboot.InMinutes());
}
void PayloadState::UpdateEngineStarted() {
@@ -1302,15 +1299,8 @@
}
// Report the UMA metric of the current boot failure.
- string metric = metrics::kMetricFailedUpdateCount;
- LOG(INFO) << "Uploading " << target_attempt
- << " (count) for metric " << metric;
- system_state_->metrics_lib()->SendToUMA(
- metric,
- target_attempt,
- 1, // min value
- 50, // max value
- kNumDefaultUmaBuckets);
+ system_state_->metrics_reporter()->ReportFailedUpdateCount(
+ target_attempt);
} else {
prefs_->Delete(kPrefsTargetVersionAttempt);
prefs_->Delete(kPrefsTargetVersionUniqueId);