Skip to content

web search done right

log number of explore api requests

Mikkel Denkerb0b1951ec952
diff --git a/core/src/api/mod.rs b/core/src/api/mod.rs
index 4f1ca64a..c8c50ded 100644
--- a/core/src/api/mod.rs
+++ b/core/src/api/mod.rs
@@ -67,13 +67,18 @@ mod webgraph;
pub struct HtmlTemplate<T>(T);
+pub struct Counters {
+ pub search_counter_success: crate::metrics::Counter,
+ pub search_counter_fail: crate::metrics::Counter,
+ pub explore_counter: crate::metrics::Counter,
+}
+
pub struct State {
pub config: FrontendConfig,
pub searcher: FrontendSearcher,
pub remote_webgraph: RemoteWebgraph,
pub autosuggest: Autosuggest,
- pub search_counter_success: crate::metrics::Counter,
- pub search_counter_fail: crate::metrics::Counter,
+ pub counters: Counters,
pub summarizer: Arc<Summarizer>,
pub fact_checker: Arc<FactCheckModel>,
pub improvement_queue: Option<Arc<Mutex<LeakyQueue<ImprovementEvent>>>>,
@@ -106,11 +111,7 @@ pub async fn favicon() -> impl IntoResponse {
.unwrap()
}
-pub async fn router(
- config: &FrontendConfig,
- search_counter_success: crate::metrics::Counter,
- search_counter_fail: crate::metrics::Counter,
-) -> Result<Router> {
+pub async fn router(config: &FrontendConfig, counters: Counters) -> Result<Router> {
let autosuggest = Autosuggest::load_csv(&config.queries_csv_path)?;
let crossencoder = CrossEncoderModel::open(&config.crossencoder_model_path)?;
@@ -151,8 +152,7 @@ pub async fn router(
config: config.clone(),
searcher,
autosuggest,
- search_counter_success,
- search_counter_fail,
+ counters,
remote_webgraph,
summarizer: Arc::new(Summarizer::open(&config.summarizer_path)?),
fact_checker: Arc::new(FactCheckModel::open(&config.fact_check_model_path)?),
@@ -223,9 +223,9 @@ async fn search_metric<B>(
let response = next.run(request).await;
if response.status().is_success() {
- state.search_counter_success.inc();
+ state.counters.search_counter_success.inc();
} else {
- state.search_counter_fail.inc();
+ state.counters.search_counter_fail.inc();
}
response
diff --git a/core/src/api/webgraph.rs b/core/src/api/webgraph.rs
index 156a6a9e..bf25f239 100644
--- a/core/src/api/webgraph.rs
+++ b/core/src/api/webgraph.rs
@@ -60,6 +60,7 @@ pub async fn similar_sites(
extract::State(state): extract::State<Arc<State>>,
extract::Json(params): extract::Json<SimilarSitesParams>,
) -> std::result::Result<impl IntoResponse, StatusCode> {
+ state.counters.explore_counter.inc();
let host = state.remote_webgraph.host().await;
let retry = ExponentialBackoff::from_millis(30)
diff --git a/core/src/entrypoint/frontend.rs b/core/src/entrypoint/frontend.rs
index 3111b916..c21823a1 100644
--- a/core/src/entrypoint/frontend.rs
+++ b/core/src/entrypoint/frontend.rs
@@ -17,7 +17,7 @@
use anyhow::Result;
use crate::{
- api::{metrics_router, router},
+ api::{metrics_router, router, Counters},
metrics::Label,
FrontendConfig,
};
@@ -25,6 +25,8 @@ use crate::{
pub async fn run(config: FrontendConfig) -> Result<()> {
let search_counter_success = crate::metrics::Counter::default();
let search_counter_fail = crate::metrics::Counter::default();
+ let explore_counter = crate::metrics::Counter::default();
+
let mut registry = crate::metrics::PrometheusRegistry::default();
let group = registry
@@ -49,7 +51,21 @@ pub async fn run(config: FrontendConfig) -> Result<()> {
}],
);
- let app = router(&config, search_counter_success, search_counter_fail).await?;
+ let group = registry
+ .new_group(
+ "explore_requests".to_string(),
+ Some("Total number of incoming requests to explore api.".to_string()),
+ )
+ .unwrap();
+ group.register(explore_counter.clone(), vec![]);
+
+ let counters = Counters {
+ search_counter_success,
+ search_counter_fail,
+ explore_counter,
+ };
+
+ let app = router(&config, counters).await?;
let metrics_app = metrics_router(registry);
let addr = config.host;