Modernize the entire codebase (#7005)

* modernize the entire codebase

Signed-off-by: SungJin1212 <[email protected]>

* add CI to modernize check

Signed-off-by: SungJin1212 <[email protected]>

* fix modernize

Signed-off-by: SungJin1212 <[email protected]>

* Delete unnecessary b.ResetTimer()

Signed-off-by: SungJin1212 <[email protected]>

* Remove StringsContain

Signed-off-by: SungJin1212 <[email protected]>

* delete unnecessary map copy in ingester test

Signed-off-by: SungJin1212 <[email protected]>

---------

Signed-off-by: SungJin1212 <[email protected]>
Signed-off-by: Friedrich Gonzalez <[email protected]>
Co-authored-by: Friedrich Gonzalez <[email protected]>

Author: SungJin1212

.github/workflows/test-build-deploy.yml

@@ -42,6 +42,8 @@ jobs:
         run: make BUILD_IN_CONTAINER=false check-doc
       - name: Check White Noise.
         run: make BUILD_IN_CONTAINER=false check-white-noise
+      - name: Check Modernize
+        run: make BUILD_IN_CONTAINER=false check-modernize
 
   test:
     runs-on: ubuntu-24.04

CHANGELOG.md

@@ -24,6 +24,7 @@
 * [FEATURE] Querier: Support for configuring query optimizers and enabling XFunctions in the Thanos engine. #6873
 * [FEATURE] Query Frontend: Add support /api/v1/format_query API for formatting queries. #6893
 * [FEATURE] Query Frontend: Add support for /api/v1/parse_query API (experimental) to parse a PromQL expression and return it as a JSON-formatted AST (abstract syntax tree). #6978
+* [ENHANCEMENT] Modernizes the entire codebase by using go modernize tool. #7005
 * [ENHANCEMENT] Overrides Exporter: Expose all fields that can be converted to float64. Also, the label value `max_local_series_per_metric` got renamed to `max_series_per_metric`, and `max_local_series_per_user` got renamed to `max_series_per_user`. #6979
 * [ENHANCEMENT] Ingester: Add `cortex_ingester_tsdb_wal_replay_unknown_refs_total` and `cortex_ingester_tsdb_wbl_replay_unknown_refs_total` metrics to track unknown series references during wal/wbl replaying. #6945
 * [ENHANCEMENT] Ruler: Emit an error message when the rule synchronization fails. #6902

Makefile

@@ -126,7 +126,7 @@ GOVOLUMES=	-v $(shell pwd)/.cache:/go/cache:delegated,z \
 			-v $(shell pwd)/.pkg:/go/pkg:delegated,z \
 			-v $(shell pwd):/go/src/github.com/cortexproject/cortex:delegated,z
 
-exes $(EXES) protos $(PROTO_GOS) lint test cover shell mod-check check-protos web-build web-pre web-deploy doc: build-image/$(UPTODATE)
+exes $(EXES) protos $(PROTO_GOS) lint test cover shell mod-check check-protos web-build web-pre web-deploy doc check-modernize: build-image/$(UPTODATE)
 	@mkdir -p $(shell pwd)/.pkg
 	@mkdir -p $(shell pwd)/.cache
 	@echo
@@ -308,6 +308,12 @@ clean-white-noise:
 check-white-noise: clean-white-noise
 	@git diff --exit-code --quiet -- '*.md' || (echo "Please remove trailing whitespaces running 'make clean-white-noise'" && false)
 
+modernize:
+	go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/[email protected] -fix ./...
+
+check-modernize: modernize
+	@git diff --exit-code -- . || (echo "Please modernize running 'make modernize'" && false)
+
 web-serve:
 	cd website && hugo --config config.toml --minify -v server
 

cmd/cortex/main_test.go

@@ -225,7 +225,6 @@ func TestExpandEnv(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		t.Run(test.in, func(t *testing.T) {
 			_ = os.Setenv("y", "y")
 			output := expandEnv([]byte(test.in))
@@ -263,7 +262,6 @@ func TestParseConfigFileParameter(t *testing.T) {
 		{"--config.expand-env --opt1 --config.file=foo", "foo", true},
 	}
 	for _, test := range tests {
-		test := test
 		t.Run(test.args, func(t *testing.T) {
 			args := strings.Split(test.args, " ")
 			configFile, expandENV := parseConfigFileParameter(args)

cmd/thanosconvert/main.go

@@ -79,7 +79,7 @@ func main() {
 
 }
 
-func fatal(msg string, args ...interface{}) {
+func fatal(msg string, args ...any) {
 	fmt.Fprintf(os.Stderr, msg+"\n", args...)
 	os.Exit(1)
 }

integration/e2e/composite_service.go

@@ -84,7 +84,7 @@ func (s *CompositeHTTPService) SumMetrics(metricNames []string, opts ...MetricsO
 			return nil, fmt.Errorf("unexpected mismatching sum metrics results (got %d, expected %d)", len(partials), len(sums))
 		}
 
-		for i := 0; i < len(sums); i++ {
+		for i := range sums {
 			sums[i] += partials[i]
 		}
 	}

integration/e2e/logger.go

@@ -29,7 +29,7 @@ func NewLogger(w io.Writer) *Logger {
 	}
 }
 
-func (l *Logger) Log(keyvals ...interface{}) error {
+func (l *Logger) Log(keyvals ...any) error {
 	log := strings.Builder{}
 	log.WriteString(time.Now().Format("15:04:05"))
 

integration/e2e/metrics.go

@@ -2,6 +2,7 @@ package e2e
 
 import (
 	"math"
+	"slices"
 
 	io_prometheus_client "github.com/prometheus/client_model/go"
 )
@@ -143,12 +144,7 @@ func EqualsAmong(values ...float64) func(sums ...float64) bool {
 		if len(sums) != 1 {
 			panic("equals among: expected one value")
 		}
-		for _, value := range values {
-			if sums[0] == value {
-				return true
-			}
-		}
-		return false
+		return slices.Contains(values, sums[0])
 	}
 }
 

integration/e2e/scenario.go

@@ -163,7 +163,7 @@ func (s *Scenario) shutdown() {
 		"--filter",
 		fmt.Sprintf("network=%s", s.networkName),
 	); err == nil {
-		for _, containerID := range strings.Split(string(out), "\n") {
+		for containerID := range strings.SplitSeq(string(out), "\n") {
 			containerID = strings.TrimSpace(containerID)
 			if containerID == "" {
 				continue

integration/e2e/service.go

@@ -503,7 +503,7 @@ type LinePrefixLogger struct {
 }
 
 func (w *LinePrefixLogger) Write(p []byte) (n int, err error) {
-	for _, line := range strings.Split(string(p), "\n") {
+	for line := range strings.SplitSeq(string(p), "\n") {
 		// Skip empty lines
 		line = strings.TrimSpace(line)
 		if line == "" {
@@ -698,7 +698,7 @@ func (s *HTTPService) WaitRemovedMetric(metricName string, opts ...MetricsOption
 func parseDockerIPv4Port(out string) (int, error) {
 	// The "docker port" output may be multiple lines if both IPv4 and IPv6 are supported,
 	// so we need to parse each line.
-	for _, line := range strings.Split(out, "\n") {
+	for line := range strings.SplitSeq(out, "\n") {
 		matches := dockerIPv4PortPattern.FindStringSubmatch(strings.TrimSpace(line))
 		if len(matches) != 2 {
 			continue