Merge pull request #1511 from prometheus/superq/go_1.25

Update Go

Author: bastischubert

.circleci/config.yml

@@ -9,7 +9,7 @@ executors:
   # should also be updated.
   golang:
     docker:
-    - image: cimg/go:1.24
+    - image: cimg/go:1.25
     parameters:
       working_dir:
         type: string

.promu.yml

@@ -1,7 +1,7 @@
 go:
     # Whenever the Go version is updated here,
     # .circle/config.yml should also be updated.
-    version: 1.24
+    version: 1.25
 repository:
     path: github.com/prometheus/snmp_exporter
 build:

Dockerfile

@@ -7,6 +7,9 @@ ARG ARCH="amd64"
 ARG OS="linux"
 COPY .build/${OS}-${ARCH}/snmp_exporter  /bin/snmp_exporter
 COPY snmp.yml       /etc/snmp_exporter/snmp.yml
+COPY LICENSE        /LICENSE
+COPY NOTICE         /NOTICE
+
 
 EXPOSE      9116
 ENTRYPOINT  [ "/bin/snmp_exporter" ]

collector/collector.go

@@ -63,7 +63,7 @@ var combinedTypeMapping = map[string]map[int]string{
 
 func oidToList(oid string) []int {
 	result := []int{}
-	for _, x := range strings.Split(oid, ".") {
+	for x := range strings.SplitSeq(oid, ".") {
 		o, _ := strconv.Atoi(x)
 		result = append(result, o)
 	}
@@ -118,10 +118,7 @@ func ScrapeTarget(snmp scraper.SNMPScraper, target string, auth *config.Auth, mo
 		maxOids = 1
 	}
 	for len(getOids) > 0 {
-		oids := len(getOids)
-		if oids > maxOids {
-			oids = maxOids
-		}
+		oids := min(len(getOids), maxOids)
 
 		packet, err := snmp.Get(getOids[:oids])
 		if err != nil {
@@ -355,7 +352,7 @@ func (c Collector) collect(ch chan<- prometheus.Metric, logger *slog.Logger, cli
 			g.MaxRepetitions = module.WalkParams.MaxRepetitions
 			g.UseUnconnectedUDPSocket = module.WalkParams.UseUnconnectedUDPSocket
 			if module.WalkParams.AllowNonIncreasingOIDs {
-				g.AppOpts = map[string]interface{}{
+				g.AppOpts = map[string]any{
 					"c": true,
 				}
 			}
@@ -423,10 +420,7 @@ func (c Collector) collect(ch chan<- prometheus.Metric, logger *slog.Logger, cli
 // Collect implements Prometheus.Collector.
 func (c Collector) Collect(ch chan<- prometheus.Metric) {
 	wg := sync.WaitGroup{}
-	workerCount := c.concurrency
-	if workerCount < 1 {
-		workerCount = 1
-	}
+	workerCount := max(c.concurrency, 1)
 	ctx, cancel := context.WithCancel(c.ctx)
 	defer cancel()
 	workerChan := make(chan *NamedModule)
@@ -764,7 +758,7 @@ func enumAsStateSet(metric *config.Metric, value int, labelnames, labelvalues []
 	return results
 }
 
-func bits(metric *config.Metric, value interface{}, labelnames, labelvalues []string) []prometheus.Metric {
+func bits(metric *config.Metric, value any, labelnames, labelvalues []string) []prometheus.Metric {
 	bytes, ok := value.([]byte)
 	if !ok {
 		return []prometheus.Metric{prometheus.NewInvalidMetric(prometheus.NewDesc("snmp_error", "BITS type was not a BISTRING on the wire.", nil, nil),
@@ -936,7 +930,7 @@ func indexOidsAsString(indexOids []int, typ string, fixedSize int, implied bool,
 		return strings.Join(parts, "."), subOid, indexOids
 	case "InetAddressIPv6":
 		subOid, indexOids := splitOid(indexOids, 16)
-		parts := make([]interface{}, 16)
+		parts := make([]any, 16)
 		for i, o := range subOid {
 			parts[i] = o
 		}

config/config.go

@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"github.com/gosnmp/gosnmp"
-	"gopkg.in/yaml.v2"
+	"go.yaml.in/yaml/v2"
 )
 
 type Auth struct {
@@ -138,7 +138,7 @@ type Module struct {
 	Filters    []DynamicFilter `yaml:"filters,omitempty"`
 }
 
-func (c *Module) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (c *Module) UnmarshalYAML(unmarshal func(any) error) error {
 	*c = DefaultModule
 	type plain Module
 	return unmarshal((*plain)(c))
@@ -273,7 +273,7 @@ var (
 )
 
 // MarshalYAML implements the yaml.Marshaler interface.
-func (s Secret) MarshalYAML() (interface{}, error) {
+func (s Secret) MarshalYAML() (any, error) {
 	if DoNotHideSecrets {
 		return string(s), nil
 	}
@@ -283,7 +283,7 @@ func (s Secret) MarshalYAML() (interface{}, error) {
 	return nil, nil
 }
 
-func (c *Auth) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (c *Auth) UnmarshalYAML(unmarshal func(any) error) error {
 	*c = DefaultAuth
 	type plain Auth
 	if err := unmarshal((*plain)(c)); err != nil {
@@ -327,7 +327,7 @@ type RegexpExtract struct {
 	Regex Regexp `yaml:"regex"`
 }
 
-func (c *RegexpExtract) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (c *RegexpExtract) UnmarshalYAML(unmarshal func(any) error) error {
 	*c = DefaultRegexpExtract
 	type plain RegexpExtract
 	return unmarshal((*plain)(c))
@@ -339,15 +339,15 @@ type Regexp struct {
 }
 
 // MarshalYAML implements the yaml.Marshaler interface.
-func (re Regexp) MarshalYAML() (interface{}, error) {
+func (re Regexp) MarshalYAML() (any, error) {
 	if re.Regexp != nil {
 		return re.String(), nil
 	}
 	return nil, nil
 }
 
 // UnmarshalYAML implements the yaml.Unmarshaler interface.
-func (re *Regexp) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (re *Regexp) UnmarshalYAML(unmarshal func(any) error) error {
 	var s string
 	if err := unmarshal(&s); err != nil {
 		return err

config_test.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	"github.com/prometheus/common/promslog"
-	yaml "gopkg.in/yaml.v2"
+	"go.yaml.in/yaml/v2"
 )
 
 var nopLogger = promslog.NewNopLogger()

generator/config.go

@@ -39,7 +39,7 @@ type MetricOverrides struct {
 }
 
 // UnmarshalYAML implements the yaml.Unmarshaler interface.
-func (c *MetricOverrides) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (c *MetricOverrides) UnmarshalYAML(unmarshal func(any) error) error {
 	type plain MetricOverrides
 	if err := unmarshal((*plain)(c)); err != nil {
 		return err
@@ -62,7 +62,7 @@ type ModuleConfig struct {
 }
 
 // UnmarshalYAML implements the yaml.Unmarshaler interface.
-func (c *ModuleConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (c *ModuleConfig) UnmarshalYAML(unmarshal func(any) error) error {
 	type plain ModuleConfig
 	if err := unmarshal((*plain)(c)); err != nil {
 		return err

generator/main.go

@@ -24,7 +24,7 @@ import (
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/prometheus/common/promslog"
 	"github.com/prometheus/common/promslog/flag"
-	"gopkg.in/yaml.v2"
+	"go.yaml.in/yaml/v2"
 
 	"github.com/prometheus/snmp_exporter/config"
 )

generator/tree.go

@@ -17,6 +17,7 @@ import (
 	"fmt"
 	"log/slog"
 	"regexp"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -466,12 +467,9 @@ func generateConfigModule(cfg *ModuleConfig, node *Node, nameToNode map[string]*
 
 				// If lookup label is used as source index in another lookup,
 				// we need to add this new label as another index.
-				for _, sourceIndex := range requiredAsIndex {
-					if sourceIndex == l.Labelname {
-						idx := &config.Index{Labelname: l.Labelname, Type: l.Type}
-						metric.Indexes = append(metric.Indexes, idx)
-						break
-					}
+				if slices.Contains(requiredAsIndex, l.Labelname) {
+					idx := &config.Index{Labelname: l.Labelname, Type: l.Type}
+					metric.Indexes = append(metric.Indexes, idx)
 				}
 
 				// Make sure we walk the lookup OID(s).

generator/tree_test.go

@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	"github.com/prometheus/common/promslog"
-	yaml "gopkg.in/yaml.v2"
+	"go.yaml.in/yaml/v2"
 
 	"github.com/prometheus/snmp_exporter/config"
 )