merge with upstream

.github/workflows/ci.yml

@@ -31,13 +31,9 @@ jobs:
         with:
           submodules: recursive
           fetch-depth: 0 # fetch git tags for "git describe"
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.18.x
-      - uses: actions/cache@v3
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ matrix.os }}-go-${{ hashFiles('**/go.sum') }}
+          go-version: '1.19'
 
       - name: Install deps
         if: matrix.os == 'ubuntu-20.04'
@@ -53,9 +49,11 @@ jobs:
         if: matrix.os == 'ubuntu-20.04'
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.50
-          args: --config=.golangci.yml --out-${NO_FUTURE}format colored-line-number
+          version: v1.52
 
       - name: Test win
         if: matrix.os == 'windows-2022'
         run: make test-no-fuzz
+      - name: Test
+        if: matrix.os != 'windows-2022'
+        run: make test

.golangci.yml

@@ -2,28 +2,28 @@ run:
   deadline: 10m
 
 linters:
-  disable-all: true
+  presets:
+    - bugs
+    - error
+    - unused
+    - performance
+  disable:
+    - exhaustive
+    - musttag
+    - contextcheck
+    - wrapcheck
+    - goerr113
+    - unparam
+    - makezero
   enable:
-    - errorlint
     - unconvert
     - predeclared
-#    - wastedassign # go1.18
+    - wastedassign
     - thelper
     - gofmt
-    - errcheck
-    - gosimple
-    - govet
-    - ineffassign
-    - staticcheck
-    - unused
-#    - gocritic
-    - bodyclose # go1.18
-    - gosec
-#    - forcetypeassert
-    - prealloc
-#    - contextcheck
-#    - goerr113
+    - gocritic
 #    - revive
+#    - forcetypeassert
 #    - stylecheck
 
 linters-settings:

Makefile

@@ -29,7 +29,7 @@ $(GOBINREL):
 
 $(GOBINREL)/protoc: | $(GOBINREL)
 	$(eval PROTOC_TMP := $(shell mktemp -d))
-	curl -sSL https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-$(PROTOC_OS)-$(ARCH).zip -o "$(PROTOC_TMP)/protoc.zip"
+	curl -sSL https://github.com/protocolbuffers/protobuf/releases/download/v22.2/protoc-22.2-$(PROTOC_OS)-$(ARCH).zip -o "$(PROTOC_TMP)/protoc.zip"
 	cd "$(PROTOC_TMP)" && unzip protoc.zip
 	cp "$(PROTOC_TMP)/bin/protoc" "$(GOBIN)"
 	mkdir -p "$(PROTOC_INCLUDE)"
@@ -67,7 +67,8 @@ $(GOBINREL)/moq: | $(GOBINREL)
 	$(GOBUILD) -o "$(GOBIN)/moq" github.com/matryer/moq
 
 mocks: $(GOBINREL)/moq
-	rm gointerfaces/remote/mocks.go
+	rm -f gointerfaces/remote/mocks.go
+	rm -f gointerfaces/sentry/mocks.go
 	PATH="$(GOBIN):$(PATH)" go generate ./...
 
 lint: $(GOBINREL)/golangci-lint
@@ -79,7 +80,7 @@ lintci-deps-clean: golangci-lint-clean
 
 # download and build golangci-lint (https://golangci-lint.run)
 $(GOBINREL)/golangci-lint: | $(GOBINREL)
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(GOBIN)" v1.50.1
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(GOBIN)" v1.52.1
 
 golangci-lint-clean:
 	rm -f "$(GOBIN)/golangci-lint"