[OTEL-2309] Fix panic in /otel-agent -h

DataDog · Jan 6, 2025 · a35aac3 · a35aac3
1 parent 5001b19
commit a35aac3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cmd/otel-agent/command/command.go b/cmd/otel-agent/command/command.go
@@ -73,7 +73,8 @@ func makeCommands(globalParams *subcommands.GlobalParams) *cobra.Command {
 		true, // show env variable value in usage
 	)
 
-	if err := ef.Parse(os.Args[1:]); err != nil {
+	// There may be other env vars in addition to the ones in envflag.NewEnvFlag. Do not panic if those env vars do not have a help message (flag.ErrHelp)
+	if err := ef.Parse(os.Args[1:]); err != nil && err != flag.ErrHelp {
 		panic(err)
 	}