Skip to content

Commit

Permalink
Change trace service name variable name to LINKERD2_PROXY_TRACE_SERVI…
Browse files Browse the repository at this point in the history
…CE_NAME
  • Loading branch information
GrigoriyMikhalkin committed May 20, 2024
1 parent ecc7ea6 commit c934687
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions linkerd/app/src/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ const ENV_OUTBOUND_DISABLE_INFORMATIONAL_HEADERS: &str =

pub const ENV_TRACE_ATTRIBUTES_PATH: &str = "LINKERD2_PROXY_TRACE_ATTRIBUTES_PATH";

pub const ENV_TRACE_SERVICE_NAME: &str = "LINKERD2_PROXY_TRACE_SERVICE_NAME";

/// Constrains which destination names may be used for profile/route discovery.
///
/// The value is a comma-separated list of domain name suffixes that may be
Expand Down Expand Up @@ -255,8 +257,6 @@ const ENV_OUTBOUND_HTTP1_CONNECTION_POOL_IDLE_TIMEOUT: &str =

const ENV_SHUTDOWN_GRACE_PERIOD: &str = "LINKERD2_PROXY_SHUTDOWN_GRACE_PERIOD";

const ENV_PROXY_TRACING_SERVICE_NAME: &str = "LINKERD2_PROXY_TRACING_SERVICE_NAME";

// Default values for various configuration fields
const DEFAULT_OUTBOUND_LISTEN_ADDR: &str = "127.0.0.1:4140";
pub const DEFAULT_INBOUND_LISTEN_ADDR: &str = "0.0.0.0:4143";
Expand Down Expand Up @@ -376,7 +376,7 @@ pub fn parse_config<S: Strings>(strings: &S) -> Result<super::Config, EnvError>

let shutdown_grace_period = parse(strings, ENV_SHUTDOWN_GRACE_PERIOD, parse_duration);

let proxy_tracing_service_name = strings.get(ENV_PROXY_TRACING_SERVICE_NAME);
let proxy_tracing_service_name = strings.get(ENV_TRACE_SERVICE_NAME);

let inbound_discovery_idle_timeout =
parse(strings, ENV_INBOUND_DISCOVERY_IDLE_TIMEOUT, parse_duration);
Expand Down

0 comments on commit c934687

Please sign in to comment.