From 04c4487660487e9e62d312e26e556cb563c5a10e Mon Sep 17 00:00:00 2001
From: Tamo <tamo@meilisearch.com>
Date: Tue, 24 Jan 2023 18:09:03 +0100
Subject: [PATCH] udpate the analytics with the new stats method

---
 .../src/analytics/segment_analytics.rs        | 24 +++++++++++++------
 meilisearch/src/main.rs                       |  3 ++-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/meilisearch/src/analytics/segment_analytics.rs b/meilisearch/src/analytics/segment_analytics.rs
index 1b5a1d73f..21b6696e7 100644
--- a/meilisearch/src/analytics/segment_analytics.rs
+++ b/meilisearch/src/analytics/segment_analytics.rs
@@ -9,7 +9,7 @@ use actix_web::HttpRequest;
 use byte_unit::Byte;
 use http::header::CONTENT_TYPE;
 use index_scheduler::IndexScheduler;
-use meilisearch_auth::SearchRules;
+use meilisearch_auth::{AuthController, SearchRules};
 use meilisearch_types::InstanceUid;
 use once_cell::sync::Lazy;
 use regex::Regex;
@@ -82,7 +82,11 @@ pub struct SegmentAnalytics {
 }
 
 impl SegmentAnalytics {
-    pub async fn new(opt: &Opt, index_scheduler: Arc<IndexScheduler>) -> Arc<dyn Analytics> {
+    pub async fn new(
+        opt: &Opt,
+        index_scheduler: Arc<IndexScheduler>,
+        auth_controller: AuthController,
+    ) -> Arc<dyn Analytics> {
         let instance_uid = super::find_user_id(&opt.db_path);
         let first_time_run = instance_uid.is_none();
         let instance_uid = instance_uid.unwrap_or_else(|| Uuid::new_v4());
@@ -136,7 +140,7 @@ impl SegmentAnalytics {
             get_tasks_aggregator: TasksAggregator::default(),
             health_aggregator: HealthAggregator::default(),
         });
-        tokio::spawn(segment.run(index_scheduler.clone()));
+        tokio::spawn(segment.run(index_scheduler.clone(), auth_controller.clone()));
 
         let this = Self { instance_uid, sender, user: user.clone() };
 
@@ -361,7 +365,7 @@ impl Segment {
         })
     }
 
-    async fn run(mut self, index_scheduler: Arc<IndexScheduler>) {
+    async fn run(mut self, index_scheduler: Arc<IndexScheduler>, auth_controller: AuthController) {
         const INTERVAL: Duration = Duration::from_secs(60 * 60); // one hour
                                                                  // The first batch must be sent after one hour.
         let mut interval =
@@ -370,7 +374,7 @@ impl Segment {
         loop {
             select! {
                 _ = interval.tick() => {
-                    self.tick(index_scheduler.clone()).await;
+                    self.tick(index_scheduler.clone(), auth_controller.clone()).await;
                 },
                 msg = self.inbox.recv() => {
                     match msg {
@@ -389,8 +393,14 @@ impl Segment {
         }
     }
 
-    async fn tick(&mut self, index_scheduler: Arc<IndexScheduler>) {
-        if let Ok(stats) = create_all_stats(index_scheduler.into(), &SearchRules::default()) {
+    async fn tick(
+        &mut self,
+        index_scheduler: Arc<IndexScheduler>,
+        auth_controller: AuthController,
+    ) {
+        if let Ok(stats) =
+            create_all_stats(index_scheduler.into(), auth_controller, &SearchRules::default())
+        {
             let _ = self
                 .batcher
                 .push(Identify {
diff --git a/meilisearch/src/main.rs b/meilisearch/src/main.rs
index 2841dd52c..b78362ec1 100644
--- a/meilisearch/src/main.rs
+++ b/meilisearch/src/main.rs
@@ -57,7 +57,8 @@ async fn main() -> anyhow::Result<()> {
 
     #[cfg(all(not(debug_assertions), feature = "analytics"))]
     let analytics = if !opt.no_analytics {
-        analytics::SegmentAnalytics::new(&opt, index_scheduler.clone()).await
+        analytics::SegmentAnalytics::new(&opt, index_scheduler.clone(), auth_controller.clone())
+            .await
     } else {
         analytics::MockAnalytics::new(&opt)
     };