ci: Add go1.22, remove go1.20

Signed-off-by: Mario Trangoni <[email protected]>

.circleci/config.yml

@@ -6,7 +6,7 @@ version: 2.1
 executors:
   golang:
     docker:
-    - image: cimg/go:1.21
+    - image: cimg/go:1.22
 
 jobs:
   codespell:

.github/workflows/build.yml

@@ -4,7 +4,7 @@ jobs:
   build:
     strategy:
       matrix:
-        go-version: [1.20.x, 1.21.x]
+        go-version: [1.21.x, 1.22.x]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/setup-go@v5
@@ -27,7 +27,7 @@ jobs:
     - name: Install go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.21.x
+        go-version: 1.22.x
     - name: Checkout code
       uses: actions/checkout@v4
     - name: Install goveralls

.promu.yml

@@ -1,7 +1,7 @@
 go:
     # Whenever the Go version is updated here, go.mod, .github/workflows/build.yml,
     # and .circleci/config.yml should also be updated.
-    version: 1.21
+    version: 1.22
     cgo: false
 repository:
     path: github.com/mjtrangoni/flexlm_exporter

Makefile

@@ -15,7 +15,7 @@ GO                      ?= GO111MODULE=on go
 GOPATH                  := $(firstword $(subst :, ,$(shell $(GO) env GOPATH)))
 PROMU                   ?= $(GOPATH)/bin/promu
 GOLINTER                ?= $(GOPATH)/bin/golangci-lint
-GO_VERSION              ?= 1.21
+GO_VERSION              ?= 1.22
 pkgs                    = $(shell $(GO) list ./... | grep -v /vendor/)
 TARGET                  ?= flexlm_exporter
 DOCKER_IMAGE_NAME       ?= mjtrangoni/flexlm_exporter
@@ -94,4 +94,4 @@ crossbuild: promu
 $(GOPATH)/bin/golangci-lint lint:
 	@GOOS=$(shell uname -s | tr A-Z a-z) \
 		GOARCH=$(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m))) \
-		$(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.1
+		$(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.2

collector/collector.go

@@ -92,13 +92,17 @@ type FlexlmCollector struct {
 // A new action function is needed for each collector flag because the ParseContext
 // does not contain information about which flag called the action.
 // See: https://github.com/alecthomas/kingpin/issues/294
+//
+//revive:disable:unused-parameter
 func collectorFlagAction(collector string) func(ctx *kingpin.ParseContext) error {
 	return func(ctx *kingpin.ParseContext) error {
 		forcedCollectors[collector] = true
 		return nil
 	}
 }
 
+//revive:enable:unused-parameter
+
 // NewFlexlmCollector creates a new FlexlmCollector.
 func NewFlexlmCollector(logger log.Logger, filters ...string) (*FlexlmCollector, error) {
 	f := make(map[string]bool)
@@ -131,6 +135,7 @@ func NewFlexlmCollector(logger log.Logger, filters ...string) (*FlexlmCollector,
 			if err != nil {
 				return nil, err
 			}
+
 			collectors[key] = collector
 			initiatedCollectors[key] = collector
 		}
@@ -175,6 +180,7 @@ func execute(name string, c Collector, ch chan<- prometheus.Metric, logger log.L
 		success = 0
 	} else {
 		level.Debug(logger).Log("OK:", name, "collector succeeded after:", duration.Seconds())
+
 		success = 1
 	}
 	ch <- prometheus.MustNewConstMetric(scrapeDurationDesc, prometheus.GaugeValue, duration.Seconds(), name)

collector/lmstat.go

@@ -231,6 +231,7 @@ func parseLmstatLicenseInfoServer(outStr [][]string) map[string]*server {
 		} else if lmutilLicenseServerStatusRegex.MatchString(lineJoined) {
 			matches := lmutilLicenseServerStatusRegex.FindStringSubmatch(lineJoined)
 			servers[strings.ToLower(strings.Split(matches[1], ".")[0])].version = matches[4]
+
 			if matches[2] == upString {
 				servers[strings.ToLower(strings.Split(matches[1], ".")[0])].status = true
 			}
@@ -298,21 +299,26 @@ func parseLmstatLicenseInfoFeature(outStr [][]string, logger log.Logger) (map[st
 			if licUsersByFeature[featureName] == nil {
 				licUsersByFeature[featureName] = map[string][]*featureUserUsed{}
 			}
+
 			matches := reSubMatchMap(lmutilLicenseFeatureUsageUserRegex, lineJoined)
 			username := matches["user"]
+
 			if strings.TrimSpace(username) == "" {
 				level.Debug(logger).Log("username couldn't be found for '", lineJoined,
 					"', using lmutilLicenseFeatureUsageUser2Regex.")
+
 				matches = reSubMatchMap(lmutilLicenseFeatureUsageUser2Regex, lineJoined)
 				username = matches["user"]
 			}
 			if matches["ver"] != "" {
 				var found = -1
+
 				for i := range licUsersByFeature[featureName][username] {
 					if licUsersByFeature[featureName][username][i].version == matches["ver"] {
 						found = i
 					}
 				}
+
 				if found < 0 {
 					unixSince := convertLmstatTimeToUnixTime(matches["since"], logger).Unix()
 					sinceString := strconv.FormatInt(unixSince, 10)
@@ -325,6 +331,7 @@ func parseLmstatLicenseInfoFeature(outStr [][]string, logger log.Logger) (map[st
 				if err != nil {
 					level.Error(logger).Log("could not convert", matches["licenses"], "to integer:", err)
 				}
+
 				for i := range licUsersByFeature[featureName][username] {
 					if licUsersByFeature[featureName][username][i].version == matches["ver"] {
 						licUsersByFeature[featureName][username][i].num += float64(licUsed)
@@ -341,11 +348,14 @@ func parseLmstatLicenseInfoFeature(outStr [][]string, logger log.Logger) (map[st
 			if reservGroupByFeature[featureName] == nil {
 				reservGroupByFeature[featureName] = map[string]float64{}
 			}
+
 			matches := lmutilLicenseFeatureGroupReservRegex.FindStringSubmatch(lineJoined)
+
 			groupReserv, err := strconv.Atoi(matches[2])
 			if err != nil {
 				level.Error(logger).Log("could not convert", matches[1], "to integer:", err)
 			}
+
 			reservGroupByFeature[featureName][matches[4]] = float64(groupReserv)
 		}
 	}

collector/lmstat_feature_exp.go

@@ -139,6 +139,7 @@ func parseLmstatLicenseFeatureExpDate(outStr [][]string, logger log.Logger) map[
 			// as permanent
 			expires = math.Inf(posInfinity)
 		}
+
 		index++
 
 		featuresExp[index] = &featureExp{

collector/lmstat_feature_exp_test.go

@@ -97,6 +97,7 @@ func TestParseLmstatLicenseFeatureExpDate1(t *testing.T) {
 					feature.licenses, feature.vendor,
 					feature.expires)
 			}
+
 			found = true
 		}
 	}
@@ -142,6 +143,7 @@ func TestParseLmstatLicenseFeatureExpDate2(t *testing.T) {
 					feature.licenses, feature.vendor,
 					feature.expires)
 			}
+
 			found = true
 		}
 	}

flexlm_exporter.go

@@ -206,7 +206,7 @@ func main() {
 	}
 
 	http.Handle(*metricsPath, newHandler(!*disableExporterMetrics, *configPath, *maxRequests, logger))
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+	http.HandleFunc("/", func(w http.ResponseWriter, _ *http.Request) {
 		w.Write([]byte(`<html>
 			<head><title>FLEXlm Exporter</title></head>
 			<body>