X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/84f21d5634e17be62748f29f4303a86e0be6715b..1ea751256b6817e0c841e0a9c4b99d559de6f0b0:/services/keep-web/server.go?ds=sidebyside diff --git a/services/keep-web/server.go b/services/keep-web/server.go index 269f5d3689..167fbbe5b8 100644 --- 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.Instrument(nil, httpserver.AddRequestIDs(httpserver.LogRequests(nil, &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() }