Mirrors/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-13 19:46:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

reverseproxy: ignore duplicate collector registration error (#6820)

Browse source 
Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>
This commit is contained in:
Mohammed Al Sahaf 2025-02-04 10:55:30 +03:00 committed by GitHub
parent 9996d6a70b
commit 9283770f68
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
modules/caddyhttp/reverseproxy/metrics.go
View file

@ -1,11 +1,12 @@
package reverseproxy package reverseproxy
import ( import (
"errors"
"runtime/debug" "runtime/debug"
"sync"
"time" "time"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
"go.uber.org/zap" "go.uber.org/zap"
"go.uber.org/zap/zapcore" "go.uber.org/zap/zapcore"
@ -13,6 +14,7 @@ import (
) )
var reverseProxyMetrics = struct { var reverseProxyMetrics = struct {
once sync.Once
upstreamsHealthy *prometheus.GaugeVec upstreamsHealthy *prometheus.GaugeVec
logger *zap.Logger logger *zap.Logger
}{} }{}
@ -21,12 +23,25 @@ func initReverseProxyMetrics(handler *Handler, registry *prometheus.Registry) {
const ns, sub = "caddy", "reverse_proxy" const ns, sub = "caddy", "reverse_proxy"
upstreamsLabels := []string{"upstream"} upstreamsLabels := []string{"upstream"}
reverseProxyMetrics.upstreamsHealthy = promauto.With(registry).NewGaugeVec(prometheus.GaugeOpts{ reverseProxyMetrics.once.Do(func() {
Namespace: ns, reverseProxyMetrics.upstreamsHealthy = prometheus.NewGaugeVec(prometheus.GaugeOpts{
Subsystem: sub, Namespace: ns,
Name: "upstreams_healthy", Subsystem: sub,
Help: "Health status of reverse proxy upstreams.", Name: "upstreams_healthy",
}, upstreamsLabels) Help: "Health status of reverse proxy upstreams.",
}, upstreamsLabels)
})
// duplicate registration could happen if multiple sites with reverse proxy are configured; so ignore the error because
// there's no good way to capture having multiple sites with reverse proxy. If this happens, the metrics will be
// registered twice, but the second registration will be ignored.
if err := registry.Register(reverseProxyMetrics.upstreamsHealthy); err != nil &&
!errors.Is(err, prometheus.AlreadyRegisteredError{
ExistingCollector: reverseProxyMetrics.upstreamsHealthy,
NewCollector: reverseProxyMetrics.upstreamsHealthy,
}) {
panic(err)
}
reverseProxyMetrics.logger = handler.logger.Named("reverse_proxy.metrics") reverseProxyMetrics.logger = handler.logger.Named("reverse_proxy.metrics")
} }
@ -35,13 +50,8 @@ type metricsUpstreamsHealthyUpdater struct {
handler *Handler handler *Handler
} }
const upstreamsHealthyMetrics caddy.CtxKey = "reverse_proxy_upstreams_healthy"
func newMetricsUpstreamsHealthyUpdater(handler *Handler, ctx caddy.Context) *metricsUpstreamsHealthyUpdater { func newMetricsUpstreamsHealthyUpdater(handler *Handler, ctx caddy.Context) *metricsUpstreamsHealthyUpdater {
if set := ctx.Value(upstreamsHealthyMetrics); set == nil { initReverseProxyMetrics(handler, ctx.GetMetricsRegistry())
initReverseProxyMetrics(handler, ctx.GetMetricsRegistry())
ctx = ctx.WithValue(upstreamsHealthyMetrics, true)
}
reverseProxyMetrics.upstreamsHealthy.Reset() reverseProxyMetrics.upstreamsHealthy.Reset()
return &metricsUpstreamsHealthyUpdater{handler} return &metricsUpstreamsHealthyUpdater{handler}