Merge pull request moby#3508 from goller/fix/otlp-env-var-spelling

AkihiroSuda · web-flow · commit c521afdba5d6 · 2023-01-16T22:15:22.000+09:00
fix(tracing): spelling of OTEL_TRACES_EXPORTER value
diff --git a/util/tracing/detect/otlp.go b/util/tracing/detect/otlp.go
@@ -16,7 +16,7 @@ func init() {
 }
 
 func otlpExporter() (sdktrace.SpanExporter, error) {
-	set := os.Getenv("OTEL_TRACES_EXPORTER") == "otpl" || os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT") != "" || os.Getenv("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT") != ""
+	set := os.Getenv("OTEL_TRACES_EXPORTER") == "otlp" || os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT") != "" || os.Getenv("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT") != ""
 	if !set {
 		return nil, nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ func init() {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`func otlpExporter() (sdktrace.SpanExporter, error) {`
`19`		`- set := os.Getenv("OTEL_TRACES_EXPORTER") == "otpl" \|\| os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT") != "" \|\| os.Getenv("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT") != ""`
	`19`	`+ set := os.Getenv("OTEL_TRACES_EXPORTER") == "otlp" \|\| os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT") != "" \|\| os.Getenv("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT") != ""`
`20`	`20`	`if !set {`
`21`	`21`	`return nil, nil`
`22`	`22`	`}`