Merge branch 'main' into add-query-integration-test

Author: mahadzaryab1

.gitignore

@@ -51,3 +51,4 @@ resource.syso
 .gocache
 test-results.json
 .metrics/
+.mockery.log

.mockery.yaml

@@ -1,4 +1,4 @@
-with-expecter: false
+with-expecter: true
 disable-version-string: true
 outpkg: "mocks"
 dir: "{{.InterfaceDir}}/mocks/"
@@ -24,28 +24,28 @@ packages:
       SpanProcessor:
   github.com/jaegertracing/jaeger/crossdock/services:
     interfaces:
-      AgentService:
+      CollectorService:
       QueryService:
-  github.com/jaegertracing/jaeger/pkg/cassandra:
+  github.com/jaegertracing/jaeger/internal/storage/cassandra:
     config:
       unroll-variadic: false
     interfaces:
       Iterator:
       Query:
       Session:
-  github.com/jaegertracing/jaeger/pkg/distributedlock:
+  github.com/jaegertracing/jaeger/internal/distributedlock:
     config:
       all: true
-  github.com/jaegertracing/jaeger/pkg/es:
+  github.com/jaegertracing/jaeger/internal/storage/elasticsearch:
     config:
       all: true
-  github.com/jaegertracing/jaeger/pkg/es/client:
+  github.com/jaegertracing/jaeger/internal/storage/elasticsearch/client:
     config:
       all: true
-  github.com/jaegertracing/jaeger/pkg/kafka/consumer:
+  github.com/jaegertracing/jaeger/internal/storage/kafka/consumer:
     interfaces:
       Consumer:
-  github.com/jaegertracing/jaeger/plugin/sampling/leaderelection:
+  github.com/jaegertracing/jaeger/internal/leaderelection:
     config:
       all: true
   github.com/jaegertracing/jaeger/internal/storage/v1/grpc/shared:
@@ -83,4 +83,6 @@ packages:
     interfaces:
       CoreSpanReader:
       CoreSpanWriter:
-
+  github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/dependencystore:
+    interfaces:
+      CoreDependencyStore:

Makefile

@@ -218,7 +218,8 @@ init-submodules:
 MOCKERY_FLAGS := --all --disable-version-string
 .PHONY: generate-mocks
 generate-mocks: $(MOCKERY)
-	$(MOCKERY)
+	find . -path '*/mocks/*' -name '*.go' -type f -delete
+	$(MOCKERY) | tee .mockery.log
 
 .PHONY: certs
 certs:

cmd/anonymizer/app/query/query_test.go

@@ -71,12 +71,15 @@ func newTestServer(t *testing.T) *testServer {
 	lis, err := net.Listen("tcp", ":0")
 	require.NoError(t, err)
 
-	var exited sync.WaitGroup
+	var started, exited sync.WaitGroup
+	started.Add(1)
 	exited.Add(1)
 	go func() {
+		started.Done()
 		assert.NoError(t, server.Serve(lis))
 		exited.Done()
 	}()
+	started.Wait()
 	t.Cleanup(func() {
 		server.Stop()
 		exited.Wait() // don't allow test to finish before server exits