Do not log health check endpoint

api/api.go

@@ -63,16 +63,17 @@ func NewAPIWithVersion(ctx context.Context, globalConfig *conf.GlobalConfigurati
 	}
 
 	xffmw, _ := xff.Default()
+	logger := newStructuredLogger(logrus.StandardLogger())
 
 	r := newRouter()
 	r.UseBypass(xffmw.Handler)
 	r.Use(withRequestID)
-	r.UseBypass(newStructuredLogger(logrus.StandardLogger()))
 	r.Use(recoverer)
 
 	r.Get("/health", api.HealthCheck)
 
 	r.Route("/", func(r *router) {
+		r.UseBypass(logger)
 		if globalConfig.MultiInstanceMode {
 			r.Use(api.loadInstanceConfig)
 		}
@@ -120,8 +121,9 @@ func NewAPIWithVersion(ctx context.Context, globalConfig *conf.GlobalConfigurati
 
 	if globalConfig.MultiInstanceMode {
 		// Operator microservice API
-		r.With(api.verifyOperatorRequest).Get("/", api.GetAppManifest)
+		r.WithBypass(logger).With(api.verifyOperatorRequest).Get("/", api.GetAppManifest)
 		r.Route("/instances", func(r *router) {
+			r.UseBypass(logger)
 			r.Use(api.verifyOperatorRequest)
 
 			r.Post("/", api.CreateInstance)

api/api_test.go

@@ -16,6 +16,9 @@ import (
 func TestTraceWrapper(t *testing.T) {
 	hook := test.NewGlobal()
 	globalConfig := new(conf.GlobalConfiguration)
+	globalConfig.MultiInstanceMode = true
+	globalConfig.OperatorToken = "token"
+
 	config := new(conf.Configuration)
 	config.Payment.Stripe.Enabled = true
 	config.Payment.Stripe.SecretKey = "secret"
@@ -28,7 +31,10 @@ func TestTraceWrapper(t *testing.T) {
 	defer server.Close()
 
 	client := http.Client{}
-	rsp, err := client.Get(server.URL + "/health")
+	req, err := http.NewRequest(http.MethodGet, server.URL+"/", nil)
+	require.NoError(t, err)
+	req.Header.Add("Authorization", "Bearer token")
+	rsp, err := client.Do(req)
 	require.NoError(t, err)
 	assert.Equal(t, http.StatusOK, rsp.StatusCode)
 	assert.True(t, len(hook.Entries) > 0)
@@ -39,7 +45,7 @@ func TestTraceWrapper(t *testing.T) {
 		}
 		expected := map[string]string{
 			"method": "GET",
-			"path":   "/health",
+			"path":   "/",
 		}
 		for k, v := range expected {
 			if value, ok := entry.Data[k]; ok {

api/router.go

@@ -39,6 +39,11 @@ func (r *router) With(fn middlewareHandler) *router {
 	return &router{c}
 }
 
+func (r *router) WithBypass(fn func(next http.Handler) http.Handler) *router {
+	c := r.chi.With(fn)
+	return &router{c}
+}
+
 func (r *router) Use(fn middlewareHandler) {
 	r.chi.Use(middleware(fn))
 }