From 933beb420ee1e3a4de10a25636cd2ff4390f70a1 Mon Sep 17 00:00:00 2001 From: Mohammed Nafees Date: Wed, 24 Jun 2026 11:58:39 +0200 Subject: [PATCH 1/2] only err rmq retries when over 80% mark --- internal/msgqueue/rabbitmq/rabbitmq.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/msgqueue/rabbitmq/rabbitmq.go b/internal/msgqueue/rabbitmq/rabbitmq.go index 9bbc73c309..16befdb3aa 100644 --- a/internal/msgqueue/rabbitmq/rabbitmq.go +++ b/internal/msgqueue/rabbitmq/rabbitmq.go @@ -804,8 +804,14 @@ func (t *MessageQueueImpl) subscribe( // message was rejected before deathCount := xDeath[0].(amqp.Table)["count"].(int64) + logger := t.l.Warn() + if deathCount > int64(float64(t.maxDeathCount)*0.8) { + // only log as error if we've exceeded 80% of the max death count + logger = t.l.Error() + } + if deathCount > 5 { - t.l.Error(). + logger. Int64("death_count", deathCount). Str("message_id", msg.ID). Str("tenant_id", msg.TenantID.String()). From 18da0c9c01d31a2cf4a5ae012c787ece3809e685 Mon Sep 17 00:00:00 2001 From: Mohammed Nafees Date: Wed, 24 Jun 2026 12:04:14 +0200 Subject: [PATCH 2/2] adhere to default max death count config value --- internal/msgqueue/rabbitmq/rabbitmq.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/msgqueue/rabbitmq/rabbitmq.go b/internal/msgqueue/rabbitmq/rabbitmq.go index 16befdb3aa..d24cd10413 100644 --- a/internal/msgqueue/rabbitmq/rabbitmq.go +++ b/internal/msgqueue/rabbitmq/rabbitmq.go @@ -87,7 +87,7 @@ func defaultMessageQueueImplOpts() *MessageQueueImplOpts { disableTenantExchangePubs: false, deadLetterBackoff: 5 * time.Second, enableMessageRejection: false, - maxDeathCount: 5, + maxDeathCount: 1000, } }