commit d4c5debc65bb35ee61c2764bda059b7f307fd093
author Tianjie Xu <xunchang@google.com> Tue Oct 24 11:17:03 2017 -0700
committer Tianjie Xu <xunchang@google.com> Wed Oct 25 11:37:04 2017 -0700
tree 379432d9dd0da75c114784a14a0530e375c741df
parent 4a7e26b998807f315c6e8b9f77f194cd3d3b12c8

Create a dummy MetricsReporterStub class

This handles the update_engine_sideload target, and thus avoiding
the insertion of "#ifdef _UE_SIDELOAD" everywhere when we report the
metrics for android.

Bug: 30989466
Test: build pass on marlin
Change-Id: Ib00ab8476218df15768bdbae1a3510f8584aa7c7

metrics_reporter_android.cc

diff --git a/metrics_reporter_android.cc b/metrics_reporter_android.cc
index bdc245e..869c4db 100644
--- a/metrics_reporter_android.cc
+++ b/metrics_reporter_android.cc
@@ -16,28 +16,24 @@
 
 #include "update_engine/metrics_reporter_android.h"
 
-#ifndef _UE_SIDELOAD
+#include <memory>
 #include <string>
 
 #include <metricslogger/metrics_logger.h>
 
 #include "update_engine/common/constants.h"
-#endif  // _UE_SIDELOAD
 
 namespace {
-#ifndef _UE_SIDELOAD
 void LogHistogram(const std::string& metrics, int value) {
   android::metricslogger::LogHistogram(metrics, value);
   LOG(INFO) << "uploading " << value << "to histogram for metric " << metrics;
 }
-#endif
 }  // namespace
 
 namespace chromeos_update_engine {
 
 namespace metrics {
 
-#ifndef _UE_SIDELOAD
 // The histograms are defined in:
 // depot/google3/analysis/uma/configs/clearcut/TRON/histograms.xml
 constexpr char kMetricsUpdateEngineAttemptNumber[] =
@@ -65,7 +61,11 @@
     "ota_update_engine_successful_update_payload_type";
 constexpr char kMetricsUpdateEngineSuccessfulUpdateRebootCount[] =
     "ota_update_engine_successful_update_reboot_count";
-#endif
+
+std::unique_ptr<MetricsReporterInterface> CreateMetricsReporter() {
+  return std::make_unique<MetricsReporterAndroid>();
+}
+
 }  // namespace metrics
 
 void MetricsReporterAndroid::ReportUpdateAttemptMetrics(
@@ -77,8 +77,6 @@
     int64_t payload_size,
     metrics::AttemptResult attempt_result,
     ErrorCode error_code) {
-// No need to log histogram under sideload mode.
-#ifndef _UE_SIDELOAD
   LogHistogram(metrics::kMetricsUpdateEngineAttemptNumber, attempt_number);
   LogHistogram(metrics::kMetricsUpdateEngineAttemptPayloadType,
                static_cast<int>(payload_type));
@@ -95,7 +93,6 @@
                static_cast<int>(attempt_result));
   LogHistogram(metrics::kMetricsUpdateEngineAttemptErrorCode,
                static_cast<int>(error_code));
-#endif
 }
 
 void MetricsReporterAndroid::ReportSuccessfulUpdateMetrics(
@@ -108,7 +105,6 @@
     base::TimeDelta total_duration,
     int reboot_count,
     int /* url_switch_count */) {
-#ifndef _UE_SIDELOAD
   LogHistogram(metrics::kMetricsUpdateEngineSuccessfulUpdateAttemptCount,
                attempt_count);
   LogHistogram(metrics::kMetricsUpdateEngineSuccessfulUpdatePayloadType,
@@ -123,15 +119,12 @@
       total_duration.InMinutes());
   LogHistogram(metrics::kMetricsUpdateEngineSuccessfulUpdateRebootCount,
                reboot_count);
-#endif
 }
 
 void MetricsReporterAndroid::ReportAbnormallyTerminatedUpdateAttemptMetrics() {
-#ifndef _UE_SIDELOAD
   int attempt_result =
       static_cast<int>(metrics::AttemptResult::kAbnormalTermination);
   LogHistogram(metrics::kMetricsUpdateEngineAttemptResult, attempt_result);
-#endif
 }
 
 };  // namespace chromeos_update_engine