homelab/traefik
1
0
Fork 0
Code Activity

Merge branch v2.5 into master

Browse source
This commit is contained in:
kevinpollet 2021-10-06 11:55:12 +02:00
commit 32340252b2
No known key found for this signature in database
GPG key ID: 0C9A5DDD1B292453
39 changed files with 413 additions and 318 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkg/metrics/prometheus.go
View file

@ -11,6 +11,7 @@ import (
"github.com/go-kit/kit/metrics"
stdprometheus "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/collectors"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/traefik/traefik/v2/pkg/config/dynamic"
"github.com/traefik/traefik/v2/pkg/log"
@ -83,14 +84,14 @@ func PrometheusHandler() http.Handler {
func RegisterPrometheus(ctx context.Context, config *types.Prometheus) Registry {
standardRegistry := initStandardRegistry(config)
if err := promRegistry.Register(stdprometheus.NewProcessCollector(stdprometheus.ProcessCollectorOpts{})); err != nil {
if err := promRegistry.Register(collectors.NewProcessCollector(collectors.ProcessCollectorOpts{})); err != nil {
var arErr stdprometheus.AlreadyRegisteredError
if !errors.As(err, &arErr) {
log.FromContext(ctx).Warn("ProcessCollector is already registered")
}
}
if err := promRegistry.Register(stdprometheus.NewGoCollector()); err != nil {
if err := promRegistry.Register(collectors.NewGoCollector()); err != nil {
var arErr stdprometheus.AlreadyRegisteredError
if !errors.As(err, &arErr) {
log.FromContext(ctx).Warn("GoCollector is already registered")