Fix conflict

The message size histogram metric is available on main and will ship in RabbitMQ 4.1, but isn't available in RabbitMQ v4.0.x
rabbitmq · Sep 27, 2024 · 7e6a666 · 7e6a666
1 parent 48ebf7b
commit 7e6a666
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/deps/rabbit/src/rabbit_amqp_session.erl b/deps/rabbit/src/rabbit_amqp_session.erl
@@ -2341,14 +2341,8 @@ incoming_link_transfer(
     end,
     validate_transfer_snd_settle_mode(SndSettleMode, Settled),
     validate_transfer_rcv_settle_mode(RcvSettleMode, Settled),
-<<<<<<< HEAD
     validate_message_size(PayloadBin, MaxMessageSize),
-=======
-    PayloadSize = iolist_size(PayloadBin),
-    validate_message_size(PayloadSize, MaxMessageSize),
-    rabbit_msg_size_metrics:observe(?PROTOCOL, PayloadSize),
     messages_received(Settled),
->>>>>>> 6863ae14dd (Comply with §2.2.2 of Anonymous Terminus extension)
 
     Mc0 = mc:init(mc_amqp, PayloadBin, #{}),
     case lookup_target(LinkExchange, LinkRKey, Mc0, Vhost, User, PermCache0) of