Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
pull/24376/head
Andrew Lamb 2021-09-24 11:42:48 -04:00 committed by GitHub
parent bf5d0d01d2
commit 15644f7d24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/end_to_end_cases/tracing.rs
View File

@ -13,7 +13,10 @@ async fn setup() -> (UdpCapture, ServerFixture) {
.with_env("TRACES_EXPORTER", "jaeger") .with_env("TRACES_EXPORTER", "jaeger")
.with_env("TRACES_EXPORTER_JAEGER_AGENT_HOST", udp_capture.ip()) .with_env("TRACES_EXPORTER_JAEGER_AGENT_HOST", udp_capture.ip())
.with_env("TRACES_EXPORTER_JAEGER_AGENT_PORT", udp_capture.port()) .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"); .with_client_header("custom-trace-header", "4:3:2:1");
let server_fixture = ServerFixture::create_single_use_with_config(test_config).await; 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_HOST", udp_capture.ip())
.with_env("TRACES_EXPORTER_JAEGER_AGENT_PORT", udp_capture.port()) .with_env("TRACES_EXPORTER_JAEGER_AGENT_PORT", udp_capture.port())
// setup a custom debug name (to ensure it gets plumbed through) // 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"); .with_client_header("force-trace", "some-debug-id");
let server_fixture = ServerFixture::create_single_use_with_config(test_config).await; let server_fixture = ServerFixture::create_single_use_with_config(test_config).await;

4
trace_exporters/src/lib.rs
View File

@ -88,7 +88,7 @@ pub struct TracingConfig {
/// Only used if `--traces-exporter` is "jaeger". /// Only used if `--traces-exporter` is "jaeger".
#[structopt( #[structopt(
long = "--traces-exporter-jaeger-trace-context-header-name", 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" default_value = "uber-trace-id"
)] )]
pub traces_jaeger_trace_context_header_name: String, pub traces_jaeger_trace_context_header_name: String,
@ -98,7 +98,7 @@ pub struct TracingConfig {
/// Only used if `--traces-exporter` is "jaeger". /// Only used if `--traces-exporter` is "jaeger".
#[structopt( #[structopt(
long = "--traces-jaeger-debug-name", long = "--traces-jaeger-debug-name",
env = "JAEGER_DEBUG_NAME", env = "TRACES_EXPORTER_JAEGER_DEBUG_NAME",
default_value = "jaeger-debug-id" default_value = "jaeger-debug-id"
)] )]
pub traces_jaeger_debug_name: String, pub traces_jaeger_debug_name: String,