[System Metrics] Migrate cobalt_system_metrics to CFv2

Migrating cobalt_system_metrics.cmx to CFv2. Creating a new cml file and
adding core/cobalt_system_metrics to moniker_rewriter.

Tested with: `fx test legacy-metrics-test`

Bug: 96512
Change-Id: Ida0c828d58c96ef75d16641b7a74b1e334031ced
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/677093
Commit-Queue: Andrew Hwang <[email protected]>
Reviewed-by: Christopher Johnson <[email protected]>
Reviewed-by: Shai Barack <[email protected]>
Reviewed-by: Francois Rousseau <[email protected]>

Author: Andrew Hwang

src/cobalt/bin/system-metrics/BUILD.gn

@@ -71,13 +71,8 @@ executable("system-metrics") {
 }
 
 fuchsia_package_with_single_component("cobalt_system_metrics") {
-  manifest = "meta/cobalt_system_metrics.cmx"
-  deps = [
-    ":system-metrics",
-
-    # Configure sysmgr to start cobalt_system_metrics.cmx
-    "//src/sys/sysmgr:cobalt_system_metrics_config",
-  ]
+  manifest = "meta/cobalt_system_metrics.cml"
+  deps = [ ":system-metrics" ]
 }
 
 executable("cobalt_system_metrics_unittests") {

src/cobalt/bin/system-metrics/meta/cobalt_system_metrics.cml

@@ -0,0 +1,44 @@
+// Copyright 2022 The Fuchsia Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+{
+    include: [
+        "inspect/client.shard.cml",
+        "syslog/client.shard.cml",
+    ],
+    program: {
+        runner: "elf",
+        binary: "bin/cobalt_system_metrics",
+    },
+    use: [
+        {
+            protocol: [
+                "fuchsia.cobalt.LoggerFactory",
+                "fuchsia.kernel.Stats",
+                "fuchsia.logger.LogSink",
+                "fuchsia.sysinfo.SysInfo",
+                "fuchsia.tracing.provider.Registry",
+                "fuchsia.ui.activity.Provider",
+            ],
+        },
+        {
+            storage: "data",
+            path: "/data",
+        },
+        {
+            directory: "config-data",
+            rights: [ "r*" ],
+            path: "/config/data",
+        },
+        {
+            directory: "dev-thermal",
+            rights: [ "r*" ],
+            path: "/dev/class/thermal",
+        },
+        {
+            directory: "dev-misc",
+            rights: [ "r*" ],
+            path: "/dev/misc",
+        },
+    ],
+}

src/diagnostics/archivist/src/moniker_rewriter.rs

@@ -25,6 +25,10 @@ lazy_static! {
             legacy_str: "omaha-client-service.cmx",
             modern_str: "core/omaha-client-service",
         },
+        MonikerRewritePair {
+            legacy_str: "cobalt_system_metrics.cmx",
+            modern_str: "core/cobalt_system_metrics"
+        }
     ];
 }
 

src/diagnostics/config/fire/components.json5

@@ -32,7 +32,7 @@
     {
         id: 107,
         label: "Cobalt Sys Metrics",
-        moniker: "cobalt_system_metrics.cmx",
+        moniker: "core/cobalt_system_metrics",
     },
     {
         id: 108,

src/sys/appmgr/config/core_component_id_index.json5

@@ -194,13 +194,7 @@
         },
         {
             instance_id: "76777fb21aa060c86680f0fbd7cbd4734ef6b239b429ac4d9cb2a9d08792033d",
-            appmgr_moniker: {
-                url: "fuchsia-pkg://fuchsia.com/cobalt_system_metrics#meta/cobalt_system_metrics.cmx",
-                realm_path: [
-                    "app",
-                    "sys",
-                ],
-            },
+            moniker: "/core/cobalt_system_metrics",
         },
 
         // An entry for `memory_monitor` is needed to preserve /cache across the v2 migration.

src/sys/core/meta/core.cml

@@ -56,6 +56,11 @@
             name: "text_manager",
             url: "fuchsia-pkg://fuchsia.com/text_manager#meta/text_manager.cm",
         },
+        {
+            name: "cobalt_system_metrics",
+            url: "fuchsia-pkg://fuchsia.com/cobalt_system_metrics#meta/cobalt_system_metrics.cm",
+            startup: "eager",
+        },
 
         // Children below this line may be present on some but not all product configurations.
         // Children above this line are expected to be present on all configs that include
@@ -226,7 +231,10 @@
                 "fuchsia.ui.activity.Tracker",
             ],
             from: "#activity",
-            to: [ "#cobalt" ],
+            to: [
+                "#cobalt",
+                "#cobalt_system_metrics",
+            ],
         },
         {
             directory: "dev",
@@ -238,7 +246,10 @@
         {
             protocol: "fuchsia.tracing.provider.Registry",
             from: "self",
-            to: "#sysmem_connector",
+            to: [
+                "#cobalt_system_metrics",
+                "#sysmem_connector",
+            ],
             dependency: "weak_for_migration",
         },
         {
@@ -419,6 +430,7 @@
                 "#bluetooth-core",
                 "#brightness_manager",
                 "#cobalt",
+                "#cobalt_system_metrics",
                 "#debug_serial",
                 "#detect",
                 "#device_settings",
@@ -605,7 +617,10 @@
         {
             protocol: "fuchsia.kernel.Stats",
             from: "parent",
-            to: "#system-metrics-logger",
+            to: [
+                "#cobalt_system_metrics",
+                "#system-metrics-logger",
+            ],
         },
         {
             protocol: "fuchsia.process.Launcher",
@@ -687,6 +702,20 @@
             to: "#metrics-logger",
             subdir: "class/power-sensor",
         },
+        {
+            directory: "dev",
+            from: "parent",
+            as: "dev-thermal",
+            to: "#cobalt_system_metrics",
+            subdir: "class/thermal",
+        },
+        {
+            directory: "dev",
+            from: "parent",
+            as: "dev-misc",
+            to: [ "#cobalt_system_metrics" ],
+            subdir: "misc",
+        },
         {
             directory: "root-ssl-certificates",
             from: "parent",
@@ -733,6 +762,12 @@
             to: "#cobalt",
             subdir: "cobalt",
         },
+        {
+            directory: "config-data",
+            from: "parent",
+            to: "#cobalt_system_metrics",
+            subdir: "cobalt_system_metrics",
+        },
         {
             protocol: [
                 "fuchsia.device.Controller",
@@ -953,6 +988,7 @@
             protocol: "fuchsia.cobalt.LoggerFactory",
             from: "#cobalt",
             to: [
+                "#cobalt_system_metrics",
                 "#pkg-resolver",
                 "#sampler",
 
@@ -987,12 +1023,18 @@
                 "fuchsia.sysinfo.SysInfo",
             ],
             from: "parent",
-            to: "#cobalt",
+            to: [
+                "#cobalt",
+                "#cobalt_system_metrics",
+            ],
         },
         {
             storage: "data",
             from: "self",
-            to: "#cobalt",
+            to: [
+                "#cobalt",
+                "#cobalt_system_metrics",
+            ],
         },
         {
             protocol: [

src/sys/sysmgr/BUILD.gn

@@ -83,10 +83,6 @@ template("cfg") {
   }
 }
 
-cfg("cobalt_system_metrics_config") {
-  name = "cobalt_system_metrics.config"
-}
-
 cfg("services_config") {
   name = "services.config"
 }