Synchronize common files from prometheus/prometheus (#1525)

* Update common Prometheus files

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

* Fixup linting issues.

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

---------

Signed-off-by: prombot <[email protected]>
Signed-off-by: SuperQ <[email protected]>
Co-authored-by: SuperQ <[email protected]>

Author: prombot

Makefile.common

@@ -61,7 +61,7 @@ PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_
 SKIP_GOLANGCI_LINT :=
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v2.4.0
+GOLANGCI_LINT_VERSION ?= v2.6.0
 GOLANGCI_FMT_OPTS ?=
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
 # windows isn't included here because of the path separator being different.

scraper/gosnmp.go

@@ -81,24 +81,26 @@ func (g *GoSNMPWrapper) Close() error {
 	return g.c.Conn.Close()
 }
 
-func (g *GoSNMPWrapper) Get(oids []string) (results *gosnmp.SnmpPacket, err error) {
+func (g *GoSNMPWrapper) Get(oids []string) (*gosnmp.SnmpPacket, error) {
 	g.logger.Debug("Getting OIDs", "oids", oids)
 	st := time.Now()
-	results, err = g.c.Get(oids)
+	results, err := g.c.Get(oids)
 	if err != nil {
 		if errors.Is(err, context.Canceled) {
 			err = fmt.Errorf("scrape cancelled after %s (possible timeout) getting target %s",
 				time.Since(st), g.c.Target)
 		} else {
 			err = fmt.Errorf("error getting target %s: %w", g.c.Target, err)
 		}
-		return
+		return results, err
 	}
 	g.logger.Debug("Get of OIDs completed", "oids", oids, "duration_seconds", time.Since(st))
-	return
+	return results, err
 }
 
-func (g *GoSNMPWrapper) WalkAll(oid string) (results []gosnmp.SnmpPDU, err error) {
+func (g *GoSNMPWrapper) WalkAll(oid string) ([]gosnmp.SnmpPDU, error) {
+	var results []gosnmp.SnmpPDU
+	var err error
 	g.logger.Debug("Walking subtree", "oid", oid)
 	st := time.Now()
 	if g.c.Version == gosnmp.Version1 {
@@ -113,8 +115,8 @@ func (g *GoSNMPWrapper) WalkAll(oid string) (results []gosnmp.SnmpPDU, err error
 		} else {
 			err = fmt.Errorf("error walking target %s: %w", g.c.Target, err)
 		}
-		return
+		return results, err
 	}
 	g.logger.Debug("Walk of subtree completed", "oid", oid, "duration_seconds", time.Since(st))
-	return
+	return results, err
 }