From 107e6b8c8fa0699a1721390a2208ad5f259f7652 Mon Sep 17 00:00:00 2001 From: Indra Gunawan Date: Wed, 12 Feb 2025 19:56:44 +0800 Subject: [PATCH] fix: missing metrics with Caddy 2.9 (#1007) --- caddy/mercure.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/caddy/mercure.go b/caddy/mercure.go index 304869f2..0adc0fbd 100644 --- a/caddy/mercure.go +++ b/caddy/mercure.go @@ -20,7 +20,6 @@ import ( "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" "github.com/caddyserver/caddy/v2/modules/caddyhttp" "github.com/dunglas/mercure" - "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) @@ -29,7 +28,6 @@ const defaultHubURL = "/.well-known/mercure" var ( ErrCompatibility = errors.New("compatibility mode only supports protocol version 7") - metrics = mercure.NewPrometheusMetrics(prometheus.DefaultRegisterer) //nolint:gochecknoglobals // Deprecated: use transports Caddy modules. transports = caddy.NewUsagePool() //nolint:gochecknoglobals @@ -189,6 +187,8 @@ func createTransportLegacy(m *Mercure) (mercure.Transport, error) { //nolint:wrapcheck func (m *Mercure) Provision(ctx caddy.Context) error { //nolint:funlen,gocognit + metrics := mercure.NewPrometheusMetrics(ctx.GetMetricsRegistry()) + if err := m.populateJWTConfig(); err != nil { return err }