From fe72773737dee7aeb3a10a72a24e561286616d0b Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Wed, 15 Jan 2025 16:29:46 +0100 Subject: [PATCH 1/2] dev log consistency --- pkg/golinters/gocritic/gocritic.go | 14 +++++++------- pkg/golinters/govet/govet.go | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkg/golinters/gocritic/gocritic.go b/pkg/golinters/gocritic/gocritic.go index 087ddc1df067..85bd50eed701 100644 --- a/pkg/golinters/gocritic/gocritic.go +++ b/pkg/golinters/gocritic/gocritic.go @@ -133,6 +133,7 @@ func (w *goCriticWrapper) buildEnabledCheckers(linterCtx *gocriticlinter.Context if err != nil { return nil, err } + enabledCheckers = append(enabledCheckers, c) } @@ -294,6 +295,7 @@ func (s *settingsWrapper) InferEnabledChecks() { s.debugChecksInitialState() enabledByDefaultChecks, disabledByDefaultChecks := s.buildEnabledAndDisabledByDefaultChecks() + debugChecksListf(enabledByDefaultChecks, "Enabled by default") debugChecksListf(disabledByDefaultChecks, "Disabled by default") @@ -314,7 +316,7 @@ func (s *settingsWrapper) InferEnabledChecks() { if len(s.EnabledTags) != 0 { enabledFromTags := s.expandTagsToChecks(s.EnabledTags) - debugChecksListf(enabledFromTags, "Enabled by config tags %s", sprintSortedStrings(s.EnabledTags)) + debugChecksListf(enabledFromTags, "Enabled by config tags %s", s.EnabledTags) for _, check := range enabledFromTags { enabledChecks[check] = struct{}{} @@ -335,7 +337,7 @@ func (s *settingsWrapper) InferEnabledChecks() { if len(s.DisabledTags) != 0 { disabledFromTags := s.expandTagsToChecks(s.DisabledTags) - debugChecksListf(disabledFromTags, "Disabled by config tags %s", sprintSortedStrings(s.DisabledTags)) + debugChecksListf(disabledFromTags, "Disabled by config tags %s", s.DisabledTags) for _, check := range disabledFromTags { delete(enabledChecks, check) @@ -549,10 +551,8 @@ func debugChecksListf(checks []string, format string, args ...any) { return } - debugf("%s checks (%d): %s", fmt.Sprintf(format, args...), len(checks), sprintSortedStrings(checks)) -} + v := slices.Clone(checks) + slices.Sort(v) -func sprintSortedStrings(v []string) string { - sort.Strings(slices.Clone(v)) - return fmt.Sprint(v) + debugf("%s checks (%d): %s", fmt.Sprintf(format, args...), len(checks), strings.Join(v, ", ")) } diff --git a/pkg/golinters/govet/govet.go b/pkg/golinters/govet/govet.go index 73bf63af73d9..b970e4039271 100644 --- a/pkg/golinters/govet/govet.go +++ b/pkg/golinters/govet/govet.go @@ -2,7 +2,7 @@ package govet import ( "slices" - "sort" + "strings" "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis/passes/appends" @@ -164,8 +164,8 @@ func New(settings *config.GovetSettings) *goanalysis.Linter { } func analyzersFromConfig(settings *config.GovetSettings) []*analysis.Analyzer { - debugAnalyzersListf(allAnalyzers, "All available analyzers") - debugAnalyzersListf(defaultAnalyzers, "Default analyzers") + logAnalyzers("All available analyzers", allAnalyzers) + logAnalyzers("Default analyzers", defaultAnalyzers) if settings == nil { return defaultAnalyzers @@ -178,7 +178,7 @@ func analyzersFromConfig(settings *config.GovetSettings) []*analysis.Analyzer { } } - debugAnalyzersListf(enabledAnalyzers, "Enabled by config analyzers") + logAnalyzers("Enabled by config analyzers", enabledAnalyzers) return enabledAnalyzers } @@ -212,7 +212,7 @@ func isAnalyzerEnabled(name string, cfg *config.GovetSettings, defaultAnalyzers } } -func debugAnalyzersListf(analyzers []*analysis.Analyzer, message string) { +func logAnalyzers(message string, analyzers []*analysis.Analyzer) { if !isDebug { return } @@ -222,7 +222,7 @@ func debugAnalyzersListf(analyzers []*analysis.Analyzer, message string) { analyzerNames = append(analyzerNames, a.Name) } - sort.Strings(analyzerNames) + slices.Sort(analyzerNames) - debugf("%s (%d): %s", message, len(analyzerNames), analyzerNames) + debugf("%s (%d): %s", message, len(analyzerNames), strings.Join(analyzerNames, ", ")) } From 44f1f954a09387cef3e477310324127ea062aba3 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Wed, 15 Jan 2025 16:40:50 +0100 Subject: [PATCH 2/2] chore isolate debug logs --- pkg/golinters/gocritic/gocritic.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/golinters/gocritic/gocritic.go b/pkg/golinters/gocritic/gocritic.go index 85bd50eed701..a51311232e35 100644 --- a/pkg/golinters/gocritic/gocritic.go +++ b/pkg/golinters/gocritic/gocritic.go @@ -316,6 +316,7 @@ func (s *settingsWrapper) InferEnabledChecks() { if len(s.EnabledTags) != 0 { enabledFromTags := s.expandTagsToChecks(s.EnabledTags) + debugChecksListf(enabledFromTags, "Enabled by config tags %s", s.EnabledTags) for _, check := range enabledFromTags { @@ -337,6 +338,7 @@ func (s *settingsWrapper) InferEnabledChecks() { if len(s.DisabledTags) != 0 { disabledFromTags := s.expandTagsToChecks(s.DisabledTags) + debugChecksListf(disabledFromTags, "Disabled by config tags %s", s.DisabledTags) for _, check := range disabledFromTags { @@ -358,6 +360,7 @@ func (s *settingsWrapper) InferEnabledChecks() { s.inferredEnabledChecks = enabledChecks s.inferredEnabledChecksLowerCased = normalizeMap(s.inferredEnabledChecks) + s.debugChecksFinalState() }