projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13619: Move configuration options to arvados.Cluster.RequestLimits
[arvados.git]
/
sdk
/
go
/
httpserver
/
metrics.go
diff --git
a/sdk/go/httpserver/metrics.go
b/sdk/go/httpserver/metrics.go
index 77525a80f12ce269132cc932cd83e343b73d788b..b52068e9571d8518a5eb5afee1267e9470821617 100644
(file)
--- a/
sdk/go/httpserver/metrics.go
+++ b/
sdk/go/httpserver/metrics.go
@@
-99,10
+99,17
@@
func (m *metrics) ServeAPI(next http.Handler) http.Handler {
// For the metrics to be accurate, the caller must ensure every
// request passed to the Handler also passes through
// LogRequests(logger, ...), and vice versa.
// For the metrics to be accurate, the caller must ensure every
// request passed to the Handler also passes through
// LogRequests(logger, ...), and vice versa.
-func Instrument(logger *logrus.Logger, next http.Handler) Handler {
+//
+// If registry is nil, a new registry is created.
+//
+// If logger is nil, logrus.StandardLogger() is used.
+func Instrument(registry *prometheus.Registry, logger *logrus.Logger, next http.Handler) Handler {
if logger == nil {
logger = logrus.StandardLogger()
}
if logger == nil {
logger = logrus.StandardLogger()
}
+ if registry == nil {
+ registry = prometheus.NewRegistry()
+ }
reqDuration := prometheus.NewSummaryVec(prometheus.SummaryOpts{
Name: "request_duration_seconds",
Help: "Summary of request duration.",
reqDuration := prometheus.NewSummaryVec(prometheus.SummaryOpts{
Name: "request_duration_seconds",
Help: "Summary of request duration.",
@@
-111,7
+118,6
@@
func Instrument(logger *logrus.Logger, next http.Handler) Handler {
Name: "time_to_status_seconds",
Help: "Summary of request TTFB.",
}, []string{"code", "method"})
Name: "time_to_status_seconds",
Help: "Summary of request TTFB.",
}, []string{"code", "method"})
- registry := prometheus.NewRegistry()
registry.MustRegister(timeToStatus)
registry.MustRegister(reqDuration)
m := &metrics{
registry.MustRegister(timeToStatus)
registry.MustRegister(reqDuration)
m := &metrics{