write the dump export

meilisearch-http/src/analytics/mock_analytics.rs

@@ -1,16 +1,19 @@
 use std::{any::Any, sync::Arc};
 
 use actix_web::HttpRequest;
+use meilisearch_types::InstanceUid;
 use serde_json::Value;
 
 use crate::{routes::indexes::documents::UpdateDocumentsQuery, Opt};
 
 use super::{find_user_id, Analytics};
 
-pub struct MockAnalytics;
+pub struct MockAnalytics {
+    instance_uid: Option<InstanceUid>,
+}
 
 #[derive(Default)]
-pub struct SearchAggregator {}
+pub struct SearchAggregator;
 
 #[allow(dead_code)]
 impl SearchAggregator {
@@ -23,13 +26,17 @@ impl SearchAggregator {
 
 impl MockAnalytics {
     #[allow(clippy::new_ret_no_self)]
-    pub fn new(opt: &Opt) -> (Arc<dyn Analytics>, String) {
-        let user = find_user_id(&opt.db_path).unwrap_or_default();
-        (Arc::new(Self), user)
+    pub fn new(opt: &Opt) -> Arc<dyn Analytics> {
+        let instance_uid = find_user_id(&opt.db_path);
+        Arc::new(Self { instance_uid })
     }
 }
 
 impl Analytics for MockAnalytics {
+    fn instance_uid(&self) -> Option<&meilisearch_types::InstanceUid> {
+        self.instance_uid.as_ref()
+    }
+
     // These methods are noop and should be optimized out
     fn publish(&self, _event_name: String, _send: Value, _request: Option<&HttpRequest>) {}
     fn get_search(&self, _aggregate: super::SearchAggregator) {}

meilisearch-http/src/analytics/mod.rs

@@ -5,8 +5,10 @@ mod segment_analytics;
 
 use std::fs;
 use std::path::{Path, PathBuf};
+use std::str::FromStr;
 
 use actix_web::HttpRequest;
+use meilisearch_types::InstanceUid;
 use once_cell::sync::Lazy;
 use platform_dirs::AppDirs;
 use serde_json::Value;
@@ -51,13 +53,16 @@ fn config_user_id_path(db_path: &Path) -> Option<PathBuf> {
 }
 
 /// Look for the instance-uid in the `data.ms` or in `~/.config/Meilisearch/path-to-db-instance-uid`
-fn find_user_id(db_path: &Path) -> Option<String> {
+fn find_user_id(db_path: &Path) -> Option<InstanceUid> {
     fs::read_to_string(db_path.join("instance-uid"))
         .ok()
         .or_else(|| fs::read_to_string(&config_user_id_path(db_path)?).ok())
+        .and_then(|uid| InstanceUid::from_str(&uid).ok())
 }
 
 pub trait Analytics: Sync + Send {
+    fn instance_uid(&self) -> Option<&InstanceUid>;
+
     /// The method used to publish most analytics that do not need to be batched every hours
     fn publish(&self, event_name: String, send: Value, request: Option<&HttpRequest>);