From e09d5cb4ece2ebec0f76c1b2338789efe4e40693 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 24 Apr 2018 19:22:03 +0200 Subject: [PATCH] Fix documentation for tracing with Jaeger --- cmd/configuration.go | 2 +- configuration/configuration.go | 2 +- configuration/configuration_test.go | 6 +++--- docs/configuration/tracing.md | 7 +++++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/cmd/configuration.go b/cmd/configuration.go index 49c9dd742..fdd99de30 100644 --- a/cmd/configuration.go +++ b/cmd/configuration.go @@ -220,7 +220,7 @@ func NewTraefikDefaultPointersConfiguration() *TraefikConfiguration { SamplingServerURL: "http://localhost:5778/sampling", SamplingType: "const", SamplingParam: 1.0, - LocalAgentHostPort: "127.0.0.1:6832", + LocalAgentHostPort: "127.0.0.1:6831", }, Zipkin: &zipkin.Config{ HTTPEndpoint: "http://localhost:9411/api/v1/spans", diff --git a/configuration/configuration.go b/configuration/configuration.go index d29bb4465..260391822 100644 --- a/configuration/configuration.go +++ b/configuration/configuration.go @@ -327,7 +327,7 @@ func (gc *GlobalConfiguration) initTracing() { SamplingServerURL: "http://localhost:5778/sampling", SamplingType: "const", SamplingParam: 1.0, - LocalAgentHostPort: "127.0.0.1:6832", + LocalAgentHostPort: "127.0.0.1:6831", } } if gc.Tracing.Zipkin != nil { diff --git a/configuration/configuration_test.go b/configuration/configuration_test.go index e8c5e7b47..2ea462d0b 100644 --- a/configuration/configuration_test.go +++ b/configuration/configuration_test.go @@ -139,7 +139,7 @@ func TestSetEffectiveConfigurationTracing(t *testing.T) { SamplingServerURL: "http://localhost:5778/sampling", SamplingType: "const", SamplingParam: 1.0, - LocalAgentHostPort: "127.0.0.1:6832", + LocalAgentHostPort: "127.0.0.1:6831", }, Zipkin: nil, }, @@ -152,7 +152,7 @@ func TestSetEffectiveConfigurationTracing(t *testing.T) { SamplingServerURL: "http://localhost:5778/sampling", SamplingType: "const", SamplingParam: 1.0, - LocalAgentHostPort: "127.0.0.1:6832", + LocalAgentHostPort: "127.0.0.1:6831", }, }, expected: &tracing.Tracing{ @@ -174,7 +174,7 @@ func TestSetEffectiveConfigurationTracing(t *testing.T) { SamplingServerURL: "http://localhost:5778/sampling", SamplingType: "const", SamplingParam: 1.0, - LocalAgentHostPort: "127.0.0.1:6832", + LocalAgentHostPort: "127.0.0.1:6831", }, Zipkin: &zipkin.Config{ HTTPEndpoint: "http://powpow:9411/api/v1/spans", diff --git a/docs/configuration/tracing.md b/docs/configuration/tracing.md index b8d2d50a3..60ca7aba2 100644 --- a/docs/configuration/tracing.md +++ b/docs/configuration/tracing.md @@ -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 # - # 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 ```toml