Merge pull request #32480 from vespa-engine/arnej/logfmt-show-all-levels

arnej27959 · web-flow · commit fa393bb5c976 · 2024-09-27T15:53:24.000+02:00
vespa-logfmt now shows all levels by default;
diff --git a/client/go/internal/admin/vespa-wrapper/logfmt/levelflags.go b/client/go/internal/admin/vespa-wrapper/logfmt/levelflags.go
@@ -21,10 +21,10 @@ func defaultLevelFlags() map[string]bool {
 		"error":   true,
 		"warning": true,
 		"info":    true,
-		"config":  false,
-		"event":   false,
-		"debug":   false,
-		"spam":    false,
+		"config":  true,
+		"event":   true,
+		"debug":   true,
+		"spam":    true,
 	}
 }
 
@@ -68,5 +68,7 @@ func (v *flagValueForLevel) unchanged() bool {
 }
 
 func (v *flagValueForLevel) Set(val string) error {
-	return applyPlusMinus(val, v)
+	err := applyPlusMinus(val, v)
+	v.changed = true
+	return err
 }
diff --git a/client/go/internal/admin/vespa-wrapper/logfmt/levelflags_test.go b/client/go/internal/admin/vespa-wrapper/logfmt/levelflags_test.go
@@ -37,18 +37,19 @@ func TestLevelFlags(t *testing.T) {
 			t.Fail()
 		}
 	}
-	check(" +fatal +error +warning +info -config -event -debug -spam")
+	check(" +fatal +error +warning +info +config +event +debug +spam")
 	check(" -fatal -error -warning -info -config -event -debug -spam", "-all")
 	check(" +fatal +error +warning +info +config +event +debug +spam", "all")
 	check(" +fatal +error +warning +info +config +event +debug +spam", "+all")
 	check(" -fatal -error -warning -info -config -event +debug -spam", "debug")
 	check(" +fatal +error +warning +info +config +event +debug -spam", "all-spam")
 	check(" +fatal +error +warning +info +config +event +debug -spam", "all", "-spam")
-	check(" +fatal +error +warning -info -config +event -debug -spam", "+event", "-info")
-	check(" +fatal +error -warning -info -config +event -debug -spam", "+event,-info,-warning,config")
-	check(" +fatal +error -warning -info +config +event -debug -spam", "+event,-info,-warning,+config")
-	check(" +fatal +error -warning -info +config +event -debug -spam", "+event,-info", "-warning,+config")
-	check(" -fatal -error -warning -info +config -event -debug -spam", "+event", "-info", "-warning", "config")
+	check(" +fatal +error +warning -info +config +event +debug +spam", "+event", "-info")
+	check(" +fatal +error -warning -info -config +event +debug +spam", "+event,-info,-warning,config")
+	check(" +fatal +error -warning -info +config +event +debug +spam", "+event,-info,-warning,+config")
+	check(" +fatal +error -warning -info +config +event +debug +spam", "+event,-info", "-warning,+config")
+	check(" +fatal +error -warning -info +config +event +debug +spam", "+event", "-info", "-warning", "config")
+	check(" -fatal +error -warning +info -config -event +debug -spam", "info", "debug", "error")
 	check = func(expectErr string, texts ...string) {
 		var target flagValueForLevel
 		target.levels = defaultLevelFlags()
diff --git a/client/go/internal/admin/vespa-wrapper/logfmt/showflags.go b/client/go/internal/admin/vespa-wrapper/logfmt/showflags.go
@@ -72,5 +72,7 @@ func (v *flagValueForShow) unchanged() bool {
 }
 
 func (v *flagValueForShow) Set(val string) error {
-	return applyPlusMinus(val, v)
+	err := applyPlusMinus(val, v)
+	v.changed = true
+	return err
 }
diff --git a/client/go/internal/admin/vespa-wrapper/logfmt/showflags_test.go b/client/go/internal/admin/vespa-wrapper/logfmt/showflags_test.go
@@ -37,7 +37,8 @@ func TestShowFlags(t *testing.T) {
 	check(" +time -fmttime +msecs -usecs +host +level -pid -service +component +message", "+host,-fmttime,-service,pid")
 	check(" +time -fmttime +msecs -usecs +host +level +pid -service +component +message", "+host,-fmttime,-service,+pid")
 	check(" +time -fmttime +msecs -usecs +host +level +pid -service +component +message", "+host,-fmttime", "-service,+pid")
-	check(" -time -fmttime -msecs -usecs -host -level +pid -service -component -message", "+host", "-fmttime", "-service", "pid")
+	check(" +time -fmttime +msecs -usecs +host +level +pid -service +component +message", "+host", "-fmttime", "-service", "pid")
+	check(" -time -fmttime -msecs -usecs +host -level +pid -service +component -message", "host", "component", "pid")
 	check = func(expectErr string, texts ...string) {
 		var target flagValueForShow
 		target.shown = defaultShowFlags()

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ func defaultLevelFlags() map[string]bool {`
`21`	`21`	`"error": true,`
`22`	`22`	`"warning": true,`
`23`	`23`	`"info": true,`
`24`		`- "config": false,`
`25`		`- "event": false,`
`26`		`- "debug": false,`
`27`		`- "spam": false,`
	`24`	`+ "config": true,`
	`25`	`+ "event": true,`
	`26`	`+ "debug": true,`
	`27`	`+ "spam": true,`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`@@ -68,5 +68,7 @@ func (v *flagValueForLevel) unchanged() bool {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`func (v *flagValueForLevel) Set(val string) error {`
`71`		`- return applyPlusMinus(val, v)`
	`71`	`+ err := applyPlusMinus(val, v)`
	`72`	`+ v.changed = true`
	`73`	`+ return err`
`72`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,5 +72,7 @@ func (v *flagValueForShow) unchanged() bool {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`func (v *flagValueForShow) Set(val string) error {`
`75`		`- return applyPlusMinus(val, v)`
	`75`	`+ err := applyPlusMinus(val, v)`
	`76`	`+ v.changed = true`
	`77`	`+ return err`
`76`	`78`	`}`