blackbeard420/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-03-09 07:29:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

reverse_proxy: re-add healthy upstreams metric (#6806)

Browse Source 
* reverse_proxy: re-add healthy upstreams metric

Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>

* lint

Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>

---------

Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>
This commit is contained in:
Mohammed Al Sahaf 2025-01-28 00:30:54 +03:00 committed by GitHub
parent d7872c3bfa
commit 904a0fa368
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/caddyhttp/reverseproxy/metrics.go
View File

@ -2,26 +2,26 @@ package reverseproxy
import ( import (
"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" "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"
"github.com/caddyserver/caddy/v2"
) )
var reverseProxyMetrics = struct { var reverseProxyMetrics = struct {
init sync.Once
upstreamsHealthy *prometheus.GaugeVec upstreamsHealthy *prometheus.GaugeVec
logger *zap.Logger logger *zap.Logger
}{} }{}
func initReverseProxyMetrics(handler *Handler) { 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.NewGaugeVec(prometheus.GaugeOpts{ reverseProxyMetrics.upstreamsHealthy = promauto.With(registry).NewGaugeVec(prometheus.GaugeOpts{
Namespace: ns, Namespace: ns,
Subsystem: sub, Subsystem: sub,
Name: "upstreams_healthy", Name: "upstreams_healthy",
@ -35,17 +35,19 @@ type metricsUpstreamsHealthyUpdater struct {
handler *Handler handler *Handler
} }
func newMetricsUpstreamsHealthyUpdater(handler *Handler) *metricsUpstreamsHealthyUpdater { const upstreamsHealthyMetrics caddy.CtxKey = "reverse_proxy_upstreams_healthy"
reverseProxyMetrics.init.Do(func() {
initReverseProxyMetrics(handler)
})
func newMetricsUpstreamsHealthyUpdater(handler *Handler, ctx caddy.Context) *metricsUpstreamsHealthyUpdater {
if set := ctx.Value(upstreamsHealthyMetrics); set == nil {
initReverseProxyMetrics(handler, ctx.GetMetricsRegistry())
ctx = ctx.WithValue(upstreamsHealthyMetrics, true)
}
reverseProxyMetrics.upstreamsHealthy.Reset() reverseProxyMetrics.upstreamsHealthy.Reset()
return &metricsUpstreamsHealthyUpdater{handler} return &metricsUpstreamsHealthyUpdater{handler}
} }
func (m *metricsUpstreamsHealthyUpdater) Init() { func (m *metricsUpstreamsHealthyUpdater) init() {
go func() { go func() {
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {

4
modules/caddyhttp/reverseproxy/reverseproxy.go
View File

@ -382,8 +382,8 @@ func (h *Handler) Provision(ctx caddy.Context) error {
} }
} }
upstreamHealthyUpdater := newMetricsUpstreamsHealthyUpdater(h) upstreamHealthyUpdater := newMetricsUpstreamsHealthyUpdater(h, ctx)
upstreamHealthyUpdater.Init() upstreamHealthyUpdater.init()
return nil return nil
} }