chore: re-enable golangci-lint checks and fix violations

Re-enable staticcheck linters that were disabled in a previous commit
and fix all resulting violations:

- Remove deprecated // +build lines (23 files) - only //go:build needed
- Fix ST1005: lowercase error strings (24 issues across multiple files)
- Fix ST1016: consistent receiver names in collector/util.go
- Fix ST1023: remove redundant type in variable declaration

Keep disabled: ST1003 (naming would break public API), ST1020/ST1021/ST1022
(comment format - too many issues, not worth the churn).

Signed-off-by: Davanum Srinivas <[email protected]>

Author: dims

.golangci.yml

@@ -14,8 +14,7 @@ linters:
   settings:
     govet:
       disable:
-        - fieldalignment
-        - buildtag  # old +build lines still present alongside //go:build
+        - fieldalignment  # too noisy, requires significant refactoring
     errcheck:
       exclude-functions:
         - (io.Closer).Close
@@ -32,8 +31,12 @@ linters:
     staticcheck:
       checks:
         - "all"
-        - "-ST*"    # disable all style checks (ST1000, ST1003, ST1005, etc.)
-        - "-QF*"    # disable all quickfix suggestions
+        - "-ST1000" # package comments - too noisy for existing codebase
+        - "-ST1003" # naming conventions (e.g., CrioId vs CrioID) - would break public API
+        - "-ST1020" # comment format on exported methods - too many to fix
+        - "-ST1021" # comment format on exported types - too many to fix
+        - "-ST1022" # comment format on exported consts - too many to fix
+        - "-QF*"    # disable quickfix suggestions
   exclusions:
     rules:
       # Exclude errcheck in test files for cleaner test code
@@ -52,6 +55,7 @@ linters:
 formatters:
   enable:
     - gofmt
+    - goimports
 
 issues:
   max-issues-per-linter: 0

client/client.go

@@ -211,11 +211,11 @@ func (c *Client) getEventStreamingData(url string, einfo chan *v1.Event) error {
 		return err
 	}
 	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("Status code is not OK: %v (%s)", resp.StatusCode, resp.Status)
+		return fmt.Errorf("status code is not OK: %v (%s)", resp.StatusCode, resp.Status)
 	}
 
 	dec := json.NewDecoder(resp.Body)
-	var m *v1.Event = &v1.Event{}
+	m := &v1.Event{}
 	for {
 		err := dec.Decode(m)
 		if err != nil {

cmd/internal/storage/influxdb/influxdb_test.go

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build influxdb_test
-// +build influxdb_test
 
 // To run unit test: go test -tags influxdb_test
 

collector/generic_collector.go

@@ -67,7 +67,7 @@ func NewCollector(collectorName string, configFile []byte, metricCountLimit int,
 	// TODO : Add checks for validity of config file (eg : Accurate JSON fields)
 
 	if len(configInJSON.MetricsConfig) == 0 {
-		return nil, fmt.Errorf("No metrics provided in config")
+		return nil, fmt.Errorf("no metrics provided in config")
 	}
 
 	minPollFrequency := time.Duration(0)
@@ -83,7 +83,7 @@ func NewCollector(collectorName string, configFile []byte, metricCountLimit int,
 
 		regexprs[ind], err = regexp.Compile(metricConfig.Regex)
 		if err != nil {
-			return nil, fmt.Errorf("Invalid regexp %v for metric %v", metricConfig.Regex, metricConfig.Name)
+			return nil, fmt.Errorf("invalid regexp %v for metric %v", metricConfig.Regex, metricConfig.Name)
 		}
 	}
 
@@ -94,7 +94,7 @@ func NewCollector(collectorName string, configFile []byte, metricCountLimit int,
 	}
 
 	if len(configInJSON.MetricsConfig) > metricCountLimit {
-		return nil, fmt.Errorf("Too many metrics defined: %d limit: %d", len(configInJSON.MetricsConfig), metricCountLimit)
+		return nil, fmt.Errorf("too many metrics defined: %d limit: %d", len(configInJSON.MetricsConfig), metricCountLimit)
 	}
 
 	return &GenericCollector{
@@ -173,10 +173,10 @@ func (collector *GenericCollector) Collect(metrics map[string][]v1.MetricVal) (t
 				}
 
 			} else {
-				errorSlice = append(errorSlice, fmt.Errorf("Unexpected value of 'data_type' for metric '%v' in config ", metricConfig.Name))
+				errorSlice = append(errorSlice, fmt.Errorf("unexpected value of 'data_type' for metric '%v' in config ", metricConfig.Name))
 			}
 		} else {
-			errorSlice = append(errorSlice, fmt.Errorf("No match found for regexp: %v for metric '%v' in config", metricConfig.Regex, metricConfig.Name))
+			errorSlice = append(errorSlice, fmt.Errorf("no match found for regexp: %v for metric '%v' in config", metricConfig.Regex, metricConfig.Name))
 		}
 	}
 	return nextCollectionTime, metrics, compileErrors(errorSlice)

collector/prometheus_collector.go

@@ -72,7 +72,7 @@ func NewPrometheusCollector(collectorName string, configFile []byte, metricCount
 	}
 
 	if metricCountLimit < 0 {
-		return nil, fmt.Errorf("Metric count limit must be greater than or equal to 0")
+		return nil, fmt.Errorf("metric count limit must be greater than or equal to 0")
 	}
 
 	var metricsSet map[string]bool
@@ -84,7 +84,7 @@ func NewPrometheusCollector(collectorName string, configFile []byte, metricCount
 	}
 
 	if len(configInJSON.MetricsConfig) > metricCountLimit {
-		return nil, fmt.Errorf("Too many metrics defined: %d limit %d", len(configInJSON.MetricsConfig), metricCountLimit)
+		return nil, fmt.Errorf("too many metrics defined: %d limit %d", len(configInJSON.MetricsConfig), metricCountLimit)
 	}
 
 	// TODO : Add checks for validity of config file (eg : Accurate JSON fields)

collector/util.go

@@ -16,11 +16,10 @@ package collector
 
 import "github.com/google/cadvisor/container"
 
-func (endpointConfig *EndpointConfig) configure(containerHandler container.ContainerHandler) {
-	//If the exact URL was not specified, generate it based on the ip address of the container.
-	endpoint := endpointConfig
-	if endpoint.URL == "" {
+func (ec *EndpointConfig) configure(containerHandler container.ContainerHandler) {
+	// If the exact URL was not specified, generate it based on the ip address of the container.
+	if ec.URL == "" {
 		ipAddress := containerHandler.GetContainerIPAddress()
-		endpointConfig.URL = endpoint.URLConfig.Protocol + "://" + ipAddress + ":" + endpoint.URLConfig.Port.String() + endpoint.URLConfig.Path
+		ec.URL = ec.URLConfig.Protocol + "://" + ipAddress + ":" + ec.URLConfig.Port.String() + ec.URLConfig.Path
 	}
 }

container/containerd/pkg/dialer/dialer_unix.go

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

container/crio/client.go

@@ -72,7 +72,7 @@ type crioClientImpl struct {
 
 func configureUnixTransport(tr *http.Transport, proto, addr string) error {
 	if len(addr) > maxUnixSocketPathSize {
-		return fmt.Errorf("Unix socket path %q is too long", addr)
+		return fmt.Errorf("unix socket path %q is too long", addr)
 	}
 	// No need for compression in local communications.
 	tr.DisableCompression = true
@@ -149,9 +149,9 @@ func (c *crioClientImpl) ContainerInfo(id string) (*ContainerInfo, error) {
 	if resp.StatusCode != http.StatusOK {
 		respBody, err := io.ReadAll(resp.Body)
 		if err != nil {
-			return nil, fmt.Errorf("Error finding container %s: Status %d", id, resp.StatusCode)
+			return nil, fmt.Errorf("error finding container %s: status %d", id, resp.StatusCode)
 		}
-		return nil, fmt.Errorf("Error finding container %s: Status %d returned error %s", id, resp.StatusCode, string(respBody))
+		return nil, fmt.Errorf("error finding container %s: status %d returned error %s", id, resp.StatusCode, string(respBody))
 	}
 
 	if err := json.NewDecoder(resp.Body).Decode(&cInfo); err != nil {

container/docker/utils/docker.go

@@ -49,7 +49,7 @@ func DriverStatusValue(status [][2]string, target string) string {
 func DockerThinPoolName(info dockersystem.Info) (string, error) {
 	poolName := DriverStatusValue(info.DriverStatus, DriverStatusPoolName)
 	if len(poolName) == 0 {
-		return "", fmt.Errorf("Could not get devicemapper pool name")
+		return "", fmt.Errorf("could not get devicemapper pool name")
 	}
 
 	return poolName, nil
@@ -78,7 +78,7 @@ func DockerMetadataDevice(info dockersystem.Info) (string, error) {
 func DockerZfsFilesystem(info dockersystem.Info) (string, error) {
 	filesystem := DriverStatusValue(info.DriverStatus, DriverStatusParentDataset)
 	if len(filesystem) == 0 {
-		return "", fmt.Errorf("Could not get zfs filesystem")
+		return "", fmt.Errorf("could not get zfs filesystem")
 	}
 
 	return filesystem, nil

container/libcontainer/handler.go

@@ -311,7 +311,7 @@ func processStatsFromProcs(rootFs string, cgroupPath string, rootPid int) (info.
 func (h *Handler) schedulerStatsFromProcs() (info.CpuSchedstat, error) {
 	pids, err := h.cgroupManager.GetAllPids()
 	if err != nil {
-		return info.CpuSchedstat{}, fmt.Errorf("Could not get PIDs for container %d: %w", h.pid, err)
+		return info.CpuSchedstat{}, fmt.Errorf("could not get PIDs for container %d: %w", h.pid, err)
 	}
 	alivePids := make(map[int]struct{}, len(pids))
 	for _, pid := range pids {