From 1964d1b8b3ba55c352694d31feba93723b84fe71 Mon Sep 17 00:00:00 2001
From: Paul Masurel <paul@quickwit.io>
Date: Fri, 27 Oct 2023 10:08:23 +0900
Subject: [PATCH] Moved metrics to proto/indexing

---
 quickwit/quickwit-cluster/src/cluster.rs         |  3 +--
 quickwit/quickwit-indexing/src/actors/indexer.rs |  3 +--
 .../src/actors/indexing_service.rs               |  3 +--
 .../src/models/indexing_statistics.rs            |  2 +-
 quickwit/quickwit-proto/src/indexing/mod.rs      | 16 ++++++++++++++++
 quickwit/quickwit-proto/src/lib.rs               | 16 ----------------
 6 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/quickwit/quickwit-cluster/src/cluster.rs b/quickwit/quickwit-cluster/src/cluster.rs
index 5638c627e20..1dcc1ab5f07 100644
--- a/quickwit/quickwit-cluster/src/cluster.rs
+++ b/quickwit/quickwit-cluster/src/cluster.rs
@@ -31,9 +31,8 @@ use chitchat::{
 };
 use futures::Stream;
 use itertools::Itertools;
+use quickwit_proto::indexing::{IndexingPipelineId, IndexingTask, PipelineMetrics};
 use quickwit_proto::types::NodeId;
-use quickwit_proto::indexing::{IndexingPipelineId, IndexingTask};
-use quickwit_proto::PipelineMetrics;
 use serde::{Deserialize, Serialize};
 use tokio::sync::{mpsc, watch, Mutex, RwLock};
 use tokio::time::timeout;
diff --git a/quickwit/quickwit-indexing/src/actors/indexer.rs b/quickwit/quickwit-indexing/src/actors/indexer.rs
index 0594576a2f0..70ab08492f8 100644
--- a/quickwit/quickwit-indexing/src/actors/indexer.rs
+++ b/quickwit/quickwit-indexing/src/actors/indexer.rs
@@ -38,12 +38,11 @@ use quickwit_common::temp_dir::TempDirectory;
 use quickwit_config::IndexingSettings;
 use quickwit_doc_mapper::DocMapper;
 use quickwit_metastore::checkpoint::{IndexCheckpointDelta, SourceCheckpointDelta};
-use quickwit_proto::indexing::IndexingPipelineId;
+use quickwit_proto::indexing::{IndexingPipelineId, PipelineMetrics};
 use quickwit_proto::metastore::{
     LastDeleteOpstampRequest, MetastoreService, MetastoreServiceClient,
 };
 use quickwit_proto::types::PublishToken;
-use quickwit_proto::PipelineMetrics;
 use quickwit_query::get_quickwit_fastfield_normalizer_manager;
 use serde::Serialize;
 use tantivy::schema::Schema;
diff --git a/quickwit/quickwit-indexing/src/actors/indexing_service.rs b/quickwit/quickwit-indexing/src/actors/indexing_service.rs
index ed6436bc1d9..519a296e8c6 100644
--- a/quickwit/quickwit-indexing/src/actors/indexing_service.rs
+++ b/quickwit/quickwit-indexing/src/actors/indexing_service.rs
@@ -46,13 +46,12 @@ use quickwit_metastore::{
 };
 use quickwit_proto::indexing::{
     ApplyIndexingPlanRequest, ApplyIndexingPlanResponse, IndexingError, IndexingPipelineId,
-    IndexingTask,
+    IndexingTask, PipelineMetrics,
 };
 use quickwit_proto::metastore::{
     IndexMetadataRequest, ListIndexesMetadataRequest, MetastoreService, MetastoreServiceClient,
 };
 use quickwit_proto::types::{IndexId, IndexUid};
-use quickwit_proto::PipelineMetrics;
 use quickwit_storage::StorageResolver;
 use serde::{Deserialize, Serialize};
 use tokio::sync::Semaphore;
diff --git a/quickwit/quickwit-indexing/src/models/indexing_statistics.rs b/quickwit/quickwit-indexing/src/models/indexing_statistics.rs
index 21536db070a..bd404021d45 100644
--- a/quickwit/quickwit-indexing/src/models/indexing_statistics.rs
+++ b/quickwit/quickwit-indexing/src/models/indexing_statistics.rs
@@ -19,7 +19,7 @@
 
 use std::sync::atomic::Ordering;
 
-use quickwit_proto::PipelineMetrics;
+use quickwit_proto::indexing::PipelineMetrics;
 use serde::Serialize;
 
 use crate::actors::{DocProcessorCounters, IndexerCounters, PublisherCounters, UploaderCounters};
diff --git a/quickwit/quickwit-proto/src/indexing/mod.rs b/quickwit/quickwit-proto/src/indexing/mod.rs
index bf77184735e..9923edea31a 100644
--- a/quickwit/quickwit-proto/src/indexing/mod.rs
+++ b/quickwit/quickwit-proto/src/indexing/mod.rs
@@ -207,6 +207,22 @@ impl TryFrom<&str> for IndexingTask {
     }
 }
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)]
+pub struct PipelineMetrics {
+    pub cpu_thousandth: u16,
+    pub throughput_mb_per_sec: u16,
+}
+
+impl fmt::Display for PipelineMetrics {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(
+            f,
+            "{}‰,{}MB/s",
+            self.cpu_thousandth, self.throughput_mb_per_sec
+        )
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/quickwit/quickwit-proto/src/lib.rs b/quickwit/quickwit-proto/src/lib.rs
index ae94ca886cb..ae43f9683d2 100644
--- a/quickwit/quickwit-proto/src/lib.rs
+++ b/quickwit/quickwit-proto/src/lib.rs
@@ -251,19 +251,3 @@ impl search::SortOrder {
 }
 
 impl quickwit_common::pubsub::Event for ReportSplitsRequest {}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)]
-pub struct PipelineMetrics {
-    pub cpu_thousandth: u16,
-    pub throughput_mb_per_sec: u16,
-}
-
-impl fmt::Display for PipelineMetrics {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "{}‰,{}MB/s",
-            self.cpu_thousandth, self.throughput_mb_per_sec
-        )
-    }
-}