fix(#2370): use bridge topic id in service_monitor

Signed-off-by: Marcel Guzik <[email protected]>

Author: Bravo555

crates/core/tedge_api/src/mqtt_topics.rs

@@ -390,12 +390,6 @@ impl EntityTopicId {
     pub fn as_str(&self) -> &str {
         self.0.as_str()
     }
-
-    // FIXME: can also match "device/bridge//" or "/device/main/service/my_custom_bridge"
-    // should match ONLY the single mapper bridge
-    pub fn is_bridge_health_topic(&self) -> bool {
-        self.as_str().contains("bridge")
-    }
 }
 
 /// Contains a topic id of the service itself and the associated device.

crates/extensions/c8y_mapper_ext/src/converter.rs

@@ -340,7 +340,7 @@ impl CumulocityConverter {
                 let ancestors_external_ids =
                     self.entity_store.ancestors_external_ids(entity_topic_id)?;
 
-                if entity_topic_id.is_bridge_health_topic() {
+                if entity_topic_id == crate::C8Y_BRIDGE_TOPIC_ID {
                     return Ok(vec![]);
                 }
 

crates/extensions/c8y_mapper_ext/src/lib.rs

@@ -14,6 +14,8 @@ pub mod service_monitor;
 #[cfg(test)]
 mod tests;
 
+pub(crate) const C8Y_BRIDGE_TOPIC_ID: &str = "device/main/service/mosquitto-c8y-bridge";
+
 #[derive(Debug, serde::Deserialize)]
 pub struct Capabilities {
     log_upload: bool,

crates/extensions/c8y_mapper_ext/src/service_monitor.rs

@@ -28,7 +28,8 @@ pub fn convert_health_status_message(
         return vec![];
     }
 
-    if entity.topic_id.is_bridge_health_topic() {
+    // the bridge itself is not registered as a service, only the mapper
+    if entity.topic_id == crate::C8Y_BRIDGE_TOPIC_ID {
         return vec![];
     }
 
@@ -128,6 +129,14 @@ mod tests {
         r#"102,test_device:device:main:service:tedge-mapper-c8y,service,tedge-mapper-c8y,"up""down""#;
         "service-monitoring-double-quotes-health-message"
     )]
+    #[test_case(
+        "test_device",
+        "te/device/main/service/my-bridge/status/health",
+        r#"{"pid":"1234","status":"up"}"#,
+        "c8y/s/us",
+        r#"102,test_device:device:main:service:my-bridge,service,my-bridge,up"#;
+        "service-monitoring-service-with-bridge-in-name"
+    )]
     fn translate_health_status_to_c8y_service_monitoring_message(
         device_name: &str,
         health_topic: &str,