Merge dependabot, deps upgrades; fix linter

jwkohnen · Feb 13, 2024 · 6754e8d · 6754e8d
6 parents 02252f1 + 9625c37 + 529fe1e + 724fa7d + e3681b9 + 3683606
commit 6754e8d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
@@ -4,7 +4,7 @@ on:
     tags:
       - v*
     branches:
-      - main
+      - '**'
   pull_request:
 permissions:
   contents: read
@@ -20,7 +20,7 @@ jobs:
           go-version: 1.18
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
           version: latest

diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,12 @@
-FROM	golang:1.21.5 as build
+FROM	golang:1.22.0 as build
 WORKDIR	/conntrack-stats-exporter
 COPY	go.mod go.sum ./
 RUN	go mod download
 COPY	. .
 RUN	go mod verify
 RUN	./build.sh
 
-FROM	alpine:3.19.0
+FROM	alpine:3.19.1
 COPY	--from=build /conntrack-stats-exporter/conntrack-stats-exporter /usr/local/sbin/
 RUN	apk update && \
 	apk --no-cache upgrade && \

diff --git a/Dockerfile-race b/Dockerfile-race
@@ -1,4 +1,4 @@
-FROM	golang:1.21.5 as build
+FROM	golang:1.22.0 as build
 WORKDIR	/conntrack-stats-exporter
 COPY	go.mod go.sum ./
 RUN	go mod download

diff --git a/exporter/exporter_test.go b/exporter/exporter_test.go
@@ -257,6 +257,7 @@ func TestScrapeError(t *testing.T) {
 				defer wg.Done()
 
 				start := time.Now()
+
 				resp, err := client.Do(req)
 				if err != nil {
 					t.Error(err)
@@ -287,10 +288,12 @@ func TestScrapeError(t *testing.T) {
 		timings := make([]time.Duration, concurrency)
 
 		wg := new(sync.WaitGroup)
-		wg.Add(concurrency)
+
 		for i := 0; i < concurrency; i++ {
 			i := i
 
+			wg.Add(1)
+
 			go func() {
 				defer wg.Done()
 
@@ -333,6 +336,7 @@ func TestScrapeError(t *testing.T) {
 					defer wg.Done()
 
 					start := time.Now()
+
 					resp, err := client.Do(req)
 					if err != nil {
 						t.Error(err)