From 646eda0802c9b0b91118332bdbe8f3d9f5713209 Mon Sep 17 00:00:00 2001
From: Diana Parra Corbacho <diana.parra-corbacho@broadcom.com>
Date: Tue, 7 Oct 2025 16:31:08 +0200
Subject: [PATCH] Shovel bugfix: increase forwarded counter for amqp10 protocol

---
 deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl b/deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl
index 229c475d7f..7cf725388a 100644
--- a/deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl
+++ b/deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl
@@ -341,15 +341,16 @@ forward(Tag, Msg0,
     Msg3 = amqp10_raw_msg:new(AckMode =/= on_confirm, Tag, iolist_to_binary(Msg2)),
     case send_msg(Link, Msg3) of
         ok ->
+            #{dest := Dst1} = State1 = rabbit_shovel_behaviour:incr_forwarded(State),
             rabbit_shovel_behaviour:decr_remaining_unacked(
               case AckMode of
                   no_ack ->
-                      rabbit_shovel_behaviour:decr_remaining(1, State);
+                      rabbit_shovel_behaviour:decr_remaining(1, State1);
                   on_confirm ->
-                      State#{dest => Dst#{unacked => Unacked#{OutTag => Tag}}};
+                      State1#{dest => Dst1#{unacked => Unacked#{OutTag => Tag}}};
                   on_publish ->
-                      State1 = rabbit_shovel_behaviour:ack(Tag, false, State),
-                      rabbit_shovel_behaviour:decr_remaining(1, State1)
+                      State2 = rabbit_shovel_behaviour:ack(Tag, false, State1),
+                      rabbit_shovel_behaviour:decr_remaining(1, State2)
               end);
         Stop ->
             Stop