X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/336638f432e46f61cc87b958580e098e81cea921..bc14c62ad1528dbddc26781c5cea6a7968c93f2e:/services/keep-web/server.go diff --git a/services/keep-web/server.go b/services/keep-web/server.go index 68ff8a7b01..167fbbe5b8 100644 --- a/services/keep-web/server.go +++ b/services/keep-web/server.go @@ -5,10 +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 { @@ -20,8 +23,9 @@ func (srv *server) Start() error { h := &handler{Config: srv.Config} reg := prometheus.NewRegistry() h.Config.Cache.registry = reg - mh := httpserver.Instrument(reg, nil, httpserver.AddRequestIDs(httpserver.LogRequests(nil, h))) - h.MetricsAPI = mh.ServeAPI(http.NotFoundHandler()) + 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()