From 8edac86ca86980d9948788aa54d53600285aec11 Mon Sep 17 00:00:00 2001
From: snowpoke <hello@snowpoke.ink>
Date: Sun, 23 Jan 2022 22:30:27 +0100
Subject: [PATCH 1/2] added server health endpoint

---
 tonic-health/src/server.rs | 43 +++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/tonic-health/src/server.rs b/tonic-health/src/server.rs
index 5747d2c5d..76bd905be 100644
--- a/tonic-health/src/server.rs
+++ b/tonic-health/src/server.rs
@@ -40,7 +40,10 @@ pub struct HealthReporter {
 
 impl HealthReporter {
     fn new() -> Self {
-        let statuses = Arc::new(RwLock::new(HashMap::new()));
+        // According to the gRPC Health Check specification, the empty service "" corresponds to the overall server health
+        let server_status = ("".to_string(), watch::channel(ServingStatus::Serving));
+
+        let statuses = Arc::new(RwLock::new(HashMap::from([server_status])));
 
         HealthReporter { statuses }
     }
@@ -166,9 +169,7 @@ mod tests {
     use crate::proto::HealthCheckRequest;
     use crate::server::{HealthReporter, HealthService};
     use crate::ServingStatus;
-    use std::collections::HashMap;
-    use std::sync::Arc;
-    use tokio::sync::{watch, RwLock};
+    use tokio::sync::watch;
     use tokio_stream::StreamExt;
     use tonic::{Code, Request, Status};
 
@@ -183,23 +184,35 @@ mod tests {
     }
 
     async fn make_test_service() -> (HealthReporter, HealthService) {
-        let state = Arc::new(RwLock::new(HashMap::new()));
-        state.write().await.insert(
-            "TestService".to_string(),
-            watch::channel(ServingStatus::Unknown),
-        );
-        (
-            HealthReporter {
-                statuses: state.clone(),
-            },
-            HealthService::new(state.clone()),
-        )
+        let health_reporter = HealthReporter::new();
+
+        // insert test value
+        {
+            let mut statuses = health_reporter.statuses.write().await;
+            statuses.insert(
+                "TestService".to_string(),
+                watch::channel(ServingStatus::Unknown),
+            );
+        }
+
+        let health_service = HealthService::new(health_reporter.statuses.clone());
+        (health_reporter, health_service)
     }
 
     #[tokio::test]
     async fn test_service_check() {
         let (mut reporter, service) = make_test_service().await;
 
+        // Overall server health
+        let resp = service
+            .check(Request::new(HealthCheckRequest {
+                service: "".to_string(),
+            }))
+            .await;
+        assert!(resp.is_ok());
+        let resp = resp.unwrap().into_inner();
+        assert_serving_status(resp.status, ServingStatus::Serving);
+
         // Unregistered service
         let resp = service
             .check(Request::new(HealthCheckRequest {

From 3beb77cd8a60fc13488605e2cea7d585d967dbd2 Mon Sep 17 00:00:00 2001
From: snowpoke <hello@snowpoke.ink>
Date: Sun, 23 Jan 2022 22:47:54 +0100
Subject: [PATCH 2/2] added watch unit test

---
 tonic-health/src/server.rs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tonic-health/src/server.rs b/tonic-health/src/server.rs
index 76bd905be..a094bf619 100644
--- a/tonic-health/src/server.rs
+++ b/tonic-health/src/server.rs
@@ -250,6 +250,21 @@ mod tests {
     async fn test_service_watch() {
         let (mut reporter, service) = make_test_service().await;
 
+        // Overall server health
+        let resp = service
+            .watch(Request::new(HealthCheckRequest {
+                service: "".to_string(),
+            }))
+            .await;
+        assert!(resp.is_ok());
+        let mut resp = resp.unwrap().into_inner();
+        let item = resp
+            .next()
+            .await
+            .expect("streamed response is Some")
+            .expect("response is ok");
+        assert_serving_status(item.status, ServingStatus::Serving);
+
         // Unregistered service
         let resp = service
             .watch(Request::new(HealthCheckRequest {