13146: Add "include" parameter and rename return field to "included"

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

diff --git a/services/keep-web/server.go b/services/keep-web/server.go
index 0edcf31708b6a0d1e9688536d8523a24827c0a29..68ff8a7b013c2d685299eae2dc7c7da1d84f5606 100644 (file)
--- a/services/keep-web/server.go
+++ b/services/keep-web/server.go
@@ -5,7 +5,10 @@
 package main
 
 import (
+       "net/http"
+
        "git.curoverse.com/arvados.git/sdk/go/httpserver"
+       "github.com/prometheus/client_golang/prometheus"
 )
 
 type server struct {
@@ -14,7 +17,12 @@ type server struct {
 }
 
 func (srv *server) Start() error {
-       srv.Handler = &handler{Config: srv.Config}
+       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())
+       srv.Handler = mh
        srv.Addr = srv.Config.Listen
        return srv.Server.Start()
 }