X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4a2dc82a1acce855151928abe0030e1dd7dbf728..39c17737ac69d7693684fe2f95bef0ec235a28bf:/services/keepstore/config.go diff --git a/services/keepstore/config.go b/services/keepstore/config.go index 3db20e29ce..1f8c7e31a2 100644 --- a/services/keepstore/config.go +++ b/services/keepstore/config.go @@ -9,17 +9,11 @@ import ( "encoding/json" "fmt" "io/ioutil" - "net/http" - "strconv" "strings" "time" "git.curoverse.com/arvados.git/sdk/go/arvados" - "git.curoverse.com/arvados.git/sdk/go/stats" "github.com/Sirupsen/logrus" - "github.com/golang/protobuf/jsonpb" - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/promhttp" ) type Config struct { @@ -54,8 +48,6 @@ type Config struct { ManagementToken string `doc: The secret key that must be provided by monitoring services wishing to access the health check endpoint (/_health).` - - metrics } var ( @@ -161,62 +153,6 @@ func (cfg *Config) Start() error { return nil } -type metrics struct { - registry *prometheus.Registry - reqDuration *prometheus.SummaryVec - timeToStatus *prometheus.SummaryVec - exportProm http.Handler -} - -func (*metrics) Levels() []logrus.Level { - return logrus.AllLevels -} - -func (m *metrics) Fire(ent *logrus.Entry) error { - if tts, ok := ent.Data["timeToStatus"].(stats.Duration); !ok { - } else if method, ok := ent.Data["reqMethod"].(string); !ok { - } else if code, ok := ent.Data["respStatusCode"].(int); !ok { - } else { - m.timeToStatus.WithLabelValues(strconv.Itoa(code), strings.ToLower(method)).Observe(time.Duration(tts).Seconds()) - } - return nil -} - -func (m *metrics) setup() { - m.registry = prometheus.NewRegistry() - m.timeToStatus = prometheus.NewSummaryVec(prometheus.SummaryOpts{ - Name: "time_to_status_seconds", - Help: "Summary of request TTFB.", - }, []string{"code", "method"}) - m.reqDuration = prometheus.NewSummaryVec(prometheus.SummaryOpts{ - Name: "request_duration_seconds", - Help: "Summary of request duration.", - }, []string{"code", "method"}) - m.registry.MustRegister(m.timeToStatus) - m.registry.MustRegister(m.reqDuration) - m.exportProm = promhttp.HandlerFor(m.registry, promhttp.HandlerOpts{ - ErrorLog: log, - }) - log.AddHook(m) -} - -func (m *metrics) exportJSON(w http.ResponseWriter, req *http.Request) { - jm := jsonpb.Marshaler{Indent: " "} - mfs, _ := m.registry.Gather() - w.Write([]byte{'['}) - for i, mf := range mfs { - if i > 0 { - w.Write([]byte{','}) - } - jm.Marshal(w, mf) - } - w.Write([]byte{']'}) -} - -func (m *metrics) Instrument(next http.Handler) http.Handler { - return promhttp.InstrumentHandlerDuration(m.reqDuration, next) -} - // VolumeTypes is built up by init() funcs in the source files that // define the volume types. var VolumeTypes = []func() VolumeWithExamples{}