twip

remote-config/src/fetch/fetcher.rs

@@ -51,7 +51,7 @@ pub trait FileStorage {
 }
 
 /// Fundamental configuration of the RC client, which always must be set.
-#[derive(Clone, Hash, Eq, PartialEq)]
+#[derive(Clone, Hash, Eq, PartialEq, Debug)]
 pub struct ConfigInvariants {
     pub language: String,
     pub tracer_version: String,

sidecar/src/shm_remote_config.rs

@@ -37,18 +37,29 @@ use zwohash::ZwoHasher;
 pub struct RemoteConfigWriter(OneWayShmWriter<NamedShmHandle>);
 pub struct RemoteConfigReader(OneWayShmReader<NamedShmHandle, CString>);
 
+#[no_mangle]
+extern "C" fn debug_dump_inv_tar(id: *const ConfigInvariants, target: *const Arc<Target>) {
+    let id = unsafe { &*id };
+    let target = unsafe { &*target };
+    debug!("ConfigInvariants: {:#?}", id);
+    debug!("Target: {:#?}", target);
+}
+
 fn path_for_remote_config(id: &ConfigInvariants, target: &Arc<Target>) -> CString {
     // We need a stable hash so that the outcome is independent of the process
     let mut hasher = ZwoHasher::default();
     id.hash(&mut hasher);
     target.hash(&mut hasher);
     // datadog remote config, on macos we're restricted to 31 chars
-    CString::new(format!(
+    let res = CString::new(format!(
         "/ddrc{}-{}",
         primary_sidecar_identifier(),
         hasher.finish()
     ))
-    .unwrap()
+    .unwrap();
+    debug_dump_inv_tar(id, target);
+    debug!("Path for remote config: {:?}", res.to_str().unwrap());
+    res
 }
 
 #[no_mangle]
@@ -373,7 +384,7 @@ fn read_config(path: &str) -> anyhow::Result<(RemoteConfigValue, u32)> {
 /// It is guaranteed that no two configurations sharing the same RemoteConfigPath are applied at
 /// once. They will always be Remove()d first, then Add()ed again upon update.
 pub struct RemoteConfigManager {
-    invariants: ConfigInvariants,
+    pub invariants: ConfigInvariants,
     active_target: Option<Arc<Target>>,
     pub active_reader: Option<RemoteConfigReader>,
     encountered_targets: HashMap<Arc<Target>, (RemoteConfigReader, Vec<String>)>,