Golang and deps bump (#39)

* bumping golang and deps

* bumping ES client

* CI and Dockerfile fix

Author: marcinbudny

.github/workflows/main.yml

@@ -16,12 +16,12 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.21.3"
+          go-version: "1.22.3"
           cache: false
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.54.2
+          version: v1.58.0
 
   test:
     strategy:
@@ -34,7 +34,7 @@ jobs:
     name: tests on ES ${{ matrix.esVersion }}
 
     runs-on: ubuntu-latest
-    container: golang:1.21.3-bookworm
+    container: golang:1.22.3-bookworm
 
     services:
       eventstore:

.github/workflows/release.yml

@@ -20,12 +20,12 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21.3
+          go-version: 1.22.3
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v5
         with:
           distribution: goreleaser
-          version: 1.21.2
+          version: 1.25.1
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.20.1-alpine as build
+FROM golang:1.22.3-alpine as build
 
 WORKDIR /go/src/github.com/marcinbudny/eventstore_exporter
 COPY . ./

go.mod

@@ -1,31 +1,36 @@
 module github.com/marcinbudny/eventstore_exporter
 
-go 1.21
+go 1.22.3
 
 require (
-	github.com/EventStore/EventStore-Client-Go/v3 v3.1.0
-	github.com/gofrs/uuid/v5 v5.0.0
+	github.com/EventStore/EventStore-Client-Go/v3 v3.3.0
+	github.com/gofrs/uuid/v5 v5.1.0
 	github.com/google/go-cmp v0.6.0
 	github.com/hashicorp/go-version v1.6.0
 	github.com/namsral/flag v1.7.4-pre
-	github.com/prometheus/client_golang v1.17.0
-	github.com/prometheus/client_model v0.5.0
-	github.com/prometheus/common v0.45.0
+	github.com/prometheus/client_golang v1.19.0
+	github.com/prometheus/client_model v0.6.1
+	github.com/prometheus/common v0.53.0
 	github.com/sirupsen/logrus v1.9.3
-	golang.org/x/sync v0.4.0
+	golang.org/x/sync v0.7.0
 )
 
 require (
+	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/containerd/continuity v0.4.3 // indirect
+	github.com/docker/go-connections v0.5.0 // indirect
+	github.com/docker/go-units v0.5.0 // indirect
 	github.com/gofrs/uuid v4.4.0+incompatible // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/grpc v1.59.0 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	github.com/moby/term v0.5.0 // indirect
+	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/prometheus/procfs v0.14.0 // indirect
+	github.com/stretchr/testify v1.9.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240506185236-b8a5c65736ae // indirect
+	google.golang.org/grpc v1.63.2 // indirect
+	google.golang.org/protobuf v1.34.1 // indirect
 )

go.sum

@@ -146,19 +146,18 @@ func getParkedMessagesLastEventNumber(ctx context.Context, grpcClient *esdb.Clie
 }
 
 func getParkedMessagesTruncateBeforeValue(ctx context.Context, grpcClient *esdb.Client, eventStreamID string, groupName string) (uint64, error) {
-	if meta, err := grpcClient.GetStreamMetadata(ctx, parkedStreamID(eventStreamID, groupName), esdb.ReadStreamOptions{}); err == nil {
+	meta, err := grpcClient.GetStreamMetadata(ctx, parkedStreamID(eventStreamID, groupName), esdb.ReadStreamOptions{})
+	if err == nil {
 		return *meta.TruncateBefore(), nil
 	} else if strings.Contains(err.Error(), "not found") {
 		return 0, nil
-	} else {
-		log.WithError(err).WithFields(log.Fields{
-			"eventStreamId": eventStreamID,
-			"groupName":     groupName,
-		}).Error("Error when getting parked message stream metadata")
-
-		return 0, err
-
 	}
+	log.WithError(err).WithFields(log.Fields{
+		"eventStreamId": eventStreamID,
+		"groupName":     groupName,
+	}).Error("Error when getting parked message stream metadata")
+
+	return 0, err
 }
 
 func parkedStreamID(eventStreamID string, groupName string) string {

internal/client/subscription_stats.go

@@ -54,7 +54,7 @@ func (server *ExporterServer) serveLandingPage() {
 		</html>
 		`)
 
-	server.mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+	server.mux.HandleFunc("/", func(w http.ResponseWriter, _ *http.Request) {
 		w.Write(landingPage) // nolint: errcheck
 	})
 }