feat(msd): emit node_type label from NodeRewardType (#2084)

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>

Author: pietrodimarco-dfinity

Cargo.Bazel.lock

@@ -1,5 +1,5 @@
 {
-  "checksum": "3804c4135bfcca159dcec52800164457cf5abdc7fe23b1f095fd7d87ffc8fbd0",
+  "checksum": "42caebc349211274d22d6696d3a2a68202e3bbea3d48e4a26953c87dce7a3231",
   "crates": {
     "actix-codec 0.5.2": {
       "name": "actix-codec",
@@ -38335,6 +38335,10 @@
               "id": "erased-serde 0.4.10",
               "target": "erased_serde"
             },
+            {
+              "id": "ic-protobuf 0.9.0",
+              "target": "ic_protobuf"
+            },
             {
               "id": "ic-registry-subnet-type 0.9.0",
               "target": "ic_registry_subnet_type"

Cargo.lock

@@ -66,6 +66,7 @@ mod tests {
             targets,
             subnet_id: Some(SubnetId::from(PrincipalId::new_anonymous())),
             subnet_type: None,
+            node_reward_type: None,
             dc_id: "test".to_string(),
             operator_id: PrincipalId::new_anonymous(),
             node_provider_id: PrincipalId::new_anonymous(),
@@ -84,6 +85,7 @@ mod tests {
             targets: BTreeSet::new(),
             subnet_id: Some(SubnetId::from(PrincipalId::new_anonymous())),
             subnet_type: None,
+            node_reward_type: None,
             dc_id: "test".to_string(),
             operator_id: PrincipalId::new_anonymous(),
             node_provider_id: PrincipalId::new_anonymous(),
@@ -98,6 +100,7 @@ mod tests {
             targets: BTreeSet::new(),
             subnet_id: Some(SubnetId::from(PrincipalId::new_anonymous())),
             subnet_type: None,
+            node_reward_type: None,
             dc_id: "test".to_string(),
             operator_id: PrincipalId::new_anonymous(),
             node_provider_id: PrincipalId::new_anonymous(),
@@ -118,6 +121,7 @@ mod tests {
             targets: BTreeSet::new(),
             subnet_id: Some(SubnetId::from(PrincipalId::new_anonymous())),
             subnet_type: None,
+            node_reward_type: None,
             dc_id: "test".to_string(),
             operator_id: PrincipalId::new_anonymous(),
             node_provider_id: PrincipalId::new_anonymous(),
@@ -132,6 +136,7 @@ mod tests {
             targets: BTreeSet::new(),
             subnet_id: Some(SubnetId::from(PrincipalId::new_anonymous())),
             subnet_type: None,
+            node_reward_type: None,
             dc_id: "test".to_string(),
             operator_id: PrincipalId::new_anonymous(),
             node_provider_id: PrincipalId::new_anonymous(),

rs/ic-observability/config-writer-common/src/filters.rs

@@ -11,6 +11,7 @@ service-discovery = { path = "../service-discovery" }
 serde = { workspace = true }
 serde_json = { workspace = true }
 ic-registry-subnet-type = { workspace = true }
+ic-protobuf = { workspace = true }
 ic-types = { workspace = true }
 erased-serde = { workspace = true }
 regex = { workspace = true }

rs/ic-observability/multiservice-discovery-shared/Cargo.toml

@@ -224,6 +224,7 @@ mod tests {
             ic_name: "ic".to_string(),
             subnet_id: None,
             subnet_type: None,
+            node_reward_type: None,
             node_provider_id: PrincipalId::new_anonymous(),
             dc_id: "dc1".to_string(),
             targets: targets.clone(),
@@ -239,6 +240,7 @@ mod tests {
             ic_name: "ic".to_string(),
             subnet_id: None,
             subnet_type: None,
+            node_reward_type: None,
             node_provider_id: PrincipalId::new_anonymous(),
             dc_id: "dc1".to_string(),
             targets: targets.clone(),

rs/ic-observability/multiservice-discovery-shared/src/builders/log_vector_config_structure.rs

@@ -19,6 +19,7 @@ pub const IC_NODE: &str = "ic_node";
 pub const IC_SUBNET: &str = "ic_subnet";
 pub const JOB: &str = "job";
 pub const IC_SUBNET_TYPE: &str = "ic_subnet_type";
+pub const NODE_TYPE: &str = "node_type";
 pub const API_BOUNDARY_NODE: &str = "api_boundary_node";
 // TODO: Re-add the labels below once we resolve the issues with the public dashboard queries
 // https://dfinity.atlassian.net/browse/OB-442
@@ -56,6 +57,10 @@ pub fn map_target_group(target_groups: Vec<TargetDto>) -> Vec<PrometheusStaticCo
                             Some(subnet_type) => vec![(IC_SUBNET_TYPE.into(), subnet_type.as_ref().to_string())],
                             None => vec![],
                         })
+                        .chain(match tg.node_reward_type {
+                            Some(node_reward_type) => vec![(NODE_TYPE.into(), node_reward_type.to_string())],
+                            None => vec![],
+                        })
                         .chain(match tg.is_api_bn {
                             true => vec![(API_BOUNDARY_NODE.into(), "1".into())],
                             false => vec![],

rs/ic-observability/multiservice-discovery-shared/src/builders/prometheus_config_structure.rs

@@ -4,6 +4,7 @@ use std::{
     net::SocketAddr,
 };
 
+use ic_protobuf::registry::node::v1::NodeRewardType;
 use ic_registry_subnet_type::SubnetType;
 use ic_types::{NodeId, PrincipalId, SubnetId};
 use serde::{Deserialize, Serialize};
@@ -21,6 +22,7 @@ pub struct TargetDto {
     /// `socket_addr`.
     pub subnet_id: Option<SubnetId>,
     pub subnet_type: Option<SubnetType>,
+    pub node_reward_type: Option<NodeRewardType>,
 
     pub dc_id: String,
     pub operator_id: PrincipalId,
@@ -60,6 +62,7 @@ pub fn map_to_target_dto(
         targets: value.targets.clone(),
         subnet_id: value.subnet_id,
         subnet_type: value.subnet_type,
+        node_reward_type: value.node_reward_type,
         dc_id: value.dc_id.clone(),
         operator_id: value.operator_id,
         node_provider_id: value.node_provider_id,
@@ -80,6 +83,7 @@ impl From<&TargetDto> for TargetGroup {
             operator_id: value.operator_id,
             subnet_id: value.subnet_id,
             subnet_type: value.subnet_type,
+            node_reward_type: value.node_reward_type,
             targets: value.targets.clone(),
             is_api_bn: value.is_api_bn,
             domain: value.domain.clone(),
@@ -98,6 +102,7 @@ impl From<&TargetGroup> for TargetDto {
             targets: value.targets.clone(),
             subnet_id: value.subnet_id,
             subnet_type: value.subnet_type,
+            node_reward_type: value.node_reward_type,
             dc_id: value.dc_id.clone(),
             operator_id: value.operator_id,
             node_provider_id: value.node_provider_id,

rs/ic-observability/multiservice-discovery-shared/src/contracts/target.rs

@@ -34,6 +34,7 @@ pub(super) async fn export_targets(
             operator_id: PrincipalId::new_anonymous(),
             subnet_id: None,
             subnet_type: None,
+            node_reward_type: None,
             // These are old boundary nodes which are not the same as API boundary nodes
             // with time these should become api boundary nodes
             is_api_bn: false,

rs/ic-observability/multiservice-discovery/src/server_handlers/export_targets_handler.rs

@@ -35,6 +35,7 @@ mod tests {
             targets,
             subnet_id: Some(SubnetId::from(PrincipalId::new_anonymous())),
             subnet_type: None,
+            node_reward_type: None,
             dc_id: "test".to_string(),
             operator_id: PrincipalId::new_anonymous(),
             node_provider_id: PrincipalId::new_anonymous(),

rs/ic-observability/prometheus-config-updater/src/custom_filters.rs

@@ -138,6 +138,7 @@ mod prometheus_serialize {
             targets,
             subnet_id,
             subnet_type: None,
+            node_reward_type: None,
             dc_id: "test".to_string(),
             operator_id: PrincipalId::new_anonymous(),
             node_provider_id: PrincipalId::new_anonymous(),