Merge "Fix metricsd to conform to the lastest server schema" (2fcf4498) · Commits · e / os / android_system_core

metricsd/etc/weaved/traits/metrics.json

+7 −5

Original line number	Diff line number	Diff line
		{
		"_metrics": {
		"commands": {
		"_enableAnalyticsReporting": {
		"minimalRole": "manager"
		"enableAnalyticsReporting": {
		"minimalRole": "manager",
		"parameters": {}
		},
		"_disableAnalyticsReporting": {
		"minimalRole": "manager"
		"disableAnalyticsReporting": {
		"minimalRole": "manager",
		"parameters": {}
		}
		},
		"state": {
		"_AnalyticsReportingState": {
		"analyticsReportingState": {
		"type": "string",
		"enum": [ "enabled", "disabled" ]
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -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";