Fold both healthz and readyz routes into the same path for now

Also remove the Arc from the config kept in the context.

Author: gruuya

src/config/context.rs

@@ -236,7 +236,7 @@ pub async fn build_context(cfg: schema::SeafowlConfig) -> Result<SeafowlContext>
     // (it will reload its schema before running the query)
 
     Ok(SeafowlContext {
-        config: Arc::new(cfg),
+        config: cfg,
         inner: context,
         metastore: Arc::new(metastore),
         internal_object_store,

src/context/mod.rs

@@ -22,7 +22,7 @@ use uuid::Uuid;
 // The core Seafowl object, responsible for parsing, logical and physical planning, as well as
 // interacting with the catalog and object store.
 pub struct SeafowlContext {
-    pub config: Arc<SeafowlConfig>,
+    pub config: SeafowlConfig,
     pub inner: SessionContext,
     pub metastore: Arc<Metastore>,
     pub internal_object_store: Arc<InternalObjectStore>,

src/frontend/http.rs

@@ -484,7 +484,7 @@ async fn load_part(mut part: Part) -> Result<Vec<u8>, ApiError> {
     Ok(bytes)
 }
 
-/// GET /readyz
+/// GET /healthz or /readyz
 pub async fn health_endpoint(context: Arc<SeafowlContext>) -> Result<Response, ApiError> {
     #[cfg(feature = "frontend-arrow-flight")]
     if let Some(flight) = &context.config.frontend.flight {
@@ -527,14 +527,24 @@ pub fn filters(
         let path = info.path();
 
         #[cfg(feature = "metrics")]
-        counter!(
-            HTTP_REQUESTS,
-            "method" => info.method().as_str().to_string(),
-            // Omit a potential db prefix or url-encoded query from the path
-            "route" => if path.contains("/upload/") { "/upload" } else if path.contains("/readyz") { "/readyz" } else { "/q" },
-            "status" => info.status().as_u16().to_string(),
-        )
-        .increment(1);
+        {
+            let route = if path.contains("/upload/") {
+                "/upload".to_string()
+            } else if path.contains("/q") {
+                "/q".to_string()
+            } else {
+                path.to_string()
+            };
+
+            counter!(
+                HTTP_REQUESTS,
+                "method" => info.method().as_str().to_string(),
+                // Omit a potential db prefix or url-encoded query from the path
+                "route" => route,
+                "status" => info.status().as_u16().to_string(),
+            )
+            .increment(1);
+        }
 
         info!(
             target: module_path!(),
@@ -623,9 +633,11 @@ pub fn filters(
 
     // Health-check/readiness probe
     let ctx = context;
-    let health_route = warp::path!("readyz")
+    let health_route = warp::path!("healthz")
+        .or(warp::path!("readyz"))
         .and(warp::path::end())
         .and(warp::get())
+        .unify()
         .and(warp::any().map(move || ctx.clone()))
         .then(health_endpoint)
         .map(into_response);

tests/main.rs

@@ -34,17 +34,16 @@ impl TestSeafowl {
             .config
             .frontend
             .http
-            .as_ref()
-            .expect("HTTP frontend configured")
-            .clone();
+            .clone()
+            .expect("HTTP frontend configured");
         format!("http://{}:{}", http.bind_host, http.bind_port)
     }
 
     pub fn metrics_port(&self) -> u16 {
         self.config
             .misc
             .metrics
-            .as_ref()
+            .clone()
             .expect("Metrics configured")
             .port
     }