Merge branch 'main' into chore/version-bump

pdabelf5 · web-flow · commit 60ec5ea5212f · 2025-08-07T11:24:27.000+01:00
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Lint Go
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
-          version: v2.1.6 # renovate: datasource=github-tags depName=golangci/golangci-lint
+          version: v2.3.1 # renovate: datasource=github-tags depName=golangci/golangci-lint
 
   actionlint:
     name: Actionlint
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -24,7 +24,7 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/golangci/golangci-lint
-    rev: v2.1.6
+    rev: v2.3.1
     hooks:
       - id: golangci-lint-full
 
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # renovate: datasource=github-tags depName=golangci/golangci-lint
-GOLANGCI_LINT_VERSION = v2.1.6
+GOLANGCI_LINT_VERSION = v2.3.1
 
 test: unit-test test-integration test-integration-no-stream-block clean
 
diff --git a/tests/client_test.go b/tests/client_test.go
@@ -850,7 +850,8 @@ func TestStreamStats(t *testing.T) {
 	}
 
 	// make connection so we have stream server zone stats - ignore response
-	_, err = net.Dial("tcp", helpers.GetStreamAddress())
+	d := &net.Dialer{}
+	_, err = d.DialContext(context.Background(), "tcp", helpers.GetStreamAddress())
 	if err != nil {
 		t.Errorf("Error making tcp connection: %v", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -850,7 +850,8 @@ func TestStreamStats(t *testing.T) {`
`850`	`850`	`}`
`851`	`851`
`852`	`852`	`// make connection so we have stream server zone stats - ignore response`
`853`		`- _, err = net.Dial("tcp", helpers.GetStreamAddress())`
	`853`	`+ d := &net.Dialer{}`
	`854`	`+ _, err = d.DialContext(context.Background(), "tcp", helpers.GetStreamAddress())`
`854`	`855`	`if err != nil {`
`855`	`856`	`t.Errorf("Error making tcp connection: %v", err)`
`856`	`857`	`}`