diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2015-12-16 12:23:14 -0800 |
|---|---|---|
| committer | Alex Vakulenko <avakulenko@google.com> | 2015-12-16 12:23:14 -0800 |
| commit | fa1ef586da984df161d2af263cce9d7d0b72b341 (patch) | |
| tree | b022045ab9e776110006d427ed7014f1d95d07e0 | |
| parent | 5816c1e6df22b5b18bdadcac1e094a9c06d11e1d (diff) | |
| download | metricsd-fa1ef586da984df161d2af263cce9d7d0b72b341.tar.gz | |
Fix metricsd to conform to the lastest server schema
The new server push enabled component/trait validation rules. This
allows us to use the new schema that does not require vendor commands,
parameters and state to start with underscore ("_").
Also fixed a few minor errors in schema definition.
Change-Id: I184dd8e4c69c05e0dd1b0dddb1f9a7b0aef78841
| -rw-r--r-- | etc/weaved/traits/metrics.json | 12 | ||||
| -rw-r--r-- | metrics_collector.cc | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/etc/weaved/traits/metrics.json b/etc/weaved/traits/metrics.json index 7d17c77..7583270 100644 --- a/etc/weaved/traits/metrics.json +++ b/etc/weaved/traits/metrics.json @@ -1,15 +1,17 @@ { "_metrics": { "commands": { - "_enableAnalyticsReporting": { - "minimalRole": "manager" + "enableAnalyticsReporting": { + "minimalRole": "manager", + "parameters": {} }, - "_disableAnalyticsReporting": { - "minimalRole": "manager" + "disableAnalyticsReporting": { + "minimalRole": "manager", + "parameters": {} } }, "state": { - "_AnalyticsReportingState": { + "analyticsReportingState": { "type": "string", "enum": [ "enabled", "disabled" ] } diff --git a/metrics_collector.cc b/metrics_collector.cc index b5c2289..e9edf2e 100644 --- a/metrics_collector.cc +++ b/metrics_collector.cc @@ -229,11 +229,11 @@ int MetricsCollector::OnInit() { device_->AddComponent(kWeaveComponent, {"_metrics"}); device_->AddCommandHandler( kWeaveComponent, - "_metrics._enableAnalyticsReporting", + "_metrics.enableAnalyticsReporting", base::Bind(&MetricsCollector::OnEnableMetrics, base::Unretained(this))); device_->AddCommandHandler( kWeaveComponent, - "_metrics._disableAnalyticsReporting", + "_metrics.disableAnalyticsReporting", base::Bind(&MetricsCollector::OnDisableMetrics, base::Unretained(this))); latest_cpu_use_microseconds_ = cpu_usage_collector_->GetCumulativeCpuUse(); @@ -294,7 +294,7 @@ void MetricsCollector::UpdateWeaveState() { metrics_lib_->AreMetricsEnabled() ? "enabled" : "disabled"; if (!device_->SetStateProperty(kWeaveComponent, - "_metrics._AnalyticsReportingState", + "_metrics.analyticsReportingState", enabled, nullptr)) { LOG(ERROR) << "failed to update weave's state"; |