Get rid of sarama-cluster, use sarama consumer group instead. #2009
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,10 +16,9 @@ package consumer | |
|
|
||
| import ( | ||
| "sync" | ||
| "context" | ||
|
|
||
| "github.com/Shopify/sarama" | ||
| "github.com/uber/jaeger-lib/metrics" | ||
| "go.uber.org/zap" | ||
|
|
||
|
|
@@ -29,153 +28,116 @@ import ( | |
|
|
||
| // Params are the parameters of a Consumer | ||
| type Params struct { | ||
| ProcessorFactory ProcessorFactory | ||
| MetricsFactory metrics.Factory | ||
| Logger *zap.Logger | ||
| InternalConsumer consumer.Consumer | ||
| } | ||
|
|
||
| // Consumer uses sarama to consume and handle messages from kafka | ||
| type Consumer struct { | ||
| metricsFactory metrics.Factory | ||
| logger *zap.Logger | ||
| internalConsumer consumer.Consumer | ||
| processorFactory ProcessorFactory | ||
| partitionsHeld int64 | ||
| partitionsHeldGauge metrics.Gauge | ||
| } | ||
|
|
||
| type consumerGroupHandler struct { | ||
| processorFactory ProcessorFactory | ||
| partitionToProcessor map[int32]processor.SpanProcessor | ||
| logger *zap.Logger | ||
| consumer *Consumer | ||
| partitionToProcessorLock sync.RWMutex | ||
| } | ||
|
|
||
| func (h *consumerGroupHandler) Setup(session sarama.ConsumerGroupSession) error { | ||
| h.partitionToProcessor = map[int32]processor.SpanProcessor{} | ||
| return nil | ||
| } | ||
|
|
||
| func (h *consumerGroupHandler) getProcessFactory(session sarama.ConsumerGroupSession, partition int32, offset int64) processor.SpanProcessor { | ||
| h.partitionToProcessorLock.RLock() | ||
| msgProcessor := h.partitionToProcessor[partition] | ||
| h.partitionToProcessorLock.RUnlock() | ||
| if msgProcessor == nil { | ||
| msgProcessor = h.processorFactory.new(session, partition, offset-1) | ||
| h.partitionToProcessorLock.Lock() | ||
| h.partitionToProcessor[partition] = msgProcessor | ||
| h.partitionToProcessorLock.Unlock() | ||
| } | ||
| return msgProcessor | ||
| } | ||
| func (h *consumerGroupHandler) Cleanup(_ sarama.ConsumerGroupSession) error { return nil } | ||
| func (h *consumerGroupHandler) ConsumeClaim(sess sarama.ConsumerGroupSession, claim sarama.ConsumerGroupClaim) error { | ||
| msgMetrics := h.consumer.newMsgMetrics(claim.Partition()) | ||
|
|
||
| for { | ||
| select { | ||
| case msg, ok := <-claim.Messages(): | ||
| if !ok { | ||
| h.logger.Info("Message channel closed. ", zap.Int32("partition", claim.Partition())) | ||
| return nil | ||
| } | ||
| h.logger.Debug("Got msg", zap.Any("msg", msg)) | ||
| msgMetrics.counter.Inc(1) | ||
| msgMetrics.offsetGauge.Update(msg.Offset) | ||
| msgMetrics.lagGauge.Update(claim.HighWaterMarkOffset() - msg.Offset - 1) | ||
| msgProcessor := h.getProcessFactory(sess, claim.Partition(), msg.Offset) | ||
| msgProcessor.Process(&saramaMessageWrapper{msg}) | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // New is a constructor for a Consumer | ||
| func New(params Params) (*Consumer, error) { | ||
| return &Consumer{ | ||
| metricsFactory: params.MetricsFactory, | ||
| logger: params.Logger, | ||
| internalConsumer: params.InternalConsumer, | ||
| processorFactory: params.ProcessorFactory, | ||
| partitionsHeldGauge: partitionsHeldGauge(params.MetricsFactory), | ||
| }, nil | ||
| } | ||
|
|
||
| // Start begins consuming messages in a go routine | ||
| func (c *Consumer) Start() { | ||
|
There was a problem hiding this comment. I know this was added after the first implementation because of a specific problem that Uber experienced, although I don't remember what the problem was exactly. Are you aware of that? Is it safe to remove this? There was a problem hiding this comment. I'm aware of that, and still not sure if this should be removed, Is something I'm investigating.. it seems like the problem was solved in this implementation. but still not 100% sure. There was a problem hiding this comment. Maybe deprecate as Juca suggests, but only start the deadlock detector if internal > 0 (I think 0 is the default and means no deadlock detection used)? There was a problem hiding this comment. It seems like this is not necesary anymore, the issue was fixed on sarama. IBM/sarama#1156 Anyway, I agree with the idea of preserve this deadlockDetector, just in case, and mark it as deprecated. I'll reintroduce it. |
||
| go func() { | ||
| c.logger.Info("Starting main loop") | ||
| ctx := context.Background() | ||
| handler := consumerGroupHandler{ | ||
| processorFactory: c.processorFactory, | ||
| logger: c.logger, | ||
| consumer: c, | ||
| } | ||
| defer func() { _ = c.internalConsumer.Close() }() | ||
|
|
||
| go func() { | ||
| for err := range c.internalConsumer.Errors() { | ||
| if error, ok := err.(*sarama.ConsumerError); ok { | ||
| c.logger.Info("Starting error handler", zap.Int32("partition", error.Partition)) | ||
| errMetrics := c.newErrMetrics(error.Partition) | ||
| errMetrics.errCounter.Inc(1) | ||
| c.logger.Error("Error consuming from Kafka", zap.Error(err)) | ||
| } | ||
| } | ||
| c.logger.Info("Finished handling errors") | ||
| }() | ||
|
|
||
| for { | ||
| err := c.internalConsumer.Consume(ctx, &handler) | ||
| if err != nil { | ||
| panic(err) | ||
|
There was a problem hiding this comment. That's rude. Do you really want a panic here? There was a problem hiding this comment. Ha, not really, I'll remove it. I copied from an example of how to use the consumer group, but it shouldn't be here. |
||
| } | ||
|
|
||
| } | ||
| }() | ||
| } | ||
|
|
||
| // Close closes the Consumer and underlying sarama consumer | ||
| func (c *Consumer) Close() error { | ||
| c.logger.Info("Closing parent consumer") | ||
| return c.internalConsumer.Close() | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IIRC, this can be configured via CLI. You might need to mark it as "deprecated" in the CLI help text + add an entry to the changelog.