Rename x-redelivery-count to x-delivery-count to align with AMQP1.0

[#161057187]

Author: dcorbacho

src/rabbit_channel.erl

@@ -2492,4 +2492,4 @@ maybe_monitor_all(Items,  S) -> lists:foldl(fun maybe_monitor/2, S, Items).
 
 add_delivery_count_header(MsgHeader, Msg) ->
     Count = maps:get(delivery_count, MsgHeader, 0),
-    rabbit_basic:add_header(<<"x-redelivery-count">>, long, Count, Msg).
+    rabbit_basic:add_header(<<"x-delivery-count">>, long, Count, Msg).

src/rabbit_quorum_queue.erl

@@ -333,7 +333,7 @@ basic_get(#amqqueue{name = QName, pid = {Name, _} = Id, type = quorum}, NoAck,
         {ok, {MsgId, {MsgHeader, Msg0}}, QState} ->
             Count = maps:get(delivery_count, MsgHeader, 0),
             IsDelivered = Count > 0,
-            Msg = rabbit_basic:add_header(<<"x-redelivery-count">>, long, Count, Msg0),
+            Msg = rabbit_basic:add_header(<<"x-delivery-count">>, long, Count, Msg0),
             {ok, quorum_messages(Name), {QName, Id, MsgId, IsDelivered, Msg}, QState};
         {timeout, _} ->
             {error, timeout}

test/quorum_queue_SUITE.erl

@@ -1650,7 +1650,7 @@ subscribe_redelivery_count(Config) ->
     wait_for_messages_pending_ack(Servers, RaName, 0),
     subscribe(Ch, QQ, false),
 
-    DTag = <<"x-redelivery-count">>,
+    DTag = <<"x-delivery-count">>,
     receive
         {#'basic.deliver'{delivery_tag = DeliveryTag,
                           redelivered  = false},
@@ -1695,7 +1695,7 @@ consume_redelivery_count(Config) ->
     wait_for_messages_ready(Servers, RaName, 1),
     wait_for_messages_pending_ack(Servers, RaName, 0),
 
-    DTag = <<"x-redelivery-count">>,
+    DTag = <<"x-delivery-count">>,
 
     {#'basic.get_ok'{delivery_tag = DeliveryTag,
                      redelivered = false},