[B2B-6248] Fix non-health requests tracking (#89)

Author: ademidov

multiserver.go

@@ -123,11 +123,13 @@ func (ms *Multiserver) AddHealthcheck(name, path string, check Healthchecker) er
 
 func WithHealthcheck(path string) serverOption {
 	return func(s *server) {
+		hc := newHealthcheckHandler(s.log, noopHealthcheck)
+
 		mux := http.NewServeMux()
-		mux.HandleFunc(path, newHealthcheckHandler(s.log, noopHealthcheck))
+		mux.Handle(path, withServerHealthcheckSummary(s.name, hc))
 		mux.Handle("/", s.handler)
 
-		s.handler = withServerHealthcheckSummary(s.name, mux)
+		s.handler = mux
 	}
 }
 

multiserver_test.go

@@ -3,6 +3,7 @@ package narada
 import (
 	"context"
 	"errors"
+	"io"
 	"net/http"
 	"testing"
 	"time"
@@ -111,6 +112,10 @@ func TestNewMultiServers(t *testing.T) {
 		assert.NoError(t, err)
 
 		cfg.Set("bind.test", ":12346")
+		cfg.Set("bind.metrics", ":9002")
+
+		err = NewMetricsInvoke(ms)
+		assert.NoError(t, err)
 
 		err = ms.Add(
 			"test",
@@ -142,6 +147,18 @@ func TestNewMultiServers(t *testing.T) {
 			assert.Equal(t, http.StatusOK, res.StatusCode)
 		}
 
+		// Check metrics
+		{
+			res, err := http.Get("http://localhost:9002")
+			assert.NoError(t, err)
+
+			body, err := io.ReadAll(res.Body)
+			assert.NoError(t, err)
+
+			assert.Contains(t, string(body), `server_healthcheck_duration_seconds_count{code="200",method="get",server="test"} 1`)
+			assert.NotContains(t, string(body), `server_healthcheck_duration_seconds_count{code="418",method="get",server="test"}`)
+		}
+
 		err = lc.Stop(context.Background())
 		assert.NoError(t, err)
 	})
@@ -156,6 +173,10 @@ func TestNewMultiServers(t *testing.T) {
 
 		cfg.Set("bind.test_success", ":12346")
 		cfg.Set("bind.test_failure", ":12347")
+		cfg.Set("bind.metrics", ":9002")
+
+		err = NewMetricsInvoke(ms)
+		assert.NoError(t, err)
 
 		err = ms.AddHealthcheck("test_success", "/healthz", func() error { return nil })
 		assert.NoError(t, err)
@@ -184,12 +205,32 @@ func TestNewMultiServers(t *testing.T) {
 			assert.Equal(t, http.StatusOK, res.StatusCode)
 		}
 
+		{
+			res, err := http.Get("http://localhost:12347")
+			assert.NoError(t, err)
+			assert.Equal(t, http.StatusNotFound, res.StatusCode)
+		}
+
 		{
 			res, err := http.Get("http://localhost:12347/healthz")
 			assert.NoError(t, err)
 			assert.Equal(t, http.StatusInternalServerError, res.StatusCode)
 		}
 
+		// Check metrics
+		{
+			res, err := http.Get("http://localhost:9002")
+			assert.NoError(t, err)
+
+			body, err := io.ReadAll(res.Body)
+			assert.NoError(t, err)
+
+			assert.Contains(t, string(body), `server_healthcheck_duration_seconds_count{code="404",method="get",server="test_success"} 2`)
+			assert.Contains(t, string(body), `server_healthcheck_duration_seconds_count{code="200",method="get",server="test_success"} 1`)
+			assert.Contains(t, string(body), `server_healthcheck_duration_seconds_count{code="404",method="get",server="test_failure"} 1`)
+			assert.Contains(t, string(body), `server_healthcheck_duration_seconds_count{code="500",method="get",server="test_failure"} 1`)
+		}
+
 		err = lc.Stop(context.Background())
 		assert.NoError(t, err)
 	})