Merge remote-tracking branch 'origin/master' into update-labkit

1 files changed, 5 insertions, 3 deletions

diff --git a/app.go b/app.go
index e0d2e1fa..ce78b097 100644
--- a/app.go
+++ b/app.go
@@ -13,8 +13,8 @@ import (
 	"github.com/rs/cors"
 	log "github.com/sirupsen/logrus"
 	"gitlab.com/gitlab-org/labkit/errortracking"
-	"gitlab.com/gitlab-org/labkit/metrics"
 	"gitlab.com/gitlab-org/labkit/monitoring"
+	labmetrics "gitlab.com/gitlab-org/labkit/metrics"
 	mimedb "gitlab.com/lupine/go-mimedb"
 
 	"gitlab.com/gitlab-org/gitlab-pages/internal/acme"
@@ -28,6 +28,7 @@ import (
 	"gitlab.com/gitlab-org/gitlab-pages/internal/netutil"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/request"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/source"
+	"gitlab.com/gitlab-org/gitlab-pages/metrics"
 )
 
 const (
@@ -74,7 +75,7 @@ func (a *theApp) ServeTLS(ch *tls.ClientHelloInfo) (*tls.Certificate, error) {
 
 func (a *theApp) healthCheck(w http.ResponseWriter, r *http.Request, https bool) {
 	if a.isReady() {
-		w.Write([]byte("success"))
+		w.Write([]byte("success\n"))
 	} else {
 		http.Error(w, "not yet ready", http.StatusServiceUnavailable)
 	}
@@ -162,6 +163,7 @@ func (a *theApp) routingMiddleware(handler http.Handler) http.Handler {
 		// middleware chain and simply respond with 502 after logging this
 		host, domain, err := a.getHostAndDomain(r)
 		if err != nil {
+			metrics.DomainsSourceFailures.Inc()
 			log.WithError(err).Error("could not fetch domain information from a source")
 
 			httperrors.Serve502(w)
@@ -334,7 +336,7 @@ func (a *theApp) buildHandlerPipeline() (http.Handler, error) {
 	}
 
 	// Metrics
-	metricsMiddleware := metrics.NewHandlerFactory(metrics.WithNamespace("gitlab_pages"))
+	metricsMiddleware := labmetrics.NewHandlerFactory(labmetrics.WithNamespace("gitlab_pages"))
 	handler = metricsMiddleware(handler)
 
 	handler = a.routingMiddleware(handler)