homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New logger for the Traefik logs

Browse source
This commit is contained in:
Ludovic Fernandez 2022-11-21 18:36:05 +01:00 • committed by GitHub
parent 27c02b5a56
commit 56f7515ecd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
297 changed files with 2337 additions and 1934 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkg/tracing/jaeger/jaeger.go
View file

@ -5,7 +5,8 @@ import (
"io"
"github.com/opentracing/opentracing-go"
"github.com/traefik/traefik/v2/pkg/log"
"github.com/rs/zerolog/log"
"github.com/traefik/traefik/v2/pkg/logs"
jaegercli "github.com/uber/jaeger-client-go"
jaegercfg "github.com/uber/jaeger-client-go/config"
"github.com/uber/jaeger-client-go/zipkin"
@ -88,8 +89,10 @@ func (c *Config) Setup(componentName string) (opentracing.Tracer, io.Closer, err
jMetricsFactory := jaegermet.NullFactory
logger := log.With().Str(logs.TracingProviderName, Name).Logger()
opts := []jaegercfg.Option{
jaegercfg.Logger(newJaegerLogger()),
jaegercfg.Logger(logs.NewJaegerLogger(logger)),
jaegercfg.Metrics(jMetricsFactory),
jaegercfg.Gen128Bit(c.Gen128Bit),
}
@ -112,10 +115,10 @@ func (c *Config) Setup(componentName string) (opentracing.Tracer, io.Closer, err
opts...,
)
if err != nil {
log.WithoutContext().Warnf("Could not initialize jaeger tracer: %v", err)
logger.Warn().Err(err).Msg("Could not initialize jaeger tracer")
return nil, nil, err
}
log.WithoutContext().Debug("Jaeger tracer configured")
logger.Debug().Msg("Jaeger tracer configured")
return opentracing.GlobalTracer(), closer, nil
}