Update supported Go versions. (#755)

SuperQ · web-flow · commit 2f4b14c60834 · 2025-10-18T10:23:15.000+02:00
* Update minimum supported version to 1.24.0.
* Update CI tests for latest Go versions.
* Run Go modernize.

Signed-off-by: SuperQ &lt;superq@gmail.com&gt;
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,7 +4,7 @@ version: 2.1
 jobs:
   lint:
     docker:
-    - image: cimg/go:1.24
+    - image: cimg/go:1.25
     steps:
     - checkout
     - run: make check_license
@@ -46,14 +46,14 @@ workflows:
         matrix:
           parameters:
             go_version:
-            - "1.23"
             - "1.24"
+            - "1.25"
     - test:
         name: test-windows
         os: windows
         run_test: false
         matrix:
           parameters:
             go_version:
-            - "1.23"
             - "1.24"
+            - "1.25"
diff --git a/blockdevice/stats.go b/blockdevice/stats.go
@@ -425,8 +425,7 @@ func (fs FS) SysBlockDeviceQueueStats(device string) (BlockQueueStats, error) {
 		return BlockQueueStats{}, err
 	}
 	var schedulers []string
-	xs := strings.Split(scheduler, " ")
-	for _, s := range xs {
+	for s := range strings.SplitSeq(scheduler, " ") {
 		if strings.HasPrefix(s, "[") && strings.HasSuffix(s, "]") {
 			s = s[1 : len(s)-1]
 			stat.SchedulerCurrent = s
diff --git a/buddyinfo.go b/buddyinfo.go
@@ -71,7 +71,7 @@ func parseBuddyInfo(r io.Reader) ([]BuddyInfo, error) {
 		}
 
 		sizes := make([]float64, arraySize)
-		for i := 0; i < arraySize; i++ {
+		for i := range arraySize {
 			sizes[i], err = strconv.ParseFloat(parts[i+4], 64)
 			if err != nil {
 				return nil, fmt.Errorf("%w: Invalid valid in buddyinfo: %f: %w", ErrFileParse, sizes[i], err)
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/prometheus/procfs
 
-go 1.23.0
+go 1.24.0
 
 require (
 	github.com/google/go-cmp v0.7.0
diff --git a/mountinfo.go b/mountinfo.go
@@ -147,8 +147,7 @@ func mountOptionsParseOptionalFields(o []string) (map[string]string, error) {
 // mountOptionsParser parses the mount options, superblock options.
 func mountOptionsParser(mountOptions string) map[string]string {
 	opts := make(map[string]string)
-	options := strings.Split(mountOptions, ",")
-	for _, opt := range options {
+	for opt := range strings.SplitSeq(mountOptions, ",") {
 		splitOption := strings.Split(opt, "=")
 		if len(splitOption) < 2 {
 			key := splitOption[0]
diff --git a/mountstats.go b/mountstats.go
@@ -383,7 +383,7 @@ func parseMountStatsNFS(s *bufio.Scanner, statVersion string) (*MountStatsNFS, e
 			if stats.Opts == nil {
 				stats.Opts = map[string]string{}
 			}
-			for _, opt := range strings.Split(ss[1], ",") {
+			for opt := range strings.SplitSeq(ss[1], ",") {
 				split := strings.Split(opt, "=")
 				if len(split) == 2 {
 					stats.Opts[split[0]] = split[1]
diff --git a/net_protocols.go b/net_protocols.go
@@ -169,7 +169,7 @@ func (pc *NetProtocolCapabilities) parseCapabilities(capabilities []string) erro
 		&pc.EnterMemoryPressure,
 	}
 
-	for i := 0; i < len(capabilities); i++ {
+	for i := range capabilities {
 		switch capabilities[i] {
 		case "y":
 			*capabilityFields[i] = true
diff --git a/net_sockstat.go b/net_sockstat.go
@@ -139,9 +139,6 @@ func parseSockstatKVs(kvs []string) (map[string]int, error) {
 func parseSockstatProtocol(kvs map[string]int) NetSockstatProtocol {
 	var nsp NetSockstatProtocol
 	for k, v := range kvs {
-		// Capture the range variable to ensure we get unique pointers for
-		// each of the optional fields.
-		v := v
 		switch k {
 		case "inuse":
 			nsp.InUse = v
diff --git a/net_unix_test.go b/net_unix_test.go
@@ -108,7 +108,7 @@ func testNetUNIX(t *testing.T, testInode bool, got *NetUNIX) {
 	// Enable the fixtures to be used for multiple tests by clearing the inode
 	// field when appropriate.
 	if !testInode {
-		for i := 0; i < len(want); i++ {
+		for i := range want {
 			want[i].Inode = 0
 		}
 	}
diff --git a/proc_maps64_test.go b/proc_maps64_test.go
@@ -147,7 +147,7 @@ func BenchmarkParseAddress(b *testing.B) {
 		s, e uintptr
 		err  error
 	)
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		s, e, err = parseAddresses("7f7d7469e000-7f7d746a0000")
 		if err != nil {
 			b.Fatal(err)
@@ -166,7 +166,7 @@ func BenchmarkParseDevice(b *testing.B) {
 		d   uint64
 		err error
 	)
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		d, err = parseDevice("00:22")
 		if err != nil {
 			b.Fatal(err)
diff --git a/proc_smaps_test.go b/proc_smaps_test.go
@@ -31,8 +31,7 @@ func BenchmarkProcSMapsRollup(b *testing.B) {
 		b.Fatal(err)
 	}
 
-	b.ResetTimer()
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		_, _ = p.ProcSMapsRollup()
 	}
 }
diff --git a/proc_statm.go b/proc_statm.go
@@ -80,7 +80,7 @@ func (p Proc) Statm() (ProcStatm, error) {
 func parseStatm(data []byte) ([]uint64, error) {
 	var statmSlice []uint64
 	statmItems := strings.Fields(string(data))
-	for i := 0; i < len(statmItems); i++ {
+	for i := range statmItems {
 		statmItem, err := strconv.ParseUint(statmItems[i], 10, 64)
 		if err != nil {
 			return nil, err
diff --git a/proc_status.go b/proc_status.go
@@ -16,7 +16,7 @@ package procfs
 import (
 	"bytes"
 	"math/bits"
-	"sort"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -94,8 +94,7 @@ func (p Proc) NewStatus() (ProcStatus, error) {
 
 	s := ProcStatus{PID: p.PID}
 
-	lines := strings.Split(string(data), "\n")
-	for _, line := range lines {
+	for line := range strings.SplitSeq(string(data), "\n") {
 		if !bytes.Contains([]byte(line), []byte(":")) {
 			continue
 		}
@@ -222,7 +221,7 @@ func calcCpusAllowedList(cpuString string) []uint64 {
 
 	}
 
-	sort.Slice(g, func(i, j int) bool { return g[i] < g[j] })
+	slices.Sort(g)
 	return g
 }
 
diff --git a/sysfs/class_sas_device.go b/sysfs/class_sas_device.go
@@ -20,6 +20,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"slices"
 
 	"github.com/prometheus/procfs/internal/util"
 )
@@ -185,10 +186,8 @@ func (sdc *SASDeviceClass) GetByName(name string) *SASDevice {
 // GetByPhy finds the SASDevice that contains the provided PHY name.
 func (sdc *SASDeviceClass) GetByPhy(name string) *SASDevice {
 	for _, d := range *sdc {
-		for _, p := range d.SASPhys {
-			if p == name {
-				return d
-			}
+		if slices.Contains(d.SASPhys, name) {
+			return d
 		}
 	}
 	return nil
@@ -197,10 +196,8 @@ func (sdc *SASDeviceClass) GetByPhy(name string) *SASDevice {
 // GetByPort finds the SASDevice that contains the provided SAS Port name.
 func (sdc *SASDeviceClass) GetByPort(name string) *SASDevice {
 	for _, d := range *sdc {
-		for _, p := range d.SASPorts {
-			if p == name {
-				return d
-			}
+		if slices.Contains(d.SASPorts, name) {
+			return d
 		}
 	}
 	return nil
diff --git a/sysfs/class_sas_host.go b/sysfs/class_sas_host.go
@@ -20,6 +20,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"slices"
 )
 
 const sasHostClassPath = "class/sas_host"
@@ -100,10 +101,8 @@ func (shc *SASHostClass) GetByName(hostName string) *SASHost {
 // GetByPhy finds the SASHost that contains the provided PHY name.
 func (shc *SASHostClass) GetByPhy(phyName string) *SASHost {
 	for _, h := range *shc {
-		for _, p := range h.SASPhys {
-			if p == phyName {
-				return h
-			}
+		if slices.Contains(h.SASPhys, phyName) {
+			return h
 		}
 	}
 	return nil
@@ -112,10 +111,8 @@ func (shc *SASHostClass) GetByPhy(phyName string) *SASHost {
 // GetByPort finds the SASHost that contains the provided SAS Port name.
 func (shc *SASHostClass) GetByPort(portName string) *SASHost {
 	for _, h := range *shc {
-		for _, p := range h.SASPorts {
-			if p == portName {
-				return h
-			}
+		if slices.Contains(h.SASPorts, portName) {
+			return h
 		}
 	}
 	return nil
diff --git a/sysfs/class_sas_port.go b/sysfs/class_sas_port.go
@@ -20,6 +20,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"slices"
 )
 
 const sasPortClassPath = "class/sas_port"
@@ -105,10 +106,8 @@ func (spc *SASPortClass) GetByName(name string) *SASPort {
 // GetByPhy finds the SASPort that contains the provided PHY name.
 func (spc *SASPortClass) GetByPhy(name string) *SASPort {
 	for _, d := range *spc {
-		for _, p := range d.SASPhys {
-			if p == name {
-				return d
-			}
+		if slices.Contains(d.SASPhys, name) {
+			return d
 		}
 	}
 	return nil
@@ -117,10 +116,8 @@ func (spc *SASPortClass) GetByPhy(name string) *SASPort {
 // GetByExpander finds the SASPort that contains the provided SAS expander name.
 func (spc *SASPortClass) GetByExpander(name string) *SASPort {
 	for _, d := range *spc {
-		for _, e := range d.Expanders {
-			if e == name {
-				return d
-			}
+		if slices.Contains(d.Expanders, name) {
+			return d
 		}
 	}
 	return nil
@@ -129,10 +126,8 @@ func (spc *SASPortClass) GetByExpander(name string) *SASPort {
 // GetByEndDevice finds the SASPort that contains the provided SAS end device name.
 func (spc *SASPortClass) GetByEndDevice(name string) *SASPort {
 	for _, d := range *spc {
-		for _, e := range d.EndDevices {
-			if e == name {
-				return d
-			}
+		if slices.Contains(d.EndDevices, name) {
+			return d
 		}
 	}
 	return nil
diff --git a/sysfs/net_class_aer.go b/sysfs/net_class_aer.go
@@ -143,7 +143,7 @@ func parseCorrectableAerCounters(devicePath string, counters *CorrectableAerCoun
 		return fmt.Errorf("failed to read file %q: %w", path, err)
 	}
 
-	for _, line := range strings.Split(string(value), "\n") {
+	for line := range strings.SplitSeq(string(value), "\n") {
 		if line == "" {
 			continue
 		}
@@ -195,7 +195,7 @@ func parseUncorrectableAerCounters(devicePath string, counterType string,
 		return fmt.Errorf("failed to read file %q: %w", path, err)
 	}
 
-	for _, line := range strings.Split(string(value), "\n") {
+	for line := range strings.SplitSeq(string(value), "\n") {
 		if line == "" {
 			continue
 		}
diff --git a/sysfs/system_cpu.go b/sysfs/system_cpu.go
@@ -326,7 +326,7 @@ func parseCpufreqCpuinfo(cpuPath string) (*SystemCPUCpufreqStats, error) {
 		}
 	} else {
 		cpuinfoFrequencyDuration = &map[uint64]uint64{}
-		for _, line := range strings.Split(string(cpuinfoFrequencyDurationString), "\n") {
+		for line := range strings.SplitSeq(string(cpuinfoFrequencyDurationString), "\n") {
 			if line == "" {
 				continue
 			}
@@ -409,7 +409,7 @@ func parseCPURange(data []byte) ([]uint16, error) {
 
 	var cpusInt = []uint16{}
 
-	for _, cpu := range strings.Split(strings.TrimSuffix(string(data), "\n"), ",") {
+	for cpu := range strings.SplitSeq(strings.TrimSuffix(string(data), "\n"), ",") {
 		if cpu == "" {
 			continue
 		}
diff --git a/zoneinfo.go b/zoneinfo.go
@@ -88,11 +88,9 @@ func parseZoneinfo(zoneinfoData []byte) ([]Zoneinfo, error) {
 
 	zoneinfo := []Zoneinfo{}
 
-	zoneinfoBlocks := bytes.Split(zoneinfoData, []byte("\nNode"))
-	for _, block := range zoneinfoBlocks {
+	for block := range bytes.SplitSeq(zoneinfoData, []byte("\nNode")) {
 		var zoneinfoElement Zoneinfo
-		lines := strings.Split(string(block), "\n")
-		for _, line := range lines {
+		for line := range strings.SplitSeq(string(block), "\n") {
 
 			if nodeZone := nodeZoneRE.FindStringSubmatch(line); nodeZone != nil {
 				zoneinfoElement.Node = nodeZone[1]

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func parseBuddyInfo(r io.Reader) ([]BuddyInfo, error) {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`sizes := make([]float64, arraySize)`
`74`		`- for i := 0; i < arraySize; i++ {`
	`74`	`+ for i := range arraySize {`
`75`	`75`	`sizes[i], err = strconv.ParseFloat(parts[i+4], 64)`
`76`	`76`	`if err != nil {`
`77`	`77`	`return nil, fmt.Errorf("%w: Invalid valid in buddyinfo: %f: %w", ErrFileParse, sizes[i], err)`
Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ func parseMountStatsNFS(s bufio.Scanner, statVersion string) (MountStatsNFS, e`
`383`	`383`	`if stats.Opts == nil {`
`384`	`384`	`stats.Opts = map[string]string{}`
`385`	`385`	`}`
`386`		`- for _, opt := range strings.Split(ss[1], ",") {`
	`386`	`+ for opt := range strings.SplitSeq(ss[1], ",") {`
`387`	`387`	`split := strings.Split(opt, "=")`
`388`	`388`	`if len(split) == 2 {`
`389`	`389`	`stats.Opts[split[0]] = split[1]`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ func (pc *NetProtocolCapabilities) parseCapabilities(capabilities []string) erro`
`169`	`169`	`&pc.EnterMemoryPressure,`
`170`	`170`	`}`
`171`	`171`
`172`		`- for i := 0; i < len(capabilities); i++ {`
	`172`	`+ for i := range capabilities {`
`173`	`173`	`switch capabilities[i] {`
`174`	`174`	`case "y":`
`175`	`175`	`*capabilityFields[i] = true`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func testNetUNIX(t testing.T, testInode bool, got NetUNIX) {`
`108`	`108`	`// Enable the fixtures to be used for multiple tests by clearing the inode`
`109`	`109`	`// field when appropriate.`
`110`	`110`	`if !testInode {`
`111`		`- for i := 0; i < len(want); i++ {`
	`111`	`+ for i := range want {`
`112`	`112`	`want[i].Inode = 0`
`113`	`113`	`}`
`114`	`114`	`}`