Rename structs

Signed-off-by: Davit Yeghshatyan <davo@uber.com>

cmd/ingester/app/consumer/consumer.go

@@ -31,15 +31,15 @@ type Params struct {
 	ProcessorFactory ProcessorFactory
 	Factory          metrics.Factory
 	Logger           *zap.Logger
-	SaramaConsumer   consumer.Consumer
+	InternalConsumer consumer.Consumer
 }
 
 // Consumer uses sarama to consume and handle messages from kafka
 type Consumer struct {
 	metricsFactory metrics.Factory
 	logger         *zap.Logger
 
-	saramaConsumer   consumer.Consumer
+	internalConsumer consumer.Consumer
 	processorFactory ProcessorFactory
 
 	close    chan struct{}
@@ -53,7 +53,7 @@ func New(params Params) (*Consumer, error) {
 		logger:           params.Logger,
 		close:            make(chan struct{}, 1),
 		isClosed:         sync.WaitGroup{},
-		saramaConsumer:   params.SaramaConsumer,
+		internalConsumer: params.InternalConsumer,
 		processorFactory: params.ProcessorFactory,
 	}, nil
 }
@@ -69,13 +69,13 @@ func (c *Consumer) Start() {
 func (c *Consumer) Close() error {
 	close(c.close)
 	c.isClosed.Wait()
-	return c.saramaConsumer.Close()
+	return c.internalConsumer.Close()
 }
 
 func (c *Consumer) mainLoop() {
 	for {
 		select {
-		case pc := <-c.saramaConsumer.Partitions():
+		case pc := <-c.internalConsumer.Partitions():
 			c.isClosed.Add(2)
 
 			go c.handleMessages(pc)

cmd/ingester/app/consumer/consumer_test.go

@@ -54,11 +54,11 @@ func withWrappedConsumer(fn func(c *consumerTest)) {
 	c := &consumerTest{
 		saramaConsumer: sc,
 		consumer: &Consumer{
-			metricsFactory: metricsFactory,
-			logger:         logger,
-			close:          make(chan struct{}),
-			isClosed:       sync.WaitGroup{},
-			saramaConsumer: sc,
+			metricsFactory:   metricsFactory,
+			logger:           logger,
+			close:            make(chan struct{}),
+			isClosed:         sync.WaitGroup{},
+			internalConsumer: sc,
 			processorFactory: ProcessorFactory{
 				topic:          "topic",
 				consumer:       sc,

cmd/ingester/app/consumer/processor_factory.go

@@ -26,8 +26,8 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/kafka/consumer"
 )
 
-// FactoryParams are the parameters of a ProcessorFactory
-type FactoryParams struct {
+// ProcessorFactoryParams are the parameters of a ProcessorFactory
+type ProcessorFactoryParams struct {
 	Parallelism    int
 	Topic          string
 	BaseProcessor  processor.SpanProcessor
@@ -46,9 +46,9 @@ type ProcessorFactory struct {
 	parallelism    int
 }
 
-// NewFactory constructs a new ProcessorFactory
-func NewFactory(params FactoryParams) (ProcessorFactory, error) {
-	return ProcessorFactory{
+// NewProcessorFactory constructs a new ProcessorFactory
+func NewProcessorFactory(params ProcessorFactoryParams) (*ProcessorFactory, error) {
+	return &ProcessorFactory{
 		topic:          params.Topic,
 		consumer:       params.SaramaConsumer,
 		metricsFactory: params.Factory,

cmd/ingester/app/consumer/processor_factory_test.go

@@ -28,8 +28,8 @@ import (
 )
 
 func Test_NewFactory(t *testing.T) {
-	params := FactoryParams{}
-	newFactory, err := NewFactory(params)
+	params := ProcessorFactoryParams{}
+	newFactory, err := NewProcessorFactory(params)
 	assert.NoError(t, err)
 	assert.NotNil(t, newFactory)
 }