implement dedicated service for /metrics

generall · generall · commit eb2e38f34f89 · 2025-12-29T15:32:52.000+01:00
diff --git a/src/actix/api/service_api.rs b/src/actix/api/service_api.rs
@@ -222,3 +222,8 @@ pub fn config_service_api(cfg: &mut web::ServiceConfig) {
         .service(get_logger_config)
         .service(update_logger_config);
 }
+
+// Dedicated service for metrics
+pub fn config_metrics_api(cfg: &mut web::ServiceConfig) {
+    cfg.service(metrics);
+}
diff --git a/src/actix/metrics_service.rs b/src/actix/metrics_service.rs
@@ -0,0 +1,55 @@
+use std::io;
+use std::sync::Arc;
+
+use actix_web::middleware::Compress;
+use actix_web::{App, HttpServer, web};
+
+use crate::actix::api::service_api::config_metrics_api;
+use crate::actix::certificate_helpers;
+use crate::common::telemetry::TelemetryCollector;
+use crate::settings::Settings;
+
+pub fn init_metrics(
+    port: u16,
+    telemetry_collector: Arc<tokio::sync::Mutex<TelemetryCollector>>,
+    settings: Settings,
+) -> io::Result<()> {
+    actix_web::rt::System::new().block_on(async {
+        let telemetry_collector_data = web::Data::from(telemetry_collector);
+        let service_config = web::Data::new(settings.service.clone());
+
+        let mut server = HttpServer::new(move || {
+            App::new()
+                .wrap(Compress::default())
+                .app_data(telemetry_collector_data.clone())
+                .app_data(service_config.clone())
+                .configure(config_metrics_api)
+        })
+        .workers(1);
+
+        let bind_addr = format!("{}:{}", settings.service.host, port);
+
+        server = if settings.service.enable_tls {
+            log::info!(
+                "TLS enabled for REST API (TTL: {})",
+                settings
+                    .tls
+                    .as_ref()
+                    .and_then(|tls| tls.cert_ttl)
+                    .map(|ttl| ttl.to_string())
+                    .unwrap_or_else(|| "none".into()),
+            );
+
+            let config = certificate_helpers::actix_tls_server_config(&settings)
+                .map_err(io::Error::other)?;
+            server.bind_rustls_0_23(bind_addr, config)?
+        } else {
+            log::info!("TLS disabled for REST API");
+
+            server.bind(bind_addr)?
+        };
+
+        log::info!("Qdrant metrics listening on {port}");
+        server.run().await
+    })
+}
diff --git a/src/actix/mod.rs b/src/actix/mod.rs
@@ -3,6 +3,7 @@ pub mod api;
 mod auth;
 mod certificate_helpers;
 pub mod helpers;
+pub mod metrics_service;
 pub mod web_ui;
 
 use std::io;
diff --git a/src/main.rs b/src/main.rs
@@ -558,6 +558,7 @@ fn main() -> anyhow::Result<()> {
 
     {
         let dispatcher_arc = dispatcher_arc.clone();
+        let telemetry_collector = telemetry_collector.clone();
         let settings = settings.clone();
         let handle = thread::Builder::new()
             .name("web".to_string())
@@ -577,6 +578,29 @@ fn main() -> anyhow::Result<()> {
         handles.push(handle);
     }
 
+    //
+    // Extra `/metrics` server
+    //
+
+    if let Some(metrics_port) = settings.service.metrics_port {
+        let telemetry_collector = telemetry_collector.clone();
+        let settings = settings.clone();
+        let handle = thread::Builder::new()
+            .name("metrics".to_string())
+            .spawn(move || {
+                log_err_if_any(
+                    "Metrics",
+                    actix::metrics_service::init_metrics(
+                        metrics_port,
+                        telemetry_collector,
+                        settings,
+                    ),
+                )
+            })
+            .unwrap();
+        handles.push(handle);
+    }
+
     //
     // gRPC server
     //
diff --git a/src/settings.rs b/src/settings.rs
@@ -26,6 +26,13 @@ pub struct ServiceConfig {
     pub host: String,
     pub http_port: u16,
     pub grpc_port: Option<u16>, // None means that gRPC is disabled
+
+    /// If specified, qdrant will serve a separate service for `/metrics` on this port.
+    /// Separate port is not protected by API keys and dedicated for internal monitoring systems.
+    /// This port should not be exposed to untrusted networks.
+    #[serde(default)]
+    pub metrics_port: Option<u16>,
+
     pub max_request_size_mb: usize,
     pub max_workers: Option<usize>,
     #[serde(default = "default_cors")]

Original file line number	Diff line number	Diff line change
`@@ -222,3 +222,8 @@ pub fn config_service_api(cfg: &mut web::ServiceConfig) {`
`222`	`222`	`.service(get_logger_config)`
`223`	`223`	`.service(update_logger_config);`
`224`	`224`	`}`
	`225`	`+`
	`226`	`+// Dedicated service for metrics`
	`227`	`+pub fn config_metrics_api(cfg: &mut web::ServiceConfig) {`
	`228`	`+ cfg.service(metrics);`
	`229`	`+}`