From cc41489670574f97cbdd07ef6085fea08b76e6bc Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Tue, 19 Dec 2017 17:23:43 +0000
Subject: [PATCH] Update ai3/go-common
---
.../ai3/go-common/serverutil/http.go | 14 +++++++++++---
vendor/vendor.json | 6 +++---
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/vendor/git.autistici.org/ai3/go-common/serverutil/http.go b/vendor/git.autistici.org/ai3/go-common/serverutil/http.go
index 81c9ae90..7797ae66 100644
--- a/vendor/git.autistici.org/ai3/go-common/serverutil/http.go
+++ b/vendor/git.autistici.org/ai3/go-common/serverutil/http.go
@@ -103,16 +103,24 @@ func instrumentHandler(h http.Handler) http.Handler {
// HTTP-related metrics.
var (
+ // Since we instrument the root HTTP handler, we don't really
+ // have a good way to set the 'handler' label based on the
+ // request URL - but still, we'd like to set the label to
+ // match what the other Prometheus jobs do. So we just set it
+ // to 'all'.
totalRequests = prometheus.NewCounterVec(
prometheus.CounterOpts{
- Name: "total_requests",
+ Name: "http_requests_total",
Help: "Total number of requests.",
+ ConstLabels: prometheus.Labels{
+ "handler": "all",
+ },
},
- []string{"code"},
+ []string{"code", "method"},
)
inFlightRequests = prometheus.NewGauge(
prometheus.GaugeOpts{
- Name: "inflight_requests",
+ Name: "http_requests_inflight",
Help: "Number of in-flight requests.",
},
)
diff --git a/vendor/vendor.json b/vendor/vendor.json
index e77165ef..a40d3404 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -21,10 +21,10 @@
"revisionTime": "2017-12-14T08:46:15Z"
},
{
- "checksumSHA1": "wY0SM35qAhX3P2IZzDnYa068cPw=",
+ "checksumSHA1": "nlGRxexjZUxnHc/z/+ZqV/Xq51w=",
"path": "git.autistici.org/ai3/go-common/serverutil",
- "revision": "0cc062297e2c27f9a1abcb1a00172d1e0281f8cb",
- "revisionTime": "2017-12-14T08:46:15Z"
+ "revision": "aa88011352b67032c19b0c14eaa06b3417176753",
+ "revisionTime": "2017-12-19T17:20:40Z"
},
{
"checksumSHA1": "DFjm2ZJpUwioPApa3htGXLEFWl8=",
--
GitLab