Graham/fh 991 feature flapping (#1643)

* Update detsys-ids-client to 0.6

* Fixups for dsidsc 0.6

Author: grahamc

Cargo.lock

@@ -23,7 +23,7 @@ async-trait = { version = "0.1.57", default-features = false }
 bytes = { version = "1.2.1", default-features = false, features = ["std", "serde"] }
 clap = { version = "4", features = ["std", "color", "usage", "help", "error-context", "suggestions", "derive", "env"], optional = true }
 color-eyre = { version = "0.6.2", default-features = false, features = [ "track-caller", "issue-url", "tracing-error", "capture-spantrace", "color-spantrace" ], optional = true }
-detsys-ids-client = { version = "0.5", optional = true }
+detsys-ids-client = { version = "0.6", optional = true }
 eyre = { version = "0.6.8", default-features = false, features = [ "track-caller" ], optional = true }
 glob = { version = "0.3.0", default-features = false }
 nix = { version = "0.29.0", default-features = false, features = ["user", "fs", "process", "term"] }

Cargo.toml

@@ -145,6 +145,11 @@ impl DiagnosticData {
         }
         let (ids_client, ids_worker) = builder.build_or_default().await;
 
+        ids_client
+            .wait_for_checkin(Some(std::time::Duration::from_millis(500)))
+            .await
+            .ok();
+
         Ok((Self { ids_client }, ids_worker))
     }
 
@@ -197,7 +202,9 @@ impl ErrorDiagnostic for DiagnosticError {
 }
 
 impl crate::feedback::Feedback for DiagnosticData {
-    async fn get_feature_ptr_payload<T: serde::de::DeserializeOwned + Send + std::fmt::Debug>(
+    async fn get_feature_ptr_payload<
+        T: serde::ser::Serialize + serde::de::DeserializeOwned + Send + std::fmt::Debug,
+    >(
         &self,
         name: impl Into<String> + std::fmt::Debug + Send,
     ) -> Option<T> {

src/diagnostics.rs

@@ -9,7 +9,9 @@ pub enum Client {
 }
 
 impl Feedback for Client {
-    async fn get_feature_ptr_payload<T: serde::de::DeserializeOwned + Send + std::fmt::Debug>(
+    async fn get_feature_ptr_payload<
+        T: serde::ser::Serialize + serde::de::DeserializeOwned + Send + std::fmt::Debug,
+    >(
         &self,
         name: impl Into<String> + core::marker::Send + std::fmt::Debug,
     ) -> Option<T> {

src/feedback/client.rs

@@ -7,7 +7,9 @@ pub trait Feedback: Clone + Send + Sync {
         planner: &crate::planner::BuiltinPlanner,
     ) -> impl std::future::Future<Output = Result<(), crate::planner::PlannerError>> + Send;
 
-    fn get_feature_ptr_payload<T: serde::de::DeserializeOwned + Send + std::fmt::Debug>(
+    fn get_feature_ptr_payload<
+        T: serde::ser::Serialize + serde::de::DeserializeOwned + Send + std::fmt::Debug,
+    >(
         &self,
         name: impl Into<String> + Send + std::fmt::Debug,
     ) -> impl std::future::Future<Output = Option<T>> + Send;

src/feedback/mod.rs

@@ -102,5 +102,5 @@ pub async fn get_profile_backend_type(profile: &std::path::Path) -> Option<Backe
     }
 
     // If neither of those exist, it can be managed by either, so express no preference.
-    return None;
+    None
 }