metricsd: Split out the trait name from the command name

weaved::Service::AddCommandHandler() and SetStateProperty() now
expect the trait name as a separate argument.

BUG: 26443877
Change-Id: I2ad587d984375a7ebd70c7dc804b446b66d6be1b

1 files changed, 6 insertions, 8 deletions

diff --git a/metrics_collector.cc b/metrics_collector.cc
index 5d3fde4..2cf2338 100644
--- a/metrics_collector.cc
+++ b/metrics_collector.cc
@@ -71,6 +71,7 @@ const char kMeminfoFileName[] = "/proc/meminfo";
 const char kVmStatFileName[] = "/proc/vmstat";
 
 const char kWeaveComponent[] = "metrics";
+const char kWeaveTrait[] = "_metrics";
 
 }  // namespace
 
@@ -259,15 +260,13 @@ void MetricsCollector::OnWeaveServiceConnected(
   if (!weave_service)
     return;
 
-  weave_service->AddComponent(kWeaveComponent, {"_metrics"}, nullptr);
+  weave_service->AddComponent(kWeaveComponent, {kWeaveTrait}, nullptr);
   weave_service->AddCommandHandler(
-      kWeaveComponent,
-      "_metrics.enableAnalyticsReporting",
+      kWeaveComponent, kWeaveTrait, "enableAnalyticsReporting",
       base::Bind(&MetricsCollector::OnEnableMetrics,
                  weak_ptr_factory_.GetWeakPtr()));
   weave_service->AddCommandHandler(
-      kWeaveComponent,
-      "_metrics.disableAnalyticsReporting",
+      kWeaveComponent, kWeaveTrait, "disableAnalyticsReporting",
       base::Bind(&MetricsCollector::OnDisableMetrics,
                  weak_ptr_factory_.GetWeakPtr()));
 
@@ -311,9 +310,8 @@ void MetricsCollector::UpdateWeaveState() {
   std::string enabled =
       metrics_lib_->AreMetricsEnabled() ? "enabled" : "disabled";
 
-  if (!weave_service->SetStateProperty(kWeaveComponent,
-                                       "_metrics.analyticsReportingState",
-                                       enabled,
+  if (!weave_service->SetStateProperty(kWeaveComponent, kWeaveTrait,
+                                       "analyticsReportingState", enabled,
                                        nullptr)) {
     LOG(ERROR) << "failed to update weave's state";
   }