Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix OTLP env var overriding 

Signed-off-by: Christopher Petito <chrisjpetito@gmail.com>
This commit is contained in:
Christopher Petito 2024-04-17 14:32:41 +00:00
parent c0cc22db58
commit d6796c002f
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cli/command/telemetry_docker.go
View File

@ -41,10 +41,7 @@ func dockerExporterOTLPEndpoint(cli Cli) (endpoint string, secure bool) {
otelCfg = m[otelContextFieldName] otelCfg = m[otelContextFieldName]
} }
if otelCfg == nil { if otelCfg != nil {
return "", false
}
otelMap, ok := otelCfg.(map[string]any) otelMap, ok := otelCfg.(map[string]any)
if !ok { if !ok {
otel.Handle(errors.Errorf( otel.Handle(errors.Errorf(
@ -53,11 +50,10 @@ func dockerExporterOTLPEndpoint(cli Cli) (endpoint string, secure bool) {
otelCfg, otelCfg,
otelMap, otelMap,
)) ))
return "", false
} }
// keys from https://opentelemetry.io/docs/concepts/sdk-configuration/otlp-exporter-configuration/ // keys from https://opentelemetry.io/docs/concepts/sdk-configuration/otlp-exporter-configuration/
endpoint, _ = otelMap[otelExporterOTLPEndpoint].(string) endpoint, _ = otelMap[otelExporterOTLPEndpoint].(string)
}
// Override with env var value if it exists AND IS SET // Override with env var value if it exists AND IS SET
// (ignore otel defaults for this override when the key exists but is empty) // (ignore otel defaults for this override when the key exists but is empty)