Merge branch 'main' into renovate/docker.elastic.co-elasticsearch-ela…

…sticsearch-8.x

.github/actions/setup-go-tip/action.yml

@@ -45,7 +45,7 @@ runs:
       if: steps.download.outputs.success == 'false'
       uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Build Go Tip from source
       if: steps.download.outputs.success == 'false'

.github/workflows/ci-build-binaries.yml

@@ -52,7 +52,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Setup Node.js version
       uses: ./.github/actions/setup-node.js

.github/workflows/ci-crossdock.yml

@@ -35,7 +35,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Export BRANCH variable
       uses: ./.github/actions/setup-branch

.github/workflows/ci-docker-all-in-one.yml

@@ -42,7 +42,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Setup Node.js version
       uses: ./.github/actions/setup-node.js

.github/workflows/ci-docker-build.yml

@@ -35,7 +35,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Setup Node.js version
       uses: ./.github/actions/setup-node.js

.github/workflows/ci-docker-hotrod.yml

@@ -34,7 +34,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Export BRANCH variable
       uses: ./.github/actions/setup-branch

.github/workflows/ci-e2e-badger.yaml

@@ -31,7 +31,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Run Badger storage integration tests
       run: |

.github/workflows/ci-e2e-cassandra.yml

@@ -39,7 +39,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Run cassandra integration tests
       id: test-execution

.github/workflows/ci-e2e-elasticsearch.yml

@@ -51,7 +51,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
     - name: Run ${{ matrix.version.distribution }} integration tests

.github/workflows/ci-e2e-grpc.yml

@@ -31,7 +31,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Run gRPC storage integration tests
       run: |

.github/workflows/ci-e2e-kafka.yml

@@ -32,7 +32,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Run Kafka integration tests
       id: test-execution

.github/workflows/ci-e2e-memory.yaml

@@ -28,7 +28,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Run Memory storage integration tests
       run: |

.github/workflows/ci-e2e-opensearch.yml

@@ -48,7 +48,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
 

.github/workflows/ci-e2e-spm.yml

@@ -42,7 +42,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Setup Node.js version
       uses: ./.github/actions/setup-node.js

.github/workflows/ci-lint-checks.yaml

@@ -41,7 +41,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Print Jaeger version
       run: make echo-version

.github/workflows/ci-lint-protogen.yml

@@ -30,7 +30,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Verify Protobuf types are up to date
       run: make proto && git diff --name-status --exit-code

.github/workflows/ci-release.yml

@@ -44,7 +44,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Setup Node.js version
       uses: ./.github/actions/setup-node.js

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

@@ -29,7 +29,7 @@ jobs:
 
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
         cache-dependency-path: ./go.sum
 
     # download dependencies separately to keep unit test step's output cleaner

.github/workflows/fossa.yml

@@ -29,7 +29,7 @@ jobs:
 
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
-          go-version: 1.22.x
+          go-version: 1.23.x
 
       - name: Add GOPATH
         run: |

.golangci.yml

@@ -220,6 +220,9 @@ linters-settings:
         # looks useful, but requires refactoring: "calls to log.Fatal only in main() or init() functions"
         - name: deep-exit
           disabled: true
+        # this rule conflicts with nolintlint which does insist on no-space in //nolint
+        - name: comment-spacings
+          disabled: true
   testifylint:
     disable:
       - float-compare
@@ -237,5 +240,5 @@ linters-settings:
       - suite-extra-assert-call
 
 run:
-  go: "1.21"
+  go: "1.22"
   timeout: 20m

Makefile

@@ -179,11 +179,6 @@ nocover:
 	@echo Verifying that all packages have test files to count in coverage
 	@scripts/check-test-files.sh $(ALL_PKGS)
 
-.PHONY: goleak
-goleak:
-	@echo Verifying that all packages with tests have goleak in their TestMain
-	@scripts/check-goleak-files.sh $(ALL_PKGS)
-
 .PHONY: fmt
 fmt: $(GOFUMPT)
 	@echo Running import-order-cleanup on ALL_SRC ...
@@ -196,12 +191,35 @@ fmt: $(GOFUMPT)
 	@./scripts/updateLicense.py $(ALL_SRC) $(SCRIPTS_SRC)
 
 .PHONY: lint
-lint: $(LINT) goleak
+lint: lint-license lint-imports lint-semconv lint-goversion lint-goleak lint-go
+
+.PHONY: lint-license
+lint-license:
+	@echo Verifying that all files have license headers
 	@./scripts/updateLicense.py $(ALL_SRC) $(SCRIPTS_SRC) > $(FMT_LOG)
+	@[ ! -s "$(FMT_LOG)" ] || (echo "License check failures, run 'make fmt'" | cat - $(FMT_LOG) && false)
+
+.PHONY: lint-imports
+lint-imports:
+	@echo Verifying that all Go files have correctly ordered imports
 	@./scripts/import-order-cleanup.py -o stdout -t $(ALL_SRC) > $(IMPORT_LOG)
-	@[ ! -s "$(FMT_LOG)" -a ! -s "$(IMPORT_LOG)" ] || (echo "License check or import ordering failures, run 'make fmt'" | cat - $(FMT_LOG) $(IMPORT_LOG) && false)
+	@[ ! -s "$(IMPORT_LOG)" ] || (echo "Import ordering failures, run 'make fmt'" | cat - $(IMPORT_LOG) && false)
+
+.PHONY: lint-semconv
+lint-semconv:
 	./scripts/check-semconv-version.sh
+
+.PHONY: lint-goversion
+lint-goversion:
 	./scripts/check-go-version.sh
+
+.PHONY: lint-goleak
+lint-goleak:
+	@echo Verifying that all packages with tests have goleak in their TestMain
+	@scripts/check-goleak-files.sh $(ALL_PKGS)
+
+.PHONY: lint-go
+lint-go: $(LINT)
 	$(LINT) -v run
 
 .PHONY: build-examples
@@ -475,8 +493,10 @@ init-submodules:
 
 MOCKERY_FLAGS := --all --disable-version-string
 .PHONY: generate-mocks
+# TODO remove GODEBUG=gotypesalias=0
+# once this is fixed: https://github.com/vektra/mockery/issues/803
 generate-mocks: $(MOCKERY)
-	$(MOCKERY)
+	GODEBUG=gotypesalias=0 $(MOCKERY)
 
 .PHONY: certs
 certs:

cmd/collector/app/handler/grpc_handler.go

@@ -93,7 +93,7 @@ func (c *batchConsumer) consume(ctx context.Context, batch *model.Batch) error {
 	})
 	if err != nil {
 		if errors.Is(err, processor.ErrBusy) {
-			return status.Errorf(codes.ResourceExhausted, err.Error())
+			return status.Error(codes.ResourceExhausted, err.Error())
 		}
 		c.logger.Error("cannot process spans", zap.Error(err))
 		return err

cmd/collector/app/span_processor_test.go

@@ -474,7 +474,7 @@ func TestSpanProcessorCountSpan(t *testing.T) {
 					time.Second,
 					time.Millisecond,
 				)
-				assert.Greater(t, p.spansProcessed.Load(), uint64(0))
+				assert.Positive(t, p.spansProcessed.Load())
 			}
 
 			for i := 0; i < 10000; i++ {

cmd/ingester/app/consumer/deadlock_detector_test.go

@@ -45,7 +45,7 @@ func TestNoClosingSignalIfMessagesProcessedInInterval(t *testing.T) {
 	w := f.startMonitoringForPartition(1)
 
 	w.incrementMsgCount()
-	assert.Zero(t, len(w.closePartitionChannel()))
+	assert.Empty(t, w.closePartitionChannel())
 	w.close()
 }
 
@@ -160,6 +160,6 @@ func TestApiCompatibilityWhenDeadlockDetectorDisabled(t *testing.T) {
 
 	w.incrementMsgCount()
 	w.incrementAllPartitionMsgCount()
-	assert.Zero(t, len(w.closePartitionChannel()))
+	assert.Empty(t, w.closePartitionChannel())
 	w.close()
 }

cmd/query/app/apiv3/grpc_handler.go

@@ -16,6 +16,7 @@ package apiv3
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"github.com/gogo/protobuf/types"
@@ -59,11 +60,11 @@ func (h *Handler) GetTrace(request *api_v3.GetTraceRequest, stream api_v3.QueryS
 func (h *Handler) FindTraces(request *api_v3.FindTracesRequest, stream api_v3.QueryService_FindTracesServer) error {
 	query := request.GetQuery()
 	if query == nil {
-		return status.Errorf(codes.InvalidArgument, "missing query")
+		return status.Error(codes.InvalidArgument, "missing query")
 	}
 	if query.GetStartTimeMin() == nil ||
 		query.GetStartTimeMax() == nil {
-		return fmt.Errorf("start time min and max are required parameters")
+		return errors.New("start time min and max are required parameters")
 	}
 
 	queryParams := &spanstore.TraceQueryParameters{

cmd/query/app/apiv3/http_gateway_test.go

@@ -4,6 +4,7 @@
 package apiv3
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -105,7 +106,7 @@ func TestHTTPGatewayTryHandleError(t *testing.T) {
 	gw.Logger = logger
 	w = httptest.NewRecorder()
 	const e = "some err"
-	assert.True(t, gw.tryHandleError(w, fmt.Errorf(e), http.StatusInternalServerError))
+	assert.True(t, gw.tryHandleError(w, errors.New(e), http.StatusInternalServerError))
 	assert.Contains(t, log.String(), e, "logs error if status code is 500")
 	assert.Contains(t, string(w.Body.String()), e, "writes error message to body")
 }
@@ -118,7 +119,7 @@ func TestHTTPGatewayOTLPError(t *testing.T) {
 	const simErr = "simulated error"
 	gw.returnSpansTestable(nil, w,
 		func(_ []*model.Span) (ptrace.Traces, error) {
-			return ptrace.Traces{}, fmt.Errorf(simErr)
+			return ptrace.Traces{}, errors.New(simErr)
 		},
 	)
 	assert.Contains(t, w.Body.String(), simErr)
@@ -138,7 +139,7 @@ func TestHTTPGatewayGetTraceErrors(t *testing.T) {
 	const simErr = "simulated error"
 	gw.reader.
 		On("GetTrace", matchContext, matchTraceID).
-		Return(nil, fmt.Errorf(simErr)).Once()
+		Return(nil, errors.New(simErr)).Once()
 
 	r, err = http.NewRequest(http.MethodGet, "/api/v3/traces/123", nil)
 	require.NoError(t, err)
@@ -247,7 +248,7 @@ func TestHTTPGatewayFindTracesErrors(t *testing.T) {
 		gw := setupHTTPGatewayNoServer(t, "", tenancy.Options{})
 		gw.reader.
 			On("FindTraces", matchContext, qp).
-			Return(nil, fmt.Errorf(simErr)).Once()
+			Return(nil, errors.New(simErr)).Once()
 
 		gw.router.ServeHTTP(w, r)
 		assert.Contains(t, w.Body.String(), simErr)
@@ -260,7 +261,7 @@ func TestHTTPGatewayGetServicesErrors(t *testing.T) {
 	const simErr = "simulated error"
 	gw.reader.
 		On("GetServices", matchContext).
-		Return(nil, fmt.Errorf(simErr)).Once()
+		Return(nil, errors.New(simErr)).Once()
 
 	r, err := http.NewRequest(http.MethodGet, "/api/v3/services", nil)
 	require.NoError(t, err)
@@ -276,7 +277,7 @@ func TestHTTPGatewayGetOperationsErrors(t *testing.T) {
 	const simErr = "simulated error"
 	gw.reader.
 		On("GetOperations", matchContext, qp).
-		Return(nil, fmt.Errorf(simErr)).Once()
+		Return(nil, errors.New(simErr)).Once()
 
 	r, err := http.NewRequest(http.MethodGet, "/api/v3/operations?service=foo&span_kind=server", nil)
 	require.NoError(t, err)

cmd/query/app/http_handler_test.go

@@ -428,9 +428,9 @@ func TestSearchByTraceIDNotFound(t *testing.T) {
 
 func TestSearchByTraceIDFailure(t *testing.T) {
 	ts := initializeTestServer(t)
-	whatsamattayou := "https://youtu.be/WrKFOCg13QQ"
+	whatsamattayou := "whatsamattayou"
 	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
-		Return(nil, fmt.Errorf(whatsamattayou)).Once()
+		Return(nil, errors.New(whatsamattayou)).Once()
 
 	var response structuredResponse
 	err := getJSON(ts.server.URL+`/api/traces?traceID=1`, &response)
@@ -763,7 +763,7 @@ func TestMetricsReaderError(t *testing.T) {
 				tc.mockedQueryMethod,
 				mock.AnythingOfType("*context.valueCtx"),
 				mock.AnythingOfType(tc.mockedQueryMethodParamType),
-			).Return(tc.mockedResponse, fmt.Errorf(tc.wantErrorMessage)).Once()
+			).Return(tc.mockedResponse, errors.New(tc.wantErrorMessage)).Once()
 
 			// Test
 			var response metrics.MetricFamily