From 4cab5b690b7299431e938da480f9ce5442a54254 Mon Sep 17 00:00:00 2001 From: Adrien Guillo Date: Fri, 27 Oct 2023 13:57:52 -0400 Subject: [PATCH] Fix `IndexingStatistics`-related tests --- quickwit/quickwit-indexing/src/actors/indexer.rs | 4 +++- quickwit/quickwit-indexing/src/lib.rs | 3 ++- quickwit/quickwit-proto/src/indexing/mod.rs | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/quickwit/quickwit-indexing/src/actors/indexer.rs b/quickwit/quickwit-indexing/src/actors/indexer.rs index 70ab08492f8..cd19c98e938 100644 --- a/quickwit/quickwit-indexing/src/actors/indexer.rs +++ b/quickwit/quickwit-indexing/src/actors/indexer.rs @@ -1062,7 +1062,9 @@ mod tests { .await .unwrap(); universe.sleep(Duration::from_secs(3)).await; - let indexer_counters = indexer_handle.observe().await.state; + let mut indexer_counters = indexer_handle.observe().await.state; + indexer_counters.pipeline_metrics_opt = None; + assert_eq!( indexer_counters, IndexerCounters { diff --git a/quickwit/quickwit-indexing/src/lib.rs b/quickwit/quickwit-indexing/src/lib.rs index 3fd3932eea5..61c0bc655b5 100644 --- a/quickwit/quickwit-indexing/src/lib.rs +++ b/quickwit/quickwit-indexing/src/lib.rs @@ -24,6 +24,7 @@ use quickwit_cluster::Cluster; use quickwit_common::pubsub::EventBroker; use quickwit_config::NodeConfig; use quickwit_ingest::{IngestApiService, IngesterPool}; +use quickwit_proto::indexing::PipelineMetrics; use quickwit_proto::metastore::MetastoreServiceClient; use quickwit_storage::StorageResolver; use tracing::info; @@ -53,7 +54,7 @@ use self::merge_policy::MergePolicy; pub use self::source::check_source_connectivity; #[derive(utoipa::OpenApi)] -#[openapi(components(schemas(IndexingStatistics)))] +#[openapi(components(schemas(IndexingStatistics, PipelineMetrics)))] /// Schema used for the OpenAPI generation which are apart of this crate. pub struct IndexingApiSchemas; diff --git a/quickwit/quickwit-proto/src/indexing/mod.rs b/quickwit/quickwit-proto/src/indexing/mod.rs index 9923edea31a..e7c7b3273a3 100644 --- a/quickwit/quickwit-proto/src/indexing/mod.rs +++ b/quickwit/quickwit-proto/src/indexing/mod.rs @@ -207,7 +207,7 @@ impl TryFrom<&str> for IndexingTask { } } -#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)] +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, utoipa::ToSchema)] pub struct PipelineMetrics { pub cpu_thousandth: u16, pub throughput_mb_per_sec: u16,