Take unmarshaller as parameter

Signed-off-by: Davit Yeghshatyan <[email protected]>
jaegertracing · Jul 24, 2018 · 453c715 · 453c715
1 parent 5b8fad1
commit 453c715
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cmd/ingester/app/processor/span_processor.go b/cmd/ingester/app/processor/span_processor.go
@@ -43,9 +43,9 @@ type Message interface {
 }
 
 // NewSpanProcessor creates a new SpanProcessor
-func NewSpanProcessor(writer spanstore.Writer) SpanProcessor {
+func NewSpanProcessor(writer spanstore.Writer, unmarshaller kafka.Unmarshaller) SpanProcessor {
 	return &spanProcessor{
-		unmarshaller: kafka.NewProtobufUnmarshaller(),
+		unmarshaller: unmarshaller,
 		writer:       writer,
 	}
 }

diff --git a/cmd/ingester/app/processor/span_processor_test.go b/cmd/ingester/app/processor/span_processor_test.go
@@ -20,14 +20,14 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 
-	kmocks "github.com/jaegertracing/jaeger/cmd/ingester/app/consumer/mocks"
+	cmocks "github.com/jaegertracing/jaeger/cmd/ingester/app/consumer/mocks"
 	"github.com/jaegertracing/jaeger/model"
 	umocks "github.com/jaegertracing/jaeger/pkg/kafka/mocks"
 	smocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 )
 
 func TestNewSpanProcessor(t *testing.T) {
-	assert.NotNil(t, NewSpanProcessor(&smocks.Writer{}))
+	assert.NotNil(t, NewSpanProcessor(&smocks.Writer{}, &umocks.Unmarshaller{}))
 }
 
 func TestSpanProcessor_Process(t *testing.T) {
@@ -38,7 +38,7 @@ func TestSpanProcessor_Process(t *testing.T) {
 		writer:       writer,
 	}
 
-	message := &kmocks.Message{}
+	message := &cmocks.Message{}
 	data := []byte("police")
 	span := &model.Span{}
 
@@ -60,7 +60,7 @@ func TestSpanProcessor_ProcessError(t *testing.T) {
 		writer:       writer,
 	}
 
-	message := &kmocks.Message{}
+	message := &cmocks.Message{}
 	data := []byte("police")
 
 	message.On("Value").Return(data)