cleanup

Signed-off-by: Yuri Shkuro <github@ysh.us>
jaegertracing · Jun 24, 2024 · 3cd8b4c · 3cd8b4c
1 parent 6432d9e
commit 3cd8b4c
Show file tree

Hide file tree

Showing 7 changed files with 130 additions and 98 deletions.
diff --git a/.mockery.yaml b/.mockery.yaml
@@ -45,6 +45,10 @@ packages:
   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

diff --git a/cmd/ingester/app/processor/span_processor_test.go b/cmd/ingester/app/processor/span_processor_test.go
@@ -25,7 +25,7 @@ import (
 
 	cmocks "github.com/jaegertracing/jaeger/cmd/ingester/app/consumer/mocks"
 	"github.com/jaegertracing/jaeger/model"
-	umocks "github.com/jaegertracing/jaeger/pkg/kafka/mocks"
+	umocks "github.com/jaegertracing/jaeger/plugin/storage/kafka/mocks"
 	smocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 )
 

diff --git a/pkg/kafka/mocks/Marshaller.go b/pkg/kafka/mocks/Marshaller.go
diff --git a/pkg/kafka/mocks/Unmarshaller.go b/pkg/kafka/mocks/Unmarshaller.go
diff --git a/plugin/storage/kafka/mocks/Marshaller.go b/plugin/storage/kafka/mocks/Marshaller.go
diff --git a/plugin/storage/kafka/mocks/Unmarshaller.go b/plugin/storage/kafka/mocks/Unmarshaller.go
diff --git a/plugin/storage/kafka/writer_test.go b/plugin/storage/kafka/writer_test.go
@@ -28,7 +28,7 @@ import (
 
 	"github.com/jaegertracing/jaeger/internal/metricstest"
 	"github.com/jaegertracing/jaeger/model"
-	"github.com/jaegertracing/jaeger/pkg/kafka/mocks"
+	"github.com/jaegertracing/jaeger/plugin/storage/kafka/mocks"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )