metrics: add support for other product id
metrics_uploader should use the GOOGLE_METRICS_PRODUCT_ID field from os-release
whenever possible instead of the default Chrome product id.
BUG=chromium:415744
TEST=FEATURES=test emerge-gizmo metrics succeeds.
TEST=test_that platform_MetricsUploader succeeds.
CQ-DEPEND=CL:221963
Change-Id: I69b1a6ca766048ad80d93008a2fe3b18879bf1da
Reviewed-on: https://chromium-review.googlesource.com/221953
Tested-by: Bertrand Simonnet <bsimonnet@chromium.org>
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Bertrand Simonnet <bsimonnet@chromium.org>
diff --git a/metrics/metrics_daemon.cc b/metrics/metrics_daemon.cc
index bdd181c..b0247c6 100644
--- a/metrics/metrics_daemon.cc
+++ b/metrics/metrics_daemon.cc
@@ -187,7 +187,9 @@
}
void MetricsDaemon::RunUploaderTest() {
- upload_service_.reset(new UploadService(testing_, server_));
+ upload_service_.reset(new UploadService(new SystemProfileCache(true,
+ config_root_),
+ server_));
upload_service_->Init(upload_interval_secs_, metrics_file_);
upload_service_->UploadEvent();
}
@@ -218,8 +220,10 @@
const string& cpuinfo_max_freq_path,
int upload_interval_secs,
const string& server,
- const string& metrics_file) {
+ const string& metrics_file,
+ const string& config_root) {
testing_ = testing;
+ config_root_ = config_root;
DCHECK(metrics_lib != nullptr);
metrics_lib_ = metrics_lib;
@@ -321,7 +325,7 @@
if (uploader_active) {
LOG(INFO) << "uploader enabled";
- upload_service_.reset(new UploadService(testing_, server_));
+ upload_service_.reset(new UploadService(new SystemProfileCache(), server_));
upload_service_->Init(upload_interval_secs_, metrics_file_);
}
}