Merge branch 'main' of https://github.com/jaegertracing/jaeger

.codecov.yml

@@ -1,7 +1,7 @@
 codecov:
   notify:
     require_ci_to_pass: yes
-    after_n_builds: 19
+    after_n_builds: 18
   strict_yaml_branch: main  # only use the latest copy on the main branch
 
 ignore:

.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
@@ -66,6 +66,15 @@ jobs:
             ;;
         esac
 
+    - name: Determine healthcheck setting
+      id: healthcheck
+      run: |
+        if [[ "${{ matrix.mode.name }}" == "v1" ]]; then
+          echo "HEALTHCHECK_V2=false" >> $GITHUB_ENV
+        elif [[ "${{ matrix.mode.name }}" == "v2" ]]; then
+          echo "HEALTHCHECK_V2=true" >> $GITHUB_ENV
+        fi
+
     - name: Build, test, and publish all-in-one image
       run: |
         bash scripts/build-all-in-one-image.sh \
@@ -74,3 +83,4 @@ jobs:
       env:
         DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
         QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
+        HEALTHCHECK_V2: ${{ env.HEALTHCHECK_V2 }}

.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

@@ -30,7 +30,7 @@ jobs:
       uses: ./.github/actions/block-pr-not-on-main
 
     - name: Set up Python 3.x for DCO check
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
       with:
         python-version: '3.x'
 
@@ -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-dependabot-config.yml

@@ -10,5 +10,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-      - uses: marocchino/validate-dependabot@v3
+      - uses: marocchino/validate-dependabot@d8ae5c0d03dd75fbd0ad5f8ab4ba8101ebbd4b37 # v3.0.0
         id: validate

.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

@@ -211,15 +211,15 @@ linters-settings:
         # this is idiocy, promotes less readable code. Don't enable.
         - name: var-declaration
           disabled: true
-        # enable after cleanup
-        - name: redefines-builtin-id
-          disabled: true
         # "no nested structs are allowed" - don't enable, doesn't make sense
         - name: nested-structs
           disabled: true
         # 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 +237,5 @@ linters-settings:
       - suite-extra-assert-call
 
 run:
-  go: "1.21"
+  go: "1.22"
   timeout: 20m

.mockery.yaml

@@ -42,7 +42,7 @@ packages:
   github.com/jaegertracing/jaeger/plugin/sampling/leaderelection:
     config:
       all: true
-  github.com/jaegertracing/jaeger/plugin/storage/grpc:
+  github.com/jaegertracing/jaeger/plugin/storage/grpc/shared:
     interfaces:
       PluginCapabilities:
   github.com/jaegertracing/jaeger/plugin/storage/kafka:

Makefile

@@ -36,12 +36,21 @@ ALL_SRC = $(shell find . -name '*.go' \
 				   -not -name '*.pb.go' \
 				   -not -path './vendor/*' \
 				   -not -path './internal/tools/*' \
+				   -not -path './docker/debug/*' \
 				   -not -path '*/mocks/*' \
 				   -not -path '*/*-gen/*' \
 				   -not -path '*/thrift-0.9.2/*' \
 				   -type f | \
 				sort)
 
+# All .sh or .py or Makefile or .mk files that should be auto-formatted and linted.
+SCRIPTS_SRC = $(shell find . \( -name '*.sh' -o -name '*.py' -o -name '*.mk' -o -name 'Makefile*' -o -name 'Dockerfile*' \) \
+						-not -path './.git/*' \
+						-not -path './idl/*' \
+						-not -path './jaeger-ui/*' \
+						-type f | \
+					sort)
+
 # ALL_PKGS is used with 'nocover' and 'goleak'
 ALL_PKGS = $(shell echo $(dir $(ALL_SRC)) | tr ' ' '\n' | sort -u)
 
@@ -171,11 +180,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 ...
@@ -185,15 +189,38 @@ fmt: $(GOFUMPT)
 	@echo Running gofumpt on ALL_SRC ...
 	@$(GOFUMPT) -e -l -w $(ALL_SRC)
 	@echo Running updateLicense.py on ALL_SRC ...
-	@./scripts/updateLicense.py $(ALL_SRC)
+	@./scripts/updateLicense.py $(ALL_SRC) $(SCRIPTS_SRC)
 
 .PHONY: lint
-lint: $(LINT) goleak
-	@./scripts/updateLicense.py $(ALL_SRC) > $(FMT_LOG)
+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
@@ -467,8 +494,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/agent/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 ARG base_image
 ARG debug_image
 

cmd/agent/app/agent.go

@@ -1,17 +1,6 @@
 // Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: Apache-2.0
 
 package app
 

cmd/agent/app/agent_test.go

@@ -1,17 +1,6 @@
 // Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: Apache-2.0
 
 package app