3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-06 10:21:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

envoyconfig: default zipkin path to / when empty (#2359)

Browse source
This commit is contained in:
Caleb Doxsey 2021-07-13 11:11:49 -06:00 • committed by GitHub
parent 4c64daa8c2
commit a9ba3ffff5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/envoyconfig/tracing.go
View file

@ -113,9 +113,13 @@ func buildTracingHTTP(options *config.Options) (*envoy_config_trace_v3.Tracing_H
}, },
}, nil }, nil
case trace.ZipkinTracingProviderName: case trace.ZipkinTracingProviderName:
path := tracingOptions.ZipkinEndpoint.Path
if path == "" {
path = "/"
}
tracingTC, _ := anypb.New(&envoy_config_trace_v3.ZipkinConfig{ tracingTC, _ := anypb.New(&envoy_config_trace_v3.ZipkinConfig{
CollectorCluster: "zipkin", CollectorCluster: "zipkin",
CollectorEndpoint: tracingOptions.ZipkinEndpoint.Path, CollectorEndpoint: path,
CollectorEndpointVersion: envoy_config_trace_v3.ZipkinConfig_HTTP_JSON, CollectorEndpointVersion: envoy_config_trace_v3.ZipkinConfig_HTTP_JSON,
}) })
return &envoy_config_trace_v3.Tracing_Http{ return &envoy_config_trace_v3.Tracing_Http{