Merge current v2.5 into v2.6

This commit is contained in:
Tom Moulard 2021-12-29 15:08:51 +01:00
commit 4990239855
No known key found for this signature in database
GPG key ID: 521ABE0C1A0DEAF6
4 changed files with 18 additions and 5 deletions

View file

@ -18,7 +18,7 @@ tracing:
!!! warning
Traefik is able to send data over the compact thrift protocol to the [Jaeger agent](https://www.jaegertracing.io/docs/deployment/#agent)
or a [Jaeger collector](https://www.jaegertracing.io/docs/deployment/#collectors).
or a [Jaeger collector](https://www.jaegertracing.io/docs/deployment/#collector).
!!! info
All Jaeger configuration can be overridden by [environment variables](https://github.com/jaegertracing/jaeger-client-go#environment-variables)