Fix paths in mockery config (#7045)

## Which problem is this PR solving?
- When we did a recent move of a bunch of packages to internal/ the
mocks were moved manually instead of being re-generated via mockery and
the paths in the mockery config were not updated. The mockery run would
log warnings, but unfortunately not fail.

## Description of the changes
- Fix the paths to eliminate most warnings (the remaining one is
deprecation notice)
- Change Makefile target to first remove all mocks/*.go files to ensure
generated code is not stale
- Regenerate some affected mocks
- Remove AgentService from crossdock (doesn't exist anymore) and fix the
tests
- We had a mock for `crossdock.T` stored and never regenerated. Moved it
from under mocks/ into `t_mock_test.go`.

## How was this change tested?
- CI

---------

Signed-off-by: Yuri Shkuro <[email protected]>

Author: yurishkuro

.gitignore

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

.mockery.yaml

@@ -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,3 @@ packages:
     interfaces:
       CoreSpanReader:
       CoreSpanWriter:
-

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:

crossdock/services/agent.go renamed to crossdock/services/collector.go

@@ -2,20 +2,21 @@
 // Copyright (c) 2017 Uber Technologies, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-package mocks
+package services
 
 import (
 	"github.com/crossdock/crossdock-go"
 	"github.com/stretchr/testify/mock"
 )
 
-// T is an autogenerated mock type for the T type
-type T struct {
+// TMock is an autogenerated mock type for the crossdock.T type.
+// Correction: it used to be auto-generated, but now is't fixed.
+type TMock struct {
 	mock.Mock
 }
 
 // Behavior provides a mock function with given fields:
-func (_m *T) Behavior() string {
+func (_m *TMock) Behavior() string {
 	ret := _m.Called()
 
 	var r0 string
@@ -29,7 +30,7 @@ func (_m *T) Behavior() string {
 }
 
 // Param provides a mock function with given fields: key
-func (_m *T) Param(key string) string {
+func (_m *TMock) Param(key string) string {
 	ret := _m.Called(key)
 
 	var r0 string
@@ -43,36 +44,36 @@ func (_m *T) Param(key string) string {
 }
 
 // Tag provides a mock function with given fields: key, value
-func (_m *T) Tag(key string, value string) {
+func (_m *TMock) Tag(key string, value string) {
 	_m.Called(key, value)
 }
 
 // Errorf provides a mock function with given fields: format, args
-func (_m *T) Errorf(format string, args ...interface{}) {
+func (_m *TMock) Errorf(format string, args ...any) {
 	_m.Called(format, args)
 }
 
 // Skipf provides a mock function with given fields: format, args
-func (_m *T) Skipf(format string, args ...interface{}) {
+func (_m *TMock) Skipf(format string, args ...any) {
 	_m.Called(format, args)
 }
 
 // Successf provides a mock function with given fields: format, args
-func (_m *T) Successf(format string, args ...interface{}) {
+func (_m *TMock) Successf(format string, args ...any) {
 	_m.Called(format, args)
 }
 
 // Fatalf provides a mock function with given fields: format, args
-func (_m *T) Fatalf(format string, args ...interface{}) {
+func (_m *TMock) Fatalf(format string, args ...any) {
 	_m.Called(format, args)
 }
 
 // FailNow provides a mock function with given fields:
-func (_m *T) FailNow() {
+func (_m *TMock) FailNow() {
 	_m.Called()
 }
 
 // Put provides a mock function with given fields: status, output
-func (_m *T) Put(status crossdock.Status, output string) {
+func (_m *TMock) Put(status crossdock.Status, output string) {
 	_m.Called(status, output)
 }

crossdock/services/agent_test.go renamed to crossdock/services/collector_test.go

@@ -416,7 +416,7 @@ func TestAdaptiveSamplingTestInternal(t *testing.T) {
 	for i, test := range tests {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
 			query := &mocks.QueryService{}
-			agent := &mocks.AgentService{}
+			agent := &mocks.CollectorService{}
 
 			handler := &TraceHandler{
 				agent:  agent,
@@ -450,8 +450,8 @@ func TestAdaptiveSamplingTestInternal(t *testing.T) {
 
 func TestEndToEndTest(t *testing.T) {
 	query := &mocks.QueryService{}
-	agent := &mocks.AgentService{}
-	cT := &mocks.T{}
+	agent := &mocks.CollectorService{}
+	cT := &TMock{}
 	handler := NewTraceHandler(query, agent, zap.NewNop())
 	handler.getTracesSleepDuration = time.Millisecond
 
@@ -489,8 +489,8 @@ func TestAdaptiveSamplingTest(t *testing.T) {
 	defer server.Close()
 
 	query := &mocks.QueryService{}
-	agent := &mocks.AgentService{}
-	cT := &mocks.T{}
+	agent := &mocks.CollectorService{}
+	cT := &TMock{}
 	handler := &TraceHandler{
 		agent:  agent,
 		query:  query,
@@ -528,7 +528,7 @@ func TestAdaptiveSamplingTest(t *testing.T) {
 		},
 	}
 
-	agent = &mocks.AgentService{}
+	agent = &mocks.CollectorService{}
 	handler.agent = agent
 	agent.On("GetSamplingRate", "go", mock.AnythingOfType("string")).Return(0.222, nil)
 	// The query service returns an adaptive sampled trace