Merge branch '15209-python-arv-deps-pinned'

[arvados.git] / services / keep-web / server.go

diff --git a/services/keep-web/server.go b/services/keep-web/server.go
index aed2989219cab297adcc0629c0162ae1f1610f36..167fbbe5b85cf93f012d072e1fd97af3f5bd7106 100644 (file)
--- a/services/keep-web/server.go
+++ b/services/keep-web/server.go
@@ -5,7 +5,13 @@
 package main
 
 import (
+       "context"
+       "net/http"
+
+       "git.curoverse.com/arvados.git/sdk/go/ctxlog"
        "git.curoverse.com/arvados.git/sdk/go/httpserver"
+       "github.com/prometheus/client_golang/prometheus"
+       "github.com/sirupsen/logrus"
 )
 
 type server struct {
@@ -14,7 +20,13 @@ type server struct {
 }
 
 func (srv *server) Start() error {
-       srv.Handler = httpserver.AddRequestIDs(&handler{Config: srv.Config})
+       h := &handler{Config: srv.Config}
+       reg := prometheus.NewRegistry()
+       h.Config.Cache.registry = reg
+       ctx := ctxlog.Context(context.Background(), logrus.StandardLogger())
+       mh := httpserver.Instrument(reg, nil, httpserver.HandlerWithContext(ctx, httpserver.AddRequestIDs(httpserver.LogRequests(h))))
+       h.MetricsAPI = mh.ServeAPI(h.Config.ManagementToken, http.NotFoundHandler())
+       srv.Handler = mh
        srv.Addr = srv.Config.Listen
        return srv.Server.Start()
 }