8000 feat(tracing): Allow trace collector to be unmeshed by sfleen · Pull Request #3953 · linkerd/linkerd2-proxy · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

feat(tracing): Allow trace collector to be unmeshed #3953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
8000 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(tracing): Allow trace collector to be unmeshed #3953

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion linkerd/app/src/env.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,8 @@ pub fn parse_config<S: Strings>(strings: &S) -> Result<super::Config, EnvError>
let trace_protocol = strings.get(ENV_TRACE_PROTOCOL);
let trace_service_ 8000 name = strings.get(ENV_TRACE_SERVICE_NAME);

let trace_collector_addr = parse_control_addr(strings, ENV_TRACE_COLLECTOR_SVC_BASE);
let trace_collector_addr =
parse_optionally_named_control_addr(strings, ENV_TRACE_COLLECTOR_SVC_BASE);

let gateway_suffixes = parse(strings, ENV_INBOUND_GATEWAY_SUFFIXES, parse_dns_suffixes);

Expand Down Expand Up @@ -1133,6 +1134,21 @@ pub fn parse_backoff<S: Strings>(
pub fn parse_control_addr<S: Strings>(
strings: &S,
base: &str,
) -> Result<Option<ControlAddr>, EnvError> {
parse_control_addr_inner(strings, base, false)
}

pub fn parse_optionally_named_control_addr<S: Strings>(
strings: &S,
base: &str,
) -> Result<Option<ControlAddr>, EnvError> {
parse_control_addr_inner(strings, base, true)
}

fn parse_control_addr_inner<S: Strings>(
strings: &S,
base: &str,
name_optional: bool,
) -> Result<Option<ControlAddr>, EnvError> {
let a = parse(strings, &format!("{base}_ADDR"), parse_addr)?;
let n = parse(strings, &format!("{base}_NAME"), parse_dns_name)?;
Expand All @@ -1142,6 +1158,10 @@ pub fn parse_control_addr<S: Strings>(
addr: addr.clone(),
identity: Conditional::None(tls::NoClientTls::Loopback),
})),
(Some(ref addr), None) if name_optional => Ok(Some(ControlAddr {
addr: addr.clone(),
identity: Conditional::None(tls::NoClientTls::Disabled),
})),
(Some(addr), Some(name)) => Ok(Some(ControlAddr {
addr,
identity: Conditional::Some(tls::ClientTls::new(
Expand Down
Loading
0