From 996a851cf67347fd863c5c1800d0cb04a973b32a Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Tue, 16 Jan 2024 14:42:10 +0100
Subject: [PATCH] chore: format username as string in log formatter

---
 apps/emqx/src/emqx_logger_textfmt.erl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/emqx/src/emqx_logger_textfmt.erl b/apps/emqx/src/emqx_logger_textfmt.erl
index 2e8718c37..08e6c8d56 100644
--- a/apps/emqx/src/emqx_logger_textfmt.erl
+++ b/apps/emqx/src/emqx_logger_textfmt.erl
@@ -48,12 +48,17 @@ is_list_report_acceptable(_) ->
 
 enrich_report(ReportRaw, Meta) ->
     %% clientid and peername always in emqx_conn's process metadata.
-    %% topic can be put in meta using ?SLOG/3, or put in msg's report by ?SLOG/2
+    %% topic and username can be put in meta using ?SLOG/3, or put in msg's report by ?SLOG/2
     Topic =
         case maps:get(topic, Meta, undefined) of
             undefined -> maps:get(topic, ReportRaw, undefined);
             Topic0 -> Topic0
         end,
+    Username =
+        case maps:get(username, Meta, undefined) of
+            undefined -> maps:get(username, ReportRaw, undefined);
+            Username0 -> Username0
+        end,
     ClientId = maps:get(clientid, Meta, undefined),
     Peer = maps:get(peername, Meta, undefined),
     MFA = emqx_utils:format_mfal(Meta),
@@ -64,8 +69,9 @@ enrich_report(ReportRaw, Meta) ->
             ({_, undefined}, Acc) -> Acc;
             (Item, Acc) -> [Item | Acc]
         end,
-        maps:to_list(maps:without([topic, msg, clientid], ReportRaw)),
+        maps:to_list(maps:without([topic, msg, clientid, username], ReportRaw)),
         [
+            {username, try_format_unicode(Username)},
             {topic, try_format_unicode(Topic)},
             {clientid, try_format_unicode(ClientId)},
             {peername, Peer},