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

Fix documentation for tracing with Jaeger

Browse source
This commit is contained in:
Michael 2018-04-24 19:22:03 +02:00 committed by Traefiker Bot
parent cae353b9f6
commit e09d5cb4ec
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/configuration.go
View file

@ -220,7 +220,7 @@ func NewTraefikDefaultPointersConfiguration() *TraefikConfiguration {
SamplingServerURL: "http://localhost:5778/sampling", SamplingServerURL: "http://localhost:5778/sampling",
SamplingType: "const", SamplingType: "const",
SamplingParam: 1.0, SamplingParam: 1.0,
LocalAgentHostPort: "127.0.0.1:6832", LocalAgentHostPort: "127.0.0.1:6831",
}, },
Zipkin: &zipkin.Config{ Zipkin: &zipkin.Config{
HTTPEndpoint: "http://localhost:9411/api/v1/spans", HTTPEndpoint: "http://localhost:9411/api/v1/spans",

2
configuration/configuration.go
View file

@ -327,7 +327,7 @@ func (gc *GlobalConfiguration) initTracing() {
SamplingServerURL: "http://localhost:5778/sampling", SamplingServerURL: "http://localhost:5778/sampling",
SamplingType: "const", SamplingType: "const",
SamplingParam: 1.0, SamplingParam: 1.0,
LocalAgentHostPort: "127.0.0.1:6832", LocalAgentHostPort: "127.0.0.1:6831",
} }
} }
if gc.Tracing.Zipkin != nil { if gc.Tracing.Zipkin != nil {

6
configuration/configuration_test.go
View file

@ -139,7 +139,7 @@ func TestSetEffectiveConfigurationTracing(t *testing.T) {
SamplingServerURL: "http://localhost:5778/sampling", SamplingServerURL: "http://localhost:5778/sampling",
SamplingType: "const", SamplingType: "const",
SamplingParam: 1.0, SamplingParam: 1.0,
LocalAgentHostPort: "127.0.0.1:6832", LocalAgentHostPort: "127.0.0.1:6831",
}, },
Zipkin: nil, Zipkin: nil,
}, },
@ -152,7 +152,7 @@ func TestSetEffectiveConfigurationTracing(t *testing.T) {
SamplingServerURL: "http://localhost:5778/sampling", SamplingServerURL: "http://localhost:5778/sampling",
SamplingType: "const", SamplingType: "const",
SamplingParam: 1.0, SamplingParam: 1.0,
LocalAgentHostPort: "127.0.0.1:6832", LocalAgentHostPort: "127.0.0.1:6831",
}, },
}, },
expected: &tracing.Tracing{ expected: &tracing.Tracing{
@ -174,7 +174,7 @@ func TestSetEffectiveConfigurationTracing(t *testing.T) {
SamplingServerURL: "http://localhost:5778/sampling", SamplingServerURL: "http://localhost:5778/sampling",
SamplingType: "const", SamplingType: "const",
SamplingParam: 1.0, SamplingParam: 1.0,
LocalAgentHostPort: "127.0.0.1:6832", LocalAgentHostPort: "127.0.0.1:6831",
}, },
Zipkin: &zipkin.Config{ Zipkin: &zipkin.Config{
HTTPEndpoint: "http://powpow:9411/api/v1/spans", HTTPEndpoint: "http://powpow:9411/api/v1/spans",

7
docs/configuration/tracing.md
View file

@ -48,11 +48,14 @@ Træfik supports two backends: Jaeger and Zipkin.
# Local Agent Host Port instructs reporter to send spans to jaeger-agent at this address # Local Agent Host Port instructs reporter to send spans to jaeger-agent at this address
# #
# Default: "127.0.0.1:6832" # Default: "127.0.0.1:6831"
# #
localAgentHostPort = "127.0.0.1:6832" localAgentHostPort = "127.0.0.1:6831"
``` ```
!!! warning
Træfik is only able to send data over compact thrift protocol to the [Jaeger agent](https://www.jaegertracing.io/docs/deployment/#agent).
## Zipkin ## Zipkin
```toml ```toml