Merge branch 'main' into sampling_extension

Signed-off-by: Pushkar Mishra <[email protected]>

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

@@ -55,7 +55,7 @@ jobs:
     - name: Install tools
       run: make install-ci
 
-    - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
+    - uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
 
     - name: Define BUILD_FLAGS var if running on a Pull Request
       run: |

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

@@ -42,3 +42,7 @@ jobs:
     - name: Temporary - only run the build
       run:
         cd docker-compose/monitor && make build
+
+    - name: Run SPM Test
+      run: ./scripts/spm-integration-test.sh
+

.github/workflows/ci-crossdock.yml

@@ -43,7 +43,7 @@ jobs:
     - name: Install tools
       run: make install-ci
 
-    - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
+    - uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
 
     - name: Build, test, and publish crossdock image
       run: bash scripts/build-crossdock.sh

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

@@ -46,7 +46,7 @@ jobs:
     - name: Install tools
       run: make install-ci
 
-    - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
+    - uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
 
     - name: Build only linux/amd64 container images for a Pull Request
       if: github.ref_name != 'main'

.github/workflows/ci-elasticsearch.yml

@@ -22,6 +22,9 @@ jobs:
       fail-fast: false
       matrix:
         version:
+        - major: 6.x
+          distribution: elasticsearch
+          jaeger: v1
         - major: 7.x
           distribution: elasticsearch
           jaeger: v1
@@ -53,7 +56,7 @@ jobs:
     - name: Install tools
       run: make install-ci
 
-    - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
+    - uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
     - name: Run ${{ matrix.version.distribution }} integration tests
       id: test-execution
       run: bash scripts/es-integration-test.sh ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}

.github/workflows/ci-hotrod.yml

@@ -42,7 +42,7 @@ jobs:
     - name: Install tools
       run: make install-ci
 
-    - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
+    - uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
 
     - name: Build, test, and publish hotrod image
       run: bash scripts/hotrod-integration-test.sh

.github/workflows/ci-opensearch.yml

@@ -53,7 +53,7 @@ jobs:
     - name: Install tools
       run: make install-ci
 
-    - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
+    - uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
 
     - name: Run ${{ matrix.version.distribution }} integration tests
       id: test-execution

.github/workflows/ci-release-testing.yml

@@ -67,7 +67,7 @@ jobs:
       id: package-binaries
       run: bash scripts/package-deploy.sh
 
-    - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
+    - uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
 
     - name: Build all container images (do not push)
       run: bash scripts/build-upload-docker-images.sh -l

.github/workflows/ci-release.yml

@@ -91,7 +91,7 @@ jobs:
         rm -rf deploy || true
         df -h /
 
-    - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
+    - uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
 
     - name: Build and upload all container images
       run: bash scripts/build-upload-docker-images.sh

.github/workflows/codeql.yml

@@ -44,7 +44,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
+      uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
+      uses: github/codeql-action/autobuild@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
+      uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11

.github/workflows/scorecard.yml

@@ -72,6 +72,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
+        uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
         with:
           sarif_file: results.sarif

.mockery.header.txt

@@ -0,0 +1,4 @@
+// Copyright (c) The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+//
+// Run 'make generate-mocks' to regenerate.

.mockery.yaml

@@ -4,17 +4,66 @@ outpkg: "mocks"
 dir: "{{.InterfaceDir}}/mocks/"
 mockname: "{{.InterfaceName}}"
 filename: "{{.InterfaceName}}.go"
+boilerplate-file: .mockery.header.txt
 packages:
+  github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer/cache:
+    interfaces:
+      ServiceAliasMappingExternalSource:
+      ServiceAliasMappingStorage:
+  github.com/jaegertracing/jaeger/cmd/ingester/app/consumer:
+    interfaces:
+      Message:
+  github.com/jaegertracing/jaeger/cmd/ingester/app/processor:
+    interfaces:
+      SpanProcessor:
+  github.com/jaegertracing/jaeger/crossdock/services:
+    interfaces:
+      AgentService:
+      QueryService:
+  github.com/jaegertracing/jaeger/pkg/cassandra:
+    config:
+      unroll-variadic: false
+    interfaces:
+      Iterator:
+      Query:
+      Session:
+  github.com/jaegertracing/jaeger/pkg/distributedlock:
+    config:
+      all: true
   github.com/jaegertracing/jaeger/pkg/es:
     config:
       all: true
-  github.com/jaegertracing/jaeger/storage/spanstore: 
+  github.com/jaegertracing/jaeger/pkg/es/client:
     config:
       all: true
-  github.com/jaegertracing/jaeger/proto-gen/storage_v1: 
+  github.com/jaegertracing/jaeger/pkg/kafka/consumer:
+    interfaces:
+      Consumer:
+  github.com/jaegertracing/jaeger/plugin/sampling/leaderelection:
     config:
       all: true
-  github.com/jaegertracing/jaeger/pkg/es/client:
+  github.com/jaegertracing/jaeger/plugin/storage/grpc:
+    interfaces:
+      PluginCapabilities:
+  github.com/jaegertracing/jaeger/plugin/storage/kafka:
+    interfaces:
+      Marshaller:
+      Unmarshaller:
+  github.com/jaegertracing/jaeger/proto-gen/storage_v1:
+    config:
+      all: true
+  github.com/jaegertracing/jaeger/storage:
+    config:
+      all: true
+  github.com/jaegertracing/jaeger/storage/dependencystore:
+    interfaces:
+      Reader:
+  github.com/jaegertracing/jaeger/storage/metricsstore:
+    config:
+      all: true
+  github.com/jaegertracing/jaeger/storage/samplingstore:
+    config:
+      all: true
+  github.com/jaegertracing/jaeger/storage/spanstore:
     config:
       all: true
-

Makefile

@@ -177,7 +177,7 @@ goleak:
 	@scripts/check-goleak-files.sh $(ALL_PKGS)
 
 .PHONY: fmt
-fmt:
+fmt: $(GOFUMPT)
 	@echo Running import-order-cleanup on ALL_SRC ...
 	@./scripts/import-order-cleanup.py -o inplace -t $(ALL_SRC)
 	@echo Running gofmt on ALL_SRC ...
@@ -188,13 +188,13 @@ fmt:
 	@./scripts/updateLicense.py $(ALL_SRC)
 
 .PHONY: lint
-lint: goleak
-	$(LINT) -v run
+lint: $(LINT) goleak
 	@./scripts/updateLicense.py $(ALL_SRC) > $(FMT_LOG)
 	@./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)
 	./scripts/check-semconv-version.sh
 	./scripts/check-go-version.sh
+	$(LINT) -v run
 
 .PHONY: build-examples
 build-examples:

cmd/ingester/app/consumer/consumer_test.go

@@ -29,11 +29,11 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 
-	kmocks "github.com/jaegertracing/jaeger/cmd/ingester/app/consumer/mocks"
 	"github.com/jaegertracing/jaeger/cmd/ingester/app/processor"
 	pmocks "github.com/jaegertracing/jaeger/cmd/ingester/app/processor/mocks"
 	"github.com/jaegertracing/jaeger/internal/metricstest"
 	"github.com/jaegertracing/jaeger/pkg/kafka/consumer"
+	kmocks "github.com/jaegertracing/jaeger/pkg/kafka/consumer/mocks"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 )
 
@@ -146,7 +146,7 @@ func TestSaramaConsumerWrapper_start_Messages(t *testing.T) {
 			partitionConsumer: &partitionConsumerWrapper{
 				topic:             topic,
 				partition:         partition,
-				PartitionConsumer: &kmocks.PartitionConsumer{},
+				PartitionConsumer: &smocks.PartitionConsumer{},
 			},
 		},
 	}