diff --git a/metrics/commands.go b/metrics/commands.go index 10adbc94f..bcf9ee91f 100644 --- a/metrics/commands.go +++ b/metrics/commands.go @@ -18,7 +18,7 @@ package metrics var commandFlags = []string{ //added to catch scan details - "--version", "--login", "--help", + "--version", "--login", } // Generated with generatecommands/main.go diff --git a/metrics/metrics.go b/metrics/metrics.go index 5b6454d40..801c25bba 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -17,6 +17,8 @@ package metrics import ( + "strings" + "github.com/docker/compose-cli/utils" ) @@ -51,15 +53,15 @@ func GetCommand(args []string) string { result := "" onlyFlags := false for _, arg := range args { + if arg == "--help" { + result = strings.TrimSpace(arg + " " + result) + continue + } if arg == "--" { break } if isCommandFlag(arg) || (!onlyFlags && isCommand(arg)) { - if result == "" { - result = arg - } else { - result = result + " " + arg - } + result = strings.TrimSpace(result + " " + arg) if isCommand(arg) && !isManagementCommand(arg) { onlyFlags = true } diff --git a/metrics/metrics_test.go b/metrics/metrics_test.go index fe4e604b2..52f35b2fa 100644 --- a/metrics/metrics_test.go +++ b/metrics/metrics_test.go @@ -162,12 +162,12 @@ func TestKeepHelpCommands(t *testing.T) { { name: "run with help flag", args: []string{"run", "--help"}, - expected: "run --help", + expected: "--help run", }, { name: "with help flag before-after commands", args: []string{"compose", "--help", "up"}, - expected: "compose --help up", + expected: "--help compose up", }, { name: "help flag",