From a24b44347ac0ec93178e9bd9d6ba2d277dcba7e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= <acogoluegnes@gmail.com>
Date: Tue, 6 Jun 2023 13:04:35 +0200
Subject: [PATCH] Polish authentication in stream reader

(cherry picked from commit 6c14d736abb66dd2db2d0740cdc7daa61d7f7e1d)
---
 deps/rabbitmq_stream/src/rabbit_stream_reader.erl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/deps/rabbitmq_stream/src/rabbit_stream_reader.erl b/deps/rabbitmq_stream/src/rabbit_stream_reader.erl
index 923c25405b37..eb5e35c7b89a 100644
--- a/deps/rabbitmq_stream/src/rabbit_stream_reader.erl
+++ b/deps/rabbitmq_stream/src/rabbit_stream_reader.erl
@@ -64,6 +64,7 @@
          %% client port
          peer_port,
          auth_mechanism,
+         authentication_state :: any(),
          connected_at :: integer(),
          helper_sup :: pid(),
          socket :: rabbit_net:socket(),
@@ -75,7 +76,6 @@
          stream_leaders :: #{stream() => pid()},
          stream_subscriptions :: #{stream() => [subscription_id()]},
          credits :: atomics:atomics_ref(),
-         authentication_state :: any(),
          user :: undefined | #user{},
          virtual_host :: undefined | binary(),
          connection_step ::
@@ -1426,9 +1426,6 @@ handle_frame_pre_auth(Transport,
                             {C1#stream_connection{connection_step = failure},
                              {sasl_authenticate, ?RESPONSE_SASL_ERROR, <<>>}};
                         {challenge, Challenge, AuthState1} ->
-                            rabbit_core_metrics:auth_attempt_succeeded(Host,
-                                                                       <<>>,
-                                                                       stream),
                             {C1#stream_connection{authentication_state = AuthState1,
                                                   connection_step = authenticating},
                              {sasl_authenticate, ?RESPONSE_SASL_CHALLENGE,