From 15644f7d246bea06fd1c7763a3f97c571bc348d7 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Fri, 24 Sep 2021 11:42:48 -0400 Subject: [PATCH] fix: `TRACES_EXPORTER_` to `JAEGER_DEBUG_NAME` and `JAEGER_TRACE_CONTEXT_HEADER_NAME` (#2616) Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- tests/end_to_end_cases/tracing.rs | 7 +++++-- trace_exporters/src/lib.rs | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/end_to_end_cases/tracing.rs b/tests/end_to_end_cases/tracing.rs index 942a2423af..9adde1efce 100644 --- a/tests/end_to_end_cases/tracing.rs +++ b/tests/end_to_end_cases/tracing.rs @@ -13,7 +13,10 @@ async fn setup() -> (UdpCapture, ServerFixture) { .with_env("TRACES_EXPORTER", "jaeger") .with_env("TRACES_EXPORTER_JAEGER_AGENT_HOST", udp_capture.ip()) .with_env("TRACES_EXPORTER_JAEGER_AGENT_PORT", udp_capture.port()) - .with_env("JAEGER_TRACE_CONTEXT_HEADER_NAME", "custom-trace-header") + .with_env( + "TRACES_EXPORTER_JAEGER_TRACE_CONTEXT_HEADER_NAME", + "custom-trace-header", + ) .with_client_header("custom-trace-header", "4:3:2:1"); let server_fixture = ServerFixture::create_single_use_with_config(test_config).await; @@ -114,7 +117,7 @@ pub async fn test_tracing_create_trace() { .with_env("TRACES_EXPORTER_JAEGER_AGENT_HOST", udp_capture.ip()) .with_env("TRACES_EXPORTER_JAEGER_AGENT_PORT", udp_capture.port()) // setup a custom debug name (to ensure it gets plumbed through) - .with_env("JAEGER_DEBUG_NAME", "force-trace") + .with_env("TRACES_EXPORTER_JAEGER_DEBUG_NAME", "force-trace") .with_client_header("force-trace", "some-debug-id"); let server_fixture = ServerFixture::create_single_use_with_config(test_config).await; diff --git a/trace_exporters/src/lib.rs b/trace_exporters/src/lib.rs index 352e17845b..56cf3735bc 100644 --- a/trace_exporters/src/lib.rs +++ b/trace_exporters/src/lib.rs @@ -88,7 +88,7 @@ pub struct TracingConfig { /// Only used if `--traces-exporter` is "jaeger". #[structopt( long = "--traces-exporter-jaeger-trace-context-header-name", - env = "JAEGER_TRACE_CONTEXT_HEADER_NAME", + env = "TRACES_EXPORTER_JAEGER_TRACE_CONTEXT_HEADER_NAME", default_value = "uber-trace-id" )] pub traces_jaeger_trace_context_header_name: String, @@ -98,7 +98,7 @@ pub struct TracingConfig { /// Only used if `--traces-exporter` is "jaeger". #[structopt( long = "--traces-jaeger-debug-name", - env = "JAEGER_DEBUG_NAME", + env = "TRACES_EXPORTER_JAEGER_DEBUG_NAME", default_value = "jaeger-debug-id" )] pub traces_jaeger_debug_name: String,