From 556729ce055dd22bbe4b910253440185bdd55f71 Mon Sep 17 00:00:00 2001 From: Conor Evans Date: Sun, 4 Apr 2021 19:33:47 +0200 Subject: [PATCH 1/3] change ForceTracingBaggageKey to be lower kebab-cae for Jaeger compatability Signed-off-by: Conor Evans --- pkg/tracing/tracing.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/tracing/tracing.go b/pkg/tracing/tracing.go index ec9709737a..07a6e6a539 100644 --- a/pkg/tracing/tracing.go +++ b/pkg/tracing/tracing.go @@ -10,7 +10,9 @@ import ( ) // ForceTracingBaggageKey - force sampling header. -const ForceTracingBaggageKey = "X-Thanos-Force-Tracing" +// Lower kebab-case for Jaeger support, per documentation: +// https://www.jaegertracing.io/docs/1.22/client-libraries/#baggage +const ForceTracingBaggageKey = "x-thanos-force-tracing" // traceIdResponseHeader - Trace ID response header. const traceIDResponseHeader = "X-Thanos-Trace-Id" From 05ba5e91fa5acd0f465e3c0873dfbfb6f606ee1e Mon Sep 17 00:00:00 2001 From: Conor Evans Date: Sun, 4 Apr 2021 19:40:43 +0200 Subject: [PATCH 2/3] add CHANGELOG entry Signed-off-by: Conor Evans --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3391ad72e6..b6a80d6395 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,10 +30,10 @@ We use _breaking :warning:_ to mark changes that are not backward compatible (re ### Changed - [#3929](https://github.com/thanos-io/thanos/pull/3929) Store: Adds the name of the instantiated memcached client to log info - - [#3948](https://github.com/thanos-io/thanos/pull/3948) Receiver: Adjust `http_request_duration_seconds` buckets for low latency requests. - [#3856](https://github.com/thanos-io/thanos/pull/3856) Mixin: _breaking :warning:_ Introduce flexible multi-cluster/namespace mode for alerts and dashboards. Removes jobPrefix config option. Removes `namespace` by default. - [#3937](https://github.com/thanos-io/thanos/pull/3937) Store: Reduce memory usage for range queries. +- [#4018](https://github.com/thanos-io/thanos/pull/4018) Tracing: Update "force tracing" baggage header to be lower kebab-case for Jaeger support. ### Removed From 5ced7e87bb26dcde28e187022ec46dcbbad89718 Mon Sep 17 00:00:00 2001 From: Conor Evans Date: Sun, 4 Apr 2021 19:41:59 +0200 Subject: [PATCH 3/3] update CHANGELOG entry Signed-off-by: Conor Evans --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6a80d6395..60ffef8432 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,7 +33,7 @@ We use _breaking :warning:_ to mark changes that are not backward compatible (re - [#3948](https://github.com/thanos-io/thanos/pull/3948) Receiver: Adjust `http_request_duration_seconds` buckets for low latency requests. - [#3856](https://github.com/thanos-io/thanos/pull/3856) Mixin: _breaking :warning:_ Introduce flexible multi-cluster/namespace mode for alerts and dashboards. Removes jobPrefix config option. Removes `namespace` by default. - [#3937](https://github.com/thanos-io/thanos/pull/3937) Store: Reduce memory usage for range queries. -- [#4018](https://github.com/thanos-io/thanos/pull/4018) Tracing: Update "force tracing" baggage header to be lower kebab-case for Jaeger support. +- [#4018](https://github.com/thanos-io/thanos/pull/4018) Tracing: Update "force tracing" baggage key to be lower kebab-case for Jaeger support. ### Removed