tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-23 21:54:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Also log help commands (no flag)

Browse Source 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
This commit is contained in:
Guillaume Tardif 2020-11-13 14:08:12 +01:00
parent b238232a77
commit 486e7b8f87
4 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
metrics/commands.go
View File

@ -23,6 +23,7 @@ var commandFlags = []string{
// Generated with generatecommands/main.go // Generated with generatecommands/main.go
var managementCommands = []string{ var managementCommands = []string{
"help",
"ecs", "ecs",
"scan", "scan",
"app", "app",

1
metrics/generatecommands/main.go
View File

@ -35,6 +35,7 @@ func main() {
fmt.Printf(` fmt.Printf(`
var managementCommands = []string{ var managementCommands = []string{
"help",
"%s", "%s",
} }

5
metrics/metrics_test.go
View File

@ -174,6 +174,11 @@ func TestKeepHelpCommands(t *testing.T) {
args: []string{"--help"}, args: []string{"--help"},
expected: "--help", expected: "--help",
}, },
{
name: "help commands",
args: []string{"help", "run"},
expected: "help run",
},
} }
for _, testCase := range testCases { for _, testCase := range testCases {

36
tests/e2e/e2e_test.go
View File

@ -161,15 +161,19 @@ func TestContextMetrics(t *testing.T) {
s.Start() s.Start()
defer s.Stop() defer s.Stop()
t.Run("do not send metrics on help commands", func(t *testing.T) { t.Run("send metrics on help commands", func(t *testing.T) {
s.ResetUsage() s.ResetUsage()
c.RunDockerCmd("help", "run")
c.RunDockerCmd("--help") c.RunDockerCmd("--help")
c.RunDockerCmd("ps", "--help")
c.RunDockerCmd("run", "--help") c.RunDockerCmd("run", "--help")
usage := s.GetUsage() usage := s.GetUsage()
assert.Equal(t, 0, len(usage)) assert.DeepEqual(t, []string{
`{"command":"help run","context":"moby","source":"cli","status":"success"}`,
`{"command":"--help","context":"moby","source":"cli","status":"success"}`,
`{"command":"--help run","context":"moby","source":"cli","status":"success"}`,
}, usage)
}) })
t.Run("metrics on default context", func(t *testing.T) { t.Run("metrics on default context", func(t *testing.T) {
@ -180,10 +184,11 @@ func TestContextMetrics(t *testing.T) {
c.RunDockerOrExitError("version", "--xxx") c.RunDockerOrExitError("version", "--xxx")
usage := s.GetUsage() usage := s.GetUsage()
assert.Equal(t, 3, len(usage)) assert.DeepEqual(t, []string{
assert.Equal(t, `{"command":"ps","context":"moby","source":"cli","status":"success"}`, usage[0]) `{"command":"ps","context":"moby","source":"cli","status":"success"}`,
assert.Equal(t, `{"command":"version","context":"moby","source":"cli","status":"success"}`, usage[1]) `{"command":"version","context":"moby","source":"cli","status":"success"}`,
assert.Equal(t, `{"command":"version","context":"moby","source":"cli","status":"failure"}`, usage[2]) `{"command":"version","context":"moby","source":"cli","status":"failure"}`,
}, usage)
}) })
t.Run("metrics on other context type", func(t *testing.T) { t.Run("metrics on other context type", func(t *testing.T) {
@ -198,14 +203,15 @@ func TestContextMetrics(t *testing.T) {
c.RunDockerCmd("--context", "test-example", "ps") c.RunDockerCmd("--context", "test-example", "ps")
usage := s.GetUsage() usage := s.GetUsage()
assert.Equal(t, 7, len(usage)) assert.DeepEqual(t, []string{
assert.Equal(t, `{"command":"context create","context":"moby","source":"cli","status":"success"}`, usage[0]) `{"command":"context create","context":"moby","source":"cli","status":"success"}`,
assert.Equal(t, `{"command":"ps","context":"moby","source":"cli","status":"success"}`, usage[1]) `{"command":"ps","context":"moby","source":"cli","status":"success"}`,
assert.Equal(t, `{"command":"context use","context":"moby","source":"cli","status":"success"}`, usage[2]) `{"command":"context use","context":"moby","source":"cli","status":"success"}`,
assert.Equal(t, `{"command":"ps","context":"example","source":"cli","status":"success"}`, usage[3]) `{"command":"ps","context":"example","source":"cli","status":"success"}`,
assert.Equal(t, `{"command":"stop","context":"example","source":"cli","status":"failure"}`, usage[4]) `{"command":"stop","context":"example","source":"cli","status":"failure"}`,
assert.Equal(t, `{"command":"context use","context":"example","source":"cli","status":"success"}`, usage[5]) `{"command":"context use","context":"example","source":"cli","status":"success"}`,
assert.Equal(t, `{"command":"ps","context":"example","source":"cli","status":"success"}`, usage[6]) `{"command":"ps","context":"example","source":"cli","status":"success"}`,
}, usage)
}) })
} }