Fix cargo build for x86 (#724)

Cargo.Bazel.lock

@@ -1,5 +1,5 @@
 {
-  "checksum": "bb01d0dcdf9c1fe555b6578fa02db9e22077f281f0c0585134761d5ad726a128",
+  "checksum": "56a1654ffcad2aab45a1a97a7e1bd2e8faf5986e1d11b824bfcd4039e0db3c31",
   "crates": {
     "actix-codec 0.5.2": {
       "name": "actix-codec",
@@ -27897,29 +27897,35 @@
         ],
         "crate_features": {
           "common": [
-            "elf",
-            "errno",
             "general",
             "ioctl",
             "no_std"
           ],
           "selects": {
             "aarch64-unknown-linux-gnu": [
+              "elf",
+              "errno",
               "prctl",
               "std",
               "system"
             ],
             "arm-unknown-linux-gnueabi": [
+              "elf",
+              "errno",
               "prctl",
               "std",
               "system"
             ],
             "armv7-unknown-linux-gnueabi": [
+              "elf",
+              "errno",
               "prctl",
               "std",
               "system"
             ],
             "i686-unknown-linux-gnu": [
+              "elf",
+              "errno",
               "prctl",
               "std",
               "system"
@@ -27935,6 +27941,8 @@
               "system"
             ],
             "x86_64-unknown-linux-gnu": [
+              "elf",
+              "errno",
               "prctl",
               "std",
               "system"
@@ -44256,18 +44264,8 @@
       "name": "trustworthy-node-metrics",
       "version": "0.5.0",
       "repository": null,
-      "targets": [
-        {
-          "Library": {
-            "crate_name": "trustworthy_node_metrics",
-            "crate_root": "src/lib.rs",
-            "srcs": [
-              "**/*.rs"
-            ]
-          }
-        }
-      ],
-      "library_target_name": "trustworthy_node_metrics",
+      "targets": [],
+      "library_target_name": null,
       "common_attrs": {
         "compile_data_glob": [
           "**"
@@ -44282,10 +44280,6 @@
               "id": "candid 0.10.10",
               "target": "candid"
             },
-            {
-              "id": "ciborium 0.2.2",
-              "target": "ciborium"
-            },
             {
               "id": "dfn_core 0.9.0",
               "target": "dfn_core"
@@ -44321,10 +44315,6 @@
             {
               "id": "itertools 0.13.0",
               "target": "itertools"
-            },
-            {
-              "id": "serde 1.0.206",
-              "target": "serde"
             }
           ],
           "selects": {}
@@ -44343,6 +44333,64 @@
       },
       "license": null
     },
+    "trustworthy-node-metrics-types 0.5.0": {
+      "name": "trustworthy-node-metrics-types",
+      "version": "0.5.0",
+      "repository": null,
+      "targets": [
+        {
+          "Library": {
+            "crate_name": "trustworthy_node_metrics_types",
+            "crate_root": "src/lib.rs",
+            "srcs": [
+              "**/*.rs"
+            ]
+          }
+        }
+      ],
+      "library_target_name": "trustworthy_node_metrics_types",
+      "common_attrs": {
+        "compile_data_glob": [
+          "**"
+        ],
+        "deps": {
+          "common": [
+            {
+              "id": "candid 0.10.10",
+              "target": "candid"
+            },
+            {
+              "id": "ciborium 0.2.2",
+              "target": "ciborium"
+            },
+            {
+              "id": "dfn_core 0.9.0",
+              "target": "dfn_core"
+            },
+            {
+              "id": "ic-management-canister-types 0.9.0",
+              "target": "ic_management_canister_types"
+            },
+            {
+              "id": "ic-stable-structures 0.6.5",
+              "target": "ic_stable_structures"
+            },
+            {
+              "id": "serde 1.0.206",
+              "target": "serde"
+            },
+            {
+              "id": "serde_json 1.0.124",
+              "target": "serde_json"
+            }
+          ],
+          "selects": {}
+        },
+        "edition": "2021",
+        "version": "0.5.0"
+      },
+      "license": null
+    },
     "try-lock 0.2.5": {
       "name": "try-lock",
       "version": "0.2.5",
@@ -48905,7 +48953,8 @@
     "service-discovery 0.5.0": "rs/ic-observability/service-discovery",
     "slack-notifications 0.5.0": "rs/slack-notifications",
     "sns-downloader 0.5.0": "rs/ic-observability/sns-downloader",
-    "trustworthy-node-metrics 0.5.0": "rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics"
+    "trustworthy-node-metrics 0.5.0": "rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics",
+    "trustworthy-node-metrics-types 0.5.0": "rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics-types"
   },
   "conditions": {
     "aarch64-apple-darwin": [

Cargo.toml

@@ -22,6 +22,7 @@ members = [
     "rs/rollout-controller",
     "rs/slack-notifications",
     "rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics",
+    "rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics-types",
     "rs/qualifier",
 ]
 
@@ -76,6 +77,7 @@ csv = "1.3.0"
 custom_error = "1.9.2"
 decentralization = { path = "rs/decentralization" }
 trustworthy-node-metrics = { path = "rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics" }
+trustworthy-node-metrics-types = { path = "rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics-types" }
 derive_builder = "0.20.0"
 derive_more = "1"
 dialoguer = "0.11.0"

bazel/external_crates.bzl

@@ -74,6 +74,7 @@ def external_crates_repository():
             "//rs/slack-notifications:Cargo.toml",
             "//rs/rollout-controller:Cargo.toml",
             "//rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics:Cargo.toml",
+            "//rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics-types:Cargo.toml",
             "//rs/qualifier:Cargo.toml",
         ],
         splicing_config = splicing_config(

rs/cli/BUILD.bazel

@@ -7,7 +7,7 @@ DEPS = [
     "//rs/decentralization",
     "//rs/ic-management-types",
     "//rs/ic-management-backend:ic-management-backend-lib",
-    "//rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics:trustworthy_node_metrics"
+    "//rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics-types:trustworthy_node_metrics_types"
 ]
 
 package(default_visibility = ["//visibility:public"])

rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics-types/BUILD.bazel

@@ -0,0 +1,16 @@
+load("@crate_index_dre//:defs.bzl", "aliases", "all_crate_deps")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "trustworthy_node_metrics_types",
+    srcs = glob(["src/**/*.rs"]),
+    aliases = aliases(),
+    proc_macro_deps = all_crate_deps(
+        proc_macro = True,
+    ),
+    deps = all_crate_deps(
+        normal = True,
+    ),
+)

rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics-types/Cargo.toml

@@ -0,0 +1,24 @@
+
+[package]
+name = "trustworthy-node-metrics-types"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+description.workspace = true
+documentation.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate-type = ["lib"]
+name = "trustworthy_node_metrics_types"
+path = "src/lib.rs"
+
+[dependencies]
+candid = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+dfn_core = { workspace = true }
+ic-management-canister-types = { workspace = true }
+ciborium = { workspace = true }
+ic-stable-structures = { workspace = true }

rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics-types/src/lib.rs

@@ -0,0 +1 @@
+pub mod types;