disable message pool by default
Some checks failed
sync / sync (push) Has been skipped
test / test (push) Successful in 4m47s
coverage / build (push) Failing after 18m8s

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
2025-05-18 18:58:53 +03:00
parent d0978fb314
commit 6d85d3ee41
3 changed files with 65 additions and 44 deletions

5
kgo.go
View File

@@ -478,11 +478,15 @@ func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interfac
} }
} }
var messagePool bool
var fatalOnError bool var fatalOnError bool
if b.opts.Context != nil { if b.opts.Context != nil {
if v, ok := b.opts.Context.Value(fatalOnErrorKey{}).(bool); ok && v { if v, ok := b.opts.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
fatalOnError = v fatalOnError = v
} }
if v, ok := b.opts.Context.Value(subscribeMessagePoolKey{}).(bool); ok && v {
messagePool = v
}
} }
if options.Context != nil { if options.Context != nil {
@@ -500,6 +504,7 @@ func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interfac
done: make(chan struct{}), done: make(chan struct{}),
fatalOnError: fatalOnError, fatalOnError: fatalOnError,
connected: b.connected, connected: b.connected,
messagePool: messagePool,
} }
kopts := append(b.kopts, kopts := append(b.kopts,

View File

@@ -109,3 +109,10 @@ type publishPromiseKey struct{}
func PublishPromise(fn func(*kgo.Record, error)) broker.PublishOption { func PublishPromise(fn func(*kgo.Record, error)) broker.PublishOption {
return broker.SetPublishOption(publishPromiseKey{}, fn) return broker.SetPublishOption(publishPromiseKey{}, fn)
} }
type subscribeMessagePoolKey struct{}
// SubscribeMessagePool optionaly enabled/disable message pool
func SubscribeMessagePool(b bool) broker.SubscribeOption {
return broker.SetSubscribeOption(subscribeMessagePoolKey{}, b)
}

View File

@@ -24,29 +24,30 @@ type tp struct {
} }
type consumer struct { type consumer struct {
topic string topic string
c *kgo.Client c *kgo.Client
htracer *hookTracer htracer *hookTracer
quit chan struct{} quit chan struct{}
done chan struct{} done chan struct{}
recs chan kgo.FetchTopicPartition recs chan kgo.FetchTopicPartition
kopts broker.Options kopts broker.Options
partition int32 partition int32
opts broker.SubscribeOptions opts broker.SubscribeOptions
handler interface{} handler interface{}
connected *atomic.Uint32 connected *atomic.Uint32
messagePool bool
} }
type Subscriber struct { type Subscriber struct {
consumers map[tp]*consumer consumers map[tp]*consumer
c *kgo.Client c *kgo.Client
htracer *hookTracer htracer *hookTracer
topic string topic string
messagePool bool
handler interface{} handler interface{}
done chan struct{} done chan struct{}
kopts broker.Options kopts broker.Options
opts broker.SubscribeOptions opts broker.SubscribeOptions
connected *atomic.Uint32 connected *atomic.Uint32
sync.RWMutex sync.RWMutex
@@ -216,17 +217,18 @@ func (s *Subscriber) assigned(_ context.Context, c *kgo.Client, assigned map[str
for topic, partitions := range assigned { for topic, partitions := range assigned {
for _, partition := range partitions { for _, partition := range partitions {
pc := &consumer{ pc := &consumer{
c: c, c: c,
topic: topic, topic: topic,
partition: partition, partition: partition,
htracer: s.htracer, htracer: s.htracer,
quit: make(chan struct{}), quit: make(chan struct{}),
done: make(chan struct{}), done: make(chan struct{}),
recs: make(chan kgo.FetchTopicPartition, 100), recs: make(chan kgo.FetchTopicPartition, 100),
handler: s.handler, handler: s.handler,
kopts: s.kopts, messagePool: s.messagePool,
opts: s.opts, kopts: s.kopts,
connected: s.connected, opts: s.opts,
connected: s.connected,
} }
s.Lock() s.Lock()
s.consumers[tp{topic, partition}] = pc s.consumers[tp{topic, partition}] = pc
@@ -245,6 +247,8 @@ func (pc *consumer) consume() {
defer pc.kopts.Logger.Debug(pc.kopts.Context, fmt.Sprintf("killing, topic %s partition %d", pc.topic, pc.partition)) defer pc.kopts.Logger.Debug(pc.kopts.Context, fmt.Sprintf("killing, topic %s partition %d", pc.topic, pc.partition))
} }
var pm *kgoMessage
for { for {
select { select {
case <-pc.quit: case <-pc.quit:
@@ -254,22 +258,26 @@ func (pc *consumer) consume() {
ctx, sp := pc.htracer.WithProcessSpan(record) ctx, sp := pc.htracer.WithProcessSpan(record)
ts := time.Now() ts := time.Now()
pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Inc() pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Inc()
p := messagePool.Get().(*kgoMessage)
p.body = record.Value if pc.messagePool {
p.topic = record.Topic pm = messagePool.Get().(*kgoMessage)
p.ack = false } else {
p.hdr = metadata.New(len(record.Headers)) pm = &kgoMessage{}
p.ctx = ctx }
pm.body = record.Value
pm.topic = record.Topic
pm.ack = false
pm.hdr = metadata.New(len(record.Headers))
pm.ctx = ctx
for _, hdr := range record.Headers { for _, hdr := range record.Headers {
p.hdr.Set(hdr.Key, string(hdr.Value)) pm.hdr.Set(hdr.Key, string(hdr.Value))
} }
switch h := pc.handler.(type) { switch h := pc.handler.(type) {
case func(broker.Message) error: case func(broker.Message) error:
err = h(p) err = h(pm)
case func([]broker.Message) error: case func([]broker.Message) error:
err = h([]broker.Message{p}) err = h([]broker.Message{pm})
} }
pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec() pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
@@ -277,16 +285,17 @@ func (pc *consumer) consume() {
sp.SetStatus(tracer.SpanStatusError, err.Error()) sp.SetStatus(tracer.SpanStatusError, err.Error())
pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "failure").Inc() pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "failure").Inc()
} else if pc.opts.AutoAck { } else if pc.opts.AutoAck {
p.ack = true pm.ack = true
} }
te := time.Since(ts) te := time.Since(ts)
pc.kopts.Meter.Summary(semconv.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds()) pc.kopts.Meter.Summary(semconv.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
pc.kopts.Meter.Histogram(semconv.SubscribeMessageDurationSeconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds()) pc.kopts.Meter.Histogram(semconv.SubscribeMessageDurationSeconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
ack := p.ack ack := pm.ack
messagePool.Put(p) if pc.messagePool {
messagePool.Put(p)
}
if ack { if ack {
pc.c.MarkCommitRecords(record) pc.c.MarkCommitRecords(record)
} else { } else {