Merge branch 'main' into upgrade-sarama-v1.38.1

.github/workflows/ci-unit-tests-go-tip.yml

@@ -35,3 +35,6 @@ jobs:
 
     - name: Run unit tests
       run: make test-ci
+
+    - name: Lint
+      run: echo skip linting on Go tip

.github/workflows/ci-unit-tests.yml

@@ -46,3 +46,6 @@ jobs:
         flags: unittests
         fail_ci_if_error: true
         token: ${{ env.CODECOV_TOKEN }}
+
+    - name: Lint
+      run: make lint

Makefile

@@ -1,6 +1,7 @@
 SHELL := /bin/bash
 JAEGER_IMPORT_PATH = github.com/jaegertracing/jaeger
 STORAGE_PKGS = ./plugin/storage/integration/...
+GO = go
 
 include docker/Makefile
 
@@ -31,11 +32,11 @@ ifeq ($(UNAME), s390x)
 else
 	RACE=-race
 endif
-GOOS ?= $(shell go env GOOS)
-GOARCH ?= $(shell go env GOARCH)
+GOOS ?= $(shell $(GO) env GOOS)
+GOARCH ?= $(shell $(GO) env GOARCH)
 GOCACHE=$(abspath .gocache)
-GOBUILD=GOCACHE=$(GOCACHE) CGO_ENABLED=0 installsuffix=cgo go build -trimpath
-GOTEST=GOCACHE=$(GOCACHE) go test -v $(RACE)
+GOBUILD=GOCACHE=$(GOCACHE) CGO_ENABLED=0 installsuffix=cgo $(GO) build -trimpath
+GOTEST=GOCACHE=$(GOCACHE) $(GO) test -v $(RACE)
 GOFMT=gofmt
 GOFUMPT=gofumpt
 FMT_LOG=.fmt.log
@@ -392,15 +393,15 @@ draft-release:
 
 .PHONY: install-tools
 install-tools:
-	go install github.com/vektra/mockery/[email protected]
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.2
-	go install mvdan.cc/gofumpt@latest
+	$(GO) install github.com/vektra/mockery/[email protected]
+	$(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.1
+	$(GO) install mvdan.cc/gofumpt@latest
 
 .PHONY: install-ci
 install-ci: install-tools
 
 .PHONY: test-ci
-test-ci: build-examples cover lint
+test-ci: build-examples cover
 
 .PHONY: thrift
 thrift: idl/thrift/jaeger.thrift thrift-image