From c68909767a90dbf414260baa400c42d8c8483bc7 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Mon, 10 Apr 2023 10:07:58 +0800
Subject: [PATCH 001/110] feat: more straightforward log for force_shutdown
 reason

---
 apps/emqx/src/emqx_misc.erl        |  2 +-
 apps/emqx/src/emqx_schema.erl      | 18 ++++++++++--------
 apps/emqx/test/emqx_misc_SUITE.erl |  5 ++++-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/apps/emqx/src/emqx_misc.erl b/apps/emqx/src/emqx_misc.erl
index cdd62df11..d0c7397c8 100644
--- a/apps/emqx/src/emqx_misc.erl
+++ b/apps/emqx/src/emqx_misc.erl
@@ -246,7 +246,7 @@ do_check_oom([]) ->
     ok;
 do_check_oom([{Val, Max, Reason} | Rest]) ->
     case is_integer(Max) andalso (0 < Max) andalso (Max < Val) of
-        true -> {shutdown, Reason};
+        true -> {shutdown, #{reason => Reason, value => Val, max => Max}};
         false -> do_check_oom(Rest)
     end.
 
diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 6bfff38d3..354e903a8 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -2642,20 +2642,22 @@ to_atom(Str) when is_list(Str) ->
 to_atom(Bin) when is_binary(Bin) ->
     binary_to_atom(Bin, utf8).
 
-validate_heap_size(Siz) ->
+validate_heap_size(Siz) when is_integer(Siz) ->
     MaxSiz =
         case erlang:system_info(wordsize) of
             % arch_64
-            8 ->
-                (1 bsl 59) - 1;
+            8 -> (1 bsl 59) - 1;
             % arch_32
-            4 ->
-                (1 bsl 27) - 1
+            4 -> (1 bsl 27) - 1
         end,
     case Siz > MaxSiz of
-        true -> error(io_lib:format("force_shutdown_policy: heap-size ~ts is too large", [Siz]));
-        false -> ok
-    end.
+        true ->
+            {error, #{reason => max_heap_size_too_large, maximum => MaxSiz}};
+        false ->
+            ok
+    end;
+validate_heap_size(_SizStr) ->
+    {error, invalid_heap_size}.
 
 validate_alarm_actions(Actions) ->
     UnSupported = lists:filter(
diff --git a/apps/emqx/test/emqx_misc_SUITE.erl b/apps/emqx/test/emqx_misc_SUITE.erl
index c2bd751fa..c068a087e 100644
--- a/apps/emqx/test/emqx_misc_SUITE.erl
+++ b/apps/emqx/test/emqx_misc_SUITE.erl
@@ -146,7 +146,10 @@ t_check(_) ->
     [self() ! {msg, I} || I <- lists:seq(1, 5)],
     ?assertEqual(ok, emqx_misc:check_oom(Policy)),
     [self() ! {msg, I} || I <- lists:seq(1, 6)],
-    ?assertEqual({shutdown, message_queue_too_long}, emqx_misc:check_oom(Policy)).
+    ?assertEqual(
+        {shutdown, #{reason => message_queue_too_long, value => 11, max => 10}},
+        emqx_misc:check_oom(Policy)
+    ).
 
 drain() ->
     drain([]).

From e70deae1c3f9788c45c37730ea07838f71e9d77d Mon Sep 17 00:00:00 2001
From: Andrew Mayorov <encube.ul@gmail.com>
Date: Mon, 10 Apr 2023 17:59:33 +0300
Subject: [PATCH 002/110] feat(resource): ask for metrics only when needed

---
 apps/emqx/priv/bpapi.versions                 |   1 +
 apps/emqx_authn/src/emqx_authn_api.erl        |   4 +-
 .../emqx_authz/src/emqx_authz_api_sources.erl |   4 +-
 apps/emqx_bridge/src/emqx_bridge.erl          |   5 +-
 apps/emqx_bridge/src/emqx_bridge_api.erl      | 141 +++++++++---------
 .../src/proto/emqx_bridge_proto_v3.erl        |   4 +
 .../src/proto/emqx_bridge_proto_v4.erl        | 135 +++++++++++++++++
 .../test/emqx_bridge_api_SUITE.erl            |  15 +-
 apps/emqx_resource/src/emqx_resource.erl      |   8 +-
 .../src/emqx_resource_manager.erl             |  16 +-
 .../test/emqx_resource_SUITE.erl              |   6 +-
 11 files changed, 239 insertions(+), 100 deletions(-)
 create mode 100644 apps/emqx_bridge/src/proto/emqx_bridge_proto_v4.erl

diff --git a/apps/emqx/priv/bpapi.versions b/apps/emqx/priv/bpapi.versions
index 6190925d2..041ed8ced 100644
--- a/apps/emqx/priv/bpapi.versions
+++ b/apps/emqx/priv/bpapi.versions
@@ -5,6 +5,7 @@
 {emqx_bridge,1}.
 {emqx_bridge,2}.
 {emqx_bridge,3}.
+{emqx_bridge,4}.
 {emqx_broker,1}.
 {emqx_cm,1}.
 {emqx_conf,1}.
diff --git a/apps/emqx_authn/src/emqx_authn_api.erl b/apps/emqx_authn/src/emqx_authn_api.erl
index ad9cd8579..fc026a671 100644
--- a/apps/emqx_authn/src/emqx_authn_api.erl
+++ b/apps/emqx_authn/src/emqx_authn_api.erl
@@ -872,8 +872,8 @@ lookup_from_local_node(ChainName, AuthenticatorID) ->
                     case emqx_resource:get_instance(ResourceId) of
                         {error, not_found} ->
                             {error, {NodeId, not_found_resource}};
-                        {ok, _, #{status := Status, metrics := ResourceMetrics}} ->
-                            {ok, {NodeId, Status, Metrics, ResourceMetrics}}
+                        {ok, _, #{status := Status}} ->
+                            {ok, {NodeId, Status, Metrics, emqx_resource:get_metrics(ResourceId)}}
                     end
             end;
         {error, Reason} ->
diff --git a/apps/emqx_authz/src/emqx_authz_api_sources.erl b/apps/emqx_authz/src/emqx_authz_api_sources.erl
index 58fa471fc..0c2dee340 100644
--- a/apps/emqx_authz/src/emqx_authz_api_sources.erl
+++ b/apps/emqx_authz/src/emqx_authz_api_sources.erl
@@ -344,8 +344,8 @@ lookup_from_local_node(Type) ->
             case emqx_resource:get_instance(ResourceId) of
                 {error, not_found} ->
                     {error, {NodeId, not_found_resource}};
-                {ok, _, #{status := Status, metrics := ResourceMetrics}} ->
-                    {ok, {NodeId, Status, Metrics, ResourceMetrics}}
+                {ok, _, #{status := Status}} ->
+                    {ok, {NodeId, Status, Metrics, emqx_resource:get_metrics(ResourceId)}}
             end;
         _ ->
             Metrics = emqx_metrics_worker:get_metrics(authz_metrics, Type),
diff --git a/apps/emqx_bridge/src/emqx_bridge.erl b/apps/emqx_bridge/src/emqx_bridge.erl
index bf91d20f7..6ff81a10b 100644
--- a/apps/emqx_bridge/src/emqx_bridge.erl
+++ b/apps/emqx_bridge/src/emqx_bridge.erl
@@ -34,7 +34,7 @@
     unload/0,
     lookup/1,
     lookup/2,
-    lookup/3,
+    get_metrics/2,
     create/3,
     disable_enable/3,
     remove/2,
@@ -271,6 +271,9 @@ lookup(Type, Name, RawConf) ->
             }}
     end.
 
+get_metrics(Type, Name) ->
+    emqx_resource:get_metrics(emqx_bridge_resource:resource_id(Type, Name)).
+
 maybe_upgrade(mqtt, Config) ->
     emqx_bridge_compatible_config:maybe_upgrade(Config);
 maybe_upgrade(webhook, Config) ->
diff --git a/apps/emqx_bridge/src/emqx_bridge_api.erl b/apps/emqx_bridge/src/emqx_bridge_api.erl
index 44a478bca..b29cefacd 100644
--- a/apps/emqx_bridge/src/emqx_bridge_api.erl
+++ b/apps/emqx_bridge/src/emqx_bridge_api.erl
@@ -46,6 +46,7 @@
 ]).
 
 -export([lookup_from_local_node/2]).
+-export([get_metrics_from_local_node/2]).
 
 -define(BRIDGE_NOT_ENABLED,
     ?BAD_REQUEST(<<"Forbidden operation, bridge not enabled">>)
@@ -467,7 +468,7 @@ schema("/bridges_probe") ->
     end;
 '/bridges'(get, _Params) ->
     Nodes = mria:running_nodes(),
-    NodeReplies = emqx_bridge_proto_v3:list_bridges_on_nodes(Nodes),
+    NodeReplies = emqx_bridge_proto_v4:list_bridges_on_nodes(Nodes),
     case is_ok(NodeReplies) of
         {ok, NodeBridges} ->
             AllBridges = [
@@ -524,7 +525,7 @@ schema("/bridges_probe") ->
     ).
 
 '/bridges/:id/metrics'(get, #{bindings := #{id := Id}}) ->
-    ?TRY_PARSE_ID(Id, lookup_from_all_nodes_metrics(BridgeType, BridgeName, 200)).
+    ?TRY_PARSE_ID(Id, get_metrics_from_all_nodes(BridgeType, BridgeName)).
 
 '/bridges/:id/metrics/reset'(put, #{bindings := #{id := Id}}) ->
     ?TRY_PARSE_ID(
@@ -564,19 +565,21 @@ maybe_deobfuscate_bridge_probe(#{<<"type">> := BridgeType, <<"name">> := BridgeN
 maybe_deobfuscate_bridge_probe(Params) ->
     Params.
 
-lookup_from_all_nodes(BridgeType, BridgeName, SuccCode) ->
-    FormatFun = fun format_bridge_info/1,
-    do_lookup_from_all_nodes(BridgeType, BridgeName, SuccCode, FormatFun).
-
-lookup_from_all_nodes_metrics(BridgeType, BridgeName, SuccCode) ->
-    FormatFun = fun format_bridge_metrics/1,
-    do_lookup_from_all_nodes(BridgeType, BridgeName, SuccCode, FormatFun).
-
-do_lookup_from_all_nodes(BridgeType, BridgeName, SuccCode, FormatFun) ->
+get_metrics_from_all_nodes(BridgeType, BridgeName) ->
     Nodes = mria:running_nodes(),
-    case is_ok(emqx_bridge_proto_v3:lookup_from_all_nodes(Nodes, BridgeType, BridgeName)) of
+    Result = do_bpapi_call(all, get_metrics_from_all_nodes, [Nodes, BridgeType, BridgeName]),
+    case Result of
+        Metrics when is_list(Metrics) ->
+            {200, format_bridge_metrics(lists:zip(Nodes, Metrics))};
+        {error, Reason} ->
+            ?INTERNAL_ERROR(Reason)
+    end.
+
+lookup_from_all_nodes(BridgeType, BridgeName, SuccCode) ->
+    Nodes = mria:running_nodes(),
+    case is_ok(emqx_bridge_proto_v4:lookup_from_all_nodes(Nodes, BridgeType, BridgeName)) of
         {ok, [{ok, _} | _] = Results} ->
-            {SuccCode, FormatFun([R || {ok, R} <- Results])};
+            {SuccCode, format_bridge_info([R || {ok, R} <- Results])};
         {ok, [{error, not_found} | _]} ->
             ?BRIDGE_NOT_FOUND(BridgeType, BridgeName);
         {error, Reason} ->
@@ -603,6 +606,9 @@ create_or_update_bridge(BridgeType, BridgeName, Conf, HttpStatusCode) ->
             ?BAD_REQUEST(map_to_json(Reason))
     end.
 
+get_metrics_from_local_node(BridgeType, BridgeName) ->
+    format_metrics(emqx_bridge:get_metrics(BridgeType, BridgeName)).
+
 '/bridges/:id/enable/:enable'(put, #{bindings := #{id := Id, enable := Enable}}) ->
     ?TRY_PARSE_ID(
         Id,
@@ -739,7 +745,7 @@ pick_bridges_by_id(Type, Name, BridgesAllNodes) ->
     ).
 
 format_bridge_info([FirstBridge | _] = Bridges) ->
-    Res = maps:without([node, metrics], FirstBridge),
+    Res = maps:remove(node, FirstBridge),
     NodeStatus = node_status(Bridges),
     redact(Res#{
         status => aggregate_status(NodeStatus),
@@ -766,7 +772,7 @@ aggregate_status(AllStatus) ->
     end.
 
 collect_metrics(Bridges) ->
-    [maps:with([node, metrics], B) || B <- Bridges].
+    [#{node => Node, metrics => Metrics} || {Node, Metrics} <- Bridges].
 
 aggregate_metrics(AllMetrics) ->
     InitMetrics = ?EMPTY_METRICS,
@@ -800,9 +806,7 @@ aggregate_metrics(
         M15 + N15,
         M16 + N16,
         M17 + N17
-    );
-aggregate_metrics(#{}, Metrics) ->
-    Metrics.
+    ).
 
 format_resource(
     #{
@@ -826,63 +830,57 @@ format_resource(
     ).
 
 format_resource_data(ResData) ->
-    maps:fold(fun format_resource_data/3, #{}, maps:with([status, metrics, error], ResData)).
+    maps:fold(fun format_resource_data/3, #{}, maps:with([status, error], ResData)).
 
 format_resource_data(error, undefined, Result) ->
     Result;
 format_resource_data(error, Error, Result) ->
     Result#{status_reason => emqx_misc:readable_error_msg(Error)};
-format_resource_data(
-    metrics,
-    #{
-        counters := #{
-            'dropped' := Dropped,
-            'dropped.other' := DroppedOther,
-            'dropped.expired' := DroppedExpired,
-            'dropped.queue_full' := DroppedQueueFull,
-            'dropped.resource_not_found' := DroppedResourceNotFound,
-            'dropped.resource_stopped' := DroppedResourceStopped,
-            'matched' := Matched,
-            'retried' := Retried,
-            'late_reply' := LateReply,
-            'failed' := SentFailed,
-            'success' := SentSucc,
-            'received' := Rcvd
-        },
-        gauges := Gauges,
-        rate := #{
-            matched := #{current := Rate, last5m := Rate5m, max := RateMax}
-        }
-    },
-    Result
-) ->
-    Queued = maps:get('queuing', Gauges, 0),
-    SentInflight = maps:get('inflight', Gauges, 0),
-    Result#{
-        metrics =>
-            ?METRICS(
-                Dropped,
-                DroppedOther,
-                DroppedExpired,
-                DroppedQueueFull,
-                DroppedResourceNotFound,
-                DroppedResourceStopped,
-                Matched,
-                Queued,
-                Retried,
-                LateReply,
-                SentFailed,
-                SentInflight,
-                SentSucc,
-                Rate,
-                Rate5m,
-                RateMax,
-                Rcvd
-            )
-    };
 format_resource_data(K, V, Result) ->
     Result#{K => V}.
 
+format_metrics(#{
+    counters := #{
+        'dropped' := Dropped,
+        'dropped.other' := DroppedOther,
+        'dropped.expired' := DroppedExpired,
+        'dropped.queue_full' := DroppedQueueFull,
+        'dropped.resource_not_found' := DroppedResourceNotFound,
+        'dropped.resource_stopped' := DroppedResourceStopped,
+        'matched' := Matched,
+        'retried' := Retried,
+        'late_reply' := LateReply,
+        'failed' := SentFailed,
+        'success' := SentSucc,
+        'received' := Rcvd
+    },
+    gauges := Gauges,
+    rate := #{
+        matched := #{current := Rate, last5m := Rate5m, max := RateMax}
+    }
+}) ->
+    Queued = maps:get('queuing', Gauges, 0),
+    SentInflight = maps:get('inflight', Gauges, 0),
+    ?METRICS(
+        Dropped,
+        DroppedOther,
+        DroppedExpired,
+        DroppedQueueFull,
+        DroppedResourceNotFound,
+        DroppedResourceStopped,
+        Matched,
+        Queued,
+        Retried,
+        LateReply,
+        SentFailed,
+        SentInflight,
+        SentSucc,
+        Rate,
+        Rate5m,
+        RateMax,
+        Rcvd
+    ).
+
 fill_defaults(Type, RawConf) ->
     PackedConf = pack_bridge_conf(Type, RawConf),
     FullConf = emqx_config:fill_defaults(emqx_bridge_schema, PackedConf, #{}),
@@ -990,7 +988,7 @@ do_bpapi_call(Node, Call, Args) ->
 do_bpapi_call_vsn(SupportedVersion, Call, Args) ->
     case lists:member(SupportedVersion, supported_versions(Call)) of
         true ->
-            apply(emqx_bridge_proto_v3, Call, Args);
+            apply(emqx_bridge_proto_v4, Call, Args);
         false ->
             {error, not_implemented}
     end.
@@ -1000,9 +998,10 @@ maybe_unwrap({error, not_implemented}) ->
 maybe_unwrap(RpcMulticallResult) ->
     emqx_rpc:unwrap_erpc(RpcMulticallResult).
 
-supported_versions(start_bridge_to_node) -> [2, 3];
-supported_versions(start_bridges_to_all_nodes) -> [2, 3];
-supported_versions(_Call) -> [1, 2, 3].
+supported_versions(start_bridge_to_node) -> [2, 3, 4];
+supported_versions(start_bridges_to_all_nodes) -> [2, 3, 4];
+supported_versions(get_metrics_from_all_nodes) -> [4];
+supported_versions(_Call) -> [1, 2, 3, 4].
 
 redact(Term) ->
     emqx_misc:redact(Term).
diff --git a/apps/emqx_bridge/src/proto/emqx_bridge_proto_v3.erl b/apps/emqx_bridge/src/proto/emqx_bridge_proto_v3.erl
index a35db5d96..0b496364a 100644
--- a/apps/emqx_bridge/src/proto/emqx_bridge_proto_v3.erl
+++ b/apps/emqx_bridge/src/proto/emqx_bridge_proto_v3.erl
@@ -20,6 +20,7 @@
 
 -export([
     introduced_in/0,
+    deprecated_since/0,
 
     list_bridges/1,
     list_bridges_on_nodes/1,
@@ -39,6 +40,9 @@
 introduced_in() ->
     "5.0.21".
 
+deprecated_since() ->
+    "5.0.22".
+
 -spec list_bridges(node()) -> list() | emqx_rpc:badrpc().
 list_bridges(Node) ->
     rpc:call(Node, emqx_bridge, list, [], ?TIMEOUT).
diff --git a/apps/emqx_bridge/src/proto/emqx_bridge_proto_v4.erl b/apps/emqx_bridge/src/proto/emqx_bridge_proto_v4.erl
new file mode 100644
index 000000000..937065e41
--- /dev/null
+++ b/apps/emqx_bridge/src/proto/emqx_bridge_proto_v4.erl
@@ -0,0 +1,135 @@
+%%--------------------------------------------------------------------
+%% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%--------------------------------------------------------------------
+
+-module(emqx_bridge_proto_v4).
+
+-behaviour(emqx_bpapi).
+
+-export([
+    introduced_in/0,
+
+    list_bridges_on_nodes/1,
+    restart_bridge_to_node/3,
+    start_bridge_to_node/3,
+    stop_bridge_to_node/3,
+    lookup_from_all_nodes/3,
+    get_metrics_from_all_nodes/3,
+    restart_bridges_to_all_nodes/3,
+    start_bridges_to_all_nodes/3,
+    stop_bridges_to_all_nodes/3
+]).
+
+-include_lib("emqx/include/bpapi.hrl").
+
+-define(TIMEOUT, 15000).
+
+introduced_in() ->
+    "5.0.22".
+
+-spec list_bridges_on_nodes([node()]) ->
+    emqx_rpc:erpc_multicall([emqx_resource:resource_data()]).
+list_bridges_on_nodes(Nodes) ->
+    erpc:multicall(Nodes, emqx_bridge, list, [], ?TIMEOUT).
+
+-type key() :: atom() | binary() | [byte()].
+
+-spec restart_bridge_to_node(node(), key(), key()) ->
+    term().
+restart_bridge_to_node(Node, BridgeType, BridgeName) ->
+    rpc:call(
+        Node,
+        emqx_bridge_resource,
+        restart,
+        [BridgeType, BridgeName],
+        ?TIMEOUT
+    ).
+
+-spec start_bridge_to_node(node(), key(), key()) ->
+    term().
+start_bridge_to_node(Node, BridgeType, BridgeName) ->
+    rpc:call(
+        Node,
+        emqx_bridge_resource,
+        start,
+        [BridgeType, BridgeName],
+        ?TIMEOUT
+    ).
+
+-spec stop_bridge_to_node(node(), key(), key()) ->
+    term().
+stop_bridge_to_node(Node, BridgeType, BridgeName) ->
+    rpc:call(
+        Node,
+        emqx_bridge_resource,
+        stop,
+        [BridgeType, BridgeName],
+        ?TIMEOUT
+    ).
+
+-spec restart_bridges_to_all_nodes([node()], key(), key()) ->
+    emqx_rpc:erpc_multicall().
+restart_bridges_to_all_nodes(Nodes, BridgeType, BridgeName) ->
+    erpc:multicall(
+        Nodes,
+        emqx_bridge_resource,
+        restart,
+        [BridgeType, BridgeName],
+        ?TIMEOUT
+    ).
+
+-spec start_bridges_to_all_nodes([node()], key(), key()) ->
+    emqx_rpc:erpc_multicall().
+start_bridges_to_all_nodes(Nodes, BridgeType, BridgeName) ->
+    erpc:multicall(
+        Nodes,
+        emqx_bridge_resource,
+        start,
+        [BridgeType, BridgeName],
+        ?TIMEOUT
+    ).
+
+-spec stop_bridges_to_all_nodes([node()], key(), key()) ->
+    emqx_rpc:erpc_multicall().
+stop_bridges_to_all_nodes(Nodes, BridgeType, BridgeName) ->
+    erpc:multicall(
+        Nodes,
+        emqx_bridge_resource,
+        stop,
+        [BridgeType, BridgeName],
+        ?TIMEOUT
+    ).
+
+-spec lookup_from_all_nodes([node()], key(), key()) ->
+    emqx_rpc:erpc_multicall().
+lookup_from_all_nodes(Nodes, BridgeType, BridgeName) ->
+    erpc:multicall(
+        Nodes,
+        emqx_bridge_api,
+        lookup_from_local_node,
+        [BridgeType, BridgeName],
+        ?TIMEOUT
+    ).
+
+-spec get_metrics_from_all_nodes([node()], key(), key()) ->
+    emqx_rpc:erpc_multicall(emqx_metrics_worker:metrics()).
+get_metrics_from_all_nodes(Nodes, BridgeType, BridgeName) ->
+    erpc:multicall(
+        Nodes,
+        emqx_bridge_api,
+        get_metrics_from_local_node,
+        [BridgeType, BridgeName],
+        ?TIMEOUT
+    ).
diff --git a/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl b/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl
index 8899cd24a..4d5495ffe 100644
--- a/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl
+++ b/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl
@@ -1201,13 +1201,16 @@ t_metrics(Config) ->
         request_json(get, uri(["bridges", BridgeID, "metrics"]), Config)
     ),
 
-    %% check that metrics isn't returned when listing all bridges
+    %% check for absence of metrics when listing all bridges
     {ok, 200, Bridges} = request_json(get, uri(["bridges"]), Config),
-    ?assert(
-        lists:all(
-            fun(E) -> not maps:is_key(<<"metrics">>, E) end,
-            Bridges
-        )
+    ?assertNotMatch(
+        [
+            #{
+                <<"metrics">> := #{},
+                <<"node_metrics">> := [_ | _]
+            }
+        ],
+        Bridges
     ),
     ok.
 
diff --git a/apps/emqx_resource/src/emqx_resource.erl b/apps/emqx_resource/src/emqx_resource.erl
index 0f7e93a9b..054bd228b 100644
--- a/apps/emqx_resource/src/emqx_resource.erl
+++ b/apps/emqx_resource/src/emqx_resource.erl
@@ -103,6 +103,7 @@
     list_instances_verbose/0,
     %% return the data of the instance
     get_instance/1,
+    get_metrics/1,
     fetch_creation_opts/1,
     %% return all the instances of the same resource type
     list_instances_by_type/1,
@@ -311,7 +312,12 @@ set_resource_status_connecting(ResId) ->
 -spec get_instance(resource_id()) ->
     {ok, resource_group(), resource_data()} | {error, Reason :: term()}.
 get_instance(ResId) ->
-    emqx_resource_manager:lookup_cached(ResId, [metrics]).
+    emqx_resource_manager:lookup_cached(ResId).
+
+-spec get_metrics(resource_id()) ->
+    emqx_metrics_worker:metrics().
+get_metrics(ResId) ->
+    emqx_resource_manager:get_metrics(ResId).
 
 -spec fetch_creation_opts(map()) -> creation_opts().
 fetch_creation_opts(Opts) ->
diff --git a/apps/emqx_resource/src/emqx_resource_manager.erl b/apps/emqx_resource/src/emqx_resource_manager.erl
index 6a4919b41..b5ccff05c 100644
--- a/apps/emqx_resource/src/emqx_resource_manager.erl
+++ b/apps/emqx_resource/src/emqx_resource_manager.erl
@@ -37,7 +37,6 @@
     list_all/0,
     list_group/1,
     lookup_cached/1,
-    lookup_cached/2,
     get_metrics/1,
     reset_metrics/1
 ]).
@@ -231,25 +230,14 @@ set_resource_status_connecting(ResId) ->
 -spec lookup(resource_id()) -> {ok, resource_group(), resource_data()} | {error, not_found}.
 lookup(ResId) ->
     case safe_call(ResId, lookup, ?T_LOOKUP) of
-        {error, timeout} -> lookup_cached(ResId, [metrics]);
+        {error, timeout} -> lookup_cached(ResId);
         Result -> Result
     end.
 
 %% @doc Lookup the group and data of a resource from the cache
 -spec lookup_cached(resource_id()) -> {ok, resource_group(), resource_data()} | {error, not_found}.
 lookup_cached(ResId) ->
-    lookup_cached(ResId, []).
-
-%% @doc Lookup the group and data of a resource from the cache
--spec lookup_cached(resource_id(), [Option]) ->
-    {ok, resource_group(), resource_data()} | {error, not_found}
-when
-    Option :: metrics.
-lookup_cached(ResId, Options) ->
-    NeedMetrics = lists:member(metrics, Options),
     case read_cache(ResId) of
-        {Group, Data} when NeedMetrics ->
-            {ok, Group, data_record_to_external_map_with_metrics(Data)};
         {Group, Data} ->
             {ok, Group, data_record_to_external_map(Data)};
         not_found ->
@@ -366,7 +354,7 @@ handle_event({call, From}, {remove, ClearMetrics}, _State, Data) ->
     handle_remove_event(From, ClearMetrics, Data);
 % Called when the state-data of the resource is being looked up.
 handle_event({call, From}, lookup, _State, #data{group = Group} = Data) ->
-    Reply = {ok, Group, data_record_to_external_map_with_metrics(Data)},
+    Reply = {ok, Group, data_record_to_external_map(Data)},
     {keep_state_and_data, [{reply, From, Reply}]};
 % Called when doing a manually health check.
 handle_event({call, From}, health_check, stopped, _Data) ->
diff --git a/apps/emqx_resource/test/emqx_resource_SUITE.erl b/apps/emqx_resource/test/emqx_resource_SUITE.erl
index 8638c381f..5d8e85697 100644
--- a/apps/emqx_resource/test/emqx_resource_SUITE.erl
+++ b/apps/emqx_resource/test/emqx_resource_SUITE.erl
@@ -349,7 +349,7 @@ t_query_counter_async_query(_) ->
             ?assertMatch([#{query := {query, _, get_counter, _, _}}], QueryTrace)
         end
     ),
-    {ok, _, #{metrics := #{counters := C}}} = emqx_resource:get_instance(?ID),
+    #{counters := C} = emqx_resource:get_metrics(?ID),
     ?assertMatch(#{matched := 1002, 'success' := 1002, 'failed' := 0}, C),
     ok = emqx_resource:remove_local(?ID).
 
@@ -402,7 +402,7 @@ t_query_counter_async_callback(_) ->
             ?assertMatch([#{query := {query, _, get_counter, _, _}}], QueryTrace)
         end
     ),
-    {ok, _, #{metrics := #{counters := C}}} = emqx_resource:get_instance(?ID),
+    #{counters := C} = emqx_resource:get_metrics(?ID),
     ?assertMatch(#{matched := 1002, 'success' := 1002, 'failed' := 0}, C),
     ?assertMatch(1000, ets:info(Tab0, size)),
     ?assert(
@@ -2702,7 +2702,7 @@ config() ->
     Config.
 
 tap_metrics(Line) ->
-    {ok, _, #{metrics := #{counters := C, gauges := G}}} = emqx_resource:get_instance(?ID),
+    #{counters := C, gauges := G} = emqx_resource:get_metrics(?ID),
     ct:pal("metrics (l. ~b): ~p", [Line, #{counters => C, gauges => G}]),
     #{counters => C, gauges => G}.
 

From 945c6bc757e06ac348a2f09b634b7a821632ed70 Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@gmail.com>
Date: Tue, 11 Apr 2023 17:26:33 +0800
Subject: [PATCH 003/110] docs: update gateway README

---
 apps/emqx_gateway/README.md | 54 ++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 10 deletions(-)

diff --git a/apps/emqx_gateway/README.md b/apps/emqx_gateway/README.md
index 57e8febab..581f0245d 100644
--- a/apps/emqx_gateway/README.md
+++ b/apps/emqx_gateway/README.md
@@ -1,4 +1,4 @@
-# emqx_gateway
+# Gateway
 
 EMQX Gateway is an application that managing all gateways in EMQX.
 
@@ -11,16 +11,42 @@ protocol access on EMQX. For example:
 - Configuration & Schema
 - HTTP/CLI management interfaces
 
-There are some standard implementations available, such as [Stomp](../emqx_stomp/README.md),
-[MQTT-SN](../emqx_mqttsn/README.md), [CoAP](../emqx_coap/README.md),
-and [LwM2M](../emqx_lwm2m/README.md) gateway.
-
 The emqx_gateway application depends on `emqx`, `emqx_authn`, `emqx_ctl` that
 provide the foundation for protocol access.
 
-## Three ways to create your gateway
+More introduction: [Extended Protocol Gateway](https://www.emqx.io/docs/en/v5.0/gateway/gateway.html)
 
-## Raw Erlang Application
+## Usage
+
+This application is just a Framework, we provide some standard implementations,
+such as [Stomp](../emqx_stomp/README.md), [MQTT-SN](../emqx_mqttsn/README.md),
+[CoAP](../emqx_coap/README.md) and [LwM2M](../emqx_lwm2m/README.md) gateway.
+
+These applications are all packaged by default in the EMQX distribution. If you
+need to start a certain gateway, you only need to enable it via
+Dashboard, HTTP API or emqx.conf file.
+
+For instance, enable the Stomp gateway in emqx.conf:
+```hocon
+gateway.stomp {
+
+  mountpoint = "stomp/"
+
+  listeners.tcp.default {
+    bind = 61613
+    acceptors = 16
+    max_connections = 1024000
+    max_conn_rate = 1000
+  }
+}
+```
+
+## How to develop your Gateway application
+
+There are three ways to develop Gateway application to accept your private protocol
+clients.
+
+### Raw Erlang Application
 
 This approach is the same as in EMQX 4.x. You need to implement an Erlang application,
 which is packaged in EMQX as a [Plugin](todo) or as a source code dependency.
@@ -30,7 +56,7 @@ and you can freely implement the features you need.
 
 Steps guide: [Implement Gateway via Raw Application](doc/implement_gateway_via_raw_appliction.md)
 
-## Respect emqx_gateway framework
+### Respect emqx_gateway framework
 
 Similar to the first approach, you still need to implement an application using Erlang
 and package it into EMQX.
@@ -43,7 +69,7 @@ by the emqx_gateway framework, even if it may require you to understand more det
 
 Steps guide: [Implement Gateway via Gateway framework](doc/implement_gateway_via_gateway_framekwork.md)
 
-## Use ExProto Gateway (Non-Erlang developers)
+### Use ExProto Gateway (Non-Erlang developers)
 
 If you want to implement your gateway using other programming languages such as
 Java, Python, Go, etc.
@@ -53,6 +79,14 @@ your device protocol and integrate it with EMQX.
 
 Refer to: [ExProto Gateway](../emqx_exproto/README.md)
 
-## Cookbook for emqx_gateway framework
+## Understard emqx_gateway framework
 
 *WIP*
+
+## Contributing
+
+Please see our [contributing.md](../../CONTRIBUTING.md).
+
+## License
+
+See [LICENSE](../../LICENSE)

From d5ae5ebfd824683c2a689b5eabee2cb7cd5a9e77 Mon Sep 17 00:00:00 2001
From: Andrew Mayorov <encube.ul@gmail.com>
Date: Tue, 11 Apr 2023 16:17:07 +0300
Subject: [PATCH 004/110] chore: add changelog entry

Co-Authored-By: ieQu1 <99872536+ieQu1@users.noreply.github.com>
---
 changes/ce/feat-10359.en.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes/ce/feat-10359.en.md

diff --git a/changes/ce/feat-10359.en.md b/changes/ce/feat-10359.en.md
new file mode 100644
index 000000000..21a253556
--- /dev/null
+++ b/changes/ce/feat-10359.en.md
@@ -0,0 +1 @@
+Metrics now are not implicitly collected in places where API handlers don't make any use of them. Instead, a separate backplane RPC gathers cluster-wide metrics.
\ No newline at end of file

From 80f964bdbe4bfa75fa9151e6ebe2d37a1e9e3548 Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@163.com>
Date: Wed, 12 Apr 2023 10:44:37 +0800
Subject: [PATCH 005/110] chore: update apps/emqx_gateway/README.md

Co-authored-by: Thales Macedo Garitezi <thalesmg@gmail.com>
---
 apps/emqx_gateway/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/emqx_gateway/README.md b/apps/emqx_gateway/README.md
index 581f0245d..5aed6421b 100644
--- a/apps/emqx_gateway/README.md
+++ b/apps/emqx_gateway/README.md
@@ -79,7 +79,7 @@ your device protocol and integrate it with EMQX.
 
 Refer to: [ExProto Gateway](../emqx_exproto/README.md)
 
-## Understard emqx_gateway framework
+## Understand emqx_gateway framework
 
 *WIP*
 

From f161399bccac08babef77b5741ea63abc8b3dd2a Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Thu, 6 Apr 2023 16:48:41 +0800
Subject: [PATCH 006/110] feat: deprecated trace config

---
 apps/emqx/src/emqx_schema.erl                 |  4 +-
 apps/emqx/src/emqx_trace/emqx_trace.erl       | 38 ++++++++++++--
 apps/emqx/src/emqx_trace/emqx_trace.hrl       |  2 +
 .../src/emqx_trace/emqx_trace_handler.erl     |  4 +-
 apps/emqx/test/emqx_trace_SUITE.erl           | 50 ++++++++++++++++++-
 .../src/emqx_mgmt_api_trace.erl               | 21 +++++++-
 .../test/emqx_mgmt_api_trace_SUITE.erl        |  7 +++
 7 files changed, 117 insertions(+), 9 deletions(-)

diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 20018b2d5..b0b316321 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -229,7 +229,7 @@ roots(low) ->
         {"trace",
             sc(
                 ref("trace"),
-                #{}
+                #{importance => ?IMPORTANCE_HIDDEN}
             )},
         {"crl_cache",
             sc(
@@ -1853,6 +1853,8 @@ fields("trace") ->
         {"payload_encode",
             sc(hoconsc:enum([hex, text, hidden]), #{
                 default => text,
+                deprecated => {since, "5.0.22"},
+                importance => ?IMPORTANCE_HIDDEN,
                 desc => ?DESC(fields_trace_payload_encode)
             })}
     ].
diff --git a/apps/emqx/src/emqx_trace/emqx_trace.erl b/apps/emqx/src/emqx_trace/emqx_trace.erl
index ea6736038..a185d1910 100644
--- a/apps/emqx/src/emqx_trace/emqx_trace.erl
+++ b/apps/emqx/src/emqx_trace/emqx_trace.erl
@@ -59,7 +59,8 @@
 -ifdef(TEST).
 -export([
     log_file/2,
-    find_closest_time/2
+    find_closest_time/2,
+    migrate_trace/0
 ]).
 -endif.
 
@@ -230,6 +231,7 @@ init([]) ->
         {attributes, record_info(fields, ?TRACE)}
     ]),
     ok = mria:wait_for_tables([?TRACE]),
+    migrate_trace(),
     {ok, _} = mnesia:subscribe({table, ?TRACE, simple}),
     ok = filelib:ensure_dir(filename:join([trace_dir(), dummy])),
     ok = filelib:ensure_dir(filename:join([zip_dir(), dummy])),
@@ -358,9 +360,10 @@ start_trace(Trace) ->
         name = Name,
         type = Type,
         filter = Filter,
-        start_at = Start
+        start_at = Start,
+        payload_encode = PayloadEncode
     } = Trace,
-    Who = #{name => Name, type => Type, filter => Filter},
+    Who = #{name => Name, type => Type, filter => Filter, payload_encode => PayloadEncode},
     emqx_trace_handler:install(Who, debug, log_file(Name, Start)).
 
 stop_trace(Finished, Started) ->
@@ -490,6 +493,8 @@ to_trace(#{type := ip_address, ip_address := Filter} = Trace, Rec) ->
     end;
 to_trace(#{type := Type}, _Rec) ->
     {error, io_lib:format("required ~s field", [Type])};
+to_trace(#{payload_encode := PayloadEncode} = Trace, Rec) ->
+    to_trace(maps:remove(payload_encode, Trace), Rec#?TRACE{payload_encode = PayloadEncode});
 to_trace(#{start_at := StartAt} = Trace, Rec) ->
     {ok, Sec} = to_system_second(StartAt),
     to_trace(maps:remove(start_at, Trace), Rec#?TRACE{start_at = Sec});
@@ -573,3 +578,30 @@ filter_cli_handler(Names) ->
 
 now_second() ->
     os:system_time(second).
+
+migrate_trace() ->
+    Fields = record_info(fields, ?TRACE),
+    case mnesia:table_info(emqx_trace, attributes) =:= Fields of
+        true ->
+            ok;
+        false ->
+            TransFun = fun(Trace) ->
+                case Trace of
+                    {?TRACE, Name, Type, Filter, Enable, StartAt, EndAt} ->
+                        #?TRACE{
+                            name = Name,
+                            type = Type,
+                            filter = Filter,
+                            enable = Enable,
+                            start_at = StartAt,
+                            end_at = EndAt,
+                            payload_encode = text,
+                            extra = #{}
+                        };
+                    #?TRACE{} ->
+                        Trace
+                end
+            end,
+            {atomic, ok} = mnesia:transform_table(?TRACE, TransFun, Fields, ?TRACE),
+            ok
+    end.
diff --git a/apps/emqx/src/emqx_trace/emqx_trace.hrl b/apps/emqx/src/emqx_trace/emqx_trace.hrl
index 096e786dd..62028bcc0 100644
--- a/apps/emqx/src/emqx_trace/emqx_trace.hrl
+++ b/apps/emqx/src/emqx_trace/emqx_trace.hrl
@@ -24,6 +24,8 @@
     filter ::
         emqx_types:topic() | emqx_types:clientid() | emqx_trace:ip_address() | undefined | '_',
     enable = true :: boolean() | '_',
+    payload_encode = text :: hex | text | hidden | '_',
+    extra = #{} :: map() | '_',
     start_at :: integer() | undefined | '_',
     end_at :: integer() | undefined | '_'
 }).
diff --git a/apps/emqx/src/emqx_trace/emqx_trace_handler.erl b/apps/emqx/src/emqx_trace/emqx_trace_handler.erl
index 9c2d2358e..7f586f7a4 100644
--- a/apps/emqx/src/emqx_trace/emqx_trace_handler.erl
+++ b/apps/emqx/src/emqx_trace/emqx_trace_handler.erl
@@ -160,14 +160,14 @@ filters(#{type := topic, filter := Filter, name := Name}) ->
 filters(#{type := ip_address, filter := Filter, name := Name}) ->
     [{ip_address, {fun ?MODULE:filter_ip_address/2, {ensure_list(Filter), Name}}}].
 
-formatter(#{type := _Type}) ->
+formatter(#{type := _Type, payload_encode := PayloadEncode}) ->
     {emqx_trace_formatter, #{
         %% template is for ?SLOG message not ?TRACE.
         template => [time, " [", level, "] ", msg, "\n"],
         single_line => true,
         max_size => unlimited,
         depth => unlimited,
-        payload_encode => payload_encode()
+        payload_encode => PayloadEncode
     }}.
 
 filter_traces(#{id := Id, level := Level, dst := Dst, filters := Filters}, Acc) ->
diff --git a/apps/emqx/test/emqx_trace_SUITE.erl b/apps/emqx/test/emqx_trace_SUITE.erl
index c66808132..3594f0651 100644
--- a/apps/emqx/test/emqx_trace_SUITE.erl
+++ b/apps/emqx/test/emqx_trace_SUITE.erl
@@ -24,7 +24,9 @@
 -include_lib("emqx/include/emqx.hrl").
 -include_lib("snabbkaffe/include/snabbkaffe.hrl").
 
--record(emqx_trace, {name, type, filter, enable = true, start_at, end_at}).
+-record(emqx_trace, {
+    name, type, filter, enable = true, payload_encode = text, extra = #{}, start_at, end_at
+}).
 
 %%--------------------------------------------------------------------
 %% Setups
@@ -97,7 +99,9 @@ t_base_create_delete(_Config) ->
             type => clientid,
             name => <<"name1">>,
             start_at => Now,
-            end_at => Now + 30 * 60
+            end_at => Now + 30 * 60,
+            payload_encode => text,
+            extra => #{}
         }
     ],
     ?assertEqual(ExpectFormat, emqx_trace:format([TraceRec])),
@@ -385,6 +389,48 @@ t_find_closed_time(_Config) ->
     ?assertEqual(1000, emqx_trace:find_closest_time(Traces, Now)),
     ok.
 
+t_migrate_trace(_Config) ->
+    build_new_trace_data(),
+    build_old_trace_data(),
+    reload(),
+    Traces = emqx_trace:format(emqx_trace:list()),
+    ?assertEqual(2, erlang:length(Traces)),
+    lists:foreach(
+        fun(#{name := Name, enable := Enable}) ->
+            ?assertEqual(true, Enable, Name)
+        end,
+        Traces
+    ),
+    LoggerIds = logger:get_handler_ids(),
+    lists:foreach(
+        fun(Id) ->
+            ?assertEqual(true, lists:member(Id, LoggerIds), LoggerIds)
+        end,
+        [
+            trace_topic_test_topic_migrate_new,
+            trace_topic_test_topic_migrate_old
+        ]
+    ),
+    ok.
+
+build_new_trace_data() ->
+    Now = erlang:system_time(second),
+    {ok, _} = emqx_trace:create([
+        {<<"name">>, <<"test_topic_migrate_new">>},
+        {<<"type">>, topic},
+        {<<"topic">>, <<"/test/migrate/new">>},
+        {<<"start_at">>, Now - 10}
+    ]).
+
+build_old_trace_data() ->
+    Now = erlang:system_time(second),
+    OldAttrs = [name, type, filter, enable, start_at, end_at],
+    {atomic, ok} = mnesia:transform_table(emqx_trace, ignore, OldAttrs, emqx_trace),
+    OldTrace =
+        {emqx_trace, <<"test_topic_migrate_old">>, topic, <<"topic">>, true, Now - 10, Now + 100},
+    ok = mnesia:dirty_write(OldTrace),
+    ok.
+
 reload() ->
     catch ok = gen_server:stop(emqx_trace),
     {ok, _Pid} = emqx_trace:start_link().
diff --git a/apps/emqx_management/src/emqx_mgmt_api_trace.erl b/apps/emqx_management/src/emqx_mgmt_api_trace.erl
index b93839b0b..73c767a52 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_trace.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_trace.erl
@@ -94,7 +94,8 @@ schema("/trace") ->
                 409 => emqx_dashboard_swagger:error_codes(
                     [
                         'ALREADY_EXISTS',
-                        'DUPLICATE_CONDITION'
+                        'DUPLICATE_CONDITION',
+                        'BAD_TYPE'
                     ],
                     <<"trace already exists">>
                 )
@@ -265,6 +266,19 @@ fields(trace) ->
                     example => running
                 }
             )},
+        {payload_encode,
+            hoconsc:mk(hoconsc:enum([hex, text, hidden]), #{
+                desc =>
+                    ""
+                    "Determine the format of the payload format in the trace file.<br/>\n"
+                    "`text`: Text-based protocol or plain text protocol.\n"
+                    " It is recommended when payload is JSON encoded.<br/>\n"
+                    "`hex`: Binary hexadecimal encode. It is recommended when payload is a custom binary protocol.<br/>\n"
+                    "`hidden`: payload is obfuscated as `******`"
+                    "",
+                default => text,
+                required => false
+            })},
         {start_at,
             hoconsc:mk(
                 emqx_datetime:epoch_second(),
@@ -421,6 +435,11 @@ trace(post, #{body := Param}) ->
                 code => 'DUPLICATE_CONDITION',
                 message => ?TO_BIN([Name, " Duplication Condition"])
             }};
+        {error, {bad_type, _}} ->
+            {409, #{
+                code => 'BAD_TYPE',
+                message => <<"Rolling upgrade in progress, create failed">>
+            }};
         {error, Reason} ->
             {400, #{
                 code => 'INVALID_PARAMS',
diff --git a/apps/emqx_management/test/emqx_mgmt_api_trace_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_trace_SUITE.erl
index 162d07aaa..7922bbb40 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_trace_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_trace_SUITE.erl
@@ -174,6 +174,13 @@ t_create_failed(_Config) ->
         {error, {"HTTP/1.1", 409, _}},
         request_api(post, api_path("trace"), [GoodName2 | Trace])
     ),
+    %% new name but bad payload-encode
+    GoodName3 = {<<"name">>, <<"test-name-2">>},
+    PayloadEncode = {<<"payload_encode">>, <<"bad">>},
+    ?assertMatch(
+        {error, {"HTTP/1.1", 400, _}},
+        request_api(post, api_path("trace"), [GoodName3, PayloadEncode | Trace])
+    ),
 
     unload(),
     emqx_trace:clear(),

From 45254c59362e9e0450abdd2e884bee509affb3af Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Wed, 12 Apr 2023 17:14:30 +0800
Subject: [PATCH 007/110] chore: add changelog for create trace

---
 apps/emqx/src/emqx_trace/emqx_trace_handler.erl  | 10 ++++++++--
 apps/emqx_management/src/emqx_mgmt_api_trace.erl |  3 ++-
 changes/ce/feat-10373.en.md                      |  2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 changes/ce/feat-10373.en.md

diff --git a/apps/emqx/src/emqx_trace/emqx_trace_handler.erl b/apps/emqx/src/emqx_trace/emqx_trace_handler.erl
index 7f586f7a4..231fd5e7b 100644
--- a/apps/emqx/src/emqx_trace/emqx_trace_handler.erl
+++ b/apps/emqx/src/emqx_trace/emqx_trace_handler.erl
@@ -44,7 +44,8 @@
 -type tracer() :: #{
     name := binary(),
     type := clientid | topic | ip_address,
-    filter := emqx_types:clientid() | emqx_types:topic() | emqx_trace:ip_address()
+    filter := emqx_types:clientid() | emqx_types:topic() | emqx_trace:ip_address(),
+    payload_encode := text | hidden | hex
 }.
 
 -define(CONFIG(_LogFile_), #{
@@ -70,7 +71,12 @@
     LogFilePath :: string()
 ) -> ok | {error, term()}.
 install(Name, Type, Filter, Level, LogFile) ->
-    Who = #{type => Type, filter => ensure_bin(Filter), name => ensure_bin(Name)},
+    Who = #{
+        type => Type,
+        filter => ensure_bin(Filter),
+        name => ensure_bin(Name),
+        payload_encode => payload_encode()
+    },
     install(Who, Level, LogFile).
 
 -spec install(
diff --git a/apps/emqx_management/src/emqx_mgmt_api_trace.erl b/apps/emqx_management/src/emqx_mgmt_api_trace.erl
index 73c767a52..619da92f0 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_trace.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_trace.erl
@@ -273,7 +273,8 @@ fields(trace) ->
                     "Determine the format of the payload format in the trace file.<br/>\n"
                     "`text`: Text-based protocol or plain text protocol.\n"
                     " It is recommended when payload is JSON encoded.<br/>\n"
-                    "`hex`: Binary hexadecimal encode. It is recommended when payload is a custom binary protocol.<br/>\n"
+                    "`hex`: Binary hexadecimal encode."
+                    "It is recommended when payload is a custom binary protocol.<br/>\n"
                     "`hidden`: payload is obfuscated as `******`"
                     "",
                 default => text,
diff --git a/changes/ce/feat-10373.en.md b/changes/ce/feat-10373.en.md
new file mode 100644
index 000000000..7609e2a1d
--- /dev/null
+++ b/changes/ce/feat-10373.en.md
@@ -0,0 +1,2 @@
+Deprecate the trace.payload_encode configuration.
+Add payload_encode=[text,hidden,hex] option when creating a trace via HTTP API.

From 9774ad2cdd79abdbb26660a6f4b695a241629b66 Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@163.com>
Date: Wed, 12 Apr 2023 20:54:08 +0800
Subject: [PATCH 008/110] chore: update apps/emqx_gateway/README.md

---
 apps/emqx_gateway/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/emqx_gateway/README.md b/apps/emqx_gateway/README.md
index 5aed6421b..d1f327db2 100644
--- a/apps/emqx_gateway/README.md
+++ b/apps/emqx_gateway/README.md
@@ -11,7 +11,7 @@ protocol access on EMQX. For example:
 - Configuration & Schema
 - HTTP/CLI management interfaces
 
-The emqx_gateway application depends on `emqx`, `emqx_authn`, `emqx_ctl` that
+The emqx_gateway application depends on `emqx`, `emqx_authn`, `emqx_authz`, `emqx_ctl` that
 provide the foundation for protocol access.
 
 More introduction: [Extended Protocol Gateway](https://www.emqx.io/docs/en/v5.0/gateway/gateway.html)

From 9c9f39d0f7431ae7f17b711ff61c17135a223761 Mon Sep 17 00:00:00 2001
From: Andrew Mayorov <encube.ul@gmail.com>
Date: Tue, 11 Apr 2023 17:01:34 +0300
Subject: [PATCH 009/110] feat(resman): also move out metrics collection for
 debugging

Now `emqx_resource:list_instances_verbose/0` will populate the metrics
for each instance, for the sake of simplicity.
---
 apps/emqx_resource/include/emqx_resource.hrl     | 3 +--
 apps/emqx_resource/src/emqx_resource.erl         | 7 +++++--
 apps/emqx_resource/src/emqx_resource_manager.erl | 7 +------
 changes/ce/feat-10359.en.md                      | 2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/apps/emqx_resource/include/emqx_resource.hrl b/apps/emqx_resource/include/emqx_resource.hrl
index d799e7d93..7f88e1440 100644
--- a/apps/emqx_resource/include/emqx_resource.hrl
+++ b/apps/emqx_resource/include/emqx_resource.hrl
@@ -43,8 +43,7 @@
     config := resource_config(),
     error := term(),
     state := resource_state(),
-    status := resource_status(),
-    metrics => emqx_metrics_worker:metrics()
+    status := resource_status()
 }.
 -type resource_group() :: binary().
 -type creation_opts() :: #{
diff --git a/apps/emqx_resource/src/emqx_resource.erl b/apps/emqx_resource/src/emqx_resource.erl
index 054bd228b..d8b91942b 100644
--- a/apps/emqx_resource/src/emqx_resource.erl
+++ b/apps/emqx_resource/src/emqx_resource.erl
@@ -327,9 +327,12 @@ fetch_creation_opts(Opts) ->
 list_instances() ->
     [Id || #{id := Id} <- list_instances_verbose()].
 
--spec list_instances_verbose() -> [resource_data()].
+-spec list_instances_verbose() -> [_ResourceDataWithMetrics :: map()].
 list_instances_verbose() ->
-    emqx_resource_manager:list_all().
+    [
+        Res#{metrics => get_metrics(ResId)}
+     || #{id := ResId} = Res <- emqx_resource_manager:list_all()
+    ].
 
 -spec list_instances_by_type(module()) -> [resource_id()].
 list_instances_by_type(ResourceType) ->
diff --git a/apps/emqx_resource/src/emqx_resource_manager.erl b/apps/emqx_resource/src/emqx_resource_manager.erl
index b5ccff05c..9fe0fbdf2 100644
--- a/apps/emqx_resource/src/emqx_resource_manager.erl
+++ b/apps/emqx_resource/src/emqx_resource_manager.erl
@@ -258,7 +258,7 @@ reset_metrics(ResId) ->
 list_all() ->
     try
         [
-            data_record_to_external_map_with_metrics(Data)
+            data_record_to_external_map(Data)
          || {_Id, _Group, Data} <- ets:tab2list(?ETS_TABLE)
         ]
     catch
@@ -669,11 +669,6 @@ data_record_to_external_map(Data) ->
         state => Data#data.state
     }.
 
--spec data_record_to_external_map_with_metrics(data()) -> resource_data().
-data_record_to_external_map_with_metrics(Data) ->
-    DataMap = data_record_to_external_map(Data),
-    DataMap#{metrics => get_metrics(Data#data.id)}.
-
 -spec wait_for_ready(resource_id(), integer()) -> ok | timeout | {error, term()}.
 wait_for_ready(ResId, WaitTime) ->
     do_wait_for_ready(ResId, WaitTime div ?WAIT_FOR_RESOURCE_DELAY).
diff --git a/changes/ce/feat-10359.en.md b/changes/ce/feat-10359.en.md
index 21a253556..524b6dbdd 100644
--- a/changes/ce/feat-10359.en.md
+++ b/changes/ce/feat-10359.en.md
@@ -1 +1 @@
-Metrics now are not implicitly collected in places where API handlers don't make any use of them. Instead, a separate backplane RPC gathers cluster-wide metrics.
\ No newline at end of file
+Metrics now are not implicitly collected in places where API handlers don't make any use of them. Instead, a separate backplane RPC gathers cluster-wide metrics.

From 871ee90b3e3138f8e663df68b7d248ca18e70406 Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Thu, 6 Apr 2023 15:04:44 -0300
Subject: [PATCH 010/110] refactor(kafka_bridge): move kafka bridge into its
 own app

Fixes https://emqx.atlassian.net/browse/EMQX-9481
---
 .github/workflows/elixir_deps_check.yaml      | 11 +++
 apps/emqx_bridge_kafka/BSL.txt                | 94 +++++++++++++++++++
 apps/emqx_bridge_kafka/README.md              | 19 ++++
 apps/emqx_bridge_kafka/docker-ct              |  2 +
 .../etc/emqx_bridge_kafka.conf                |  0
 apps/emqx_bridge_kafka/rebar.config           | 14 +++
 .../src/emqx_bridge_kafka.app.src             | 16 ++++
 .../src/emqx_bridge_kafka.erl                 |  2 +-
 .../src/emqx_bridge_kafka_consumer_sup.erl    |  2 +-
 .../src/emqx_bridge_kafka_impl.erl            |  2 +-
 .../src/emqx_bridge_kafka_impl_consumer.erl   | 27 +++---
 .../src/emqx_bridge_kafka_impl_producer.erl   |  8 +-
 .../emqx_bridge_kafka_impl_consumer_SUITE.erl | 34 ++++---
 .../emqx_bridge_kafka_impl_producer_SUITE.erl | 10 +-
 .../test/emqx_bridge_kafka_tests.erl          |  2 +-
 lib-ee/emqx_ee_bridge/docker-ct               |  1 -
 lib-ee/emqx_ee_bridge/rebar.config            |  6 +-
 .../emqx_ee_bridge/src/emqx_ee_bridge.app.src |  5 +-
 lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl  | 16 ++--
 .../src/emqx_ee_connector.app.src             |  2 -
 mix.exs                                       | 25 ++++-
 rebar.config.erl                              | 14 ++-
 ...ge_kafka.hocon => emqx_bridge_kafka.hocon} |  2 +-
 scripts/ct/run.sh                             |  6 +-
 scripts/find-apps.sh                          |  3 +
 25 files changed, 264 insertions(+), 59 deletions(-)
 create mode 100644 apps/emqx_bridge_kafka/BSL.txt
 create mode 100644 apps/emqx_bridge_kafka/README.md
 create mode 100644 apps/emqx_bridge_kafka/docker-ct
 create mode 100644 apps/emqx_bridge_kafka/etc/emqx_bridge_kafka.conf
 create mode 100644 apps/emqx_bridge_kafka/rebar.config
 create mode 100644 apps/emqx_bridge_kafka/src/emqx_bridge_kafka.app.src
 rename lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_kafka.erl => apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl (99%)
 rename lib-ee/emqx_ee_bridge/src/kafka/emqx_ee_bridge_kafka_consumer_sup.erl => apps/emqx_bridge_kafka/src/emqx_bridge_kafka_consumer_sup.erl (98%)
 rename lib-ee/emqx_ee_bridge/src/kafka/emqx_bridge_impl_kafka.erl => apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl.erl (97%)
 rename lib-ee/emqx_ee_bridge/src/kafka/emqx_bridge_impl_kafka_consumer.erl => apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl_consumer.erl (94%)
 rename lib-ee/emqx_ee_bridge/src/kafka/emqx_bridge_impl_kafka_producer.erl => apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl_producer.erl (98%)
 rename lib-ee/emqx_ee_bridge/test/emqx_bridge_impl_kafka_consumer_SUITE.erl => apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl (98%)
 rename lib-ee/emqx_ee_bridge/test/emqx_bridge_impl_kafka_producer_SUITE.erl => apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_producer_SUITE.erl (98%)
 rename lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_kafka_tests.erl => apps/emqx_bridge_kafka/test/emqx_bridge_kafka_tests.erl (99%)
 rename rel/i18n/{emqx_ee_bridge_kafka.hocon => emqx_bridge_kafka.hocon} (99%)

diff --git a/.github/workflows/elixir_deps_check.yaml b/.github/workflows/elixir_deps_check.yaml
index 511639a3c..d6449f563 100644
--- a/.github/workflows/elixir_deps_check.yaml
+++ b/.github/workflows/elixir_deps_check.yaml
@@ -23,7 +23,18 @@ jobs:
           mix local.hex --force
           mix local.rebar --force
           mix deps.get
+        # we check only enterprise because `rebar3 tree`, even if an
+        # enterprise app is excluded from `project_app_dirs` in
+        # `rebar.config.erl`, will still list dependencies from it.
+        # Since the enterprise profile is a superset of the
+        # community one and thus more complete, we use the former.
+        env:
+          MIX_ENV: emqx-enterprise
+          PROFILE: emqx-enterprise
       - name: check elixir deps
         run: ./scripts/check-elixir-deps-discrepancies.exs
+        env:
+          MIX_ENV: emqx-enterprise
+          PROFILE: emqx-enterprise
 
 ...
diff --git a/apps/emqx_bridge_kafka/BSL.txt b/apps/emqx_bridge_kafka/BSL.txt
new file mode 100644
index 000000000..0acc0e696
--- /dev/null
+++ b/apps/emqx_bridge_kafka/BSL.txt
@@ -0,0 +1,94 @@
+Business Source License 1.1
+
+Licensor:             Hangzhou EMQ Technologies Co., Ltd.
+Licensed Work:        EMQX Enterprise Edition
+                      The Licensed Work is (c) 2023
+                      Hangzhou EMQ Technologies Co., Ltd.
+Additional Use Grant: Students and educators are granted right to copy,
+                      modify, and create derivative work for research
+                      or education.
+Change Date:          2027-02-01
+Change License:       Apache License, Version 2.0
+
+For information about alternative licensing arrangements for the Software,
+please contact Licensor: https://www.emqx.com/en/contact
+
+Notice
+
+The Business Source License (this document, or the “License”) is not an Open
+Source license. However, the Licensed Work will eventually be made available
+under an Open Source License, as stated in this License.
+
+License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
+“Business Source License” is a trademark of MariaDB Corporation Ab.
+
+-----------------------------------------------------------------------------
+
+Business Source License 1.1
+
+Terms
+
+The Licensor hereby grants you the right to copy, modify, create derivative
+works, redistribute, and make non-production use of the Licensed Work. The
+Licensor may make an Additional Use Grant, above, permitting limited
+production use.
+
+Effective on the Change Date, or the fourth anniversary of the first publicly
+available distribution of a specific version of the Licensed Work under this
+License, whichever comes first, the Licensor hereby grants you rights under
+the terms of the Change License, and the rights granted in the paragraph
+above terminate.
+
+If your use of the Licensed Work does not comply with the requirements
+currently in effect as described in this License, you must purchase a
+commercial license from the Licensor, its affiliated entities, or authorized
+resellers, or you must refrain from using the Licensed Work.
+
+All copies of the original and modified Licensed Work, and derivative works
+of the Licensed Work, are subject to this License. This License applies
+separately for each version of the Licensed Work and the Change Date may vary
+for each version of the Licensed Work released by Licensor.
+
+You must conspicuously display this License on each original or modified copy
+of the Licensed Work. If you receive the Licensed Work in original or
+modified form from a third party, the terms and conditions set forth in this
+License apply to your use of that work.
+
+Any use of the Licensed Work in violation of this License will automatically
+terminate your rights under this License for the current and all other
+versions of the Licensed Work.
+
+This License does not grant you any right in any trademark or logo of
+Licensor or its affiliates (provided that you may use a trademark or logo of
+Licensor as expressly required by this License).
+
+TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
+AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
+EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
+TITLE.
+
+MariaDB hereby grants you permission to use this License’s text to license
+your works, and to refer to it using the trademark “Business Source License”,
+as long as you comply with the Covenants of Licensor below.
+
+Covenants of Licensor
+
+In consideration of the right to use this License’s text and the “Business
+Source License” name and trademark, Licensor covenants to MariaDB, and to all
+other recipients of the licensed work to be provided by Licensor:
+
+1. To specify as the Change License the GPL Version 2.0 or any later version,
+   or a license that is compatible with GPL Version 2.0 or a later version,
+   where “compatible” means that software provided under the Change License can
+   be included in a program with software provided under GPL Version 2.0 or a
+   later version. Licensor may specify additional Change Licenses without
+   limitation.
+
+2. To either: (a) specify an additional grant of rights to use that does not
+   impose any additional restriction on the right granted in this License, as
+   the Additional Use Grant; or (b) insert the text “None”.
+
+3. To specify a Change Date.
+
+4. Not to modify this License in any other way.
diff --git a/apps/emqx_bridge_kafka/README.md b/apps/emqx_bridge_kafka/README.md
new file mode 100644
index 000000000..72cbeecc6
--- /dev/null
+++ b/apps/emqx_bridge_kafka/README.md
@@ -0,0 +1,19 @@
+# Kafka Data Integration Bridge
+
+This application houses the Kafka Producer and Consumer data
+integration bridges for EMQX Enterprise Edition.  It provides the
+means to connect to Kafka and publish/consume messages to/from it.
+
+Currently, our Kafka Producer library (`wolff`) has its own `replayq`
+buffering implementation, so this bridge does not require buffer
+workers from `emqx_resource`.  It implements the connection management
+and interaction without need for a separate connector app, since it's
+not used by authentication and authorization applications.
+
+## Contributing
+
+Please see our [contributing.md](../../CONTRIBUTING.md).
+
+## License
+
+See [BSL](./BSL.txt).
diff --git a/apps/emqx_bridge_kafka/docker-ct b/apps/emqx_bridge_kafka/docker-ct
new file mode 100644
index 000000000..5288ee246
--- /dev/null
+++ b/apps/emqx_bridge_kafka/docker-ct
@@ -0,0 +1,2 @@
+toxiproxy
+kafka
diff --git a/apps/emqx_bridge_kafka/etc/emqx_bridge_kafka.conf b/apps/emqx_bridge_kafka/etc/emqx_bridge_kafka.conf
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/emqx_bridge_kafka/rebar.config b/apps/emqx_bridge_kafka/rebar.config
new file mode 100644
index 000000000..fd21fd15b
--- /dev/null
+++ b/apps/emqx_bridge_kafka/rebar.config
@@ -0,0 +1,14 @@
+%% -*- mode: erlang; -*-
+{erl_opts, [debug_info]}.
+{deps, [ {wolff, {git, "https://github.com/kafka4beam/wolff.git", {tag, "1.7.5"}}}
+       , {kafka_protocol, {git, "https://github.com/kafka4beam/kafka_protocol.git", {tag, "4.1.2"}}}
+       , {brod_gssapi, {git, "https://github.com/kafka4beam/brod_gssapi.git", {tag, "v0.1.0-rc1"}}}
+       , {brod, {git, "https://github.com/kafka4beam/brod.git", {tag, "3.16.8"}}}
+       , {emqx_connector, {path, "../../apps/emqx_connector"}}
+       , {emqx_resource, {path, "../../apps/emqx_resource"}}
+       , {emqx_bridge, {path, "../../apps/emqx_bridge"}}
+       ]}.
+
+{shell, [
+    {apps, [emqx_bridge_kafka]}
+]}.
diff --git a/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.app.src b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.app.src
new file mode 100644
index 000000000..a4fbe5673
--- /dev/null
+++ b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.app.src
@@ -0,0 +1,16 @@
+{application, emqx_bridge_kafka, [
+    {description, "EMQX Enterprise Kafka Bridge"},
+    {vsn, "0.1.0"},
+    {registered, [emqx_bridge_kafka_consumer_sup]},
+    {applications, [
+        kernel,
+        stdlib,
+        telemetry,
+        wolff,
+        brod
+    ]},
+    {env, []},
+    {modules, []},
+
+    {links, []}
+]}.
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_kafka.erl b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl
similarity index 99%
rename from lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_kafka.erl
rename to apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl
index f3dfa5964..30f6cd60d 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_kafka.erl
+++ b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
--module(emqx_ee_bridge_kafka).
+-module(emqx_bridge_kafka).
 
 -include_lib("emqx_connector/include/emqx_connector.hrl").
 -include_lib("typerefl/include/types.hrl").
diff --git a/lib-ee/emqx_ee_bridge/src/kafka/emqx_ee_bridge_kafka_consumer_sup.erl b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_consumer_sup.erl
similarity index 98%
rename from lib-ee/emqx_ee_bridge/src/kafka/emqx_ee_bridge_kafka_consumer_sup.erl
rename to apps/emqx_bridge_kafka/src/emqx_bridge_kafka_consumer_sup.erl
index feec8c09b..638c1def6 100644
--- a/lib-ee/emqx_ee_bridge/src/kafka/emqx_ee_bridge_kafka_consumer_sup.erl
+++ b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_consumer_sup.erl
@@ -2,7 +2,7 @@
 %% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
 
--module(emqx_ee_bridge_kafka_consumer_sup).
+-module(emqx_bridge_kafka_consumer_sup).
 
 -behaviour(supervisor).
 
diff --git a/lib-ee/emqx_ee_bridge/src/kafka/emqx_bridge_impl_kafka.erl b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl.erl
similarity index 97%
rename from lib-ee/emqx_ee_bridge/src/kafka/emqx_bridge_impl_kafka.erl
rename to apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl.erl
index c9dcce9a2..22a67c551 100644
--- a/lib-ee/emqx_ee_bridge/src/kafka/emqx_bridge_impl_kafka.erl
+++ b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl.erl
@@ -3,7 +3,7 @@
 %%--------------------------------------------------------------------
 
 %% Kafka connection configuration
--module(emqx_bridge_impl_kafka).
+-module(emqx_bridge_kafka_impl).
 
 -export([
     hosts/1,
diff --git a/lib-ee/emqx_ee_bridge/src/kafka/emqx_bridge_impl_kafka_consumer.erl b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl_consumer.erl
similarity index 94%
rename from lib-ee/emqx_ee_bridge/src/kafka/emqx_bridge_impl_kafka_consumer.erl
rename to apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl_consumer.erl
index f4dc3456e..2dc43a130 100644
--- a/lib-ee/emqx_ee_bridge/src/kafka/emqx_bridge_impl_kafka_consumer.erl
+++ b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl_consumer.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
--module(emqx_bridge_impl_kafka_consumer).
+-module(emqx_bridge_kafka_impl_consumer).
 
 -behaviour(emqx_resource).
 
@@ -52,8 +52,9 @@
     ssl := _,
     any() => term()
 }.
--type subscriber_id() :: emqx_ee_bridge_kafka_consumer_sup:child_id().
+-type subscriber_id() :: emqx_bridge_kafka_consumer_sup:child_id().
 -type kafka_topic() :: brod:topic().
+-type kafka_message() :: #kafka_message{}.
 -type state() :: #{
     kafka_topics := nonempty_list(kafka_topic()),
     subscriber_id := subscriber_id(),
@@ -129,14 +130,14 @@ on_start(InstanceId, Config) ->
         ssl := SSL,
         topic_mapping := _
     } = Config,
-    BootstrapHosts = emqx_bridge_impl_kafka:hosts(BootstrapHosts0),
+    BootstrapHosts = emqx_bridge_kafka_impl:hosts(BootstrapHosts0),
     KafkaType = kafka_consumer,
     %% Note: this is distinct per node.
     ClientID = make_client_id(InstanceId, KafkaType, BridgeName),
     ClientOpts0 =
         case Auth of
             none -> [];
-            Auth -> [{sasl, emqx_bridge_impl_kafka:sasl(Auth)}]
+            Auth -> [{sasl, emqx_bridge_kafka_impl:sasl(Auth)}]
         end,
     ClientOpts = add_ssl_opts(ClientOpts0, SSL),
     case brod:start_client(BootstrapHosts, ClientID, ClientOpts) of
@@ -191,7 +192,7 @@ init(GroupData, State0) ->
     State = State0#{kafka_topic => KafkaTopic},
     {ok, State}.
 
--spec handle_message(#kafka_message{}, consumer_state()) -> {ok, commit, consumer_state()}.
+-spec handle_message(kafka_message(), consumer_state()) -> {ok, commit, consumer_state()}.
 handle_message(Message, State) ->
     ?tp_span(
         kafka_consumer_handle_message,
@@ -240,13 +241,13 @@ add_ssl_opts(ClientOpts, #{enable := false}) ->
 add_ssl_opts(ClientOpts, SSL) ->
     [{ssl, emqx_tls_lib:to_client_opts(SSL)} | ClientOpts].
 
--spec make_subscriber_id(atom() | binary()) -> emqx_ee_bridge_kafka_consumer_sup:child_id().
+-spec make_subscriber_id(atom() | binary()) -> emqx_bridge_kafka_consumer_sup:child_id().
 make_subscriber_id(BridgeName) ->
     BridgeNameBin = to_bin(BridgeName),
     <<"kafka_subscriber:", BridgeNameBin/binary>>.
 
 ensure_consumer_supervisor_started() ->
-    Mod = emqx_ee_bridge_kafka_consumer_sup,
+    Mod = emqx_bridge_kafka_consumer_sup,
     ChildSpec =
         #{
             id => Mod,
@@ -327,7 +328,7 @@ start_consumer(Config, InstanceId, ClientID) ->
     %% spawns one worker for each assigned topic-partition
     %% automatically, so we should not spawn duplicate workers.
     SubscriberId = make_subscriber_id(BridgeName),
-    case emqx_ee_bridge_kafka_consumer_sup:start_child(SubscriberId, GroupSubscriberConfig) of
+    case emqx_bridge_kafka_consumer_sup:start_child(SubscriberId, GroupSubscriberConfig) of
         {ok, _ConsumerPid} ->
             ?tp(
                 kafka_consumer_subscriber_started,
@@ -342,18 +343,18 @@ start_consumer(Config, InstanceId, ClientID) ->
             ?SLOG(error, #{
                 msg => "failed_to_start_kafka_consumer",
                 instance_id => InstanceId,
-                kafka_hosts => emqx_bridge_impl_kafka:hosts(BootstrapHosts0),
+                kafka_hosts => emqx_bridge_kafka_impl:hosts(BootstrapHosts0),
                 reason => emqx_misc:redact(Reason2)
             }),
             stop_client(ClientID),
             throw(failed_to_start_kafka_consumer)
     end.
 
--spec stop_subscriber(emqx_ee_bridge_kafka_consumer_sup:child_id()) -> ok.
+-spec stop_subscriber(emqx_bridge_kafka_consumer_sup:child_id()) -> ok.
 stop_subscriber(SubscriberId) ->
     _ = log_when_error(
         fun() ->
-            emqx_ee_bridge_kafka_consumer_sup:ensure_child_deleted(SubscriberId)
+            emqx_bridge_kafka_consumer_sup:ensure_child_deleted(SubscriberId)
         end,
         #{
             msg => "failed_to_delete_kafka_subscriber",
@@ -437,7 +438,7 @@ do_get_status1(ClientID, KafkaTopic, SubscriberId, NPartitions) ->
     end.
 
 are_subscriber_workers_alive(SubscriberId) ->
-    Children = supervisor:which_children(emqx_ee_bridge_kafka_consumer_sup),
+    Children = supervisor:which_children(emqx_bridge_kafka_consumer_sup),
     case lists:keyfind(SubscriberId, 1, Children) of
         false ->
             false;
@@ -479,7 +480,7 @@ is_dry_run(InstanceId) ->
 make_client_id(InstanceId, KafkaType, KafkaName) ->
     case is_dry_run(InstanceId) of
         false ->
-            ClientID0 = emqx_bridge_impl_kafka:make_client_id(KafkaType, KafkaName),
+            ClientID0 = emqx_bridge_kafka_impl:make_client_id(KafkaType, KafkaName),
             binary_to_atom(ClientID0);
         true ->
             %% It is a dry run and we don't want to leak too many
diff --git a/lib-ee/emqx_ee_bridge/src/kafka/emqx_bridge_impl_kafka_producer.erl b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl_producer.erl
similarity index 98%
rename from lib-ee/emqx_ee_bridge/src/kafka/emqx_bridge_impl_kafka_producer.erl
rename to apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl_producer.erl
index 09713a431..7bee2c70d 100644
--- a/lib-ee/emqx_ee_bridge/src/kafka/emqx_bridge_impl_kafka_producer.erl
+++ b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl_producer.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
--module(emqx_bridge_impl_kafka_producer).
+-module(emqx_bridge_kafka_impl_producer).
 
 -include_lib("emqx_resource/include/emqx_resource.hrl").
 
@@ -47,15 +47,15 @@ on_start(InstId, Config) ->
     BridgeType = ?BRIDGE_TYPE,
     ResourceId = emqx_bridge_resource:resource_id(BridgeType, BridgeName),
     _ = maybe_install_wolff_telemetry_handlers(ResourceId),
-    Hosts = emqx_bridge_impl_kafka:hosts(Hosts0),
-    ClientId = emqx_bridge_impl_kafka:make_client_id(BridgeType, BridgeName),
+    Hosts = emqx_bridge_kafka_impl:hosts(Hosts0),
+    ClientId = emqx_bridge_kafka_impl:make_client_id(BridgeType, BridgeName),
     ClientConfig = #{
         min_metadata_refresh_interval => MinMetaRefreshInterval,
         connect_timeout => ConnTimeout,
         client_id => ClientId,
         request_timeout => MetaReqTimeout,
         extra_sock_opts => socket_opts(SocketOpts),
-        sasl => emqx_bridge_impl_kafka:sasl(Auth),
+        sasl => emqx_bridge_kafka_impl:sasl(Auth),
         ssl => ssl(SSL)
     },
     case wolff:ensure_supervised_client(ClientId, Hosts, ClientConfig) of
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_bridge_impl_kafka_consumer_SUITE.erl b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl
similarity index 98%
rename from lib-ee/emqx_ee_bridge/test/emqx_bridge_impl_kafka_consumer_SUITE.erl
rename to apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl
index 4019a9c42..fb7cf524c 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_bridge_impl_kafka_consumer_SUITE.erl
+++ b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
--module(emqx_bridge_impl_kafka_consumer_SUITE).
+-module(emqx_bridge_kafka_impl_consumer_SUITE).
 
 -compile(nowarn_export_all).
 -compile(export_all).
@@ -15,6 +15,7 @@
 -import(emqx_common_test_helpers, [on_exit/1]).
 
 -define(BRIDGE_TYPE_BIN, <<"kafka_consumer">>).
+-define(APPS, [emqx_bridge, emqx_resource, emqx_rule_engine, emqx_bridge_kafka]).
 
 %%------------------------------------------------------------------------------
 %% CT boilerplate
@@ -67,7 +68,7 @@ init_per_suite(Config) ->
 end_per_suite(_Config) ->
     emqx_mgmt_api_test_util:end_suite(),
     ok = emqx_common_test_helpers:stop_apps([emqx_conf]),
-    ok = emqx_connector_test_helpers:stop_apps([emqx_bridge, emqx_resource, emqx_rule_engine]),
+    ok = emqx_connector_test_helpers:stop_apps(lists:reverse(?APPS)),
     _ = application:stop(emqx_connector),
     ok.
 
@@ -228,7 +229,7 @@ common_init_per_group() ->
     emqx_common_test_helpers:reset_proxy(ProxyHost, ProxyPort),
     application:load(emqx_bridge),
     ok = emqx_common_test_helpers:start_apps([emqx_conf]),
-    ok = emqx_connector_test_helpers:start_apps([emqx_resource, emqx_bridge, emqx_rule_engine]),
+    ok = emqx_connector_test_helpers:start_apps(?APPS),
     {ok, _} = application:ensure_all_started(emqx_connector),
     emqx_mgmt_api_test_util:init_suite(),
     UniqueNum = integer_to_binary(erlang:unique_integer()),
@@ -408,7 +409,7 @@ start_producers(TestCase, Config) ->
     DirectKafkaPort = ?config(direct_kafka_port, Config),
     UseTLS = ?config(use_tls, Config),
     UseSASL = ?config(use_sasl, Config),
-    Hosts = emqx_bridge_impl_kafka:hosts(
+    Hosts = emqx_bridge_kafka_impl:hosts(
         DirectKafkaHost ++ ":" ++ integer_to_list(DirectKafkaPort)
     ),
     SSL =
@@ -876,7 +877,7 @@ ensure_connected(Config) ->
 
 consumer_clientid(Config) ->
     KafkaName = ?config(kafka_name, Config),
-    binary_to_atom(emqx_bridge_impl_kafka:make_client_id(kafka_consumer, KafkaName)).
+    binary_to_atom(emqx_bridge_kafka_impl:make_client_id(kafka_consumer, KafkaName)).
 
 get_client_connection(Config) ->
     KafkaHost = ?config(kafka_host, Config),
@@ -885,7 +886,7 @@ get_client_connection(Config) ->
     brod_client:get_connection(ClientID, KafkaHost, KafkaPort).
 
 get_subscriber_workers() ->
-    [{_, SubscriberPid, _, _}] = supervisor:which_children(emqx_ee_bridge_kafka_consumer_sup),
+    [{_, SubscriberPid, _, _}] = supervisor:which_children(emqx_bridge_kafka_consumer_sup),
     brod_group_subscriber_v2:get_workers(SubscriberPid).
 
 wait_downs(Refs, _Timeout) when map_size(Refs) =:= 0 ->
@@ -1069,7 +1070,7 @@ cluster(Config) ->
     Cluster = emqx_common_test_helpers:emqx_cluster(
         [core, core],
         [
-            {apps, [emqx_conf, emqx_bridge, emqx_rule_engine]},
+            {apps, [emqx_conf, emqx_bridge, emqx_rule_engine, emqx_bridge_kafka]},
             {listener_ports, []},
             {peer_mod, PeerModule},
             {priv_data_dir, PrivDataDir},
@@ -1504,7 +1505,7 @@ do_t_receive_after_recovery(Config) ->
                 _Interval = 500,
                 _NAttempts = 20,
                 begin
-                    GroupId = emqx_bridge_impl_kafka_consumer:consumer_group_id(KafkaNameA),
+                    GroupId = emqx_bridge_kafka_impl_consumer:consumer_group_id(KafkaNameA),
                     {ok, [#{partitions := Partitions}]} = brod:fetch_committed_offsets(
                         KafkaClientId, GroupId
                     ),
@@ -1745,8 +1746,12 @@ t_node_joins_existing_cluster(Config) ->
     ?check_trace(
         begin
             [{Name1, Opts1}, {Name2, Opts2} | _] = Cluster,
+            ct:pal("starting ~p", [Name1]),
             N1 = emqx_common_test_helpers:start_slave(Name1, Opts1),
-            on_exit(fun() -> ok = emqx_common_test_helpers:stop_slave(N1) end),
+            on_exit(fun() ->
+                ct:pal("stopping ~p", [N1]),
+                ok = emqx_common_test_helpers:stop_slave(N1)
+            end),
             setup_group_subscriber_spy(N1),
             {{ok, _}, {ok, _}} =
                 ?wait_async_action(
@@ -1785,8 +1790,12 @@ t_node_joins_existing_cluster(Config) ->
                 1,
                 30_000
             ),
+            ct:pal("starting ~p", [Name2]),
             N2 = emqx_common_test_helpers:start_slave(Name2, Opts2),
-            on_exit(fun() -> ok = emqx_common_test_helpers:stop_slave(N2) end),
+            on_exit(fun() ->
+                ct:pal("stopping ~p", [N2]),
+                ok = emqx_common_test_helpers:stop_slave(N2)
+            end),
             setup_group_subscriber_spy(N2),
             Nodes = [N1, N2],
             wait_for_cluster_rpc(N2),
@@ -1873,7 +1882,10 @@ t_cluster_node_down(Config) ->
             Nodes =
                 [N1, N2 | _] =
                 lists:map(
-                    fun({Name, Opts}) -> emqx_common_test_helpers:start_slave(Name, Opts) end,
+                    fun({Name, Opts}) ->
+                        ct:pal("starting ~p", [Name]),
+                        emqx_common_test_helpers:start_slave(Name, Opts)
+                    end,
                     Cluster
                 ),
             on_exit(fun() ->
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_bridge_impl_kafka_producer_SUITE.erl b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_producer_SUITE.erl
similarity index 98%
rename from lib-ee/emqx_ee_bridge/test/emqx_bridge_impl_kafka_producer_SUITE.erl
rename to apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_producer_SUITE.erl
index 9b6ac05a7..6e3ddf5bb 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_bridge_impl_kafka_producer_SUITE.erl
+++ b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_producer_SUITE.erl
@@ -2,7 +2,7 @@
 %% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
 
--module(emqx_bridge_impl_kafka_producer_SUITE).
+-module(emqx_bridge_kafka_impl_producer_SUITE).
 
 -compile(nowarn_export_all).
 -compile(export_all).
@@ -12,7 +12,7 @@
 -include_lib("snabbkaffe/include/snabbkaffe.hrl").
 -include_lib("brod/include/brod.hrl").
 
--define(PRODUCER, emqx_bridge_impl_kafka_producer).
+-define(PRODUCER, emqx_bridge_kafka_impl_producer).
 
 %%------------------------------------------------------------------------------
 %% Things for REST API tests
@@ -41,6 +41,8 @@
 %% to hocon; keeping this as just `kafka' for backwards compatibility.
 -define(BRIDGE_TYPE, "kafka").
 
+-define(APPS, [emqx_resource, emqx_bridge, emqx_rule_engine, emqx_bridge_kafka]).
+
 %%------------------------------------------------------------------------------
 %% CT boilerplate
 %%------------------------------------------------------------------------------
@@ -76,7 +78,7 @@ init_per_suite(Config) ->
     _ = emqx_ee_bridge:module_info(),
     application:load(emqx_bridge),
     ok = emqx_common_test_helpers:start_apps([emqx_conf]),
-    ok = emqx_connector_test_helpers:start_apps([emqx_resource, emqx_bridge, emqx_rule_engine]),
+    ok = emqx_connector_test_helpers:start_apps(?APPS),
     {ok, _} = application:ensure_all_started(emqx_connector),
     emqx_mgmt_api_test_util:init_suite(),
     wait_until_kafka_is_up(),
@@ -96,7 +98,7 @@ init_per_suite(Config) ->
 end_per_suite(_Config) ->
     emqx_mgmt_api_test_util:end_suite(),
     ok = emqx_common_test_helpers:stop_apps([emqx_conf]),
-    ok = emqx_connector_test_helpers:stop_apps([emqx_bridge, emqx_resource, emqx_rule_engine]),
+    ok = emqx_connector_test_helpers:stop_apps(lists:reverse(?APPS)),
     _ = application:stop(emqx_connector),
     ok.
 
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_kafka_tests.erl b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_tests.erl
similarity index 99%
rename from lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_kafka_tests.erl
rename to apps/emqx_bridge_kafka/test/emqx_bridge_kafka_tests.erl
index 1b32f856d..fa352ce89 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_kafka_tests.erl
+++ b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_tests.erl
@@ -2,7 +2,7 @@
 %% Copyright (c) 2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
 
--module(emqx_ee_bridge_kafka_tests).
+-module(emqx_bridge_kafka_tests).
 
 -include_lib("eunit/include/eunit.hrl").
 
diff --git a/lib-ee/emqx_ee_bridge/docker-ct b/lib-ee/emqx_ee_bridge/docker-ct
index 963122082..0e947d89e 100644
--- a/lib-ee/emqx_ee_bridge/docker-ct
+++ b/lib-ee/emqx_ee_bridge/docker-ct
@@ -1,6 +1,5 @@
 toxiproxy
 influxdb
-kafka
 mongo
 mongo_rs_sharded
 mysql
diff --git a/lib-ee/emqx_ee_bridge/rebar.config b/lib-ee/emqx_ee_bridge/rebar.config
index 1c7d130ae..afd90f622 100644
--- a/lib-ee/emqx_ee_bridge/rebar.config
+++ b/lib-ee/emqx_ee_bridge/rebar.config
@@ -1,9 +1,5 @@
 {erl_opts, [debug_info]}.
-{deps, [ {wolff, {git, "https://github.com/kafka4beam/wolff.git", {tag, "1.7.5"}}}
-       , {kafka_protocol, {git, "https://github.com/kafka4beam/kafka_protocol.git", {tag, "4.1.2"}}}
-       , {brod_gssapi, {git, "https://github.com/kafka4beam/brod_gssapi.git", {tag, "v0.1.0-rc1"}}}
-       , {brod, {git, "https://github.com/kafka4beam/brod.git", {tag, "3.16.8"}}}
-       , {ecql, {git, "https://github.com/emqx/ecql.git", {tag, "v0.5.1"}}}
+{deps, [ {ecql, {git, "https://github.com/emqx/ecql.git", {tag, "v0.5.1"}}}
        , {emqx_connector, {path, "../../apps/emqx_connector"}}
        , {emqx_resource, {path, "../../apps/emqx_resource"}}
        , {emqx_bridge, {path, "../../apps/emqx_bridge"}}
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src
index 8316545a3..f1793d2e0 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src
@@ -1,12 +1,13 @@
 {application, emqx_ee_bridge, [
     {description, "EMQX Enterprise data bridges"},
     {vsn, "0.1.9"},
-    {registered, [emqx_ee_bridge_kafka_consumer_sup]},
+    {registered, []},
     {applications, [
         kernel,
         stdlib,
         emqx_ee_connector,
-        telemetry
+        telemetry,
+        emqx_bridge_kafka
     ]},
     {env, []},
     {modules, []},
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl
index 1ddc1a110..84b0b98b0 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl
@@ -15,8 +15,8 @@
 api_schemas(Method) ->
     [
         ref(emqx_ee_bridge_gcp_pubsub, Method),
-        ref(emqx_ee_bridge_kafka, Method ++ "_consumer"),
-        ref(emqx_ee_bridge_kafka, Method ++ "_producer"),
+        ref(emqx_bridge_kafka, Method ++ "_consumer"),
+        ref(emqx_bridge_kafka, Method ++ "_producer"),
         ref(emqx_ee_bridge_mysql, Method),
         ref(emqx_ee_bridge_pgsql, Method),
         ref(emqx_ee_bridge_mongodb, Method ++ "_rs"),
@@ -39,7 +39,7 @@ api_schemas(Method) ->
 
 schema_modules() ->
     [
-        emqx_ee_bridge_kafka,
+        emqx_bridge_kafka,
         emqx_ee_bridge_hstreamdb,
         emqx_ee_bridge_gcp_pubsub,
         emqx_ee_bridge_influxdb,
@@ -69,10 +69,10 @@ examples(Method) ->
     lists:foldl(Fun, #{}, schema_modules()).
 
 resource_type(Type) when is_binary(Type) -> resource_type(binary_to_atom(Type, utf8));
-resource_type(kafka_consumer) -> emqx_bridge_impl_kafka_consumer;
+resource_type(kafka_consumer) -> emqx_bridge_kafka_impl_consumer;
 %% TODO: rename this to `kafka_producer' after alias support is added
 %% to hocon; keeping this as just `kafka' for backwards compatibility.
-resource_type(kafka) -> emqx_bridge_impl_kafka_producer;
+resource_type(kafka) -> emqx_bridge_kafka_impl_producer;
 resource_type(hstreamdb) -> emqx_ee_connector_hstreamdb;
 resource_type(gcp_pubsub) -> emqx_ee_connector_gcp_pubsub;
 resource_type(mongodb_rs) -> emqx_ee_connector_mongodb;
@@ -174,16 +174,16 @@ kafka_structs() ->
         %% backwards compatibility.
         {kafka,
             mk(
-                hoconsc:map(name, ref(emqx_ee_bridge_kafka, kafka_producer)),
+                hoconsc:map(name, ref(emqx_bridge_kafka, kafka_producer)),
                 #{
                     desc => <<"Kafka Producer Bridge Config">>,
                     required => false,
-                    converter => fun emqx_ee_bridge_kafka:kafka_producer_converter/2
+                    converter => fun emqx_bridge_kafka:kafka_producer_converter/2
                 }
             )},
         {kafka_consumer,
             mk(
-                hoconsc:map(name, ref(emqx_ee_bridge_kafka, kafka_consumer)),
+                hoconsc:map(name, ref(emqx_bridge_kafka, kafka_consumer)),
                 #{desc => <<"Kafka Consumer Bridge Config">>, required => false}
             )}
     ].
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector.app.src b/lib-ee/emqx_ee_connector/src/emqx_ee_connector.app.src
index cd176081b..2e6406d70 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector.app.src
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector.app.src
@@ -8,8 +8,6 @@
         hstreamdb_erl,
         influxdb,
         tdengine,
-        wolff,
-        brod,
         clickhouse,
         erlcloud,
         rocketmq,
diff --git a/mix.exs b/mix.exs
index 56840579d..6709f1774 100644
--- a/mix.exs
+++ b/mix.exs
@@ -107,6 +107,8 @@ defmodule EMQXUmbrella.MixProject do
   end
 
   defp umbrella_apps() do
+    enterprise_apps = enterprise_umbrella_apps()
+
     "apps/*"
     |> Path.wildcard()
     |> Enum.map(fn path ->
@@ -117,9 +119,20 @@ defmodule EMQXUmbrella.MixProject do
 
       {app, path: path, manager: :rebar3, override: true}
     end)
+    |> Enum.reject(fn dep_spec ->
+      dep_spec
+      |> elem(0)
+      |> then(&MapSet.member?(enterprise_apps, &1))
+    end)
   end
 
   defp enterprise_apps(_profile_info = %{edition_type: :enterprise}) do
+    umbrella_apps =
+      Enum.map(enterprise_umbrella_apps(), fn app_name ->
+        path = "apps/#{app_name}"
+        {app_name, path: path, manager: :rebar3, override: true}
+      end)
+
     "lib-ee/*"
     |> Path.wildcard()
     |> Enum.filter(&File.dir?/1)
@@ -131,12 +144,20 @@ defmodule EMQXUmbrella.MixProject do
 
       {app, path: path, manager: :rebar3, override: true}
     end)
+    |> Enum.concat(umbrella_apps)
   end
 
   defp enterprise_apps(_profile_info) do
     []
   end
 
+  # need to remove those when listing `/apps/`...
+  defp enterprise_umbrella_apps() do
+    MapSet.new([
+      :emqx_bridge_kafka
+    ])
+  end
+
   defp enterprise_deps(_profile_info = %{edition_type: :enterprise}) do
     [
       {:hstreamdb_erl, github: "hstreamdb/hstreamdb_erl", tag: "0.2.5"},
@@ -146,7 +167,8 @@ defmodule EMQXUmbrella.MixProject do
       {:brod_gssapi, github: "kafka4beam/brod_gssapi", tag: "v0.1.0-rc1"},
       {:brod, github: "kafka4beam/brod", tag: "3.16.8"},
       {:snappyer, "1.2.8", override: true},
-      {:supervisor3, "1.1.11", override: true}
+      {:crc32cer, "0.1.8", override: true},
+      {:supervisor3, "1.1.12", override: true}
     ]
   end
 
@@ -320,6 +342,7 @@ defmodule EMQXUmbrella.MixProject do
           emqx_ee_conf: :load,
           emqx_ee_connector: :permanent,
           emqx_ee_bridge: :permanent,
+          emqx_bridge_kafka: :permanent,
           emqx_ee_schema_registry: :permanent
         ],
         else: []
diff --git a/rebar.config.erl b/rebar.config.erl
index cdd628664..39c336422 100644
--- a/rebar.config.erl
+++ b/rebar.config.erl
@@ -78,6 +78,9 @@ is_cover_enabled() ->
 is_enterprise(ce) -> false;
 is_enterprise(ee) -> true.
 
+is_community_umbrella_app("apps/emqx_bridge_kafka") -> false;
+is_community_umbrella_app(_) -> true.
+
 is_jq_supported() ->
     not (false =/= os:getenv("BUILD_WITHOUT_JQ") orelse
         is_win32()) orelse
@@ -122,8 +125,14 @@ project_app_dirs() ->
     project_app_dirs(get_edition_from_profile_env()).
 
 project_app_dirs(Edition) ->
-    ["apps/*"] ++
-        case is_enterprise(Edition) of
+    IsEnterprise = is_enterprise(Edition),
+    UmbrellaApps = [
+        Path
+     || Path <- filelib:wildcard("apps/*"),
+        is_community_umbrella_app(Path) orelse IsEnterprise
+    ],
+    UmbrellaApps ++
+        case IsEnterprise of
             true -> ["lib-ee/*"];
             false -> []
         end.
@@ -428,6 +437,7 @@ relx_apps_per_edition(ee) ->
         {emqx_ee_conf, load},
         emqx_ee_connector,
         emqx_ee_bridge,
+        emqx_bridge_kafka,
         emqx_ee_schema_registry
     ];
 relx_apps_per_edition(ce) ->
diff --git a/rel/i18n/emqx_ee_bridge_kafka.hocon b/rel/i18n/emqx_bridge_kafka.hocon
similarity index 99%
rename from rel/i18n/emqx_ee_bridge_kafka.hocon
rename to rel/i18n/emqx_bridge_kafka.hocon
index 1638eb89f..2f1811269 100644
--- a/rel/i18n/emqx_ee_bridge_kafka.hocon
+++ b/rel/i18n/emqx_bridge_kafka.hocon
@@ -1,4 +1,4 @@
-emqx_ee_bridge_kafka {
+emqx_bridge_kafka {
     config_enable {
         desc {
             en: "Enable (true) or disable (false) this Kafka bridge."
diff --git a/scripts/ct/run.sh b/scripts/ct/run.sh
index 82823720d..83e69d1ad 100755
--- a/scripts/ct/run.sh
+++ b/scripts/ct/run.sh
@@ -107,6 +107,10 @@ case "${WHICH_APP}" in
         ## ensure enterprise profile when testing lib-ee applications
         export PROFILE='emqx-enterprise'
         ;;
+    apps/emqx_bridge_kafka)
+        ## ensure enterprise profile when testing ee applications
+        export PROFILE='emqx-enterprise'
+        ;;
     *)
         export PROFILE="${PROFILE:-emqx}"
         ;;
@@ -172,7 +176,7 @@ for dep in ${CT_DEPS}; do
             ;;
         rocketmq)
             FILES+=( '.ci/docker-compose-file/docker-compose-rocketmq.yaml' )
-            ;; 
+            ;;
         cassandra)
             FILES+=( '.ci/docker-compose-file/docker-compose-cassandra.yaml' )
             ;;
diff --git a/scripts/find-apps.sh b/scripts/find-apps.sh
index f07cd2f7d..66990ae12 100755
--- a/scripts/find-apps.sh
+++ b/scripts/find-apps.sh
@@ -72,6 +72,9 @@ describe_app() {
         runner="docker"
     fi
     case "${app}" in
+        apps/emqx_bridge_kafka)
+            profile='emqx-enterprise'
+            ;;
         apps/*)
             profile='emqx'
             ;;

From a70930fed04b721e2c1c5e1753de5ea319ff377d Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Thu, 13 Apr 2023 09:26:16 +0800
Subject: [PATCH 011/110] feat: hiden auto_subscribe conf

---
 .../src/emqx_auto_subscribe.app.src                 |  2 +-
 .../src/emqx_auto_subscribe_schema.erl              | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/emqx_auto_subscribe/src/emqx_auto_subscribe.app.src b/apps/emqx_auto_subscribe/src/emqx_auto_subscribe.app.src
index a273face1..d6f6f4058 100644
--- a/apps/emqx_auto_subscribe/src/emqx_auto_subscribe.app.src
+++ b/apps/emqx_auto_subscribe/src/emqx_auto_subscribe.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_auto_subscribe, [
     {description, "Auto subscribe Application"},
-    {vsn, "0.1.3"},
+    {vsn, "0.1.4"},
     {registered, []},
     {mod, {emqx_auto_subscribe_app, []}},
     {applications, [
diff --git a/apps/emqx_auto_subscribe/src/emqx_auto_subscribe_schema.erl b/apps/emqx_auto_subscribe/src/emqx_auto_subscribe_schema.erl
index a01e17c1f..e6eea2b74 100644
--- a/apps/emqx_auto_subscribe/src/emqx_auto_subscribe_schema.erl
+++ b/apps/emqx_auto_subscribe/src/emqx_auto_subscribe_schema.erl
@@ -31,14 +31,18 @@
 namespace() -> "auto_subscribe".
 
 roots() ->
-    ["auto_subscribe"].
+    [{"auto_subscribe", ?HOCON(?R_REF("auto_subscribe"), #{importance => ?IMPORTANCE_HIDDEN})}].
 
 fields("auto_subscribe") ->
     [
         {topics,
             ?HOCON(
                 ?ARRAY(?R_REF("topic")),
-                #{desc => ?DESC(auto_subscribe), default => []}
+                #{
+                    desc => ?DESC(auto_subscribe),
+                    default => [],
+                    importance => ?IMPORTANCE_HIDDEN
+                }
             )}
     ];
 fields("topic") ->
@@ -47,26 +51,31 @@ fields("topic") ->
             ?HOCON(binary(), #{
                 required => true,
                 example => topic_example(),
+                importance => ?IMPORTANCE_HIDDEN,
                 desc => ?DESC("topic")
             })},
         {qos,
             ?HOCON(emqx_schema:qos(), #{
                 default => 0,
+                importance => ?IMPORTANCE_HIDDEN,
                 desc => ?DESC("qos")
             })},
         {rh,
             ?HOCON(range(0, 2), #{
                 default => 0,
+                importance => ?IMPORTANCE_HIDDEN,
                 desc => ?DESC("rh")
             })},
         {rap,
             ?HOCON(range(0, 1), #{
                 default => 0,
+                importance => ?IMPORTANCE_HIDDEN,
                 desc => ?DESC("rap")
             })},
         {nl,
             ?HOCON(range(0, 1), #{
                 default => 0,
+                importance => ?IMPORTANCE_HIDDEN,
                 desc => ?DESC(nl)
             })}
     ].

From 48600cbc8e502a7e363cf3b08409950cbb6ccc29 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Thu, 13 Apr 2023 09:50:11 +0800
Subject: [PATCH 012/110] chore: add auto_subscribe changelog

---
 changes/ce/feat-10381.en.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes/ce/feat-10381.en.md

diff --git a/changes/ce/feat-10381.en.md b/changes/ce/feat-10381.en.md
new file mode 100644
index 000000000..355839db9
--- /dev/null
+++ b/changes/ce/feat-10381.en.md
@@ -0,0 +1 @@
+Hide the auto_subscribe configuration item so that it can be modified later only through the HTTP API.

From 17b2a622462418b2068b52086b14a104cbaeb79a Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Thu, 13 Apr 2023 11:02:10 +0800
Subject: [PATCH 013/110] chore: update changes/ce/feat-10381.en.md

Co-authored-by: JianBo He <heeejianbo@163.com>
---
 changes/ce/feat-10381.en.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/ce/feat-10381.en.md b/changes/ce/feat-10381.en.md
index 355839db9..3ea11188f 100644
--- a/changes/ce/feat-10381.en.md
+++ b/changes/ce/feat-10381.en.md
@@ -1 +1 @@
-Hide the auto_subscribe configuration item so that it can be modified later only through the HTTP API.
+Hide the `auto_subscribe` configuration items so that they can be modified later only through the HTTP API.

From b57b964083c54cc46e4f920f768dea67e2e157e6 Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@gmail.com>
Date: Thu, 13 Apr 2023 11:15:19 +0800
Subject: [PATCH 014/110] chore(i18n): improve config desc

---
 rel/i18n/emqx_conf_schema.hocon | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rel/i18n/emqx_conf_schema.hocon b/rel/i18n/emqx_conf_schema.hocon
index 2f0c6b938..e9f9c1211 100644
--- a/rel/i18n/emqx_conf_schema.hocon
+++ b/rel/i18n/emqx_conf_schema.hocon
@@ -1190,11 +1190,11 @@ To flush events, the handler discards the buffered log messages without logging.
   log_overload_kill_restart_after {
     desc {
       en: """The handler restarts automatically after a delay in the event of termination, unless the value `infinity` is set, which blocks any subsequent restarts."""
-      zh: """如果处理进程终止，它会在以指定的时间后后自动重新启动。 `infinity` 不自动重启。"""
+      zh: """处理进程停止后，会在该延迟时间后自动重新启动。除非该值设置为 <code>infinity</code>，这表示永不重新启动。"""
     }
     label {
       en: "Handler Restart Timer"
-      zh: "处理进程重启机制"
+      zh: "处理进程重启延迟"
     }
   }
 

From a4d9234b24d802f599f50612f7c2c6eaeecd93dc Mon Sep 17 00:00:00 2001
From: firest <blankalupo@163.com>
Date: Thu, 13 Apr 2023 12:02:22 +0800
Subject: [PATCH 015/110] test(dynamo): remove the flaky test case

---
 .../test/emqx_ee_bridge_dynamo_SUITE.erl      | 21 +------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_dynamo_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_dynamo_SUITE.erl
index c0d58c4f7..0c0dbbe04 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_dynamo_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_dynamo_SUITE.erl
@@ -40,7 +40,7 @@ groups() ->
 
     %% due to the poorly implemented driver or other reasons
     %% if we mix these cases with others, this suite will become flaky.
-    Flaky = [t_get_status, t_write_failure, t_write_timeout],
+    Flaky = [t_get_status, t_write_failure],
     TCs = TCs0 -- Flaky,
 
     [
@@ -383,25 +383,6 @@ t_write_failure(Config) ->
     end),
     ok.
 
-t_write_timeout(Config) ->
-    ProxyName = ?config(proxy_name, Config),
-    ProxyPort = ?config(proxy_port, Config),
-    ProxyHost = ?config(proxy_host, Config),
-    {{ok, _}, {ok, _}} =
-        ?wait_async_action(
-            create_bridge(Config),
-            #{?snk_kind := resource_connected_enter},
-            20_000
-        ),
-    SentData = #{id => emqx_misc:gen_id(), payload => ?PAYLOAD},
-    emqx_common_test_helpers:with_failure(timeout, ProxyName, ProxyHost, ProxyPort, fun() ->
-        ?assertMatch(
-            {error, {resource_error, #{reason := timeout}}},
-            query_resource(Config, {send_message, SentData})
-        )
-    end),
-    ok.
-
 t_simple_query(Config) ->
     ?assertMatch(
         {ok, _},

From 4ba4c6bf6219f419941b18961aebbcffca633946 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Thu, 13 Apr 2023 14:22:13 +0800
Subject: [PATCH 016/110] chore: only hiden root keys

---
 .../src/emqx_auto_subscribe_schema.erl                    | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/emqx_auto_subscribe/src/emqx_auto_subscribe_schema.erl b/apps/emqx_auto_subscribe/src/emqx_auto_subscribe_schema.erl
index e6eea2b74..98f32c8a4 100644
--- a/apps/emqx_auto_subscribe/src/emqx_auto_subscribe_schema.erl
+++ b/apps/emqx_auto_subscribe/src/emqx_auto_subscribe_schema.erl
@@ -40,8 +40,7 @@ fields("auto_subscribe") ->
                 ?ARRAY(?R_REF("topic")),
                 #{
                     desc => ?DESC(auto_subscribe),
-                    default => [],
-                    importance => ?IMPORTANCE_HIDDEN
+                    default => []
                 }
             )}
     ];
@@ -51,31 +50,26 @@ fields("topic") ->
             ?HOCON(binary(), #{
                 required => true,
                 example => topic_example(),
-                importance => ?IMPORTANCE_HIDDEN,
                 desc => ?DESC("topic")
             })},
         {qos,
             ?HOCON(emqx_schema:qos(), #{
                 default => 0,
-                importance => ?IMPORTANCE_HIDDEN,
                 desc => ?DESC("qos")
             })},
         {rh,
             ?HOCON(range(0, 2), #{
                 default => 0,
-                importance => ?IMPORTANCE_HIDDEN,
                 desc => ?DESC("rh")
             })},
         {rap,
             ?HOCON(range(0, 1), #{
                 default => 0,
-                importance => ?IMPORTANCE_HIDDEN,
                 desc => ?DESC("rap")
             })},
         {nl,
             ?HOCON(range(0, 1), #{
                 default => 0,
-                importance => ?IMPORTANCE_HIDDEN,
                 desc => ?DESC(nl)
             })}
     ].

From cc2beda37a5d680e9bdee231686d48b157f27a8d Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Thu, 13 Apr 2023 14:42:21 +0800
Subject: [PATCH 017/110] feat: hiden rule_engine/bridge/authz/authn from
 doc/example

---
 apps/emqx/src/emqx_schema.erl                         | 8 ++++++--
 apps/emqx_bridge/src/schema/emqx_bridge_schema.erl    | 2 +-
 apps/emqx_conf/src/emqx_conf_schema.erl               | 5 ++++-
 apps/emqx_rule_engine/src/emqx_rule_engine_schema.erl | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 20018b2d5..948c5d6d3 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -163,7 +163,7 @@ roots(high) ->
         {?EMQX_AUTHORIZATION_CONFIG_ROOT_NAME,
             sc(
                 ref(?EMQX_AUTHORIZATION_CONFIG_ROOT_NAME),
-                #{}
+                #{importance => ?IMPORTANCE_HIDDEN}
             )}
     ];
 roots(medium) ->
@@ -2760,7 +2760,11 @@ authentication(Which) ->
             Module ->
                 Module:root_type()
         end,
-    hoconsc:mk(Type, #{desc => Desc, converter => fun ensure_array/2}).
+    hoconsc:mk(Type, #{
+        desc => Desc,
+        converter => fun ensure_array/2,
+        importance => ?IMPORTANCE_HIDDEN
+    }).
 
 %% the older version schema allows individual element (instead of a chain) in config
 ensure_array(undefined, _) -> undefined;
diff --git a/apps/emqx_bridge/src/schema/emqx_bridge_schema.erl b/apps/emqx_bridge/src/schema/emqx_bridge_schema.erl
index 6c278a5ec..52000ba7f 100644
--- a/apps/emqx_bridge/src/schema/emqx_bridge_schema.erl
+++ b/apps/emqx_bridge/src/schema/emqx_bridge_schema.erl
@@ -137,7 +137,7 @@ namespace() -> "bridge".
 tags() ->
     [<<"Bridge">>].
 
-roots() -> [bridges].
+roots() -> [{bridges, ?HOCON(?R_REF(bridges), #{importance => ?IMPORTANCE_HIDDEN})}].
 
 fields(bridges) ->
     [
diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl
index 58bcf9700..a24f43801 100644
--- a/apps/emqx_conf/src/emqx_conf_schema.erl
+++ b/apps/emqx_conf/src/emqx_conf_schema.erl
@@ -1278,7 +1278,10 @@ emqx_schema_high_prio_roots() ->
         {"authorization",
             sc(
                 ?R_REF("authorization"),
-                #{desc => ?DESC(authorization)}
+                #{
+                    desc => ?DESC(authorization),
+                    importance => ?IMPORTANCE_HIDDEN
+                }
             )},
     lists:keyreplace("authorization", 1, Roots, Authz).
 
diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine_schema.erl b/apps/emqx_rule_engine/src/emqx_rule_engine_schema.erl
index 5b205f355..242c86c71 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_engine_schema.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_engine_schema.erl
@@ -38,7 +38,7 @@ namespace() -> rule_engine.
 tags() ->
     [<<"Rule Engine">>].
 
-roots() -> ["rule_engine"].
+roots() -> [{"rule_engine", ?HOCON(?R_REF("rule_engine"), #{importance => ?IMPORTANCE_HIDDEN})}].
 
 fields("rule_engine") ->
     rule_engine_settings() ++

From 0a62d6c55639f7ddaf5b4e9f8420b8a245739828 Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@gmail.com>
Date: Thu, 13 Apr 2023 14:53:47 +0800
Subject: [PATCH 018/110] refactor(gw): rename all gateway application name

---
 .../.gitignore                                |   0
 .../README.md                                 |   0
 .../doc/flow.png                              | Bin
 .../doc/shared_state.png                      | Bin
 .../doc/transport.png                         | Bin
 .../include/emqx_coap.hrl                     |   0
 .../rebar.config                              |   0
 .../src/emqx_coap_api.erl                     |   0
 .../src/emqx_coap_channel.erl                 |   0
 .../src/emqx_coap_frame.erl                   |   0
 .../src/emqx_coap_medium.erl                  |   0
 .../src/emqx_coap_message.erl                 |   0
 .../src/emqx_coap_mqtt_handler.erl            |   0
 .../src/emqx_coap_observe_res.erl             |   0
 .../src/emqx_coap_pubsub_handler.erl          |   0
 .../src/emqx_coap_schema.erl                  |   0
 .../src/emqx_coap_session.erl                 |   0
 .../src/emqx_coap_tm.erl                      |   0
 .../src/emqx_coap_transport.erl               |   0
 .../src/emqx_gateway_coap.app.src}            |   2 +-
 .../src/emqx_gateway_coap.erl}                |   2 +-
 .../test/emqx_coap_SUITE.erl                  |   0
 .../test/emqx_coap_api_SUITE.erl              |   0
 .../.gitignore                                |   0
 .../README.md                                 |   0
 .../include/emqx_exproto.hrl                  |   0
 .../priv/protos/exproto.proto                 |   0
 .../rebar.config                              |   0
 .../src/emqx_exproto_channel.erl              |   0
 .../src/emqx_exproto_frame.erl                |   0
 .../src/emqx_exproto_gcli.erl                 |   0
 .../src/emqx_exproto_gsvr.erl                 |   0
 .../src/emqx_exproto_schema.erl               |   0
 .../src/emqx_gateway_exproto.app.src}         |   2 +-
 .../src/emqx_gateway_exproto.erl}             |   2 +-
 .../test/emqx_exproto_SUITE.erl               |   0
 .../test/emqx_exproto_echo_svr.erl            |   0
 .../.gitignore                                |   0
 .../README.md                                 |   0
 .../include/emqx_lwm2m.hrl                    |   0
 .../lwm2m_xml/LWM2M_Access_Control-v1_0_1.xml |   0
 .../LWM2M_Connectivity_Statistics-v1_0_1.xml  |   0
 .../lwm2m_xml/LWM2M_Device-v1_0_1.xml         |   0
 .../LWM2M_Firmware_Update-v1_0_1.xml          |   0
 .../lwm2m_xml/LWM2M_Location-v1_0.xml         |   0
 .../lwm2m_xml/LWM2M_Security-v1_0.xml         |   0
 .../lwm2m_xml/LWM2M_Server-v1_0.xml           |   0
 .../rebar.config                              |   0
 .../src/binary_util.erl                       |   0
 .../src/emqx_gateway_lwm2m.app.src}           |   4 ++--
 .../src/emqx_gateway_lwm2m.erl}               |   2 +-
 .../src/emqx_lwm2m_api.erl                    |   0
 .../src/emqx_lwm2m_channel.erl                |   2 +-
 .../src/emqx_lwm2m_cmd.erl                    |   2 +-
 .../src/emqx_lwm2m_message.erl                |   0
 .../src/emqx_lwm2m_schema.erl                 |   0
 .../src/emqx_lwm2m_session.erl                |   2 +-
 .../src/emqx_lwm2m_tlv.erl                    |   0
 .../src/emqx_lwm2m_xml_object.erl             |   0
 .../src/emqx_lwm2m_xml_object_db.erl          |   0
 .../test/emqx_lwm2m_SUITE.erl                 |   2 +-
 .../test/emqx_lwm2m_api_SUITE.erl             |   2 +-
 .../test/emqx_tlv_SUITE.erl                   |   2 +-
 .../.gitignore                                |   0
 .../README.md                                 |   0
 .../include/emqx_mqttsn.hrl                   |   0
 .../rebar.config                              |   0
 .../src/emqx_gateway_mqttsn.app.src}          |   2 +-
 .../src/emqx_gateway_mqttsn.erl}              |   2 +-
 .../src/emqx_mqttsn_broadcast.erl             |   0
 .../src/emqx_mqttsn_channel.erl               |   0
 .../src/emqx_mqttsn_frame.erl                 |   0
 .../src/emqx_mqttsn_registry.erl              |   0
 .../src/emqx_mqttsn_schema.erl                |   0
 .../test/broadcast_test.py                    |   0
 .../test/emqx_sn_frame_SUITE.erl              |   0
 .../test/emqx_sn_protocol_SUITE.erl           |   0
 .../test/emqx_sn_registry_SUITE.erl           |   0
 .../test/intergration_test/Makefile           |   0
 .../test/intergration_test/README.md          |   0
 .../add_emqx_sn_to_project.py                 |   0
 .../intergration_test/client/case1_qos0pub.c  |   0
 .../intergration_test/client/case1_qos0sub.c  |   0
 .../intergration_test/client/case2_qos0pub.c  |   0
 .../intergration_test/client/case2_qos0sub.c  |   0
 .../intergration_test/client/case3_qos0pub.c  |   0
 .../intergration_test/client/case3_qos0sub.c  |   0
 .../intergration_test/client/case4_qos3pub.c  |   0
 .../intergration_test/client/case4_qos3sub.c  |   0
 .../intergration_test/client/case5_qos3pub.c  |   0
 .../intergration_test/client/case5_qos3sub.c  |   0
 .../intergration_test/client/case6_sleep.c    |   0
 .../client/case7_double_connect.c             |   0
 .../client/int_test_result.c                  |   0
 .../client/int_test_result.h                  |   0
 .../test/intergration_test/disable_qos3.py    |   0
 .../test/intergration_test/enable_qos3.py     |   0
 .../test/props/emqx_sn_proper_types.erl       |   0
 .../test/props/prop_emqx_sn_frame.erl         |   0
 .../.gitignore                                |   0
 .../README.md                                 |   0
 .../include/emqx_stomp.hrl                    |   0
 .../rebar.config                              |   0
 .../src/emqx_gateway_stomp.app.src}           |   2 +-
 .../src/emqx_gateway_stomp.erl}               |   2 +-
 .../src/emqx_stomp_channel.erl                |   0
 .../src/emqx_stomp_frame.erl                  |   0
 .../src/emqx_stomp_heartbeat.erl              |   0
 .../src/emqx_stomp_schema.erl                 |   0
 .../test/emqx_stomp_SUITE.erl                 |   0
 .../test/emqx_stomp_heartbeat_SUITE.erl       |   0
 mix.exs                                       |  20 +++++++++---------
 rebar.config.erl                              |  12 +++++------
 113 files changed, 33 insertions(+), 33 deletions(-)
 rename apps/{emqx_coap => emqx_gateway_coap}/.gitignore (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/README.md (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/doc/flow.png (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/doc/shared_state.png (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/doc/transport.png (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/include/emqx_coap.hrl (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/rebar.config (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/src/emqx_coap_api.erl (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/src/emqx_coap_channel.erl (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/src/emqx_coap_frame.erl (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/src/emqx_coap_medium.erl (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/src/emqx_coap_message.erl (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/src/emqx_coap_mqtt_handler.erl (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/src/emqx_coap_observe_res.erl (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/src/emqx_coap_pubsub_handler.erl (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/src/emqx_coap_schema.erl (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/src/emqx_coap_session.erl (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/src/emqx_coap_tm.erl (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/src/emqx_coap_transport.erl (100%)
 rename apps/{emqx_coap/src/emqx_coap.app.src => emqx_gateway_coap/src/emqx_gateway_coap.app.src} (86%)
 rename apps/{emqx_coap/src/emqx_coap.erl => emqx_gateway_coap/src/emqx_gateway_coap.erl} (99%)
 rename apps/{emqx_coap => emqx_gateway_coap}/test/emqx_coap_SUITE.erl (100%)
 rename apps/{emqx_coap => emqx_gateway_coap}/test/emqx_coap_api_SUITE.erl (100%)
 rename apps/{emqx_exproto => emqx_gateway_exproto}/.gitignore (100%)
 rename apps/{emqx_exproto => emqx_gateway_exproto}/README.md (100%)
 rename apps/{emqx_exproto => emqx_gateway_exproto}/include/emqx_exproto.hrl (100%)
 rename apps/{emqx_exproto => emqx_gateway_exproto}/priv/protos/exproto.proto (100%)
 rename apps/{emqx_exproto => emqx_gateway_exproto}/rebar.config (100%)
 rename apps/{emqx_exproto => emqx_gateway_exproto}/src/emqx_exproto_channel.erl (100%)
 rename apps/{emqx_exproto => emqx_gateway_exproto}/src/emqx_exproto_frame.erl (100%)
 rename apps/{emqx_exproto => emqx_gateway_exproto}/src/emqx_exproto_gcli.erl (100%)
 rename apps/{emqx_exproto => emqx_gateway_exproto}/src/emqx_exproto_gsvr.erl (100%)
 rename apps/{emqx_exproto => emqx_gateway_exproto}/src/emqx_exproto_schema.erl (100%)
 rename apps/{emqx_exproto/src/emqx_exproto.app.src => emqx_gateway_exproto/src/emqx_gateway_exproto.app.src} (85%)
 rename apps/{emqx_exproto/src/emqx_exproto.erl => emqx_gateway_exproto/src/emqx_gateway_exproto.erl} (99%)
 rename apps/{emqx_exproto => emqx_gateway_exproto}/test/emqx_exproto_SUITE.erl (100%)
 rename apps/{emqx_exproto => emqx_gateway_exproto}/test/emqx_exproto_echo_svr.erl (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/.gitignore (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/README.md (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/include/emqx_lwm2m.hrl (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/lwm2m_xml/LWM2M_Access_Control-v1_0_1.xml (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/lwm2m_xml/LWM2M_Connectivity_Statistics-v1_0_1.xml (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/lwm2m_xml/LWM2M_Device-v1_0_1.xml (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/lwm2m_xml/LWM2M_Firmware_Update-v1_0_1.xml (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/lwm2m_xml/LWM2M_Location-v1_0.xml (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/lwm2m_xml/LWM2M_Security-v1_0.xml (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/lwm2m_xml/LWM2M_Server-v1_0.xml (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/rebar.config (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/src/binary_util.erl (100%)
 rename apps/{emqx_lwm2m/src/emqx_lwm2m.app.src => emqx_gateway_lwm2m/src/emqx_gateway_lwm2m.app.src} (59%)
 rename apps/{emqx_lwm2m/src/emqx_lwm2m.erl => emqx_gateway_lwm2m/src/emqx_gateway_lwm2m.erl} (99%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/src/emqx_lwm2m_api.erl (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/src/emqx_lwm2m_channel.erl (99%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/src/emqx_lwm2m_cmd.erl (99%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/src/emqx_lwm2m_message.erl (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/src/emqx_lwm2m_schema.erl (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/src/emqx_lwm2m_session.erl (99%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/src/emqx_lwm2m_tlv.erl (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/src/emqx_lwm2m_xml_object.erl (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/src/emqx_lwm2m_xml_object_db.erl (100%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/test/emqx_lwm2m_SUITE.erl (99%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/test/emqx_lwm2m_api_SUITE.erl (99%)
 rename apps/{emqx_lwm2m => emqx_gateway_lwm2m}/test/emqx_tlv_SUITE.erl (99%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/.gitignore (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/README.md (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/include/emqx_mqttsn.hrl (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/rebar.config (100%)
 rename apps/{emqx_mqttsn/src/emqx_mqttsn.app.src => emqx_gateway_mqttsn/src/emqx_gateway_mqttsn.app.src} (85%)
 rename apps/{emqx_mqttsn/src/emqx_mqttsn.erl => emqx_gateway_mqttsn/src/emqx_gateway_mqttsn.erl} (99%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/src/emqx_mqttsn_broadcast.erl (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/src/emqx_mqttsn_channel.erl (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/src/emqx_mqttsn_frame.erl (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/src/emqx_mqttsn_registry.erl (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/src/emqx_mqttsn_schema.erl (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/broadcast_test.py (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/emqx_sn_frame_SUITE.erl (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/emqx_sn_protocol_SUITE.erl (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/emqx_sn_registry_SUITE.erl (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/Makefile (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/README.md (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/add_emqx_sn_to_project.py (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/client/case1_qos0pub.c (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/client/case1_qos0sub.c (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/client/case2_qos0pub.c (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/client/case2_qos0sub.c (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/client/case3_qos0pub.c (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/client/case3_qos0sub.c (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/client/case4_qos3pub.c (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/client/case4_qos3sub.c (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/client/case5_qos3pub.c (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/client/case5_qos3sub.c (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/client/case6_sleep.c (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/client/case7_double_connect.c (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/client/int_test_result.c (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/client/int_test_result.h (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/disable_qos3.py (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/intergration_test/enable_qos3.py (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/props/emqx_sn_proper_types.erl (100%)
 rename apps/{emqx_mqttsn => emqx_gateway_mqttsn}/test/props/prop_emqx_sn_frame.erl (100%)
 rename apps/{emqx_stomp => emqx_gateway_stomp}/.gitignore (100%)
 rename apps/{emqx_stomp => emqx_gateway_stomp}/README.md (100%)
 rename apps/{emqx_stomp => emqx_gateway_stomp}/include/emqx_stomp.hrl (100%)
 rename apps/{emqx_stomp => emqx_gateway_stomp}/rebar.config (100%)
 rename apps/{emqx_stomp/src/emqx_stomp.app.src => emqx_gateway_stomp/src/emqx_gateway_stomp.app.src} (86%)
 rename apps/{emqx_stomp/src/emqx_stomp.erl => emqx_gateway_stomp/src/emqx_gateway_stomp.erl} (99%)
 rename apps/{emqx_stomp => emqx_gateway_stomp}/src/emqx_stomp_channel.erl (100%)
 rename apps/{emqx_stomp => emqx_gateway_stomp}/src/emqx_stomp_frame.erl (100%)
 rename apps/{emqx_stomp => emqx_gateway_stomp}/src/emqx_stomp_heartbeat.erl (100%)
 rename apps/{emqx_stomp => emqx_gateway_stomp}/src/emqx_stomp_schema.erl (100%)
 rename apps/{emqx_stomp => emqx_gateway_stomp}/test/emqx_stomp_SUITE.erl (100%)
 rename apps/{emqx_stomp => emqx_gateway_stomp}/test/emqx_stomp_heartbeat_SUITE.erl (100%)

diff --git a/apps/emqx_coap/.gitignore b/apps/emqx_gateway_coap/.gitignore
similarity index 100%
rename from apps/emqx_coap/.gitignore
rename to apps/emqx_gateway_coap/.gitignore
diff --git a/apps/emqx_coap/README.md b/apps/emqx_gateway_coap/README.md
similarity index 100%
rename from apps/emqx_coap/README.md
rename to apps/emqx_gateway_coap/README.md
diff --git a/apps/emqx_coap/doc/flow.png b/apps/emqx_gateway_coap/doc/flow.png
similarity index 100%
rename from apps/emqx_coap/doc/flow.png
rename to apps/emqx_gateway_coap/doc/flow.png
diff --git a/apps/emqx_coap/doc/shared_state.png b/apps/emqx_gateway_coap/doc/shared_state.png
similarity index 100%
rename from apps/emqx_coap/doc/shared_state.png
rename to apps/emqx_gateway_coap/doc/shared_state.png
diff --git a/apps/emqx_coap/doc/transport.png b/apps/emqx_gateway_coap/doc/transport.png
similarity index 100%
rename from apps/emqx_coap/doc/transport.png
rename to apps/emqx_gateway_coap/doc/transport.png
diff --git a/apps/emqx_coap/include/emqx_coap.hrl b/apps/emqx_gateway_coap/include/emqx_coap.hrl
similarity index 100%
rename from apps/emqx_coap/include/emqx_coap.hrl
rename to apps/emqx_gateway_coap/include/emqx_coap.hrl
diff --git a/apps/emqx_coap/rebar.config b/apps/emqx_gateway_coap/rebar.config
similarity index 100%
rename from apps/emqx_coap/rebar.config
rename to apps/emqx_gateway_coap/rebar.config
diff --git a/apps/emqx_coap/src/emqx_coap_api.erl b/apps/emqx_gateway_coap/src/emqx_coap_api.erl
similarity index 100%
rename from apps/emqx_coap/src/emqx_coap_api.erl
rename to apps/emqx_gateway_coap/src/emqx_coap_api.erl
diff --git a/apps/emqx_coap/src/emqx_coap_channel.erl b/apps/emqx_gateway_coap/src/emqx_coap_channel.erl
similarity index 100%
rename from apps/emqx_coap/src/emqx_coap_channel.erl
rename to apps/emqx_gateway_coap/src/emqx_coap_channel.erl
diff --git a/apps/emqx_coap/src/emqx_coap_frame.erl b/apps/emqx_gateway_coap/src/emqx_coap_frame.erl
similarity index 100%
rename from apps/emqx_coap/src/emqx_coap_frame.erl
rename to apps/emqx_gateway_coap/src/emqx_coap_frame.erl
diff --git a/apps/emqx_coap/src/emqx_coap_medium.erl b/apps/emqx_gateway_coap/src/emqx_coap_medium.erl
similarity index 100%
rename from apps/emqx_coap/src/emqx_coap_medium.erl
rename to apps/emqx_gateway_coap/src/emqx_coap_medium.erl
diff --git a/apps/emqx_coap/src/emqx_coap_message.erl b/apps/emqx_gateway_coap/src/emqx_coap_message.erl
similarity index 100%
rename from apps/emqx_coap/src/emqx_coap_message.erl
rename to apps/emqx_gateway_coap/src/emqx_coap_message.erl
diff --git a/apps/emqx_coap/src/emqx_coap_mqtt_handler.erl b/apps/emqx_gateway_coap/src/emqx_coap_mqtt_handler.erl
similarity index 100%
rename from apps/emqx_coap/src/emqx_coap_mqtt_handler.erl
rename to apps/emqx_gateway_coap/src/emqx_coap_mqtt_handler.erl
diff --git a/apps/emqx_coap/src/emqx_coap_observe_res.erl b/apps/emqx_gateway_coap/src/emqx_coap_observe_res.erl
similarity index 100%
rename from apps/emqx_coap/src/emqx_coap_observe_res.erl
rename to apps/emqx_gateway_coap/src/emqx_coap_observe_res.erl
diff --git a/apps/emqx_coap/src/emqx_coap_pubsub_handler.erl b/apps/emqx_gateway_coap/src/emqx_coap_pubsub_handler.erl
similarity index 100%
rename from apps/emqx_coap/src/emqx_coap_pubsub_handler.erl
rename to apps/emqx_gateway_coap/src/emqx_coap_pubsub_handler.erl
diff --git a/apps/emqx_coap/src/emqx_coap_schema.erl b/apps/emqx_gateway_coap/src/emqx_coap_schema.erl
similarity index 100%
rename from apps/emqx_coap/src/emqx_coap_schema.erl
rename to apps/emqx_gateway_coap/src/emqx_coap_schema.erl
diff --git a/apps/emqx_coap/src/emqx_coap_session.erl b/apps/emqx_gateway_coap/src/emqx_coap_session.erl
similarity index 100%
rename from apps/emqx_coap/src/emqx_coap_session.erl
rename to apps/emqx_gateway_coap/src/emqx_coap_session.erl
diff --git a/apps/emqx_coap/src/emqx_coap_tm.erl b/apps/emqx_gateway_coap/src/emqx_coap_tm.erl
similarity index 100%
rename from apps/emqx_coap/src/emqx_coap_tm.erl
rename to apps/emqx_gateway_coap/src/emqx_coap_tm.erl
diff --git a/apps/emqx_coap/src/emqx_coap_transport.erl b/apps/emqx_gateway_coap/src/emqx_coap_transport.erl
similarity index 100%
rename from apps/emqx_coap/src/emqx_coap_transport.erl
rename to apps/emqx_gateway_coap/src/emqx_coap_transport.erl
diff --git a/apps/emqx_coap/src/emqx_coap.app.src b/apps/emqx_gateway_coap/src/emqx_gateway_coap.app.src
similarity index 86%
rename from apps/emqx_coap/src/emqx_coap.app.src
rename to apps/emqx_gateway_coap/src/emqx_gateway_coap.app.src
index c0f3f23da..decd13bef 100644
--- a/apps/emqx_coap/src/emqx_coap.app.src
+++ b/apps/emqx_gateway_coap/src/emqx_gateway_coap.app.src
@@ -1,4 +1,4 @@
-{application, emqx_coap, [
+{application, emqx_gateway_coap, [
     {description, "CoAP Gateway"},
     {vsn, "0.1.0"},
     {registered, []},
diff --git a/apps/emqx_coap/src/emqx_coap.erl b/apps/emqx_gateway_coap/src/emqx_gateway_coap.erl
similarity index 99%
rename from apps/emqx_coap/src/emqx_coap.erl
rename to apps/emqx_gateway_coap/src/emqx_gateway_coap.erl
index d553349a4..6c495fbdb 100644
--- a/apps/emqx_coap/src/emqx_coap.erl
+++ b/apps/emqx_gateway_coap/src/emqx_gateway_coap.erl
@@ -15,7 +15,7 @@
 %%--------------------------------------------------------------------
 
 %% @doc The CoAP Gateway implement
--module(emqx_coap).
+-module(emqx_gateway_coap).
 
 -include_lib("emqx/include/logger.hrl").
 -include_lib("emqx_gateway/include/emqx_gateway.hrl").
diff --git a/apps/emqx_coap/test/emqx_coap_SUITE.erl b/apps/emqx_gateway_coap/test/emqx_coap_SUITE.erl
similarity index 100%
rename from apps/emqx_coap/test/emqx_coap_SUITE.erl
rename to apps/emqx_gateway_coap/test/emqx_coap_SUITE.erl
diff --git a/apps/emqx_coap/test/emqx_coap_api_SUITE.erl b/apps/emqx_gateway_coap/test/emqx_coap_api_SUITE.erl
similarity index 100%
rename from apps/emqx_coap/test/emqx_coap_api_SUITE.erl
rename to apps/emqx_gateway_coap/test/emqx_coap_api_SUITE.erl
diff --git a/apps/emqx_exproto/.gitignore b/apps/emqx_gateway_exproto/.gitignore
similarity index 100%
rename from apps/emqx_exproto/.gitignore
rename to apps/emqx_gateway_exproto/.gitignore
diff --git a/apps/emqx_exproto/README.md b/apps/emqx_gateway_exproto/README.md
similarity index 100%
rename from apps/emqx_exproto/README.md
rename to apps/emqx_gateway_exproto/README.md
diff --git a/apps/emqx_exproto/include/emqx_exproto.hrl b/apps/emqx_gateway_exproto/include/emqx_exproto.hrl
similarity index 100%
rename from apps/emqx_exproto/include/emqx_exproto.hrl
rename to apps/emqx_gateway_exproto/include/emqx_exproto.hrl
diff --git a/apps/emqx_exproto/priv/protos/exproto.proto b/apps/emqx_gateway_exproto/priv/protos/exproto.proto
similarity index 100%
rename from apps/emqx_exproto/priv/protos/exproto.proto
rename to apps/emqx_gateway_exproto/priv/protos/exproto.proto
diff --git a/apps/emqx_exproto/rebar.config b/apps/emqx_gateway_exproto/rebar.config
similarity index 100%
rename from apps/emqx_exproto/rebar.config
rename to apps/emqx_gateway_exproto/rebar.config
diff --git a/apps/emqx_exproto/src/emqx_exproto_channel.erl b/apps/emqx_gateway_exproto/src/emqx_exproto_channel.erl
similarity index 100%
rename from apps/emqx_exproto/src/emqx_exproto_channel.erl
rename to apps/emqx_gateway_exproto/src/emqx_exproto_channel.erl
diff --git a/apps/emqx_exproto/src/emqx_exproto_frame.erl b/apps/emqx_gateway_exproto/src/emqx_exproto_frame.erl
similarity index 100%
rename from apps/emqx_exproto/src/emqx_exproto_frame.erl
rename to apps/emqx_gateway_exproto/src/emqx_exproto_frame.erl
diff --git a/apps/emqx_exproto/src/emqx_exproto_gcli.erl b/apps/emqx_gateway_exproto/src/emqx_exproto_gcli.erl
similarity index 100%
rename from apps/emqx_exproto/src/emqx_exproto_gcli.erl
rename to apps/emqx_gateway_exproto/src/emqx_exproto_gcli.erl
diff --git a/apps/emqx_exproto/src/emqx_exproto_gsvr.erl b/apps/emqx_gateway_exproto/src/emqx_exproto_gsvr.erl
similarity index 100%
rename from apps/emqx_exproto/src/emqx_exproto_gsvr.erl
rename to apps/emqx_gateway_exproto/src/emqx_exproto_gsvr.erl
diff --git a/apps/emqx_exproto/src/emqx_exproto_schema.erl b/apps/emqx_gateway_exproto/src/emqx_exproto_schema.erl
similarity index 100%
rename from apps/emqx_exproto/src/emqx_exproto_schema.erl
rename to apps/emqx_gateway_exproto/src/emqx_exproto_schema.erl
diff --git a/apps/emqx_exproto/src/emqx_exproto.app.src b/apps/emqx_gateway_exproto/src/emqx_gateway_exproto.app.src
similarity index 85%
rename from apps/emqx_exproto/src/emqx_exproto.app.src
rename to apps/emqx_gateway_exproto/src/emqx_gateway_exproto.app.src
index aa586a4fd..09cf58338 100644
--- a/apps/emqx_exproto/src/emqx_exproto.app.src
+++ b/apps/emqx_gateway_exproto/src/emqx_gateway_exproto.app.src
@@ -1,4 +1,4 @@
-{application, emqx_exproto, [
+{application, emqx_gateway_exproto, [
     {description, "ExProto Gateway"},
     {vsn, "0.1.0"},
     {registered, []},
diff --git a/apps/emqx_exproto/src/emqx_exproto.erl b/apps/emqx_gateway_exproto/src/emqx_gateway_exproto.erl
similarity index 99%
rename from apps/emqx_exproto/src/emqx_exproto.erl
rename to apps/emqx_gateway_exproto/src/emqx_gateway_exproto.erl
index 1e6e0e6de..7860f1220 100644
--- a/apps/emqx_exproto/src/emqx_exproto.erl
+++ b/apps/emqx_gateway_exproto/src/emqx_gateway_exproto.erl
@@ -15,7 +15,7 @@
 %%--------------------------------------------------------------------
 
 %% @doc The ExProto Gateway implement
--module(emqx_exproto).
+-module(emqx_gateway_exproto).
 
 -include_lib("emqx/include/logger.hrl").
 -include_lib("emqx_gateway/include/emqx_gateway.hrl").
diff --git a/apps/emqx_exproto/test/emqx_exproto_SUITE.erl b/apps/emqx_gateway_exproto/test/emqx_exproto_SUITE.erl
similarity index 100%
rename from apps/emqx_exproto/test/emqx_exproto_SUITE.erl
rename to apps/emqx_gateway_exproto/test/emqx_exproto_SUITE.erl
diff --git a/apps/emqx_exproto/test/emqx_exproto_echo_svr.erl b/apps/emqx_gateway_exproto/test/emqx_exproto_echo_svr.erl
similarity index 100%
rename from apps/emqx_exproto/test/emqx_exproto_echo_svr.erl
rename to apps/emqx_gateway_exproto/test/emqx_exproto_echo_svr.erl
diff --git a/apps/emqx_lwm2m/.gitignore b/apps/emqx_gateway_lwm2m/.gitignore
similarity index 100%
rename from apps/emqx_lwm2m/.gitignore
rename to apps/emqx_gateway_lwm2m/.gitignore
diff --git a/apps/emqx_lwm2m/README.md b/apps/emqx_gateway_lwm2m/README.md
similarity index 100%
rename from apps/emqx_lwm2m/README.md
rename to apps/emqx_gateway_lwm2m/README.md
diff --git a/apps/emqx_lwm2m/include/emqx_lwm2m.hrl b/apps/emqx_gateway_lwm2m/include/emqx_lwm2m.hrl
similarity index 100%
rename from apps/emqx_lwm2m/include/emqx_lwm2m.hrl
rename to apps/emqx_gateway_lwm2m/include/emqx_lwm2m.hrl
diff --git a/apps/emqx_lwm2m/lwm2m_xml/LWM2M_Access_Control-v1_0_1.xml b/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Access_Control-v1_0_1.xml
similarity index 100%
rename from apps/emqx_lwm2m/lwm2m_xml/LWM2M_Access_Control-v1_0_1.xml
rename to apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Access_Control-v1_0_1.xml
diff --git a/apps/emqx_lwm2m/lwm2m_xml/LWM2M_Connectivity_Statistics-v1_0_1.xml b/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Connectivity_Statistics-v1_0_1.xml
similarity index 100%
rename from apps/emqx_lwm2m/lwm2m_xml/LWM2M_Connectivity_Statistics-v1_0_1.xml
rename to apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Connectivity_Statistics-v1_0_1.xml
diff --git a/apps/emqx_lwm2m/lwm2m_xml/LWM2M_Device-v1_0_1.xml b/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Device-v1_0_1.xml
similarity index 100%
rename from apps/emqx_lwm2m/lwm2m_xml/LWM2M_Device-v1_0_1.xml
rename to apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Device-v1_0_1.xml
diff --git a/apps/emqx_lwm2m/lwm2m_xml/LWM2M_Firmware_Update-v1_0_1.xml b/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Firmware_Update-v1_0_1.xml
similarity index 100%
rename from apps/emqx_lwm2m/lwm2m_xml/LWM2M_Firmware_Update-v1_0_1.xml
rename to apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Firmware_Update-v1_0_1.xml
diff --git a/apps/emqx_lwm2m/lwm2m_xml/LWM2M_Location-v1_0.xml b/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Location-v1_0.xml
similarity index 100%
rename from apps/emqx_lwm2m/lwm2m_xml/LWM2M_Location-v1_0.xml
rename to apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Location-v1_0.xml
diff --git a/apps/emqx_lwm2m/lwm2m_xml/LWM2M_Security-v1_0.xml b/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Security-v1_0.xml
similarity index 100%
rename from apps/emqx_lwm2m/lwm2m_xml/LWM2M_Security-v1_0.xml
rename to apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Security-v1_0.xml
diff --git a/apps/emqx_lwm2m/lwm2m_xml/LWM2M_Server-v1_0.xml b/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Server-v1_0.xml
similarity index 100%
rename from apps/emqx_lwm2m/lwm2m_xml/LWM2M_Server-v1_0.xml
rename to apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Server-v1_0.xml
diff --git a/apps/emqx_lwm2m/rebar.config b/apps/emqx_gateway_lwm2m/rebar.config
similarity index 100%
rename from apps/emqx_lwm2m/rebar.config
rename to apps/emqx_gateway_lwm2m/rebar.config
diff --git a/apps/emqx_lwm2m/src/binary_util.erl b/apps/emqx_gateway_lwm2m/src/binary_util.erl
similarity index 100%
rename from apps/emqx_lwm2m/src/binary_util.erl
rename to apps/emqx_gateway_lwm2m/src/binary_util.erl
diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m.app.src b/apps/emqx_gateway_lwm2m/src/emqx_gateway_lwm2m.app.src
similarity index 59%
rename from apps/emqx_lwm2m/src/emqx_lwm2m.app.src
rename to apps/emqx_gateway_lwm2m/src/emqx_gateway_lwm2m.app.src
index 6338fa9d3..83a707395 100644
--- a/apps/emqx_lwm2m/src/emqx_lwm2m.app.src
+++ b/apps/emqx_gateway_lwm2m/src/emqx_gateway_lwm2m.app.src
@@ -1,8 +1,8 @@
-{application, emqx_lwm2m, [
+{application, emqx_gateway_lwm2m, [
     {description, "LwM2M Gateway"},
     {vsn, "0.1.0"},
     {registered, []},
-    {applications, [kernel, stdlib, emqx, emqx_gateway, emqx_coap]},
+    {applications, [kernel, stdlib, emqx, emqx_gateway, emqx_gateway_coap]},
     {env, []},
     {modules, []},
     {licenses, ["Apache 2.0"]},
diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m.erl b/apps/emqx_gateway_lwm2m/src/emqx_gateway_lwm2m.erl
similarity index 99%
rename from apps/emqx_lwm2m/src/emqx_lwm2m.erl
rename to apps/emqx_gateway_lwm2m/src/emqx_gateway_lwm2m.erl
index 222d1076e..1c8f67863 100644
--- a/apps/emqx_lwm2m/src/emqx_lwm2m.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_gateway_lwm2m.erl
@@ -15,7 +15,7 @@
 %%--------------------------------------------------------------------
 
 %% @doc The LwM2M Gateway implement
--module(emqx_lwm2m).
+-module(emqx_gateway_lwm2m).
 
 -include_lib("emqx/include/logger.hrl").
 -include_lib("emqx_gateway/include/emqx_gateway.hrl").
diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m_api.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_api.erl
similarity index 100%
rename from apps/emqx_lwm2m/src/emqx_lwm2m_api.erl
rename to apps/emqx_gateway_lwm2m/src/emqx_lwm2m_api.erl
diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m_channel.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_channel.erl
similarity index 99%
rename from apps/emqx_lwm2m/src/emqx_lwm2m_channel.erl
rename to apps/emqx_gateway_lwm2m/src/emqx_lwm2m_channel.erl
index 276b4f19d..a424375dd 100644
--- a/apps/emqx_lwm2m/src/emqx_lwm2m_channel.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_channel.erl
@@ -18,7 +18,7 @@
 
 -include("emqx_lwm2m.hrl").
 -include_lib("emqx/include/logger.hrl").
--include_lib("emqx_coap/include/emqx_coap.hrl").
+-include_lib("emqx_gateway_coap/include/emqx_coap.hrl").
 
 %% API
 -export([
diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m_cmd.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_cmd.erl
similarity index 99%
rename from apps/emqx_lwm2m/src/emqx_lwm2m_cmd.erl
rename to apps/emqx_gateway_lwm2m/src/emqx_lwm2m_cmd.erl
index 9ef3fb10d..53995c97c 100644
--- a/apps/emqx_lwm2m/src/emqx_lwm2m_cmd.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_cmd.erl
@@ -18,7 +18,7 @@
 
 -include("emqx_lwm2m.hrl").
 -include_lib("emqx/include/logger.hrl").
--include_lib("emqx_coap/include/emqx_coap.hrl").
+-include_lib("emqx_gateway_coap/include/emqx_coap.hrl").
 
 -export([
     mqtt_to_coap/2,
diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m_message.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl
similarity index 100%
rename from apps/emqx_lwm2m/src/emqx_lwm2m_message.erl
rename to apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl
diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m_schema.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_schema.erl
similarity index 100%
rename from apps/emqx_lwm2m/src/emqx_lwm2m_schema.erl
rename to apps/emqx_gateway_lwm2m/src/emqx_lwm2m_schema.erl
diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m_session.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_session.erl
similarity index 99%
rename from apps/emqx_lwm2m/src/emqx_lwm2m_session.erl
rename to apps/emqx_gateway_lwm2m/src/emqx_lwm2m_session.erl
index 6c8b419ee..2752804dc 100644
--- a/apps/emqx_lwm2m/src/emqx_lwm2m_session.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_session.erl
@@ -20,7 +20,7 @@
 -include_lib("emqx/include/emqx.hrl").
 -include_lib("emqx/include/emqx_mqtt.hrl").
 -include_lib("snabbkaffe/include/snabbkaffe.hrl").
--include_lib("emqx_coap/include/emqx_coap.hrl").
+-include_lib("emqx_gateway_coap/include/emqx_coap.hrl").
 
 %% API
 -export([
diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m_tlv.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_tlv.erl
similarity index 100%
rename from apps/emqx_lwm2m/src/emqx_lwm2m_tlv.erl
rename to apps/emqx_gateway_lwm2m/src/emqx_lwm2m_tlv.erl
diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m_xml_object.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_xml_object.erl
similarity index 100%
rename from apps/emqx_lwm2m/src/emqx_lwm2m_xml_object.erl
rename to apps/emqx_gateway_lwm2m/src/emqx_lwm2m_xml_object.erl
diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m_xml_object_db.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_xml_object_db.erl
similarity index 100%
rename from apps/emqx_lwm2m/src/emqx_lwm2m_xml_object_db.erl
rename to apps/emqx_gateway_lwm2m/src/emqx_lwm2m_xml_object_db.erl
diff --git a/apps/emqx_lwm2m/test/emqx_lwm2m_SUITE.erl b/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_SUITE.erl
similarity index 99%
rename from apps/emqx_lwm2m/test/emqx_lwm2m_SUITE.erl
rename to apps/emqx_gateway_lwm2m/test/emqx_lwm2m_SUITE.erl
index dd2e3bbfd..b090faba7 100644
--- a/apps/emqx_lwm2m/test/emqx_lwm2m_SUITE.erl
+++ b/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_SUITE.erl
@@ -32,7 +32,7 @@
 -define(LOGT(Format, Args), ct:pal("TEST_SUITE: " ++ Format, Args)).
 
 -include("emqx_lwm2m.hrl").
--include_lib("emqx_coap/include/emqx_coap.hrl").
+-include_lib("emqx_gateway_coap/include/emqx_coap.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 -include_lib("snabbkaffe/include/snabbkaffe.hrl").
diff --git a/apps/emqx_lwm2m/test/emqx_lwm2m_api_SUITE.erl b/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_api_SUITE.erl
similarity index 99%
rename from apps/emqx_lwm2m/test/emqx_lwm2m_api_SUITE.erl
rename to apps/emqx_gateway_lwm2m/test/emqx_lwm2m_api_SUITE.erl
index a1d048d76..8608b543d 100644
--- a/apps/emqx_lwm2m/test/emqx_lwm2m_api_SUITE.erl
+++ b/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_api_SUITE.erl
@@ -24,7 +24,7 @@
 -define(LOGT(Format, Args), ct:pal("TEST_SUITE: " ++ Format, Args)).
 
 -include("emqx_lwm2m.hrl").
--include("emqx_coap/include/emqx_coap.hrl").
+-include("emqx_gateway_coap/include/emqx_coap.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 
diff --git a/apps/emqx_lwm2m/test/emqx_tlv_SUITE.erl b/apps/emqx_gateway_lwm2m/test/emqx_tlv_SUITE.erl
similarity index 99%
rename from apps/emqx_lwm2m/test/emqx_tlv_SUITE.erl
rename to apps/emqx_gateway_lwm2m/test/emqx_tlv_SUITE.erl
index da1e3a9c4..c413469ea 100644
--- a/apps/emqx_lwm2m/test/emqx_tlv_SUITE.erl
+++ b/apps/emqx_gateway_lwm2m/test/emqx_tlv_SUITE.erl
@@ -22,7 +22,7 @@
 -define(LOGT(Format, Args), logger:debug("TEST_SUITE: " ++ Format, Args)).
 
 -include("emqx_lwm2m.hrl").
--include("emqx_coap/include/emqx_coap.hrl").
+-include("emqx_gateway_coap/include/emqx_coap.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 %%--------------------------------------------------------------------
diff --git a/apps/emqx_mqttsn/.gitignore b/apps/emqx_gateway_mqttsn/.gitignore
similarity index 100%
rename from apps/emqx_mqttsn/.gitignore
rename to apps/emqx_gateway_mqttsn/.gitignore
diff --git a/apps/emqx_mqttsn/README.md b/apps/emqx_gateway_mqttsn/README.md
similarity index 100%
rename from apps/emqx_mqttsn/README.md
rename to apps/emqx_gateway_mqttsn/README.md
diff --git a/apps/emqx_mqttsn/include/emqx_mqttsn.hrl b/apps/emqx_gateway_mqttsn/include/emqx_mqttsn.hrl
similarity index 100%
rename from apps/emqx_mqttsn/include/emqx_mqttsn.hrl
rename to apps/emqx_gateway_mqttsn/include/emqx_mqttsn.hrl
diff --git a/apps/emqx_mqttsn/rebar.config b/apps/emqx_gateway_mqttsn/rebar.config
similarity index 100%
rename from apps/emqx_mqttsn/rebar.config
rename to apps/emqx_gateway_mqttsn/rebar.config
diff --git a/apps/emqx_mqttsn/src/emqx_mqttsn.app.src b/apps/emqx_gateway_mqttsn/src/emqx_gateway_mqttsn.app.src
similarity index 85%
rename from apps/emqx_mqttsn/src/emqx_mqttsn.app.src
rename to apps/emqx_gateway_mqttsn/src/emqx_gateway_mqttsn.app.src
index 55e18e800..dd48b2723 100644
--- a/apps/emqx_mqttsn/src/emqx_mqttsn.app.src
+++ b/apps/emqx_gateway_mqttsn/src/emqx_gateway_mqttsn.app.src
@@ -1,4 +1,4 @@
-{application, emqx_mqttsn, [
+{application, emqx_gateway_mqttsn, [
     {description, "MQTT-SN Gateway"},
     {vsn, "0.1.0"},
     {registered, []},
diff --git a/apps/emqx_mqttsn/src/emqx_mqttsn.erl b/apps/emqx_gateway_mqttsn/src/emqx_gateway_mqttsn.erl
similarity index 99%
rename from apps/emqx_mqttsn/src/emqx_mqttsn.erl
rename to apps/emqx_gateway_mqttsn/src/emqx_gateway_mqttsn.erl
index 5d6a94df4..167ee465c 100644
--- a/apps/emqx_mqttsn/src/emqx_mqttsn.erl
+++ b/apps/emqx_gateway_mqttsn/src/emqx_gateway_mqttsn.erl
@@ -15,7 +15,7 @@
 %%--------------------------------------------------------------------
 
 %% @doc The MQTT-SN Gateway implement interface
--module(emqx_mqttsn).
+-module(emqx_gateway_mqttsn).
 
 -include_lib("emqx/include/logger.hrl").
 
diff --git a/apps/emqx_mqttsn/src/emqx_mqttsn_broadcast.erl b/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_broadcast.erl
similarity index 100%
rename from apps/emqx_mqttsn/src/emqx_mqttsn_broadcast.erl
rename to apps/emqx_gateway_mqttsn/src/emqx_mqttsn_broadcast.erl
diff --git a/apps/emqx_mqttsn/src/emqx_mqttsn_channel.erl b/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_channel.erl
similarity index 100%
rename from apps/emqx_mqttsn/src/emqx_mqttsn_channel.erl
rename to apps/emqx_gateway_mqttsn/src/emqx_mqttsn_channel.erl
diff --git a/apps/emqx_mqttsn/src/emqx_mqttsn_frame.erl b/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_frame.erl
similarity index 100%
rename from apps/emqx_mqttsn/src/emqx_mqttsn_frame.erl
rename to apps/emqx_gateway_mqttsn/src/emqx_mqttsn_frame.erl
diff --git a/apps/emqx_mqttsn/src/emqx_mqttsn_registry.erl b/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_registry.erl
similarity index 100%
rename from apps/emqx_mqttsn/src/emqx_mqttsn_registry.erl
rename to apps/emqx_gateway_mqttsn/src/emqx_mqttsn_registry.erl
diff --git a/apps/emqx_mqttsn/src/emqx_mqttsn_schema.erl b/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_schema.erl
similarity index 100%
rename from apps/emqx_mqttsn/src/emqx_mqttsn_schema.erl
rename to apps/emqx_gateway_mqttsn/src/emqx_mqttsn_schema.erl
diff --git a/apps/emqx_mqttsn/test/broadcast_test.py b/apps/emqx_gateway_mqttsn/test/broadcast_test.py
similarity index 100%
rename from apps/emqx_mqttsn/test/broadcast_test.py
rename to apps/emqx_gateway_mqttsn/test/broadcast_test.py
diff --git a/apps/emqx_mqttsn/test/emqx_sn_frame_SUITE.erl b/apps/emqx_gateway_mqttsn/test/emqx_sn_frame_SUITE.erl
similarity index 100%
rename from apps/emqx_mqttsn/test/emqx_sn_frame_SUITE.erl
rename to apps/emqx_gateway_mqttsn/test/emqx_sn_frame_SUITE.erl
diff --git a/apps/emqx_mqttsn/test/emqx_sn_protocol_SUITE.erl b/apps/emqx_gateway_mqttsn/test/emqx_sn_protocol_SUITE.erl
similarity index 100%
rename from apps/emqx_mqttsn/test/emqx_sn_protocol_SUITE.erl
rename to apps/emqx_gateway_mqttsn/test/emqx_sn_protocol_SUITE.erl
diff --git a/apps/emqx_mqttsn/test/emqx_sn_registry_SUITE.erl b/apps/emqx_gateway_mqttsn/test/emqx_sn_registry_SUITE.erl
similarity index 100%
rename from apps/emqx_mqttsn/test/emqx_sn_registry_SUITE.erl
rename to apps/emqx_gateway_mqttsn/test/emqx_sn_registry_SUITE.erl
diff --git a/apps/emqx_mqttsn/test/intergration_test/Makefile b/apps/emqx_gateway_mqttsn/test/intergration_test/Makefile
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/Makefile
rename to apps/emqx_gateway_mqttsn/test/intergration_test/Makefile
diff --git a/apps/emqx_mqttsn/test/intergration_test/README.md b/apps/emqx_gateway_mqttsn/test/intergration_test/README.md
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/README.md
rename to apps/emqx_gateway_mqttsn/test/intergration_test/README.md
diff --git a/apps/emqx_mqttsn/test/intergration_test/add_emqx_sn_to_project.py b/apps/emqx_gateway_mqttsn/test/intergration_test/add_emqx_sn_to_project.py
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/add_emqx_sn_to_project.py
rename to apps/emqx_gateway_mqttsn/test/intergration_test/add_emqx_sn_to_project.py
diff --git a/apps/emqx_mqttsn/test/intergration_test/client/case1_qos0pub.c b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case1_qos0pub.c
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/client/case1_qos0pub.c
rename to apps/emqx_gateway_mqttsn/test/intergration_test/client/case1_qos0pub.c
diff --git a/apps/emqx_mqttsn/test/intergration_test/client/case1_qos0sub.c b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case1_qos0sub.c
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/client/case1_qos0sub.c
rename to apps/emqx_gateway_mqttsn/test/intergration_test/client/case1_qos0sub.c
diff --git a/apps/emqx_mqttsn/test/intergration_test/client/case2_qos0pub.c b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case2_qos0pub.c
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/client/case2_qos0pub.c
rename to apps/emqx_gateway_mqttsn/test/intergration_test/client/case2_qos0pub.c
diff --git a/apps/emqx_mqttsn/test/intergration_test/client/case2_qos0sub.c b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case2_qos0sub.c
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/client/case2_qos0sub.c
rename to apps/emqx_gateway_mqttsn/test/intergration_test/client/case2_qos0sub.c
diff --git a/apps/emqx_mqttsn/test/intergration_test/client/case3_qos0pub.c b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case3_qos0pub.c
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/client/case3_qos0pub.c
rename to apps/emqx_gateway_mqttsn/test/intergration_test/client/case3_qos0pub.c
diff --git a/apps/emqx_mqttsn/test/intergration_test/client/case3_qos0sub.c b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case3_qos0sub.c
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/client/case3_qos0sub.c
rename to apps/emqx_gateway_mqttsn/test/intergration_test/client/case3_qos0sub.c
diff --git a/apps/emqx_mqttsn/test/intergration_test/client/case4_qos3pub.c b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case4_qos3pub.c
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/client/case4_qos3pub.c
rename to apps/emqx_gateway_mqttsn/test/intergration_test/client/case4_qos3pub.c
diff --git a/apps/emqx_mqttsn/test/intergration_test/client/case4_qos3sub.c b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case4_qos3sub.c
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/client/case4_qos3sub.c
rename to apps/emqx_gateway_mqttsn/test/intergration_test/client/case4_qos3sub.c
diff --git a/apps/emqx_mqttsn/test/intergration_test/client/case5_qos3pub.c b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case5_qos3pub.c
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/client/case5_qos3pub.c
rename to apps/emqx_gateway_mqttsn/test/intergration_test/client/case5_qos3pub.c
diff --git a/apps/emqx_mqttsn/test/intergration_test/client/case5_qos3sub.c b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case5_qos3sub.c
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/client/case5_qos3sub.c
rename to apps/emqx_gateway_mqttsn/test/intergration_test/client/case5_qos3sub.c
diff --git a/apps/emqx_mqttsn/test/intergration_test/client/case6_sleep.c b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case6_sleep.c
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/client/case6_sleep.c
rename to apps/emqx_gateway_mqttsn/test/intergration_test/client/case6_sleep.c
diff --git a/apps/emqx_mqttsn/test/intergration_test/client/case7_double_connect.c b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case7_double_connect.c
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/client/case7_double_connect.c
rename to apps/emqx_gateway_mqttsn/test/intergration_test/client/case7_double_connect.c
diff --git a/apps/emqx_mqttsn/test/intergration_test/client/int_test_result.c b/apps/emqx_gateway_mqttsn/test/intergration_test/client/int_test_result.c
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/client/int_test_result.c
rename to apps/emqx_gateway_mqttsn/test/intergration_test/client/int_test_result.c
diff --git a/apps/emqx_mqttsn/test/intergration_test/client/int_test_result.h b/apps/emqx_gateway_mqttsn/test/intergration_test/client/int_test_result.h
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/client/int_test_result.h
rename to apps/emqx_gateway_mqttsn/test/intergration_test/client/int_test_result.h
diff --git a/apps/emqx_mqttsn/test/intergration_test/disable_qos3.py b/apps/emqx_gateway_mqttsn/test/intergration_test/disable_qos3.py
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/disable_qos3.py
rename to apps/emqx_gateway_mqttsn/test/intergration_test/disable_qos3.py
diff --git a/apps/emqx_mqttsn/test/intergration_test/enable_qos3.py b/apps/emqx_gateway_mqttsn/test/intergration_test/enable_qos3.py
similarity index 100%
rename from apps/emqx_mqttsn/test/intergration_test/enable_qos3.py
rename to apps/emqx_gateway_mqttsn/test/intergration_test/enable_qos3.py
diff --git a/apps/emqx_mqttsn/test/props/emqx_sn_proper_types.erl b/apps/emqx_gateway_mqttsn/test/props/emqx_sn_proper_types.erl
similarity index 100%
rename from apps/emqx_mqttsn/test/props/emqx_sn_proper_types.erl
rename to apps/emqx_gateway_mqttsn/test/props/emqx_sn_proper_types.erl
diff --git a/apps/emqx_mqttsn/test/props/prop_emqx_sn_frame.erl b/apps/emqx_gateway_mqttsn/test/props/prop_emqx_sn_frame.erl
similarity index 100%
rename from apps/emqx_mqttsn/test/props/prop_emqx_sn_frame.erl
rename to apps/emqx_gateway_mqttsn/test/props/prop_emqx_sn_frame.erl
diff --git a/apps/emqx_stomp/.gitignore b/apps/emqx_gateway_stomp/.gitignore
similarity index 100%
rename from apps/emqx_stomp/.gitignore
rename to apps/emqx_gateway_stomp/.gitignore
diff --git a/apps/emqx_stomp/README.md b/apps/emqx_gateway_stomp/README.md
similarity index 100%
rename from apps/emqx_stomp/README.md
rename to apps/emqx_gateway_stomp/README.md
diff --git a/apps/emqx_stomp/include/emqx_stomp.hrl b/apps/emqx_gateway_stomp/include/emqx_stomp.hrl
similarity index 100%
rename from apps/emqx_stomp/include/emqx_stomp.hrl
rename to apps/emqx_gateway_stomp/include/emqx_stomp.hrl
diff --git a/apps/emqx_stomp/rebar.config b/apps/emqx_gateway_stomp/rebar.config
similarity index 100%
rename from apps/emqx_stomp/rebar.config
rename to apps/emqx_gateway_stomp/rebar.config
diff --git a/apps/emqx_stomp/src/emqx_stomp.app.src b/apps/emqx_gateway_stomp/src/emqx_gateway_stomp.app.src
similarity index 86%
rename from apps/emqx_stomp/src/emqx_stomp.app.src
rename to apps/emqx_gateway_stomp/src/emqx_gateway_stomp.app.src
index e118f8370..38da1e18b 100644
--- a/apps/emqx_stomp/src/emqx_stomp.app.src
+++ b/apps/emqx_gateway_stomp/src/emqx_gateway_stomp.app.src
@@ -1,4 +1,4 @@
-{application, emqx_stomp, [
+{application, emqx_gateway_stomp, [
     {description, "Stomp Gateway"},
     {vsn, "0.1.0"},
     {registered, []},
diff --git a/apps/emqx_stomp/src/emqx_stomp.erl b/apps/emqx_gateway_stomp/src/emqx_gateway_stomp.erl
similarity index 99%
rename from apps/emqx_stomp/src/emqx_stomp.erl
rename to apps/emqx_gateway_stomp/src/emqx_gateway_stomp.erl
index dbfdfdce5..b8c2f0166 100644
--- a/apps/emqx_stomp/src/emqx_stomp.erl
+++ b/apps/emqx_gateway_stomp/src/emqx_gateway_stomp.erl
@@ -15,7 +15,7 @@
 %%--------------------------------------------------------------------
 
 %% @doc The Stomp Gateway implement
--module(emqx_stomp).
+-module(emqx_gateway_stomp).
 
 -include_lib("emqx/include/logger.hrl").
 -include_lib("emqx_gateway/include/emqx_gateway.hrl").
diff --git a/apps/emqx_stomp/src/emqx_stomp_channel.erl b/apps/emqx_gateway_stomp/src/emqx_stomp_channel.erl
similarity index 100%
rename from apps/emqx_stomp/src/emqx_stomp_channel.erl
rename to apps/emqx_gateway_stomp/src/emqx_stomp_channel.erl
diff --git a/apps/emqx_stomp/src/emqx_stomp_frame.erl b/apps/emqx_gateway_stomp/src/emqx_stomp_frame.erl
similarity index 100%
rename from apps/emqx_stomp/src/emqx_stomp_frame.erl
rename to apps/emqx_gateway_stomp/src/emqx_stomp_frame.erl
diff --git a/apps/emqx_stomp/src/emqx_stomp_heartbeat.erl b/apps/emqx_gateway_stomp/src/emqx_stomp_heartbeat.erl
similarity index 100%
rename from apps/emqx_stomp/src/emqx_stomp_heartbeat.erl
rename to apps/emqx_gateway_stomp/src/emqx_stomp_heartbeat.erl
diff --git a/apps/emqx_stomp/src/emqx_stomp_schema.erl b/apps/emqx_gateway_stomp/src/emqx_stomp_schema.erl
similarity index 100%
rename from apps/emqx_stomp/src/emqx_stomp_schema.erl
rename to apps/emqx_gateway_stomp/src/emqx_stomp_schema.erl
diff --git a/apps/emqx_stomp/test/emqx_stomp_SUITE.erl b/apps/emqx_gateway_stomp/test/emqx_stomp_SUITE.erl
similarity index 100%
rename from apps/emqx_stomp/test/emqx_stomp_SUITE.erl
rename to apps/emqx_gateway_stomp/test/emqx_stomp_SUITE.erl
diff --git a/apps/emqx_stomp/test/emqx_stomp_heartbeat_SUITE.erl b/apps/emqx_gateway_stomp/test/emqx_stomp_heartbeat_SUITE.erl
similarity index 100%
rename from apps/emqx_stomp/test/emqx_stomp_heartbeat_SUITE.erl
rename to apps/emqx_gateway_stomp/test/emqx_stomp_heartbeat_SUITE.erl
diff --git a/mix.exs b/mix.exs
index 56840579d..63e2de03f 100644
--- a/mix.exs
+++ b/mix.exs
@@ -223,11 +223,11 @@ defmodule EMQXUmbrella.MixProject do
           applications: applications(edition_type),
           skip_mode_validation_for: [
             :emqx_gateway,
-            :emqx_stomp,
-            :emqx_mqttsn,
-            :emqx_coap,
-            :emqx_lwm2m,
-            :emqx_exproto,
+            :emqx_gateway_stomp,
+            :emqx_gateway_mqttsn,
+            :emqx_gateway_coap,
+            :emqx_gateway_lwm2m,
+            :emqx_gateway_exproto,
             :emqx_dashboard,
             :emqx_resource,
             :emqx_connector,
@@ -288,11 +288,11 @@ defmodule EMQXUmbrella.MixProject do
         emqx_authz: :permanent,
         emqx_auto_subscribe: :permanent,
         emqx_gateway: :permanent,
-        emqx_stomp: :permanent,
-        emqx_mqttsn: :permanent,
-        emqx_coap: :permanent,
-        emqx_lwm2m: :permanent,
-        emqx_exproto: :permanent,
+        emqx_gateway_stomp: :permanent,
+        emqx_gateway_mqttsn: :permanent,
+        emqx_gateway_coap: :permanent,
+        emqx_gateway_lwm2m: :permanent,
+        emqx_gateway_exproto: :permanent,
         emqx_exhook: :permanent,
         emqx_bridge: :permanent,
         emqx_rule_engine: :permanent,
diff --git a/rebar.config.erl b/rebar.config.erl
index cdd628664..8f0cf4292 100644
--- a/rebar.config.erl
+++ b/rebar.config.erl
@@ -389,11 +389,11 @@ relx_apps(ReleaseType, Edition) ->
             emqx_authz,
             emqx_auto_subscribe,
             emqx_gateway,
-            emqx_stomp,
-            emqx_mqttsn,
-            emqx_coap,
-            emqx_lwm2m,
-            emqx_exproto,
+            emqx_gateway_stomp,
+            emqx_gateway_mqttsn,
+            emqx_gateway_coap,
+            emqx_gateway_lwm2m,
+            emqx_gateway_exproto,
             emqx_exhook,
             emqx_bridge,
             emqx_rule_engine,
@@ -455,7 +455,7 @@ relx_overlay(ReleaseType, Edition) ->
         {copy, "bin/emqx_ctl", "bin/emqx_ctl-{{release_version}}"},
         %% for relup
         {copy, "bin/install_upgrade.escript", "bin/install_upgrade.escript-{{release_version}}"},
-        {copy, "apps/emqx_lwm2m/lwm2m_xml", "etc/lwm2m_xml"},
+        {copy, "apps/emqx_gateway_lwm2m/lwm2m_xml", "etc/lwm2m_xml"},
         {copy, "apps/emqx_authz/etc/acl.conf", "etc/acl.conf"},
         {template, "bin/emqx.cmd", "bin/emqx.cmd"},
         {template, "bin/emqx_ctl.cmd", "bin/emqx_ctl.cmd"},

From 0cec52d5e4da6f790916f09aa468e75f6408a674 Mon Sep 17 00:00:00 2001
From: Kjell Winblad <kjellwinblad@gmail.com>
Date: Tue, 4 Apr 2023 12:01:41 +0200
Subject: [PATCH 019/110] fix: check Clickhouse connection after creation

When pressing reconnect on a badly configured Clickhouse bridge in the
dashboard, no error message was shown. This commit fixes this issue by
testing the connection after creation and returning an error tuple if
the connection is not working.

Fixes:
https://emqx.atlassian.net/browse/EMQX-9374
---
 changes/ee/fix-10324.en.md                            |  1 +
 changes/ee/fix-10324.zh.md                            |  1 +
 .../src/emqx_ee_connector_clickhouse.erl              | 11 +++++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 changes/ee/fix-10324.en.md
 create mode 100644 changes/ee/fix-10324.zh.md

diff --git a/changes/ee/fix-10324.en.md b/changes/ee/fix-10324.en.md
new file mode 100644
index 000000000..2d4c323da
--- /dev/null
+++ b/changes/ee/fix-10324.en.md
@@ -0,0 +1 @@
+Previously, when attempting to reconnect to a misconfigured Clickhouse bridge through the dashboard, users would not receive an error message. This issue is now resolved, and error messages will now be displayed
diff --git a/changes/ee/fix-10324.zh.md b/changes/ee/fix-10324.zh.md
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/changes/ee/fix-10324.zh.md
@@ -0,0 +1 @@
+
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_clickhouse.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_clickhouse.erl
index 8f2fdc042..5d68687dc 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_clickhouse.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_clickhouse.erl
@@ -270,8 +270,15 @@ connect(Options) ->
         {pool_size, PoolSize}
     ],
     case clickhouse:start_link(FixedOptions) of
-        {ok, _Conn} = Ok ->
-            Ok;
+        {ok, Connection} ->
+            %% Check if we can connect and send a query
+            case clickhouse:detailed_status(Connection) of
+                ok ->
+                    {ok, Connection};
+                Error ->
+                    ok = clickhouse:stop(Connection),
+                    Error
+            end;
         {error, Reason} ->
             {error, Reason}
     end.

From aa9292e37ecbba51170347e3d0f00a40221f538a Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@163.com>
Date: Thu, 13 Apr 2023 16:18:34 +0800
Subject: [PATCH 020/110] chore: update apps/emqx_gateway/README.md

Co-authored-by: Stefan Strigler <stefan@strigler.de>
---
 apps/emqx_gateway/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/emqx_gateway/README.md b/apps/emqx_gateway/README.md
index d1f327db2..5dedea418 100644
--- a/apps/emqx_gateway/README.md
+++ b/apps/emqx_gateway/README.md
@@ -1,6 +1,6 @@
 # Gateway
 
-EMQX Gateway is an application that managing all gateways in EMQX.
+EMQX Gateway is an application framework that manages all gateways within EMQX.
 
 It provides a set of standards to define how to implement a certain type of
 protocol access on EMQX. For example:

From 40e4419a62d0a06cff19987aa3668a53c301c00a Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@163.com>
Date: Thu, 13 Apr 2023 16:18:46 +0800
Subject: [PATCH 021/110] chore: update apps/emqx_gateway/README.md

Co-authored-by: Stefan Strigler <stefan@strigler.de>
---
 apps/emqx_gateway/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/emqx_gateway/README.md b/apps/emqx_gateway/README.md
index 5dedea418..8ef0fa30a 100644
--- a/apps/emqx_gateway/README.md
+++ b/apps/emqx_gateway/README.md
@@ -43,7 +43,7 @@ gateway.stomp {
 
 ## How to develop your Gateway application
 
-There are three ways to develop Gateway application to accept your private protocol
+There are three ways to develop a Gateway application to accept your private protocol
 clients.
 
 ### Raw Erlang Application

From 4dd0080e821682dda28036cd65b68d8eda9e51d2 Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@gmail.com>
Date: Thu, 13 Apr 2023 17:19:47 +0800
Subject: [PATCH 022/110] chore: fix unreachable links

---
 apps/emqx_gateway/README.md | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/apps/emqx_gateway/README.md b/apps/emqx_gateway/README.md
index 8ef0fa30a..ebab3a7a9 100644
--- a/apps/emqx_gateway/README.md
+++ b/apps/emqx_gateway/README.md
@@ -49,13 +49,11 @@ clients.
 ### Raw Erlang Application
 
 This approach is the same as in EMQX 4.x. You need to implement an Erlang application,
-which is packaged in EMQX as a [Plugin](todo) or as a source code dependency.
+which is packaged in EMQX as a Plugin or as a source code dependency.
 In this approach, you do not need to respect any specifications of emqx_gateway,
 and you can freely implement the features you need.
 
 
-Steps guide: [Implement Gateway via Raw Application](doc/implement_gateway_via_raw_appliction.md)
-
 ### Respect emqx_gateway framework
 
 Similar to the first approach, you still need to implement an application using Erlang
@@ -67,8 +65,6 @@ This is the approach we recommend. In this approach, your implementation can be
 by the emqx_gateway framework, even if it may require you to understand more details about it.
 
 
-Steps guide: [Implement Gateway via Gateway framework](doc/implement_gateway_via_gateway_framekwork.md)
-
 ### Use ExProto Gateway (Non-Erlang developers)
 
 If you want to implement your gateway using other programming languages such as
@@ -77,11 +73,6 @@ Java, Python, Go, etc.
 You need to implement a gRPC service in the other programming language to parse
 your device protocol and integrate it with EMQX.
 
-Refer to: [ExProto Gateway](../emqx_exproto/README.md)
-
-## Understand emqx_gateway framework
-
-*WIP*
 
 ## Contributing
 
@@ -89,4 +80,4 @@ Please see our [contributing.md](../../CONTRIBUTING.md).
 
 ## License
 
-See [LICENSE](../../LICENSE)
+See [LICENSE](../../APL.txt)

From c7054886b1e5ae569824688ab3198ef12593d17e Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@gmail.com>
Date: Thu, 13 Apr 2023 17:44:02 +0800
Subject: [PATCH 023/110] chore: refine test cases

---
 apps/emqx_gateway/test/emqx_gateway_test_utils.erl     | 10 +++++-----
 apps/emqx_gateway_coap/test/emqx_coap_SUITE.erl        |  2 +-
 apps/emqx_gateway_coap/test/emqx_coap_api_SUITE.erl    |  2 +-
 apps/emqx_gateway_exproto/test/emqx_exproto_SUITE.erl  |  2 +-
 apps/emqx_gateway_lwm2m/test/emqx_lwm2m_SUITE.erl      |  4 ++--
 apps/emqx_gateway_lwm2m/test/emqx_lwm2m_api_SUITE.erl  |  2 +-
 .../test/emqx_sn_protocol_SUITE.erl                    |  2 +-
 apps/emqx_gateway_stomp/test/emqx_stomp_SUITE.erl      |  2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/apps/emqx_gateway/test/emqx_gateway_test_utils.erl b/apps/emqx_gateway/test/emqx_gateway_test_utils.erl
index 56a2fe7f9..7ec0c9538 100644
--- a/apps/emqx_gateway/test/emqx_gateway_test_utils.erl
+++ b/apps/emqx_gateway/test/emqx_gateway_test_utils.erl
@@ -102,11 +102,11 @@ assert_fields_exist(Ks, Map) ->
         Ks
     ).
 load_all_gateway_apps() ->
-    application:load(emqx_stomp),
-    application:load(emqx_mqttsn),
-    application:load(emqx_coap),
-    application:load(emqx_lwm2m),
-    application:load(emqx_exproto).
+    application:load(emqx_gateway_stomp),
+    application:load(emqx_gateway_mqttsn),
+    application:load(emqx_gateway_coap),
+    application:load(emqx_gateway_lwm2m),
+    application:load(emqx_gateway_exproto).
 
 %%--------------------------------------------------------------------
 %% http
diff --git a/apps/emqx_gateway_coap/test/emqx_coap_SUITE.erl b/apps/emqx_gateway_coap/test/emqx_coap_SUITE.erl
index 1d33e042a..9b6f7ce1f 100644
--- a/apps/emqx_gateway_coap/test/emqx_coap_SUITE.erl
+++ b/apps/emqx_gateway_coap/test/emqx_coap_SUITE.erl
@@ -56,7 +56,7 @@
 all() -> emqx_common_test_helpers:all(?MODULE).
 
 init_per_suite(Config) ->
-    application:load(emqx_coap),
+    application:load(emqx_gateway_coap),
     ok = emqx_common_test_helpers:load_config(emqx_gateway_schema, ?CONF_DEFAULT),
     emqx_mgmt_api_test_util:init_suite([emqx_authn, emqx_gateway]),
     ok = meck:new(emqx_access_control, [passthrough, no_history, no_link]),
diff --git a/apps/emqx_gateway_coap/test/emqx_coap_api_SUITE.erl b/apps/emqx_gateway_coap/test/emqx_coap_api_SUITE.erl
index 9c418ab57..a0d6dbaaa 100644
--- a/apps/emqx_gateway_coap/test/emqx_coap_api_SUITE.erl
+++ b/apps/emqx_gateway_coap/test/emqx_coap_api_SUITE.erl
@@ -56,7 +56,7 @@ all() ->
     emqx_common_test_helpers:all(?MODULE).
 
 init_per_suite(Config) ->
-    application:load(emqx_coap),
+    application:load(emqx_gateway_coap),
     ok = emqx_common_test_helpers:load_config(emqx_gateway_schema, ?CONF_DEFAULT),
     emqx_mgmt_api_test_util:init_suite([emqx_authn, emqx_gateway]),
     Config.
diff --git a/apps/emqx_gateway_exproto/test/emqx_exproto_SUITE.erl b/apps/emqx_gateway_exproto/test/emqx_exproto_SUITE.erl
index a8ce41f44..264f6af95 100644
--- a/apps/emqx_gateway_exproto/test/emqx_exproto_SUITE.erl
+++ b/apps/emqx_gateway_exproto/test/emqx_exproto_SUITE.erl
@@ -76,7 +76,7 @@ metrics() ->
     [tcp, ssl, udp, dtls].
 
 init_per_group(GrpName, Cfg) ->
-    application:load(emqx_exproto),
+    application:load(emqx_gateway_exproto),
     put(grpname, GrpName),
     Svrs = emqx_exproto_echo_svr:start(),
     emqx_common_test_helpers:start_apps([emqx_authn, emqx_gateway], fun set_special_cfg/1),
diff --git a/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_SUITE.erl b/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_SUITE.erl
index b090faba7..33ccec2c7 100644
--- a/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_SUITE.erl
+++ b/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_SUITE.erl
@@ -134,7 +134,7 @@ groups() ->
 init_per_suite(Config) ->
     %% load application first for minirest api searching
     application:load(emqx_gateway),
-    application:load(emqx_lwm2m),
+    application:load(emqx_gateway_lwm2m),
     emqx_mgmt_api_test_util:init_suite([emqx_conf, emqx_authn]),
     Config.
 
@@ -181,7 +181,7 @@ default_config(Overrides) ->
         [
             emqx_common_test_helpers:proj_root(),
             "apps",
-            "emqx_lwm2m",
+            "emqx_gateway_lwm2m",
             "lwm2m_xml"
         ]
     ),
diff --git a/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_api_SUITE.erl b/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_api_SUITE.erl
index 8608b543d..b3c059b31 100644
--- a/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_api_SUITE.erl
+++ b/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_api_SUITE.erl
@@ -59,7 +59,7 @@ all() ->
 
 init_per_suite(Config) ->
     application:load(emqx_gateway),
-    application:load(emqx_lwm2m),
+    application:load(emqx_gateway_lwm2m),
     DefaultConfig = emqx_lwm2m_SUITE:default_config(),
     ok = emqx_common_test_helpers:load_config(emqx_gateway_schema, DefaultConfig),
     emqx_mgmt_api_test_util:init_suite([emqx_conf, emqx_authn]),
diff --git a/apps/emqx_gateway_mqttsn/test/emqx_sn_protocol_SUITE.erl b/apps/emqx_gateway_mqttsn/test/emqx_sn_protocol_SUITE.erl
index 0e04ec67a..04b1b5fb2 100644
--- a/apps/emqx_gateway_mqttsn/test/emqx_sn_protocol_SUITE.erl
+++ b/apps/emqx_gateway_mqttsn/test/emqx_sn_protocol_SUITE.erl
@@ -97,7 +97,7 @@ all() ->
     emqx_common_test_helpers:all(?MODULE).
 
 init_per_suite(Config) ->
-    application:load(emqx_mqttsn),
+    application:load(emqx_gateway_mqttsn),
     ok = emqx_common_test_helpers:load_config(emqx_gateway_schema, ?CONF_DEFAULT),
     emqx_mgmt_api_test_util:init_suite([emqx_conf, emqx_authn, emqx_gateway]),
     Config.
diff --git a/apps/emqx_gateway_stomp/test/emqx_stomp_SUITE.erl b/apps/emqx_gateway_stomp/test/emqx_stomp_SUITE.erl
index fed7f5163..4323cf32f 100644
--- a/apps/emqx_gateway_stomp/test/emqx_stomp_SUITE.erl
+++ b/apps/emqx_gateway_stomp/test/emqx_stomp_SUITE.erl
@@ -53,7 +53,7 @@ all() -> emqx_common_test_helpers:all(?MODULE).
 %%--------------------------------------------------------------------
 
 init_per_suite(Cfg) ->
-    application:load(emqx_stomp),
+    application:load(emqx_gateway_stomp),
     ok = emqx_common_test_helpers:load_config(emqx_gateway_schema, ?CONF_DEFAULT),
     emqx_mgmt_api_test_util:init_suite([emqx_authn, emqx_gateway]),
     Cfg.

From 993be31998615da3ef005809b347f48fae6bb4ee Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@163.com>
Date: Thu, 13 Apr 2023 18:12:17 +0800
Subject: [PATCH 024/110] chore: update rel/i18n/emqx_conf_schema.hocon

Co-authored-by: LenaLenaPan <120552185+LenaLenaPan@users.noreply.github.com>
---
 rel/i18n/emqx_conf_schema.hocon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rel/i18n/emqx_conf_schema.hocon b/rel/i18n/emqx_conf_schema.hocon
index e9f9c1211..b252353f8 100644
--- a/rel/i18n/emqx_conf_schema.hocon
+++ b/rel/i18n/emqx_conf_schema.hocon
@@ -1190,7 +1190,7 @@ To flush events, the handler discards the buffered log messages without logging.
   log_overload_kill_restart_after {
     desc {
       en: """The handler restarts automatically after a delay in the event of termination, unless the value `infinity` is set, which blocks any subsequent restarts."""
-      zh: """处理进程停止后，会在该延迟时间后自动重新启动。除非该值设置为 <code>infinity</code>，这表示永不重新启动。"""
+      zh: """处理进程停止后，会在该延迟时间后自动重新启动。除非该值设置为 <code>infinity</code>，这会阻止任何后续的重启。"""
     }
     label {
       en: "Handler Restart Timer"

From cbd2d90bb356cee15ebd80f785be972e201b1a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=90=E6=96=87?= <zhongwencool@gmail.com>
Date: Thu, 13 Apr 2023 19:45:49 +0800
Subject: [PATCH 025/110] chore: add changelog for hide data items

---
 changes/ce/feat-10385.en.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes/ce/feat-10385.en.md

diff --git a/changes/ce/feat-10385.en.md b/changes/ce/feat-10385.en.md
new file mode 100644
index 000000000..667e01890
--- /dev/null
+++ b/changes/ce/feat-10385.en.md
@@ -0,0 +1 @@
+Hide data items(rule_engine/bridge/authz/authn) from configuration files and documentation.

From dd7dcfe3739f2686721d907f04804b674a8cc67a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=90=E6=96=87?= <zhongwencool@gmail.com>
Date: Thu, 13 Apr 2023 20:04:03 +0800
Subject: [PATCH 026/110] fix: fix dialyzer warning

---
 apps/emqx/src/emqx_trace/emqx_trace.erl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/emqx/src/emqx_trace/emqx_trace.erl b/apps/emqx/src/emqx_trace/emqx_trace.erl
index a185d1910..533e2e822 100644
--- a/apps/emqx/src/emqx_trace/emqx_trace.erl
+++ b/apps/emqx/src/emqx_trace/emqx_trace.erl
@@ -148,7 +148,11 @@ list(Enable) ->
 
 -spec create([{Key :: binary(), Value :: binary()}] | #{atom() => binary()}) ->
     {ok, #?TRACE{}}
-    | {error, {duplicate_condition, iodata()} | {already_existed, iodata()} | iodata()}.
+    | {error,
+        {duplicate_condition, iodata()}
+        | {already_existed, iodata()}
+        | {error, {bad_type, any()}}
+        | iodata()}.
 create(Trace) ->
     case mnesia:table_info(?TRACE, size) < ?MAX_SIZE of
         true ->

From dc71a97d26532a7438a967aea40d9f2fbfc4a72a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=90=E6=96=87?= <zhongwencool@gmail.com>
Date: Thu, 13 Apr 2023 20:35:15 +0800
Subject: [PATCH 027/110] chore: add changelog for max_heap_size

---
 changes/ce/feat-10354.en.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 changes/ce/feat-10354.en.md

diff --git a/changes/ce/feat-10354.en.md b/changes/ce/feat-10354.en.md
new file mode 100644
index 000000000..d728a1b20
--- /dev/null
+++ b/changes/ce/feat-10354.en.md
@@ -0,0 +1,2 @@
+More specific error messages when configure with bad max_heap_size value.
+Log current value and the max value when the `message_queue_too_long` error is thrown.

From c1163d1952dc35e038125167cc5b1655f3589c6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=90=E6=96=87?= <zhongwencool@gmail.com>
Date: Thu, 13 Apr 2023 20:51:14 +0800
Subject: [PATCH 028/110] chore: share emqx_trace.hrl between code and test

---
 .../{src/emqx_trace => include}/emqx_trace.hrl   |  0
 apps/emqx/src/emqx_trace/emqx_trace.erl          | 16 +++++++---------
 apps/emqx/test/emqx_trace_SUITE.erl              |  5 +----
 3 files changed, 8 insertions(+), 13 deletions(-)
 rename apps/emqx/{src/emqx_trace => include}/emqx_trace.hrl (100%)

diff --git a/apps/emqx/src/emqx_trace/emqx_trace.hrl b/apps/emqx/include/emqx_trace.hrl
similarity index 100%
rename from apps/emqx/src/emqx_trace/emqx_trace.hrl
rename to apps/emqx/include/emqx_trace.hrl
diff --git a/apps/emqx/src/emqx_trace/emqx_trace.erl b/apps/emqx/src/emqx_trace/emqx_trace.erl
index 533e2e822..f14dc0c15 100644
--- a/apps/emqx/src/emqx_trace/emqx_trace.erl
+++ b/apps/emqx/src/emqx_trace/emqx_trace.erl
@@ -21,6 +21,7 @@
 -include_lib("emqx/include/logger.hrl").
 -include_lib("kernel/include/file.hrl").
 -include_lib("snabbkaffe/include/trace.hrl").
+-include_lib("emqx/include/emqx_trace.hrl").
 
 -export([
     publish/1,
@@ -54,13 +55,10 @@
 
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
 
--include("emqx_trace.hrl").
-
 -ifdef(TEST).
 -export([
     log_file/2,
-    find_closest_time/2,
-    migrate_trace/0
+    find_closest_time/2
 ]).
 -endif.
 
@@ -151,7 +149,7 @@ list(Enable) ->
     | {error,
         {duplicate_condition, iodata()}
         | {already_existed, iodata()}
-        | {error, {bad_type, any()}}
+        | {bad_type, any()}
         | iodata()}.
 create(Trace) ->
     case mnesia:table_info(?TRACE, size) < ?MAX_SIZE of
@@ -227,15 +225,16 @@ format(Traces) ->
 
 init([]) ->
     erlang:process_flag(trap_exit, true),
+    Fields = record_info(fields, ?TRACE),
     ok = mria:create_table(?TRACE, [
         {type, set},
         {rlog_shard, ?SHARD},
         {storage, disc_copies},
         {record_name, ?TRACE},
-        {attributes, record_info(fields, ?TRACE)}
+        {attributes, Fields}
     ]),
     ok = mria:wait_for_tables([?TRACE]),
-    migrate_trace(),
+    maybe_migrate_trace(Fields),
     {ok, _} = mnesia:subscribe({table, ?TRACE, simple}),
     ok = filelib:ensure_dir(filename:join([trace_dir(), dummy])),
     ok = filelib:ensure_dir(filename:join([zip_dir(), dummy])),
@@ -583,8 +582,7 @@ filter_cli_handler(Names) ->
 now_second() ->
     os:system_time(second).
 
-migrate_trace() ->
-    Fields = record_info(fields, ?TRACE),
+maybe_migrate_trace(Fields) ->
     case mnesia:table_info(emqx_trace, attributes) =:= Fields of
         true ->
             ok;
diff --git a/apps/emqx/test/emqx_trace_SUITE.erl b/apps/emqx/test/emqx_trace_SUITE.erl
index 3594f0651..140ec79ff 100644
--- a/apps/emqx/test/emqx_trace_SUITE.erl
+++ b/apps/emqx/test/emqx_trace_SUITE.erl
@@ -22,12 +22,9 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/emqx_trace.hrl").
 -include_lib("snabbkaffe/include/snabbkaffe.hrl").
 
--record(emqx_trace, {
-    name, type, filter, enable = true, payload_encode = text, extra = #{}, start_at, end_at
-}).
-
 %%--------------------------------------------------------------------
 %% Setups
 %%--------------------------------------------------------------------

From 58e31d5efd8dba6adad48359f1feb088ac14aa30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=90=E6=96=87?= <zhongwencool@gmail.com>
Date: Thu, 13 Apr 2023 21:33:48 +0800
Subject: [PATCH 029/110] feat: hide
 ex_hook/rewrite/topic_metric/persistent_session_store/overload_protection

---
 apps/emqx/src/emqx_schema.erl                 |  4 ++--
 apps/emqx_exhook/src/emqx_exhook.app.src      |  2 +-
 apps/emqx_exhook/src/emqx_exhook_schema.erl   |  3 ++-
 apps/emqx_modules/src/emqx_modules_schema.erl | 10 ++++++++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 20018b2d5..48b0b4fed 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -186,7 +186,7 @@ roots(medium) ->
         {"overload_protection",
             sc(
                 ref("overload_protection"),
-                #{}
+                #{importance => ?IMPORTANCE_HIDDEN}
             )}
     ];
 roots(low) ->
@@ -224,7 +224,7 @@ roots(low) ->
         {"persistent_session_store",
             sc(
                 ref("persistent_session_store"),
-                #{}
+                #{importance => ?IMPORTANCE_HIDDEN}
             )},
         {"trace",
             sc(
diff --git a/apps/emqx_exhook/src/emqx_exhook.app.src b/apps/emqx_exhook/src/emqx_exhook.app.src
index 8ca15a907..194c91206 100644
--- a/apps/emqx_exhook/src/emqx_exhook.app.src
+++ b/apps/emqx_exhook/src/emqx_exhook.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_exhook, [
     {description, "EMQX Extension for Hook"},
-    {vsn, "5.0.11"},
+    {vsn, "5.0.12"},
     {modules, []},
     {registered, []},
     {mod, {emqx_exhook_app, []}},
diff --git a/apps/emqx_exhook/src/emqx_exhook_schema.erl b/apps/emqx_exhook/src/emqx_exhook_schema.erl
index 07373288d..708e164fc 100644
--- a/apps/emqx_exhook/src/emqx_exhook_schema.erl
+++ b/apps/emqx_exhook/src/emqx_exhook_schema.erl
@@ -31,7 +31,8 @@
 
 namespace() -> exhook.
 
-roots() -> [exhook].
+roots() ->
+    [{exhook, ?HOCON(?R_REF(exhook), #{importance => ?IMPORTANCE_HIDDEN})}].
 
 fields(exhook) ->
     [
diff --git a/apps/emqx_modules/src/emqx_modules_schema.erl b/apps/emqx_modules/src/emqx_modules_schema.erl
index ddb8f37a3..36a08de60 100644
--- a/apps/emqx_modules/src/emqx_modules_schema.erl
+++ b/apps/emqx_modules/src/emqx_modules_schema.erl
@@ -34,8 +34,14 @@ roots() ->
     [
         "delayed",
         "telemetry",
-        array("rewrite", #{desc => "List of topic rewrite rules."}),
-        array("topic_metrics", #{desc => "List of topics whose metrics are reported."})
+        array("rewrite", #{
+            desc => "List of topic rewrite rules.",
+            importance => ?IMPORTANCE_HIDDEN
+        }),
+        array("topic_metrics", #{
+            desc => "List of topics whose metrics are reported.",
+            importance => ?IMPORTANCE_HIDDEN
+        })
     ].
 
 fields("telemetry") ->

From 3431a1b12385d004afa87428150c91f23dd2fba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=90=E6=96=87?= <zhongwencool@gmail.com>
Date: Thu, 13 Apr 2023 21:55:01 +0800
Subject: [PATCH 030/110] chore: add changelog

---
 changes/ce/feat-10391.en.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes/ce/feat-10391.en.md

diff --git a/changes/ce/feat-10391.en.md b/changes/ce/feat-10391.en.md
new file mode 100644
index 000000000..a64b01221
--- /dev/null
+++ b/changes/ce/feat-10391.en.md
@@ -0,0 +1 @@
+hide exhook/rewrite/topic_metric/persistent_session_store/overload_protection from the docs and configuration file.

From 2334917e353d45688df9b4d973840fd7150c2f00 Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Thu, 13 Apr 2023 21:59:26 +0800
Subject: [PATCH 031/110] chore: apply suggestions from code review

Co-authored-by: Thales Macedo Garitezi <thalesmg@gmail.com>
---
 apps/emqx_management/src/emqx_mgmt_api_trace.erl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/emqx_management/src/emqx_mgmt_api_trace.erl b/apps/emqx_management/src/emqx_mgmt_api_trace.erl
index 619da92f0..a69837eb3 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_trace.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_trace.erl
@@ -277,8 +277,7 @@ fields(trace) ->
                     "It is recommended when payload is a custom binary protocol.<br/>\n"
                     "`hidden`: payload is obfuscated as `******`"
                     "",
-                default => text,
-                required => false
+                default => text
             })},
         {start_at,
             hoconsc:mk(

From 9f99a725940a0dace605495ff946b09cf0b66e66 Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@gmail.com>
Date: Fri, 14 Apr 2023 00:45:22 +0800
Subject: [PATCH 032/110] chore: refine tests

---
 apps/emqx_gateway/test/emqx_gateway_SUITE.erl     | 12 ++++++------
 apps/emqx_gateway/test/emqx_gateway_api_SUITE.erl |  2 +-
 apps/emqx_gateway/test/emqx_gateway_cli_SUITE.erl | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/emqx_gateway/test/emqx_gateway_SUITE.erl b/apps/emqx_gateway/test/emqx_gateway_SUITE.erl
index 5120e096e..9f8c7911c 100644
--- a/apps/emqx_gateway/test/emqx_gateway_SUITE.erl
+++ b/apps/emqx_gateway/test/emqx_gateway_SUITE.erl
@@ -68,11 +68,11 @@ end_per_testcase(_TestCase, _Config) ->
 
 t_registered_gateway(_) ->
     [
-        {coap, #{cbkmod := emqx_coap}},
-        {exproto, #{cbkmod := emqx_exproto}},
-        {lwm2m, #{cbkmod := emqx_lwm2m}},
-        {mqttsn, #{cbkmod := emqx_mqttsn}},
-        {stomp, #{cbkmod := emqx_stomp}}
+        {coap, #{cbkmod := emqx_gateway_coap}},
+        {exproto, #{cbkmod := emqx_gateway_exproto}},
+        {lwm2m, #{cbkmod := emqx_gateway_lwm2m}},
+        {mqttsn, #{cbkmod := emqx_gateway_mqttsn}},
+        {stomp, #{cbkmod := emqx_gateway_stomp}}
     ] = emqx_gateway:registered_gateway().
 
 t_load_unload_list_lookup(_) ->
@@ -192,7 +192,7 @@ setup_fake_usage_data(Lwm2mDataDir) ->
         [
             emqx_common_test_helpers:proj_root(),
             "apps",
-            "emqx_lwm2m",
+            "emqx_gateway_lwm2m",
             "lwm2m_xml"
         ]
     ),
diff --git a/apps/emqx_gateway/test/emqx_gateway_api_SUITE.erl b/apps/emqx_gateway/test/emqx_gateway_api_SUITE.erl
index c5fabf2fd..10adcc428 100644
--- a/apps/emqx_gateway/test/emqx_gateway_api_SUITE.erl
+++ b/apps/emqx_gateway/test/emqx_gateway_api_SUITE.erl
@@ -219,7 +219,7 @@ t_gateway_lwm2m(_) ->
         [
             emqx_common_test_helpers:proj_root(),
             "apps",
-            "emqx_lwm2m",
+            "emqx_gateway_lwm2m",
             "lwm2m_xml"
         ]
     ),
diff --git a/apps/emqx_gateway/test/emqx_gateway_cli_SUITE.erl b/apps/emqx_gateway/test/emqx_gateway_cli_SUITE.erl
index a234dd126..641528eda 100644
--- a/apps/emqx_gateway/test/emqx_gateway_cli_SUITE.erl
+++ b/apps/emqx_gateway/test/emqx_gateway_cli_SUITE.erl
@@ -117,11 +117,11 @@ t_gateway_registry_usage(_) ->
 t_gateway_registry_list(_) ->
     emqx_gateway_cli:'gateway-registry'(["list"]),
     ?assertEqual(
-        "Registered Name: coap, Callback Module: emqx_coap\n"
-        "Registered Name: exproto, Callback Module: emqx_exproto\n"
-        "Registered Name: lwm2m, Callback Module: emqx_lwm2m\n"
-        "Registered Name: mqttsn, Callback Module: emqx_mqttsn\n"
-        "Registered Name: stomp, Callback Module: emqx_stomp\n",
+        "Registered Name: coap, Callback Module: emqx_gateway_coap\n"
+        "Registered Name: exproto, Callback Module: emqx_gateway_exproto\n"
+        "Registered Name: lwm2m, Callback Module: emqx_gateway_lwm2m\n"
+        "Registered Name: mqttsn, Callback Module: emqx_gateway_mqttsn\n"
+        "Registered Name: stomp, Callback Module: emqx_gateway_stomp\n",
         acc_print()
     ).
 

From c5ad3c8f41f05308ed983093efece207623c487a Mon Sep 17 00:00:00 2001
From: ieQu1 <99872536+ieQu1@users.noreply.github.com>
Date: Thu, 13 Apr 2023 22:39:49 +0200
Subject: [PATCH 033/110] docs(emqx_machine): Improve README

---
 apps/emqx_machine/README.md | 45 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/apps/emqx_machine/README.md b/apps/emqx_machine/README.md
index 9ff33a5e5..8c2bb6391 100644
--- a/apps/emqx_machine/README.md
+++ b/apps/emqx_machine/README.md
@@ -1,5 +1,48 @@
-# EMQX Machine
+# EMQX machine
 
 This application manages other OTP applications in EMQX and serves as the entry point when BEAM VM starts up.
 It prepares the node before starting mnesia/mria, as well as EMQX business logic.
 It keeps track of the business applications storing data in Mnesia, which need to be restarted when the node joins the cluster by registering `ekka` callbacks.
+Also it kicks off autoclustering (EMQX cluster discovery) on the core nodes.
+
+`emqx_machine` application doesn't do much on its own, but it facilitates the environment for running other EMQX applications.
+
+# Features
+
+## Global GC
+
+`emqx_global_gc` is a gen_server that forces garbage collection of all Erlang processes running in the BEAM VM.
+This is meant to save the RAM.
+
+## Restricted shell
+
+`emqx_restricted_shell` module prevents user from accidentally issuing Erlang shell commands that can stop the remote node.
+
+## Signal handler
+
+`emqx_machine_signal_handler` handles POSIX signals sent to BEAM VM process.
+It helps to shut down EMQX broker gracefully when it receives `SIGTERM` signal.
+
+## Cover
+
+`emqx_cover` is a helper module that helps to collect coverage reports during testing.
+
+# Limitation
+
+Currently `emqx_machine` boots the business apps before starting autocluster, so a fresh node joining the cluster actually starts business application twice: first in the singleton mode, and then in clustered mode.
+
+# Documention links
+
+Configuration: [node.global_gc_interval](https://www.emqx.io/docs/en/v5.0/configuration/configuration-manual.html#node-and-cookie)
+
+# Configurations
+
+The following application environment variables are used:
+
+- `emqx_machine.global_gc_interval`: interval at which global GC is run
+- `emqx_machine.custom_shard_transports`: contains a map that allows to fine tune transport (`rpc` or `gen_rpc`) used to send Mria transactions from the core node to the replicant
+- `emqx_machine.backtrace_depth`: set maximum depth of Erlang stacktraces in crash reports
+
+
+# Contributing
+Please see our [contributing.md](../../CONTRIBUTING.md).

From 8ceeafb0de8f49e02afdf9d63ec402ad6a8a2b42 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Wed, 22 Mar 2023 10:28:37 +0800
Subject: [PATCH 034/110] chore: fix file license in lib-ee

---
 .../emqx_connector/src/emqx_connector_mysql.erl |  2 +-
 .../src/emqx_ee_connector_cassa.erl             | 13 +------------
 .../src/emqx_ee_connector_clickhouse.erl        | 14 +-------------
 .../test/ee_connector_clickhouse_SUITE.erl      | 17 +++--------------
 .../test/emqx_ee_connector_cassa_SUITE.erl      | 13 +------------
 5 files changed, 7 insertions(+), 52 deletions(-)

diff --git a/apps/emqx_connector/src/emqx_connector_mysql.erl b/apps/emqx_connector/src/emqx_connector_mysql.erl
index fe495252a..c69cf5ca0 100644
--- a/apps/emqx_connector/src/emqx_connector_mysql.erl
+++ b/apps/emqx_connector/src/emqx_connector_mysql.erl
@@ -437,7 +437,7 @@ do_sql_query(SQLFunc, Conn, SQLOrKey, Params, Timeout, LogMeta) ->
                 error,
                 LogMeta#{msg => "mysql_connector_do_sql_query_failed", reason => disconnected}
             ),
-            %% kill the poll worker to trigger reconnection
+            %% kill the pool worker to trigger reconnection
             _ = exit(Conn, restart),
             {error, {recoverable_error, disconnected}};
         {error, not_prepared} = Error ->
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_cassa.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_cassa.erl
index 1e1882a1f..ce964dd17 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_cassa.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_cassa.erl
@@ -1,18 +1,7 @@
 %%--------------------------------------------------------------------
 %% Copyright (c) 2023 EMQ Technologies Co., Ltd. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
 %%--------------------------------------------------------------------
+
 -module(emqx_ee_connector_cassa).
 
 -behaviour(emqx_resource).
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_clickhouse.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_clickhouse.erl
index 5d68687dc..3749ecc6e 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_clickhouse.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_clickhouse.erl
@@ -1,17 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2020-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
+%% Copyright (c) 2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
 
 -module(emqx_ee_connector_clickhouse).
diff --git a/lib-ee/emqx_ee_connector/test/ee_connector_clickhouse_SUITE.erl b/lib-ee/emqx_ee_connector/test/ee_connector_clickhouse_SUITE.erl
index 111deba06..c608588a1 100644
--- a/lib-ee/emqx_ee_connector/test/ee_connector_clickhouse_SUITE.erl
+++ b/lib-ee/emqx_ee_connector/test/ee_connector_clickhouse_SUITE.erl
@@ -1,17 +1,6 @@
-% %%--------------------------------------------------------------------
-% %% Copyright (c) 2020-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
-% %%
-% %% Licensed under the Apache License, Version 2.0 (the "License");
-% %% you may not use this file except in compliance with the License.
-% %% You may obtain a copy of the License at
-% %% http://www.apache.org/licenses/LICENSE-2.0
-% %%
-% %% Unless required by applicable law or agreed to in writing, software
-% %% distributed under the License is distributed on an "AS IS" BASIS,
-% %% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-% %% See the License for the specific language governing permissions and
-% %% limitations under the License.
-% %%--------------------------------------------------------------------
+%%--------------------------------------------------------------------
+%% Copyright (c) 2023 EMQ Technologies Co., Ltd. All Rights Reserved.
+%%--------------------------------------------------------------------
 
 -module(ee_connector_clickhouse_SUITE).
 
diff --git a/lib-ee/emqx_ee_connector/test/emqx_ee_connector_cassa_SUITE.erl b/lib-ee/emqx_ee_connector/test/emqx_ee_connector_cassa_SUITE.erl
index 95b4407cf..52ed03a62 100644
--- a/lib-ee/emqx_ee_connector/test/emqx_ee_connector_cassa_SUITE.erl
+++ b/lib-ee/emqx_ee_connector/test/emqx_ee_connector_cassa_SUITE.erl
@@ -1,16 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2020-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%% http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
+%% Copyright (c) 2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
 
 -module(emqx_ee_connector_cassa_SUITE).

From 8e62afecdd31cb905426bae1c90e55c767db9dfe Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Mon, 27 Mar 2023 13:55:16 +0800
Subject: [PATCH 035/110] chore: suite module rename

---
 ...ckhouse_SUITE.erl => emqx_ee_connector_clickhouse_SUITE.erl} | 2 +-
 ...streamdb_SUITE.erl => emqx_ee_connector_hstreamdb_SUITE.erl} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename lib-ee/emqx_ee_connector/test/{ee_connector_clickhouse_SUITE.erl => emqx_ee_connector_clickhouse_SUITE.erl} (99%)
 rename lib-ee/emqx_ee_connector/test/{ee_connector_hstreamdb_SUITE.erl => emqx_ee_connector_hstreamdb_SUITE.erl} (90%)

diff --git a/lib-ee/emqx_ee_connector/test/ee_connector_clickhouse_SUITE.erl b/lib-ee/emqx_ee_connector/test/emqx_ee_connector_clickhouse_SUITE.erl
similarity index 99%
rename from lib-ee/emqx_ee_connector/test/ee_connector_clickhouse_SUITE.erl
rename to lib-ee/emqx_ee_connector/test/emqx_ee_connector_clickhouse_SUITE.erl
index c608588a1..73018e14f 100644
--- a/lib-ee/emqx_ee_connector/test/ee_connector_clickhouse_SUITE.erl
+++ b/lib-ee/emqx_ee_connector/test/emqx_ee_connector_clickhouse_SUITE.erl
@@ -2,7 +2,7 @@
 %% Copyright (c) 2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
 
--module(ee_connector_clickhouse_SUITE).
+-module(emqx_ee_connector_clickhouse_SUITE).
 
 -compile(nowarn_export_all).
 -compile(export_all).
diff --git a/lib-ee/emqx_ee_connector/test/ee_connector_hstreamdb_SUITE.erl b/lib-ee/emqx_ee_connector/test/emqx_ee_connector_hstreamdb_SUITE.erl
similarity index 90%
rename from lib-ee/emqx_ee_connector/test/ee_connector_hstreamdb_SUITE.erl
rename to lib-ee/emqx_ee_connector/test/emqx_ee_connector_hstreamdb_SUITE.erl
index 8acabbef4..ad49d9f62 100644
--- a/lib-ee/emqx_ee_connector/test/ee_connector_hstreamdb_SUITE.erl
+++ b/lib-ee/emqx_ee_connector/test/emqx_ee_connector_hstreamdb_SUITE.erl
@@ -2,7 +2,7 @@
 %% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
 
--module(ee_connector_hstreamdb_SUITE).
+-module(emqx_ee_connector_hstreamdb_SUITE).
 
 -compile(nowarn_export_all).
 -compile(export_all).

From 58419698775275da71fa16229ebb94aa21b4e3ec Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Mon, 20 Mar 2023 10:28:34 +0800
Subject: [PATCH 036/110] feat: implement Microsoft SQL Server bridge (e5.0)

---
 apps/emqx_bridge/src/emqx_bridge.erl          |   3 +-
 changes/ee/feat-10363.en.md                   |   1 +
 lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl  |  23 +-
 .../src/emqx_ee_bridge_sqlserver.erl          | 128 +++++
 .../src/emqx_ee_connector.app.src             |   4 +-
 .../src/emqx_ee_connector_sqlserver.erl       | 531 ++++++++++++++++++
 rel/i18n/emqx_ee_bridge_sqlserver.hocon       |  87 +++
 rel/i18n/emqx_ee_connector_sqlserver.hocon    |  22 +
 8 files changed, 793 insertions(+), 6 deletions(-)
 create mode 100644 changes/ee/feat-10363.en.md
 create mode 100644 lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_sqlserver.erl
 create mode 100644 lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
 create mode 100644 rel/i18n/emqx_ee_bridge_sqlserver.hocon
 create mode 100644 rel/i18n/emqx_ee_connector_sqlserver.hocon

diff --git a/apps/emqx_bridge/src/emqx_bridge.erl b/apps/emqx_bridge/src/emqx_bridge.erl
index bf91d20f7..5d1850ebd 100644
--- a/apps/emqx_bridge/src/emqx_bridge.erl
+++ b/apps/emqx_bridge/src/emqx_bridge.erl
@@ -69,7 +69,8 @@
     T == tdengine;
     T == dynamo;
     T == rocketmq;
-    T == cassandra
+    T == cassandra;
+    T == sqlserver
 ).
 
 load() ->
diff --git a/changes/ee/feat-10363.en.md b/changes/ee/feat-10363.en.md
new file mode 100644
index 000000000..c3b53a538
--- /dev/null
+++ b/changes/ee/feat-10363.en.md
@@ -0,0 +1 @@
+Add MicroSoft SQL Server data Bridge support.
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl
index 84b0b98b0..3ad5cbbb4 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl
@@ -34,7 +34,8 @@ api_schemas(Method) ->
         ref(emqx_ee_bridge_clickhouse, Method),
         ref(emqx_ee_bridge_dynamo, Method),
         ref(emqx_ee_bridge_rocketmq, Method),
-        ref(emqx_ee_bridge_cassa, Method)
+        ref(emqx_ee_bridge_cassa, Method),
+        ref(emqx_ee_bridge_sqlserver, Method)
     ].
 
 schema_modules() ->
@@ -53,7 +54,8 @@ schema_modules() ->
         emqx_ee_bridge_clickhouse,
         emqx_ee_bridge_dynamo,
         emqx_ee_bridge_rocketmq,
-        emqx_ee_bridge_cassa
+        emqx_ee_bridge_cassa,
+        emqx_ee_bridge_sqlserver
     ].
 
 examples(Method) ->
@@ -91,7 +93,8 @@ resource_type(tdengine) -> emqx_ee_connector_tdengine;
 resource_type(clickhouse) -> emqx_ee_connector_clickhouse;
 resource_type(dynamo) -> emqx_ee_connector_dynamo;
 resource_type(rocketmq) -> emqx_ee_connector_rocketmq;
-resource_type(cassandra) -> emqx_ee_connector_cassa.
+resource_type(cassandra) -> emqx_ee_connector_cassa;
+resource_type(sqlserver) -> emqx_ee_connector_sqlserver.
 
 fields(bridges) ->
     [
@@ -152,7 +155,7 @@ fields(bridges) ->
                 }
             )}
     ] ++ kafka_structs() ++ mongodb_structs() ++ influxdb_structs() ++ redis_structs() ++
-        pgsql_structs() ++ clickhouse_structs().
+        pgsql_structs() ++ clickhouse_structs() ++ sqlserver_structs().
 
 mongodb_structs() ->
     [
@@ -249,3 +252,15 @@ clickhouse_structs() ->
                 }
             )}
     ].
+
+sqlserver_structs() ->
+    [
+        {sqlserver,
+            mk(
+                hoconsc:map(name, ref(emqx_ee_bridge_sqlserver, "config")),
+                #{
+                    desc => <<"Microsoft SQL Server Bridge Config">>,
+                    required => false
+                }
+            )}
+    ].
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_sqlserver.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_sqlserver.erl
new file mode 100644
index 000000000..49a5ed0ce
--- /dev/null
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_sqlserver.erl
@@ -0,0 +1,128 @@
+%%--------------------------------------------------------------------
+%% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
+%%--------------------------------------------------------------------
+-module(emqx_ee_bridge_sqlserver).
+
+-include_lib("typerefl/include/types.hrl").
+-include_lib("hocon/include/hoconsc.hrl").
+-include_lib("emqx_bridge/include/emqx_bridge.hrl").
+-include_lib("emqx_resource/include/emqx_resource.hrl").
+
+-import(hoconsc, [mk/2, enum/1, ref/2]).
+
+-export([
+    conn_bridge_examples/1
+]).
+
+-export([
+    namespace/0,
+    roots/0,
+    fields/1,
+    desc/1
+]).
+
+-define(DEFAULT_SQL, <<
+    "insert into t_mqtt_msg(msgid, topic, qos, payload)"
+    "values (${id}, ${topic}, ${qos}, ${payload})"
+>>).
+
+-define(DEFAULT_DRIVER, <<"ms-sqlserver-18">>).
+
+conn_bridge_examples(Method) ->
+    [
+        #{
+            <<"sqlserver">> => #{
+                summary => <<"Microsoft SQL Server Bridge">>,
+                value => values(Method)
+            }
+        }
+    ].
+
+values(get) ->
+    values(post);
+values(post) ->
+    #{
+        enable => true,
+        type => sqlserver,
+        name => <<"bar">>,
+        server => <<"127.0.0.1:1433">>,
+        database => <<"test">>,
+        pool_size => 8,
+        username => <<"sa">>,
+        password => <<"******">>,
+        sql => ?DEFAULT_SQL,
+        driver => ?DEFAULT_DRIVER,
+        local_topic => <<"local/topic/#">>,
+        resource_opts => #{
+            worker_pool_size => 1,
+            health_check_interval => ?HEALTHCHECK_INTERVAL_RAW,
+            auto_restart_interval => ?AUTO_RESTART_INTERVAL_RAW,
+            batch_size => ?DEFAULT_BATCH_SIZE,
+            batch_time => ?DEFAULT_BATCH_TIME,
+            query_mode => async,
+            max_queue_bytes => ?DEFAULT_QUEUE_SIZE
+        }
+    };
+values(put) ->
+    values(post).
+
+%% -------------------------------------------------------------------------------------------------
+%% Hocon Schema Definitions
+namespace() -> "bridge_sqlserver".
+
+roots() -> [].
+
+fields("config") ->
+    [
+        {enable, mk(boolean(), #{desc => ?DESC("config_enable"), default => true})},
+        {sql,
+            mk(
+                binary(),
+                #{desc => ?DESC("sql_template"), default => ?DEFAULT_SQL, format => <<"sql">>}
+            )},
+        {driver, mk(binary(), #{desc => ?DESC("driver"), default => ?DEFAULT_DRIVER})},
+        {local_topic,
+            mk(
+                binary(),
+                #{desc => ?DESC("local_topic"), default => undefined}
+            )},
+        {resource_opts,
+            mk(
+                ref(?MODULE, "creation_opts"),
+                #{
+                    required => false,
+                    default => #{},
+                    desc => ?DESC(emqx_resource_schema, <<"resource_opts">>)
+                }
+            )}
+    ] ++
+        (emqx_ee_connector_sqlserver:fields(config) --
+            emqx_connector_schema_lib:prepare_statement_fields());
+fields("creation_opts") ->
+    emqx_resource_schema:fields("creation_opts");
+fields("post") ->
+    fields("post", sqlserver);
+fields("put") ->
+    fields("config");
+fields("get") ->
+    emqx_bridge_schema:status_fields() ++ fields("post").
+
+fields("post", Type) ->
+    [type_field(Type), name_field() | fields("config")].
+
+desc("config") ->
+    ?DESC("desc_config");
+desc(Method) when Method =:= "get"; Method =:= "put"; Method =:= "post" ->
+    ["Configuration for Microsoft SQL Server using `", string:to_upper(Method), "` method."];
+desc("creation_opts" = Name) ->
+    emqx_resource_schema:desc(Name);
+desc(_) ->
+    undefined.
+
+%% -------------------------------------------------------------------------------------------------
+
+type_field(Type) ->
+    {type, mk(enum([Type]), #{required => true, desc => ?DESC("desc_type")})}.
+
+name_field() ->
+    {name, mk(binary(), #{required => true, desc => ?DESC("desc_name")})}.
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector.app.src b/lib-ee/emqx_ee_connector/src/emqx_ee_connector.app.src
index 2e6406d70..2e2ff2a62 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector.app.src
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector.app.src
@@ -5,13 +5,15 @@
     {applications, [
         kernel,
         stdlib,
+        ecpool,
         hstreamdb_erl,
         influxdb,
         tdengine,
         clickhouse,
         erlcloud,
         rocketmq,
-        ecql
+        ecql,
+        odbc
     ]},
     {env, []},
     {modules, []},
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
new file mode 100644
index 000000000..4cc92e80a
--- /dev/null
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
@@ -0,0 +1,531 @@
+%%--------------------------------------------------------------------
+%% Copyright (c) 2023 EMQ Technologies Co., Ltd. All Rights Reserved.
+%%--------------------------------------------------------------------
+
+-module(emqx_ee_connector_sqlserver).
+
+-behaviour(emqx_resource).
+
+-include_lib("kernel/include/file.hrl").
+-include_lib("emqx/include/logger.hrl").
+-include_lib("emqx_resource/include/emqx_resource.hrl").
+-include_lib("emqx_ee_connector/include/emqx_ee_connector.hrl").
+
+-include_lib("typerefl/include/types.hrl").
+-include_lib("hocon/include/hoconsc.hrl").
+
+-include_lib("snabbkaffe/include/snabbkaffe.hrl").
+
+%%====================================================================
+%% Exports
+%%====================================================================
+
+%% Hocon config schema exports
+-export([
+    roots/0,
+    fields/1
+]).
+
+%% callbacks for behaviour emqx_resource
+-export([
+    callback_mode/0,
+    is_buffer_supported/0,
+    on_start/2,
+    on_stop/2,
+    on_query/3,
+    on_batch_query/3,
+    on_query_async/4,
+    on_batch_query_async/4,
+    on_get_status/2
+]).
+
+%% callbacks for ecpool
+-export([connect/1]).
+
+%% Internal exports used to execute code with ecpool worker
+-export([do_get_status/2, worker_do_insert/3, do_async_reply/2]).
+
+-import(emqx_plugin_libs_rule, [str/1]).
+-import(hoconsc, [mk/2, enum/1, ref/2]).
+
+-define(ACTION_SEND_MESSAGE, send_message).
+
+-define(SINGLE_INSERT, single_insert).
+
+-define(SYNC_QUERY_MODE, handover).
+-define(ASYNC_QUERY_MODE(REPLY), {handover_async, {?MODULE, do_async_reply, [REPLY]}}).
+
+-define(SQLSERVER_HOST_OPTIONS, #{
+    default_port => 1433
+}).
+
+-define(REQUEST_TIMEOUT(RESOURCE_OPTS),
+    maps:get(request_timeout, RESOURCE_OPTS, ?DEFAULT_REQUEST_TIMEOUT)
+).
+
+-define(SINGLE_INSERT_TEMP, single_insert_temp).
+-define(BATCH_INSERT_TEMP, batch_insert_temp).
+
+-define(BATCH_INSERT_PART, batch_insert_part).
+-define(BATCH_PARAMS_TOKENS, batch_insert_tks).
+
+%% Copied from odbc reference page
+%% https://www.erlang.org/doc/man/odbc.html
+
+-type bridge_id() :: binary().
+%% as returned by connect/2
+-type connection_reference() :: pid().
+-type time_out() :: milliseconds() | infinity.
+-type sql() :: string() | binary().
+-type milliseconds() :: pos_integer().
+%% Tuple of column values e.g. one row of the result set.
+%% it's a variable size tuple of column values.
+-type row() :: tuple().
+%% Some kind of explanation of what went wrong
+-type common_reason() :: connection_closed | extended_error() | term().
+%% extended error type with ODBC
+%% and native database error codes, as well as the base reason that would have been
+%% returned had extended_errors not been enabled.
+-type extended_error() :: {string(), integer(), _Reason :: term()}.
+%% Name of column in the result set
+-type col_name() :: string().
+%% e.g. a list of the names of the selected columns in the result set.
+-type col_names() :: [col_name()].
+%% A list of rows from the result set.
+-type rows() :: list(row()).
+
+%% -type result_tuple() :: {updated, n_rows()} | {selected, col_names(), rows()}.
+-type updated_tuple() :: {updated, n_rows()}.
+-type selected_tuple() :: {selected, col_names(), rows()}.
+%% The number of affected rows for UPDATE,
+%% INSERT, or DELETE queries. For other query types the value
+%% is driver defined, and hence should be ignored.
+-type n_rows() :: integer().
+
+%% These type was not used in this module, but we may use it later
+%% -type odbc_data_type() ::
+%%     sql_integer
+%%     | sql_smallint
+%%     | sql_tinyint
+%%     | {sql_decimal, precision(), scale()}
+%%     | {sql_numeric, precision(), scale()}
+%%     | {sql_char, size()}
+%%     | {sql_wchar, size()}
+%%     | {sql_varchar, size()}
+%%     | {sql_wvarchar, size()}
+%%     | {sql_float, precision()}
+%%     | {sql_wlongvarchar, size()}
+%%     | {sql_float, precision()}
+%%     | sql_real
+%%     | sql_double
+%%     | sql_bit
+%%     | atom().
+%% -type precision() :: integer().
+%% -type scale() :: integer().
+%% -type size() :: integer().
+
+-type state() :: #{
+    poolname := binary(),
+    resource_opts := map(),
+    sql_templates := map()
+}.
+
+%%====================================================================
+%% Configuration and default values
+%%====================================================================
+
+roots() ->
+    [{config, #{type => hoconsc:ref(?MODULE, config)}}].
+
+fields(config) ->
+    [
+        {server, server()}
+        | add_default_username(emqx_connector_schema_lib:relational_db_fields())
+    ].
+
+add_default_username(Fields) ->
+    lists:map(
+        fun
+            ({username, OrigUsernameFn}) ->
+                {username, add_default_fn(OrigUsernameFn, <<"sa">>)};
+            (Field) ->
+                Field
+        end,
+        Fields
+    ).
+
+add_default_fn(OrigFn, Default) ->
+    fun
+        (default) -> Default;
+        (Field) -> OrigFn(Field)
+    end.
+
+server() ->
+    Meta = #{desc => ?DESC("server")},
+    emqx_schema:servers_sc(Meta, ?SQLSERVER_HOST_OPTIONS).
+
+%%====================================================================
+%% Callbacks defined in emqx_resource
+%%====================================================================
+
+callback_mode() -> async_if_possible.
+
+is_buffer_supported() -> false.
+
+on_start(
+    BridgeId = PoolName,
+    #{
+        server := Server,
+        username := Username,
+        password := Password,
+        driver := Driver,
+        database := Database,
+        pool_size := PoolSize,
+        resource_opts := ResourceOpts
+    } = Config
+) ->
+    ?SLOG(info, #{
+        msg => "starting_sqlserver_connector",
+        connector => BridgeId,
+        config => emqx_misc:redact(Config)
+    }),
+
+    ODBCDir = code:priv_dir(odbc),
+    OdbcserverDir = filename:join(ODBCDir, "bin/odbcserver"),
+    {ok, Info = #file_info{mode = Mode}} = file:read_file_info(OdbcserverDir),
+    case 33261 =:= Mode of
+        true ->
+            ok;
+        false ->
+            _ = file:write_file_info(OdbcserverDir, Info#file_info{mode = 33261}),
+            ok
+    end,
+
+    Options = [
+        {server, to_bin(Server)},
+        {username, Username},
+        {password, Password},
+        {driver, Driver},
+        {database, Database},
+        {pool_size, PoolSize},
+        {poolname, PoolName}
+    ],
+
+    State = #{
+        %% also BridgeId
+        poolname => PoolName,
+        sql_templates => parse_sql_template(Config),
+        resource_opts => ResourceOpts
+    },
+    case emqx_plugin_libs_pool:start_pool(PoolName, ?MODULE, Options) of
+        ok ->
+            {ok, State};
+        {error, Reason} ->
+            ?tp(
+                sqlserver_connector_start_failed,
+                #{error => Reason}
+            ),
+            {error, Reason}
+    end.
+
+on_stop(InstanceId, #{poolname := PoolName} = _State) ->
+    ?SLOG(info, #{
+        msg => "stopping_sqlserver_connector",
+        connector => InstanceId
+    }),
+    emqx_plugin_libs_pool:stop_pool(PoolName).
+
+-spec on_query(
+    bridge_id(),
+    {?ACTION_SEND_MESSAGE, map()},
+    state()
+) ->
+    ok
+    | {ok, list()}
+    | {error, {recoverable_error, term()}}
+    | {error, term()}.
+on_query(BridgeId, {?ACTION_SEND_MESSAGE, _Msg} = Query, State) ->
+    ?TRACE(
+        "SINGLE_QUERY_SYNC",
+        "bridge_sqlserver_received",
+        #{requests => Query, connector => BridgeId, state => State}
+    ),
+    do_query(BridgeId, Query, ?SYNC_QUERY_MODE, State).
+
+-spec on_query_async(
+    bridge_id(),
+    {?ACTION_SEND_MESSAGE, map()},
+    {ReplyFun :: function(), Args :: list()},
+    state()
+) ->
+    {ok, any()}
+    | {error, term()}.
+on_query_async(
+    BridgeId,
+    {?ACTION_SEND_MESSAGE, _Msg} = Query,
+    ReplyFunAndArgs,
+    %% #{poolname := PoolName, sql_templates := Templates} = State
+    State
+) ->
+    ?TRACE(
+        "SINGLE_QUERY_ASYNC",
+        "bridge_sqlserver_received",
+        #{requests => Query, connector => BridgeId, state => State}
+    ),
+    do_query(BridgeId, Query, ?ASYNC_QUERY_MODE(ReplyFunAndArgs), State).
+
+-spec on_batch_query(
+    bridge_id(),
+    [{?ACTION_SEND_MESSAGE, map()}],
+    state()
+) ->
+    ok
+    | {ok, list()}
+    | {error, {recoverable_error, term()}}
+    | {error, term()}.
+on_batch_query(BridgeId, BatchRequests, State) ->
+    ?TRACE(
+        "BATCH_QUERY_SYNC",
+        "bridge_sqlserver_received",
+        #{requests => BatchRequests, connector => BridgeId, state => State}
+    ),
+    do_query(BridgeId, BatchRequests, ?SYNC_QUERY_MODE, State).
+
+-spec on_batch_query_async(
+    bridge_id(),
+    [{?ACTION_SEND_MESSAGE, map()}],
+    {ReplyFun :: function(), Args :: list()},
+    state()
+) -> {ok, any()}.
+on_batch_query_async(BridgeId, Requests, ReplyFunAndArgs, State) ->
+    ?TRACE(
+        "BATCH_QUERY_ASYNC",
+        "bridge_sqlserver_received",
+        #{requests => Requests, connector => BridgeId, state => State}
+    ),
+    do_query(BridgeId, Requests, ?ASYNC_QUERY_MODE(ReplyFunAndArgs), State).
+
+on_get_status(_InstanceId, #{poolname := Pool, resource_opts := ResourceOpts} = _State) ->
+    RequestTimeout = ?REQUEST_TIMEOUT(ResourceOpts),
+    Health = emqx_plugin_libs_pool:health_check_ecpool_workers(
+        Pool, {?MODULE, do_get_status, [RequestTimeout]}, RequestTimeout
+    ),
+    status_result(Health).
+
+status_result(_Status = true) -> connected;
+status_result(_Status = false) -> connecting.
+%% TODO:
+%% case for disconnected
+
+%%====================================================================
+%% ecpool callback fns
+%%====================================================================
+
+-spec connect(Options :: list()) -> {ok, connection_reference()} | {error, term()}.
+connect(Options) ->
+    ConnectStr = lists:concat(conn_str(Options, [])),
+    Opts = proplists:get_value(options, Options, []),
+    odbc:connect(ConnectStr, Opts).
+
+-spec do_get_status(connection_reference(), time_out()) -> Result :: boolean().
+do_get_status(Conn, RequestTimeout) ->
+    case execute(Conn, <<"SELECT 1">>, RequestTimeout) of
+        {selected, [[]], [{1}]} -> true;
+        _ -> false
+    end.
+
+%%====================================================================
+%% Internal Helper fns
+%%====================================================================
+
+%% TODO && FIXME:
+%% About the connection string attribute `Encrypt`:
+%% The default value is `yes` in odbc version 18.0+ and `no` in previous versions.
+%% And encrypted connections always verify the server's certificate.
+%% So `Encrypt=YES;TrustServerCertificate=YES` must be set in the connection string when connecting to a server that has a self-signed certificate.
+%% See also:
+%% https://learn.microsoft.com/en-us/sql/connect/odbc/dsn-connection-string-attribute?source=recommendations&view=sql-server-ver16#encrypt
+conn_str([], Acc) ->
+    %% we should use this for msodbcsql 18+
+    %% lists:join(";", ["Encrypt=YES", "TrustServerCertificate=YES" | Acc]);
+    lists:join(";", Acc);
+conn_str([{driver, Driver} | Opts], Acc) ->
+    conn_str(Opts, ["Driver=" ++ str(Driver) | Acc]);
+conn_str([{server, Server} | Opts], Acc) ->
+    {Host, Port} = emqx_schema:parse_server(Server, ?SQLSERVER_HOST_OPTIONS),
+    conn_str(Opts, ["Server=" ++ str(Host) ++ "," ++ str(Port) | Acc]);
+conn_str([{database, Database} | Opts], Acc) ->
+    conn_str(Opts, ["Database=" ++ str(Database) | Acc]);
+conn_str([{username, Username} | Opts], Acc) ->
+    conn_str(Opts, ["UID=" ++ str(Username) | Acc]);
+conn_str([{password, Password} | Opts], Acc) ->
+    conn_str(Opts, ["PWD=" ++ str(Password) | Acc]);
+conn_str([{_, _} | Opts], Acc) ->
+    conn_str(Opts, Acc).
+
+%% Sync & Async query with singe & batch sql statement
+-spec do_query(
+    bridge_id(),
+    Query :: {?ACTION_SEND_MESSAGE, map()} | [{?ACTION_SEND_MESSAGE, map()}],
+    ApplyMode ::
+        handover
+        | {handover_async, {?MODULE, do_async_reply, [{ReplyFun :: function(), Args :: list()}]}},
+    state()
+) ->
+    {ok, list()}
+    | {error, {recoverable_error, term()}}
+    | {error, term()}.
+do_query(
+    BridgeId,
+    Query,
+    ApplyMode,
+    #{poolname := PoolName, sql_templates := Templates} = State
+) ->
+    ?TRACE(
+        "SINGLE_QUERY_SYNC",
+        "sqlserver_connector_received",
+        #{query => Query, connector => BridgeId, state => State}
+    ),
+
+    %% only insert sql statement for single query and batch query
+    case apply_template(Query, Templates) of
+        {?ACTION_SEND_MESSAGE, SQL} ->
+            Result = ecpool:pick_and_do(
+                PoolName,
+                {?MODULE, worker_do_insert, [SQL, State]},
+                ApplyMode
+            );
+        Query ->
+            Result = {error, {unrecoverable_error, invalid_query}};
+        _ ->
+            Result = {error, {unrecoverable_error, failed_to_apply_sql_template}}
+    end,
+    case Result of
+        {error, Reason} ->
+            ?tp(
+                sqlserver_connector_query_return,
+                #{error => Reason}
+            ),
+            ?SLOG(error, #{
+                msg => "sqlserver_connector_do_query_failed",
+                connector => BridgeId,
+                query => Query,
+                reason => Reason
+            }),
+            Result;
+        _ ->
+            ?tp(
+                sqlserver_connector_query_return,
+                #{result => Result}
+            ),
+            Result
+    end.
+
+worker_do_insert(
+    Conn, SQL, #{resource_opts := ResourceOpts, poolname := BridgeId} = State
+) ->
+    LogMeta = #{connector => BridgeId, state => State},
+    try
+        case execute(Conn, SQL, ?REQUEST_TIMEOUT(ResourceOpts)) of
+            {selected, Rows, _} ->
+                {ok, Rows};
+            {updated, _} ->
+                ok;
+            {error, ErrStr} ->
+                ?SLOG(error, LogMeta#{msg => "invalid_request", reason => ErrStr}),
+                {error, {unrecoverable_error, {invalid_request, ErrStr}}}
+        end
+    catch
+        _Type:Reason ->
+            ?SLOG(error, LogMeta#{msg => "invalid_request", reason => Reason}),
+            {error, {unrecoverable_error, {invalid_request, Reason}}}
+    end.
+
+-spec execute(pid(), sql(), time_out()) ->
+    updated_tuple()
+    | selected_tuple()
+    | [updated_tuple()]
+    | [selected_tuple()]
+    | {error, common_reason()}.
+execute(Conn, SQL, Timeout) ->
+    odbc:sql_query(Conn, str(SQL), Timeout).
+
+to_bin(List) when is_list(List) ->
+    unicode:characters_to_binary(List, utf8).
+
+%% for bridge data to sql server
+parse_sql_template(Config) ->
+    RawSQLTemplates =
+        case maps:get(sql, Config, undefined) of
+            undefined -> #{};
+            <<>> -> #{};
+            SQLTemplate -> #{?ACTION_SEND_MESSAGE => SQLTemplate}
+        end,
+
+    SingleInsertTks = #{},
+    BatchInsertTks = #{},
+    parse_sql_template(maps:to_list(RawSQLTemplates), SingleInsertTks, BatchInsertTks).
+
+parse_sql_template([{Key, H} | T], SingleInsertTks, BatchInsertTks) ->
+    case emqx_plugin_libs_rule:detect_sql_type(H) of
+        {ok, select} ->
+            parse_sql_template(T, SingleInsertTks, BatchInsertTks);
+        {ok, insert} ->
+            case emqx_plugin_libs_rule:split_insert_sql(H) of
+                {ok, {InsertSQL, Params}} ->
+                    parse_sql_template(
+                        T,
+                        SingleInsertTks#{Key => emqx_plugin_libs_rule:preproc_tmpl(H)},
+                        BatchInsertTks#{
+                            Key =>
+                                #{
+                                    ?BATCH_INSERT_PART => InsertSQL,
+                                    ?BATCH_PARAMS_TOKENS => emqx_plugin_libs_rule:preproc_tmpl(
+                                        Params
+                                    )
+                                }
+                        }
+                    );
+                {error, Reason} ->
+                    ?SLOG(error, #{msg => "split sql failed", sql => H, reason => Reason}),
+                    parse_sql_template(T, SingleInsertTks, BatchInsertTks)
+            end;
+        {error, Reason} ->
+            ?SLOG(error, #{msg => "detect sql type failed", sql => H, reason => Reason}),
+            parse_sql_template(T, SingleInsertTks, BatchInsertTks)
+    end;
+parse_sql_template([], SingleInsertTks, BatchInsertTks) ->
+    #{
+        ?SINGLE_INSERT_TEMP => SingleInsertTks,
+        ?BATCH_INSERT_TEMP => BatchInsertTks
+    }.
+
+%% single insert
+apply_template(
+    {?ACTION_SEND_MESSAGE = Key, Msg} = Query,
+    #{?SINGLE_INSERT_TEMP := SingleInsertTks} = _Templates
+) ->
+    case maps:get(Key, SingleInsertTks, undefined) of
+        undefined ->
+            Query;
+        Template ->
+            {Key, emqx_plugin_libs_rule:proc_tmpl(Template, Msg)}
+    end;
+%% batch inserts
+apply_template(
+    [{?ACTION_SEND_MESSAGE = Key, _Msg} | _T] = BatchReqs,
+    #{?BATCH_INSERT_TEMP := BatchInsertsTks} = _Templates
+) ->
+    case maps:get(Key, BatchInsertsTks, undefined) of
+        undefined ->
+            BatchReqs;
+        #{?BATCH_INSERT_PART := BatchInserts, ?BATCH_PARAMS_TOKENS := BatchParamsTks} ->
+            SQL = emqx_plugin_libs_rule:proc_batch_sql(BatchReqs, BatchInserts, BatchParamsTks),
+            {Key, SQL}
+    end;
+apply_template(Query, Templates) ->
+    %% TODO: more detail infomatoin
+    ?SLOG(error, #{msg => "apply sql template failed", query => Query, templates => Templates}).
+
+do_async_reply(Result, {ReplyFun, Args}) ->
+    erlang:apply(ReplyFun, Args ++ Result).
diff --git a/rel/i18n/emqx_ee_bridge_sqlserver.hocon b/rel/i18n/emqx_ee_bridge_sqlserver.hocon
new file mode 100644
index 000000000..bb82c82f8
--- /dev/null
+++ b/rel/i18n/emqx_ee_bridge_sqlserver.hocon
@@ -0,0 +1,87 @@
+emqx_ee_bridge_sqlserver {
+
+  local_topic {
+    desc {
+      en: """The MQTT topic filter to be forwarded to MicroSoft SQL Server. All MQTT 'PUBLISH' messages with the topic
+matching the local_topic will be forwarded.</br>
+NOTE: if this bridge is used as the action of a rule (EMQX rule engine), and also local_topic is
+configured, then both the data got from the rule and the MQTT messages that match local_topic
+will be forwarded.
+"""
+      zh: """发送到 'local_topic' 的消息都会转发到 MicroSoft SQL Server。 </br>
+注意：如果这个 Bridge 被用作规则（EMQX 规则引擎）的输出，同时也配置了 'local_topic' ，那么这两部分的消息都会被转发。
+"""
+    }
+    label {
+      en: """Local Topic"""
+      zh: """本地 Topic"""
+    }
+  }
+
+  sql_template {
+    desc {
+      en: """SQL Template"""
+      zh: """SQL 模板"""
+    }
+    label {
+      en: """SQL Template"""
+      zh: """SQL 模板"""
+    }
+  }
+
+  driver {
+    desc {
+      en: """SQL Server Driver Name"""
+      zh: """SQL Server Driver 名称"""
+    }
+    desc {
+      en: """SQL Server Driver Name"""
+      zh: """SQL Server Driver 名称"""
+    }
+  }
+
+  config_enable {
+    desc {
+      en: """Enable or disable this bridge"""
+      zh: """启用/禁用桥接"""
+    }
+    label {
+      en: """Enable Or Disable Bridge"""
+      zh: """启用/禁用桥接"""
+    }
+  }
+
+  desc_config {
+    desc {
+      en: """Configuration for an MicroSoft SQL Server bridge."""
+      zh: """MicroSoft SQL Server 桥接配置"""
+    }
+    label: {
+      en: """MicroSoft SQL Server Bridge Configuration"""
+      zh: """MicroSoft SQL Server 桥接配置"""
+    }
+  }
+
+  desc_type {
+    desc {
+      en: """The Bridge Type"""
+      zh: """Bridge 类型"""
+    }
+    label {
+      en: """Bridge Type"""
+      zh: """桥接类型"""
+    }
+  }
+
+  desc_name {
+    desc {
+      en: """Bridge name."""
+      zh: """桥接名字"""
+    }
+    label {
+      en: """Bridge Name"""
+      zh: """桥接名字"""
+    }
+  }
+
+}
diff --git a/rel/i18n/emqx_ee_connector_sqlserver.hocon b/rel/i18n/emqx_ee_connector_sqlserver.hocon
new file mode 100644
index 000000000..9ff24c1c1
--- /dev/null
+++ b/rel/i18n/emqx_ee_connector_sqlserver.hocon
@@ -0,0 +1,22 @@
+emqx_ee_connector_sqlserver {
+
+  server {
+    desc {
+      en: """
+The IPv4 or IPv6 address or the hostname to connect to.<br/>
+A host entry has the following form: `Host[:Port]`.<br/>
+The SQL Server default port 1433 is used if `[:Port]` is not specified.
+"""
+      zh: """
+将要连接的 IPv4 或 IPv6 地址，或者主机名。<br/>
+主机名具有以下形式：`Host[:Port]`。<br/>
+如果未指定 `[:Port]`，则使用 SQL Server 默认端口 1433。
+"""
+    }
+    label: {
+      en: "Server Host"
+      zh: "服务器地址"
+    }
+  }
+
+}

From 611edf422719069297219370fe120968737fc0cf Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Mon, 10 Apr 2023 14:18:25 +0800
Subject: [PATCH 037/110] build: docker file add unixodbc and msodbcsql17

---
 .gitignore               |  1 +
 deploy/docker/Dockerfile | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 62e8ddc81..3f7e268a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@ apps/emqx/test/emqx_static_checks_data/master.bpapi
 lux_logs/
 /.prepare
 bom.json
+.dockerignore
diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile
index 8f04c433c..dcebe9b1a 100644
--- a/deploy/docker/Dockerfile
+++ b/deploy/docker/Dockerfile
@@ -29,9 +29,19 @@ COPY --from=builder /emqx-rel/emqx /opt/emqx
 
 RUN ln -s /opt/emqx/bin/* /usr/local/bin/
 
-RUN apt-get update; \
-    apt-get install -y --no-install-recommends ca-certificates procps; \
-    rm -rf /var/lib/apt/lists/*
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends ca-certificates procps
+
+RUN apt-get update \
+    && apt-get install -y gnupg2 curl apt-utils \
+    && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
+    && curl https://packages.microsoft.com/config/debian/11/prod.list > /etc/apt/sources.list.d/mssql-release.list \
+    && apt-get update \
+    && ACCEPT_EULA=Y apt-get install -y msodbcsql17 unixodbc-dev \
+    && sed -i 's/ODBC Driver 17 for SQL Server/ms-sql/g' /etc/odbcinst.ini
+
+RUN apt-get clean && \
+    rm -rf /var/lib/apt/lists/*;
 
 WORKDIR /opt/emqx
 

From c366267b0faf7290ce5479690acfe2fefb0a2a9b Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Fri, 7 Apr 2023 09:59:07 +0800
Subject: [PATCH 038/110] test: MS SQL Server data bridge

---
 .ci/docker-compose-file/.env                  |   3 +
 .../docker-compose-sqlserver.yaml             |  19 +
 .../docker-compose-toxiproxy.yaml             |   1 +
 .ci/docker-compose-file/docker-compose.yaml   |   1 +
 .ci/docker-compose-file/odbc/odbcinst.ini     |  10 +
 .ci/docker-compose-file/toxiproxy.json        |   6 +
 lib-ee/emqx_ee_bridge/docker-ct               |   1 +
 .../test/emqx_ee_bridge_sqlserver_SUITE.erl   | 654 ++++++++++++++++++
 lib-ee/emqx_ee_connector/docker-ct            |   1 +
 scripts/ct/run.sh                             |   3 +
 10 files changed, 699 insertions(+)
 create mode 100644 .ci/docker-compose-file/docker-compose-sqlserver.yaml
 create mode 100644 .ci/docker-compose-file/odbc/odbcinst.ini
 create mode 100644 lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl

diff --git a/.ci/docker-compose-file/.env b/.ci/docker-compose-file/.env
index 956750e00..b394d6bb1 100644
--- a/.ci/docker-compose-file/.env
+++ b/.ci/docker-compose-file/.env
@@ -8,4 +8,7 @@ TDENGINE_TAG=3.0.2.4
 DYNAMO_TAG=1.21.0
 CASSANDRA_TAG=3.11.6
 
+MS_IMAGE_ADDR=mcr.microsoft.com/mssql/server
+SQLSERVER_TAG=2019-CU11-ubuntu-20.04
+
 TARGET=emqx/emqx
diff --git a/.ci/docker-compose-file/docker-compose-sqlserver.yaml b/.ci/docker-compose-file/docker-compose-sqlserver.yaml
new file mode 100644
index 000000000..37799e20b
--- /dev/null
+++ b/.ci/docker-compose-file/docker-compose-sqlserver.yaml
@@ -0,0 +1,19 @@
+version: '3.9'
+
+services:
+  sql_server:
+    container_name: sqlserver
+    # See also:
+    # https://mcr.microsoft.com/en-us/product/mssql/server/about
+    # https://hub.docker.com/_/microsoft-mssql-server
+    image: ${MS_IMAGE_ADDR}:${SQLSERVER_TAG}
+    environment:
+      # See also:
+      # https://learn.microsoft.com/en-us/sql/linux/sql-server-linux-configure-environment-variables
+      ACCEPT_EULA: "Y"
+      SA_PASSWORD: "mqtt_public"
+    restart: always
+    # ports:
+    #   - "1433:1433"
+    networks:
+      - emqx_bridge
diff --git a/.ci/docker-compose-file/docker-compose-toxiproxy.yaml b/.ci/docker-compose-file/docker-compose-toxiproxy.yaml
index 9a1d08ba6..ba5e831a5 100644
--- a/.ci/docker-compose-file/docker-compose-toxiproxy.yaml
+++ b/.ci/docker-compose-file/docker-compose-toxiproxy.yaml
@@ -16,6 +16,7 @@ services:
       - 8474:8474
       - 8086:8086
       - 8087:8087
+      - 11433:1433
       - 13306:3306
       - 13307:3307
       - 15432:5432
diff --git a/.ci/docker-compose-file/docker-compose.yaml b/.ci/docker-compose-file/docker-compose.yaml
index 48d900400..8f97fa9d6 100644
--- a/.ci/docker-compose-file/docker-compose.yaml
+++ b/.ci/docker-compose-file/docker-compose.yaml
@@ -24,6 +24,7 @@ services:
       - /tmp/emqx-ci/emqx-shared-secret:/var/lib/secret
       - ./kerberos/krb5.conf:/etc/kdc/krb5.conf
       - ./kerberos/krb5.conf:/etc/krb5.conf
+      - ./odbc/odbcinst.ini:/etc/odbcinst.ini
     working_dir: /emqx
     tty: true
     user: "${DOCKER_USER:-root}"
diff --git a/.ci/docker-compose-file/odbc/odbcinst.ini b/.ci/docker-compose-file/odbc/odbcinst.ini
new file mode 100644
index 000000000..16701cfd2
--- /dev/null
+++ b/.ci/docker-compose-file/odbc/odbcinst.ini
@@ -0,0 +1,10 @@
+[ms-sql]
+Description=Microsoft ODBC Driver 17 for SQL Server
+Driver=/opt/microsoft/msodbcsql17/lib64/libmsodbcsql-17.10.so.2.1
+UsageCount=1
+
+[ODBC Driver 17 for SQL Server]
+Description=Microsoft ODBC Driver 17 for SQL Server
+Driver=/opt/microsoft/msodbcsql17/lib64/libmsodbcsql-17.10.so.2.1
+UsageCount=1
+
diff --git a/.ci/docker-compose-file/toxiproxy.json b/.ci/docker-compose-file/toxiproxy.json
index 708cbf1ef..da2dff763 100644
--- a/.ci/docker-compose-file/toxiproxy.json
+++ b/.ci/docker-compose-file/toxiproxy.json
@@ -95,5 +95,11 @@
     "listen": "0.0.0.0:9142",
     "upstream": "cassandra:9142",
     "enabled": true
+  },
+  {
+    "name": "sqlserver",
+    "listen": "0.0.0.0:1433",
+    "upstream": "sqlserver:1433",
+    "enabled": true
   }
 ]
diff --git a/lib-ee/emqx_ee_bridge/docker-ct b/lib-ee/emqx_ee_bridge/docker-ct
index 0e947d89e..35d6b9d5b 100644
--- a/lib-ee/emqx_ee_bridge/docker-ct
+++ b/lib-ee/emqx_ee_bridge/docker-ct
@@ -11,3 +11,4 @@ clickhouse
 dynamo
 rocketmq
 cassandra
+sqlserver
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
new file mode 100644
index 000000000..8b0cc53ce
--- /dev/null
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
@@ -0,0 +1,654 @@
+%%--------------------------------------------------------------------
+% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
+%%--------------------------------------------------------------------
+
+-module(emqx_ee_bridge_sqlserver_SUITE).
+
+-compile(nowarn_export_all).
+-compile(export_all).
+
+-include_lib("eunit/include/eunit.hrl").
+-include_lib("common_test/include/ct.hrl").
+-include_lib("snabbkaffe/include/snabbkaffe.hrl").
+
+% SQL definitions
+-define(SQL_BRIDGE,
+    "insert into t_mqtt_msg(msgid, topic, qos, payload) values ( ${id}, ${topic}, ${qos}, ${payload})"
+).
+-define(SQL_SERVER_DRIVER, "ms-sql").
+
+-define(SQL_CREATE_DATABASE_IF_NOT_EXISTS,
+    " IF NOT EXISTS(SELECT name FROM sys.databases WHERE name = 'mqtt')"
+    " BEGIN"
+    " CREATE DATABASE mqtt;"
+    " END"
+).
+
+-define(SQL_CREATE_TABLE_IN_DB_MQTT,
+    " CREATE TABLE mqtt.dbo.t_mqtt_msg"
+    " (id int PRIMARY KEY IDENTITY(1000000001,1) NOT NULL,"
+    " msgid   VARCHAR(64) NULL,"
+    " topic   VARCHAR(100) NULL,"
+    " qos     tinyint NOT NULL DEFAULT 0,"
+    " payload NVARCHAR(100) NULL,"
+    " arrived DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP)"
+).
+
+-define(SQL_DROP_DB_MQTT, "DROP DATABASE mqtt").
+-define(SQL_DROP_TABLE, "DROP TABLE mqtt.dbo.t_mqtt_msg").
+-define(SQL_DELETE, "DELETE from mqtt.dbo.t_mqtt_msg").
+-define(SQL_SELECT, "SELECT payload FROM mqtt.dbo.t_mqtt_msg").
+-define(SQL_SELECT_COUNT, "SELECT COUNT(*) FROM mqtt.dbo.t_mqtt_msg").
+% DB defaults
+-define(SQL_SERVER_DATABASE, "mqtt").
+-define(SQL_SERVER_USERNAME, "sa").
+-define(SQL_SERVER_PASSWORD, "mqtt_public").
+-define(BATCH_SIZE, 10).
+-define(REQUEST_TIMEOUT_MS, 500).
+
+-define(WORKER_POOL_SIZE, 4).
+
+-define(WITH_CON(Process),
+    Con = connect_direct_sqlserver(Config),
+    Process,
+    ok = disconnect(Con)
+).
+
+%% How to run it locally:
+%%   A: run ct on host
+%%     1. Start all deps services
+%%       sudo docker compose -f .ci/docker-compose-file/docker-compose.yaml \
+%%                           -f .ci/docker-compose-file/docker-compose-sqlserver.yaml \
+%%                           -f .ci/docker-compose-file/docker-compose-toxiproxy.yaml \
+%%                           up --build
+%%
+%%     2. Run use cases with special environment variables
+%%       11433 is toxiproxy exported port
+%%       Local:
+%%       ```
+%%       SQLSERVER_HOST=toxiproxy SQLSERVER_PORT=11433 \
+%%           PROXY_HOST=toxiproxy PROXY_PORT=1433 \
+%%           ./rebar3 as test ct -c -v --readable true --name ct@127.0.0.1 --suite lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
+%%       ```
+%%
+%%   B: run ct in docker container
+%%     run script:
+%%     ./scripts/ct/run.sh --ci --app lib-ee/emqx_ee_bridge/ \
+%%                        -- --name 'test@127.0.0.1' -c -v --readable true --suite lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
+
+%%------------------------------------------------------------------------------
+%% CT boilerplate
+%%------------------------------------------------------------------------------
+
+all() ->
+    [
+        {group, async},
+        {group, sync}
+    ].
+
+groups() ->
+    TCs = emqx_common_test_helpers:all(?MODULE),
+    NonBatchCases = [t_write_timeout],
+    BatchingGroups = [{group, with_batch}, {group, without_batch}],
+    [
+        {async, BatchingGroups},
+        {sync, BatchingGroups},
+        {with_batch, TCs -- NonBatchCases},
+        {without_batch, TCs}
+    ].
+
+init_per_group(async, Config) ->
+    [{query_mode, async} | Config];
+init_per_group(sync, Config) ->
+    [{query_mode, sync} | Config];
+init_per_group(with_batch, Config0) ->
+    Config = [{enable_batch, true} | Config0],
+    common_init(Config);
+init_per_group(without_batch, Config0) ->
+    Config = [{enable_batch, false} | Config0],
+    common_init(Config);
+init_per_group(_Group, Config) ->
+    Config.
+
+end_per_group(Group, Config) when Group =:= with_batch; Group =:= without_batch ->
+    connect_and_drop_table(Config),
+    connect_and_drop_db(Config),
+    ProxyHost = ?config(proxy_host, Config),
+    ProxyPort = ?config(proxy_port, Config),
+    emqx_common_test_helpers:reset_proxy(ProxyHost, ProxyPort),
+    ok;
+end_per_group(_Group, _Config) ->
+    ok.
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    emqx_mgmt_api_test_util:end_suite(),
+    ok = emqx_common_test_helpers:stop_apps([emqx_bridge, emqx_conf]),
+    ok.
+
+init_per_testcase(_Testcase, Config) ->
+    %% drop database and table
+    %% connect_and_clear_table(Config),
+    %% create a new one
+    %% TODO: create a new database for each test case
+    delete_bridge(Config),
+    snabbkaffe:start_trace(),
+    Config.
+
+end_per_testcase(_Testcase, Config) ->
+    ProxyHost = ?config(proxy_host, Config),
+    ProxyPort = ?config(proxy_port, Config),
+    emqx_common_test_helpers:reset_proxy(ProxyHost, ProxyPort),
+    connect_and_clear_table(Config),
+    ok = snabbkaffe:stop(),
+    delete_bridge(Config),
+    ok.
+
+%%------------------------------------------------------------------------------
+%% Testcases
+%%------------------------------------------------------------------------------
+
+t_setup_via_config_and_publish(Config) ->
+    ?assertMatch(
+        {ok, _},
+        create_bridge(Config)
+    ),
+    Val = str(erlang:unique_integer()),
+    SentData = sent_data(Val),
+    ?check_trace(
+        begin
+            ?wait_async_action(
+                ?assertEqual(ok, send_message(Config, SentData)),
+                #{?snk_kind := sqlserver_connector_query_return},
+                10_000
+            ),
+            ?assertMatch(
+                [{Val}],
+                connect_and_get_payload(Config)
+            ),
+            ok
+        end,
+        fun(Trace0) ->
+            Trace = ?of_kind(sqlserver_connector_query_return, Trace0),
+            ?assertMatch([#{result := ok}], Trace),
+            ok
+        end
+    ),
+    ok.
+
+t_setup_via_http_api_and_publish(Config) ->
+    BridgeType = ?config(sqlserver_bridge_type, Config),
+    Name = ?config(sqlserver_name, Config),
+    SQLServerConfig0 = ?config(sqlserver_config, Config),
+    SQLServerConfig = SQLServerConfig0#{
+        <<"name">> => Name,
+        <<"type">> => BridgeType
+    },
+    ?assertMatch(
+        {ok, _},
+        create_bridge_http(SQLServerConfig)
+    ),
+    Val = str(erlang:unique_integer()),
+    SentData = sent_data(Val),
+    ?check_trace(
+        begin
+            ?wait_async_action(
+                ?assertEqual(ok, send_message(Config, SentData)),
+                #{?snk_kind := sqlserver_connector_query_return},
+                10_000
+            ),
+            ?assertMatch(
+                [{Val}],
+                connect_and_get_payload(Config)
+            ),
+            ok
+        end,
+        fun(Trace0) ->
+            Trace = ?of_kind(sqlserver_connector_query_return, Trace0),
+            ?assertMatch([#{result := ok}], Trace),
+            ok
+        end
+    ),
+    ok.
+
+t_get_status(Config) ->
+    ?assertMatch(
+        {ok, _},
+        create_bridge(Config)
+    ),
+    ProxyPort = ?config(proxy_port, Config),
+    ProxyHost = ?config(proxy_host, Config),
+    ProxyName = ?config(proxy_name, Config),
+
+    Name = ?config(sqlserver_name, Config),
+    BridgeType = ?config(sqlserver_bridge_type, Config),
+    ResourceID = emqx_bridge_resource:resource_id(BridgeType, Name),
+
+    ?assertEqual({ok, connected}, emqx_resource_manager:health_check(ResourceID)),
+    emqx_common_test_helpers:with_failure(down, ProxyName, ProxyHost, ProxyPort, fun() ->
+        case emqx_resource_manager:health_check(ResourceID) of
+            {ok, Status} when Status =:= disconnected orelse Status =:= connecting ->
+                ok;
+            {error, timeout} ->
+                ok;
+            Other ->
+                ?assert(
+                    false, lists:flatten(io_lib:format("invalid health check result:~p~n", [Other]))
+                )
+        end
+    end),
+    ok.
+
+t_create_disconnected(Config) ->
+    ProxyPort = ?config(proxy_port, Config),
+    ProxyHost = ?config(proxy_host, Config),
+    ProxyName = ?config(proxy_name, Config),
+    ?check_trace(
+        emqx_common_test_helpers:with_failure(down, ProxyName, ProxyHost, ProxyPort, fun() ->
+            ?assertMatch({ok, _}, create_bridge(Config))
+        end),
+        fun(Trace) ->
+            ?assertMatch(
+                [#{error := {start_pool_failed, _, _}}],
+                ?of_kind(sqlserver_connector_start_failed, Trace)
+            ),
+            ok
+        end
+    ),
+    ok.
+
+t_write_failure(Config) ->
+    ProxyName = ?config(proxy_name, Config),
+    ProxyPort = ?config(proxy_port, Config),
+    ProxyHost = ?config(proxy_host, Config),
+    QueryMode = ?config(query_mode, Config),
+    Val = str(erlang:unique_integer()),
+    SentData = sent_data(Val),
+    {{ok, _}, {ok, _}} =
+        ?wait_async_action(
+            create_bridge(Config),
+            #{?snk_kind := resource_connected_enter},
+            20_000
+        ),
+    emqx_common_test_helpers:with_failure(down, ProxyName, ProxyHost, ProxyPort, fun() ->
+        case QueryMode of
+            sync ->
+                ?assertMatch(
+                    {error, {resource_error, #{reason := timeout}}},
+                    send_message(Config, SentData)
+                );
+            async ->
+                ?assertMatch(
+                    ok, send_message(Config, SentData)
+                )
+        end
+    end),
+    ok.
+
+t_write_timeout(_Config) ->
+    %% msodbc driver handled all connection exceptions
+    %% the case is same as t_write_failure/1
+    ok.
+
+t_simple_query(Config) ->
+    BatchSize = batch_size(Config),
+    ?assertMatch(
+        {ok, _},
+        create_bridge(Config)
+    ),
+    {Requests, Vals} = gen_batch_req(BatchSize),
+    ?check_trace(
+        begin
+            ?wait_async_action(
+                begin
+                    [?assertEqual(ok, query_resource(Config, Request)) || Request <- Requests]
+                end,
+                #{?snk_kind := sqlserver_connector_query_return},
+                10_000
+            ),
+            %% just assert the data count is correct
+            ?assertMatch(
+                BatchSize,
+                connect_and_get_count(Config)
+            ),
+            %% assert the data order is correct
+            ?assertMatch(
+                Vals,
+                connect_and_get_payload(Config)
+            )
+        end,
+        fun(Trace0) ->
+            Trace = ?of_kind(sqlserver_connector_query_return, Trace0),
+            case BatchSize of
+                1 ->
+                    ?assertMatch([#{result := ok}], Trace);
+                _ ->
+                    [?assertMatch(#{result := ok}, Trace1) || Trace1 <- Trace]
+            end,
+            ok
+        end
+    ),
+    ok.
+
+-define(MISSING_TINYINT_ERROR,
+    "[Microsoft][ODBC Driver 17 for SQL Server][SQL Server]"
+    "Conversion failed when converting the varchar value 'undefined' to data type tinyint. SQLSTATE IS: 22018"
+).
+
+t_missing_data(Config) ->
+    QueryMode = ?config(query_mode, Config),
+    ?assertMatch(
+        {ok, _},
+        create_bridge(Config)
+    ),
+    Result = send_message(Config, #{}),
+    case QueryMode of
+        sync ->
+            ?assertMatch(
+                {error, {unrecoverable_error, {invalid_request, ?MISSING_TINYINT_ERROR}}},
+                Result
+            );
+        async ->
+            ?assertMatch(
+                ok, send_message(Config, #{})
+            )
+    end,
+    ok.
+
+t_bad_parameter(Config) ->
+    QueryMode = ?config(query_mode, Config),
+    ?assertMatch(
+        {ok, _},
+        create_bridge(Config)
+    ),
+    Result = send_message(Config, #{}),
+    case QueryMode of
+        sync ->
+            ?assertMatch(
+                {error, {unrecoverable_error, {invalid_request, ?MISSING_TINYINT_ERROR}}},
+                Result
+            );
+        async ->
+            ?assertMatch(
+                ok, send_message(Config, #{})
+            )
+    end,
+    ok.
+
+%%------------------------------------------------------------------------------
+%% Helper fns
+%%------------------------------------------------------------------------------
+
+common_init(ConfigT) ->
+    Host = os:getenv("SQLSERVER_HOST", "toxiproxy"),
+    Port = list_to_integer(os:getenv("SQLSERVER_PORT", "1433")),
+
+    Config0 = [
+        {sqlserver_host, Host},
+        {sqlserver_port, Port},
+        %% see also for `proxy_name` : $PROJ_ROOT/.ci/docker-compose-file/toxiproxy.json
+        {proxy_name, "sqlserver"},
+        {batch_size, ?BATCH_SIZE}
+        | ConfigT
+    ],
+
+    BridgeType = proplists:get_value(bridge_type, Config0, <<"sqlserver">>),
+    case emqx_common_test_helpers:is_tcp_server_available(Host, Port) of
+        true ->
+            % Setup toxiproxy
+            ProxyHost = os:getenv("PROXY_HOST", "toxiproxy"),
+            ProxyPort = list_to_integer(os:getenv("PROXY_PORT", "8474")),
+            emqx_common_test_helpers:reset_proxy(ProxyHost, ProxyPort),
+            % Ensure EE bridge module is loaded
+            _ = application:load(emqx_ee_bridge),
+            _ = emqx_ee_bridge:module_info(),
+            ok = emqx_common_test_helpers:start_apps([emqx_conf, emqx_bridge]),
+            emqx_mgmt_api_test_util:init_suite(),
+            % Connect to sqlserver directly
+            % drop old db and table, and then create new ones
+            connect_and_create_db_and_table(Config0),
+            {Name, SQLServerConf} = sqlserver_config(BridgeType, Config0),
+            Config =
+                [
+                    {sqlserver_config, SQLServerConf},
+                    {sqlserver_bridge_type, BridgeType},
+                    {sqlserver_name, Name},
+                    {proxy_host, ProxyHost},
+                    {proxy_port, ProxyPort}
+                    | Config0
+                ],
+            Config;
+        false ->
+            case os:getenv("IS_CI") of
+                "yes" ->
+                    throw(no_sqlserver);
+                _ ->
+                    {skip, no_sqlserver}
+            end
+    end.
+
+sqlserver_config(BridgeType, Config) ->
+    Port = integer_to_list(?config(sqlserver_port, Config)),
+    Server = ?config(sqlserver_host, Config) ++ ":" ++ Port,
+    Name = atom_to_binary(?MODULE),
+    BatchSize = batch_size(Config),
+    QueryMode = ?config(query_mode, Config),
+    ConfigString =
+        io_lib:format(
+            "bridges.~s.~s {\n"
+            "  enable = true\n"
+            "  server = ~p\n"
+            "  database = ~p\n"
+            "  username = ~p\n"
+            "  password = ~p\n"
+            "  sql = ~p\n"
+            "  driver = ~p\n"
+            "  resource_opts = {\n"
+            "    request_timeout = 500ms\n"
+            "    batch_size = ~b\n"
+            "    query_mode = ~s\n"
+            "    worker_pool_size = ~b\n"
+            "  }\n"
+            "}",
+            [
+                BridgeType,
+                Name,
+                Server,
+                ?SQL_SERVER_DATABASE,
+                ?SQL_SERVER_USERNAME,
+                ?SQL_SERVER_PASSWORD,
+                ?SQL_BRIDGE,
+                ?SQL_SERVER_DRIVER,
+                BatchSize,
+                QueryMode,
+                ?WORKER_POOL_SIZE
+            ]
+        ),
+    {Name, parse_and_check(ConfigString, BridgeType, Name)}.
+
+parse_and_check(ConfigString, BridgeType, Name) ->
+    {ok, RawConf} = hocon:binary(ConfigString, #{format => map}),
+    hocon_tconf:check_plain(emqx_bridge_schema, RawConf, #{required => false, atom_key => false}),
+    #{<<"bridges">> := #{BridgeType := #{Name := Config}}} = RawConf,
+    Config.
+
+create_bridge(Config) ->
+    create_bridge(Config, _Overrides = #{}).
+
+create_bridge(Config, Overrides) ->
+    BridgeType = ?config(sqlserver_bridge_type, Config),
+    Name = ?config(sqlserver_name, Config),
+    SSConfig0 = ?config(sqlserver_config, Config),
+    SSConfig = emqx_map_lib:deep_merge(SSConfig0, Overrides),
+    emqx_bridge:create(BridgeType, Name, SSConfig).
+
+delete_bridge(Config) ->
+    BridgeType = ?config(sqlserver_bridge_type, Config),
+    Name = ?config(sqlserver_name, Config),
+    emqx_bridge:remove(BridgeType, Name).
+
+create_bridge_http(Params) ->
+    Path = emqx_mgmt_api_test_util:api_path(["bridges"]),
+    AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
+    case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Params) of
+        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        Error -> Error
+    end.
+
+send_message(Config, Payload) ->
+    Name = ?config(sqlserver_name, Config),
+    BridgeType = ?config(sqlserver_bridge_type, Config),
+    BridgeID = emqx_bridge_resource:bridge_id(BridgeType, Name),
+    emqx_bridge:send_message(BridgeID, Payload).
+
+query_resource(Config, Request) ->
+    Name = ?config(sqlserver_name, Config),
+    BridgeType = ?config(sqlserver_bridge_type, Config),
+    ResourceID = emqx_bridge_resource:resource_id(BridgeType, Name),
+    emqx_resource:query(ResourceID, Request, #{timeout => 1_000}).
+
+query_resource_async(Config, Request) ->
+    Name = ?config(sqlserver_name, Config),
+    BridgeType = ?config(sqlserver_bridge_type, Config),
+    Ref = alias([reply]),
+    AsyncReplyFun = fun(Result) -> Ref ! {result, Ref, Result} end,
+    ResourceID = emqx_bridge_resource:resource_id(BridgeType, Name),
+    Return = emqx_resource:query(ResourceID, Request, #{
+        timeout => 500, async_reply_fun => {AsyncReplyFun, []}
+    }),
+    {Return, Ref}.
+
+receive_result(Ref, Timeout) ->
+    receive
+        {result, Ref, Result} ->
+            {ok, Result};
+        {Ref, Result} ->
+            {ok, Result}
+    after Timeout ->
+        timeout
+    end.
+
+connect_direct_sqlserver(Config) ->
+    Opts = [
+        {host, ?config(sqlserver_host, Config)},
+        {port, ?config(sqlserver_port, Config)},
+        {username, ?SQL_SERVER_USERNAME},
+        {password, ?SQL_SERVER_PASSWORD},
+        {driver, ?SQL_SERVER_DRIVER},
+        {pool_size, 8}
+    ],
+    {ok, Con} = connect(Opts),
+    Con.
+
+connect(Options) ->
+    ConnectStr = lists:concat(conn_str(Options, [])),
+    Opts = proplists:get_value(options, Options, []),
+    odbc:connect(ConnectStr, Opts).
+
+disconnect(Ref) ->
+    odbc:disconnect(Ref).
+
+% These funs connect and then stop the sqlserver connection
+connect_and_create_db_and_table(Config) ->
+    ?WITH_CON(begin
+        {updated, undefined} = directly_query(Con, ?SQL_CREATE_DATABASE_IF_NOT_EXISTS),
+        {updated, undefined} = directly_query(Con, ?SQL_CREATE_TABLE_IN_DB_MQTT)
+    end).
+
+connect_and_drop_db(Config) ->
+    ?WITH_CON({updated, undefined} = directly_query(Con, ?SQL_DROP_DB_MQTT)).
+
+connect_and_drop_table(Config) ->
+    ?WITH_CON({updated, undefined} = directly_query(Con, ?SQL_DROP_TABLE)).
+
+connect_and_clear_table(Config) ->
+    ?WITH_CON({updated, _} = directly_query(Con, ?SQL_DELETE)).
+
+connect_and_get_payload(Config) ->
+    ?WITH_CON(
+        {selected, ["payload"], Rows} = directly_query(Con, ?SQL_SELECT)
+    ),
+    Rows.
+
+connect_and_get_count(Config) ->
+    ?WITH_CON(
+        {selected, [[]], [{Count}]} = directly_query(Con, ?SQL_SELECT_COUNT)
+    ),
+    Count.
+
+directly_query(Con, Query) ->
+    directly_query(Con, Query, ?REQUEST_TIMEOUT_MS).
+
+directly_query(Con, Query, Timeout) ->
+    odbc:sql_query(Con, Query, Timeout).
+
+%%--------------------------------------------------------------------
+%% help functions
+%%--------------------------------------------------------------------
+
+batch_size(Config) ->
+    case ?config(enable_batch, Config) of
+        true -> ?BATCH_SIZE;
+        false -> 1
+    end.
+
+conn_str([], Acc) ->
+    %% TODO: for msodbc 18+, we need to add "Encrypt=YES;TrustServerCertificate=YES"
+    %% but havn't tested now
+    %% we should use this for msodbcsql 18+
+    %% lists:join(";", ["Encrypt=YES", "TrustServerCertificate=YES" | Acc]);
+    lists:join(";", Acc);
+conn_str([{driver, Driver} | Opts], Acc) ->
+    conn_str(Opts, ["Driver=" ++ str(Driver) | Acc]);
+conn_str([{host, Host} | Opts], Acc) ->
+    Port = proplists:get_value(port, Opts, "1433"),
+    NOpts = proplists:delete(port, Opts),
+    conn_str(NOpts, ["Server=" ++ str(Host) ++ "," ++ str(Port) | Acc]);
+conn_str([{port, Port} | Opts], Acc) ->
+    Host = proplists:get_value(host, Opts, "localhost"),
+    NOpts = proplists:delete(host, Opts),
+    conn_str(NOpts, ["Server=" ++ str(Host) ++ "," ++ str(Port) | Acc]);
+conn_str([{database, Database} | Opts], Acc) ->
+    conn_str(Opts, ["Database=" ++ str(Database) | Acc]);
+conn_str([{username, Username} | Opts], Acc) ->
+    conn_str(Opts, ["UID=" ++ str(Username) | Acc]);
+conn_str([{password, Password} | Opts], Acc) ->
+    conn_str(Opts, ["PWD=" ++ str(Password) | Acc]);
+conn_str([{_, _} | Opts], Acc) ->
+    conn_str(Opts, Acc).
+
+sent_data(Payload) ->
+    #{
+        payload => to_bin(Payload),
+        id => <<"0005F8F84FFFAFB9F44200000D810002">>,
+        topic => <<"test/topic">>,
+        qos => 0
+    }.
+
+gen_batch_req(Count) when
+    is_integer(Count) andalso Count > 0
+->
+    Vals = [{str(erlang:unique_integer())} || _Seq <- lists:seq(1, Count)],
+    Requests = [{send_message, sent_data(Payload)} || {Payload} <- Vals],
+    {Requests, Vals};
+gen_batch_req(Count) ->
+    ct:pal("Gen batch requests failed with unexpected Count: ~p", [Count]).
+
+str(List) when is_list(List) ->
+    unicode:characters_to_list(List, utf8);
+str(Bin) when is_binary(Bin) ->
+    unicode:characters_to_list(Bin, utf8);
+str(Num) when is_number(Num) ->
+    number_to_list(Num).
+
+number_to_list(Int) when is_integer(Int) ->
+    integer_to_list(Int);
+number_to_list(Float) when is_float(Float) ->
+    float_to_list(Float, [{decimals, 10}, compact]).
+
+to_bin(List) when is_list(List) ->
+    unicode:characters_to_binary(List, utf8);
+to_bin(Bin) when is_binary(Bin) ->
+    Bin.
diff --git a/lib-ee/emqx_ee_connector/docker-ct b/lib-ee/emqx_ee_connector/docker-ct
index 446c8ee4e..fc8e75e68 100644
--- a/lib-ee/emqx_ee_connector/docker-ct
+++ b/lib-ee/emqx_ee_connector/docker-ct
@@ -2,3 +2,4 @@ toxiproxy
 influxdb
 clickhouse
 cassandra
+sqlserver
diff --git a/scripts/ct/run.sh b/scripts/ct/run.sh
index 83e69d1ad..17a30e08b 100755
--- a/scripts/ct/run.sh
+++ b/scripts/ct/run.sh
@@ -180,6 +180,9 @@ for dep in ${CT_DEPS}; do
         cassandra)
             FILES+=( '.ci/docker-compose-file/docker-compose-cassandra.yaml' )
             ;;
+        sqlserver)
+            FILES+=( '.ci/docker-compose-file/docker-compose-sqlserver.yaml' )
+            ;;
         *)
             echo "unknown_ct_dependency $dep"
             exit 1

From a379d909bfb6101ccc55f32e04ffa9dea3ac3b89 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Mon, 10 Apr 2023 16:44:21 +0800
Subject: [PATCH 039/110] test: use type VARCHAR to use utf8 encoding in
 sqlserver

---
 lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
index 8b0cc53ce..27a85d10f 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
@@ -30,7 +30,9 @@
     " msgid   VARCHAR(64) NULL,"
     " topic   VARCHAR(100) NULL,"
     " qos     tinyint NOT NULL DEFAULT 0,"
-    " payload NVARCHAR(100) NULL,"
+    %% use VARCHAR to use utf8 encoding
+    %% for default, sqlserver use utf16 encoding NVARCHAR()
+    " payload VARCHAR(100) NULL,"
     " arrived DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP)"
 ).
 

From 27fdf644aa5fa75906b5791c6d8cba08f96ae9fd Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Mon, 10 Apr 2023 16:18:29 +0800
Subject: [PATCH 040/110] fix(sqlserver): let a single query be a length 1
 batch

Need to be fixed:
`emqx_plugin_libs_rule:proc_tmpl/2` won't add single quotes for string
---
 .../src/emqx_ee_connector_sqlserver.erl       | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
index 4cc92e80a..214663b22 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
@@ -502,15 +502,18 @@ parse_sql_template([], SingleInsertTks, BatchInsertTks) ->
 
 %% single insert
 apply_template(
-    {?ACTION_SEND_MESSAGE = Key, Msg} = Query,
-    #{?SINGLE_INSERT_TEMP := SingleInsertTks} = _Templates
+    {?ACTION_SEND_MESSAGE = _Key, _Msg} = Query,
+    #{?SINGLE_INSERT_TEMP := _SingleInsertTks} = Templates
 ) ->
-    case maps:get(Key, SingleInsertTks, undefined) of
-        undefined ->
-            Query;
-        Template ->
-            {Key, emqx_plugin_libs_rule:proc_tmpl(Template, Msg)}
-    end;
+    %% TODO: fix emqx_plugin_libs_rule:proc_tmpl/2
+    %% it won't add single quotes for string
+    apply_template([Query], Templates);
+%% case maps:get(Key, SingleInsertTks, undefined) of
+%%     undefined ->
+%%         Query;
+%%     Template ->
+%%         {Key, emqx_plugin_libs_rule:proc_tmpl(Template, Msg)}
+%% end;
 %% batch inserts
 apply_template(
     [{?ACTION_SEND_MESSAGE = Key, _Msg} | _T] = BatchReqs,

From 59433b8b33288bf8b9abcb0a2b708350efaa9eaa Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Tue, 11 Apr 2023 03:41:40 +0800
Subject: [PATCH 041/110] ci: install msodbcsql17 drier data bridge

---
 scripts/install-odbc-driver.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100755 scripts/install-odbc-driver.sh

diff --git a/scripts/install-odbc-driver.sh b/scripts/install-odbc-driver.sh
new file mode 100755
index 000000000..c7b94cf13
--- /dev/null
+++ b/scripts/install-odbc-driver.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+## this script install msodbcsql17 and unixodbc-dev on ci environment
+set -euo pipefail
+
+# install msodbcsql17
+curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
+curl https://packages.microsoft.com/config/debian/11/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
+ACCEPT_EULA=Y apt-get install -y msodbcsql17 unixodbc-dev && \
+## and not needed to modify /etc/odbcinst.ini
+## docker-compose will mount one in .ci/docker-compose-file/odbc
+sed -i 's/ODBC Driver 17 for SQL Server/ms-sql/g' /etc/odbcinst.ini

From d7ad07f1dc27dca9f20fc980163d036d203bc754 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Tue, 11 Apr 2023 04:17:04 +0800
Subject: [PATCH 042/110] ci: install odbc driver for ms sqlserver bridge

---
 scripts/ct/run.sh              | 9 +++++++++
 scripts/install-odbc-driver.sh | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/scripts/ct/run.sh b/scripts/ct/run.sh
index 17a30e08b..4e79476e0 100755
--- a/scripts/ct/run.sh
+++ b/scripts/ct/run.sh
@@ -39,6 +39,7 @@ ONLY_UP='no'
 ATTACH='no'
 STOP='no'
 IS_CI='no'
+ODBC_REQUEST='no'
 while [ "$#" -gt 0 ]; do
     case $1 in
         -h|--help)
@@ -181,6 +182,7 @@ for dep in ${CT_DEPS}; do
             FILES+=( '.ci/docker-compose-file/docker-compose-cassandra.yaml' )
             ;;
         sqlserver)
+            ODBC_REQUEST='yes'
             FILES+=( '.ci/docker-compose-file/docker-compose-sqlserver.yaml' )
             ;;
         *)
@@ -190,6 +192,12 @@ for dep in ${CT_DEPS}; do
     esac
 done
 
+if [ "$ODBC_REQUEST" = 'yes' ]; then
+    INSTALL_ODBC="./scripts/install-odbc-driver.sh"
+else
+    INSTALL_ODBC="echo 'Driver msodbcsql driver not requested'"
+fi
+
 F_OPTIONS=""
 
 for file in "${FILES[@]}"; do
@@ -232,6 +240,7 @@ docker exec -i $TTY -u root:root "$ERLANG_CONTAINER" bash -c "openssl rand -base
 # the user must exist inside the container for `whoami` to work
 docker exec -i $TTY -u root:root "$ERLANG_CONTAINER" bash -c "useradd --uid $DOCKER_USER -M -d / emqx" || true
 docker exec -i $TTY -u root:root "$ERLANG_CONTAINER" bash -c "chown -R $DOCKER_USER /var/lib/secret" || true
+docker exec -i $TTY -u root:root "$ERLANG_CONTAINER" bash -c "$INSTALL_ODBC" || true
 
 if [ "$ONLY_UP" = 'yes' ]; then
     exit 0
diff --git a/scripts/install-odbc-driver.sh b/scripts/install-odbc-driver.sh
index c7b94cf13..b1fd894a0 100755
--- a/scripts/install-odbc-driver.sh
+++ b/scripts/install-odbc-driver.sh
@@ -6,6 +6,8 @@ set -euo pipefail
 # install msodbcsql17
 curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
 curl https://packages.microsoft.com/config/debian/11/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
+## TODO: upgrade builder image
+apt-get update && \
 ACCEPT_EULA=Y apt-get install -y msodbcsql17 unixodbc-dev && \
 ## and not needed to modify /etc/odbcinst.ini
 ## docker-compose will mount one in .ci/docker-compose-file/odbc

From 437096985b7c43d02ae2cccebc19166c284a689b Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Tue, 11 Apr 2023 04:39:15 +0800
Subject: [PATCH 043/110] test: fix SUITE case `t_create_disconnected/1`

---
 .../test/emqx_ee_bridge_sqlserver_SUITE.erl   | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
index 27a85d10f..7a9c1baf9 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
@@ -224,22 +224,9 @@ t_get_status(Config) ->
     ProxyHost = ?config(proxy_host, Config),
     ProxyName = ?config(proxy_name, Config),
 
-    Name = ?config(sqlserver_name, Config),
-    BridgeType = ?config(sqlserver_bridge_type, Config),
-    ResourceID = emqx_bridge_resource:resource_id(BridgeType, Name),
-
-    ?assertEqual({ok, connected}, emqx_resource_manager:health_check(ResourceID)),
+    health_check_resource_ok(Config),
     emqx_common_test_helpers:with_failure(down, ProxyName, ProxyHost, ProxyPort, fun() ->
-        case emqx_resource_manager:health_check(ResourceID) of
-            {ok, Status} when Status =:= disconnected orelse Status =:= connecting ->
-                ok;
-            {error, timeout} ->
-                ok;
-            Other ->
-                ?assert(
-                    false, lists:flatten(io_lib:format("invalid health check result:~p~n", [Other]))
-                )
-        end
+        health_check_resource_down(Config)
     end),
     ok.
 
@@ -247,18 +234,11 @@ t_create_disconnected(Config) ->
     ProxyPort = ?config(proxy_port, Config),
     ProxyHost = ?config(proxy_host, Config),
     ProxyName = ?config(proxy_name, Config),
-    ?check_trace(
-        emqx_common_test_helpers:with_failure(down, ProxyName, ProxyHost, ProxyPort, fun() ->
-            ?assertMatch({ok, _}, create_bridge(Config))
-        end),
-        fun(Trace) ->
-            ?assertMatch(
-                [#{error := {start_pool_failed, _, _}}],
-                ?of_kind(sqlserver_connector_start_failed, Trace)
-            ),
-            ok
-        end
-    ),
+    emqx_common_test_helpers:with_failure(down, ProxyName, ProxyHost, ProxyPort, fun() ->
+        ?assertMatch({ok, _}, create_bridge(Config)),
+        health_check_resource_down(Config)
+    end),
+    health_check_resource_ok(Config),
     ok.
 
 t_write_failure(Config) ->
@@ -522,6 +502,26 @@ query_resource_async(Config, Request) ->
     }),
     {Return, Ref}.
 
+resource_id(Config) ->
+    Name = ?config(sqlserver_name, Config),
+    BridgeType = ?config(sqlserver_bridge_type, Config),
+    _ResourceID = emqx_bridge_resource:resource_id(BridgeType, Name).
+
+health_check_resource_ok(Config) ->
+    ?assertEqual({ok, connected}, emqx_resource_manager:health_check(resource_id(Config))).
+
+health_check_resource_down(Config) ->
+    case emqx_resource_manager:health_check(resource_id(Config)) of
+        {ok, Status} when Status =:= disconnected orelse Status =:= connecting ->
+            ok;
+        {error, timeout} ->
+            ok;
+        Other ->
+            ?assert(
+                false, lists:flatten(io_lib:format("invalid health check result:~p~n", [Other]))
+            )
+    end.
+
 receive_result(Ref, Timeout) ->
     receive
         {result, Ref, Result} ->

From 57505cdfb3fc84c559e47912e3cff9e016eed214 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Tue, 11 Apr 2023 05:15:24 +0800
Subject: [PATCH 044/110] ci: unmount odbcinst.ini file

---
 .ci/docker-compose-file/docker-compose.yaml |  2 +-
 .ci/docker-compose-file/odbc/odbcinst.ini   |  1 -
 scripts/install-odbc-driver.sh              | 11 +++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.ci/docker-compose-file/docker-compose.yaml b/.ci/docker-compose-file/docker-compose.yaml
index 8f97fa9d6..6f4b7c04b 100644
--- a/.ci/docker-compose-file/docker-compose.yaml
+++ b/.ci/docker-compose-file/docker-compose.yaml
@@ -24,7 +24,7 @@ services:
       - /tmp/emqx-ci/emqx-shared-secret:/var/lib/secret
       - ./kerberos/krb5.conf:/etc/kdc/krb5.conf
       - ./kerberos/krb5.conf:/etc/krb5.conf
-      - ./odbc/odbcinst.ini:/etc/odbcinst.ini
+      # - ./odbc/odbcinst.ini:/etc/odbcinst.ini
     working_dir: /emqx
     tty: true
     user: "${DOCKER_USER:-root}"
diff --git a/.ci/docker-compose-file/odbc/odbcinst.ini b/.ci/docker-compose-file/odbc/odbcinst.ini
index 16701cfd2..dd0241543 100644
--- a/.ci/docker-compose-file/odbc/odbcinst.ini
+++ b/.ci/docker-compose-file/odbc/odbcinst.ini
@@ -7,4 +7,3 @@ UsageCount=1
 Description=Microsoft ODBC Driver 17 for SQL Server
 Driver=/opt/microsoft/msodbcsql17/lib64/libmsodbcsql-17.10.so.2.1
 UsageCount=1
-
diff --git a/scripts/install-odbc-driver.sh b/scripts/install-odbc-driver.sh
index b1fd894a0..4ca71d88d 100755
--- a/scripts/install-odbc-driver.sh
+++ b/scripts/install-odbc-driver.sh
@@ -1,14 +1,21 @@
 #!/usr/bin/env bash
 
 ## this script install msodbcsql17 and unixodbc-dev on ci environment
+## specific to ubuntu 16.04, 18.04, 20.04, 22.04
 set -euo pipefail
 
 # install msodbcsql17
+if ! [[ "16.04 18.04 20.04 22.04" == *"$(lsb_release -rs)"* ]];
+then
+    echo "Ubuntu $(lsb_release -rs) is not currently supported.";
+    exit 1;
+fi
+
 curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
-curl https://packages.microsoft.com/config/debian/11/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
+curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
 ## TODO: upgrade builder image
 apt-get update && \
-ACCEPT_EULA=Y apt-get install -y msodbcsql17 unixodbc-dev && \
+ACCEPT_EULA=Y apt-get install -y msodbcsql17 unixodbc-dev mssql-tools && \
 ## and not needed to modify /etc/odbcinst.ini
 ## docker-compose will mount one in .ci/docker-compose-file/odbc
 sed -i 's/ODBC Driver 17 for SQL Server/ms-sql/g' /etc/odbcinst.ini

From f8c0aa49a240b65114edb99be2f1e68401cebc56 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Tue, 11 Apr 2023 09:54:58 +0800
Subject: [PATCH 045/110] style: make elvis and shellcheck happy

---
 .../emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl  | 6 ++++--
 scripts/install-odbc-driver.sh                             | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
index 214663b22..55a5d488f 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
@@ -342,9 +342,11 @@ do_get_status(Conn, RequestTimeout) ->
 %% About the connection string attribute `Encrypt`:
 %% The default value is `yes` in odbc version 18.0+ and `no` in previous versions.
 %% And encrypted connections always verify the server's certificate.
-%% So `Encrypt=YES;TrustServerCertificate=YES` must be set in the connection string when connecting to a server that has a self-signed certificate.
+%% So `Encrypt=YES;TrustServerCertificate=YES` must be set in the connection string
+%% when connecting to a server that has a self-signed certificate.
 %% See also:
-%% https://learn.microsoft.com/en-us/sql/connect/odbc/dsn-connection-string-attribute?source=recommendations&view=sql-server-ver16#encrypt
+%% 'https://learn.microsoft.com/en-us/sql/connect/odbc/
+%%      dsn-connection-string-attribute?source=recommendations&view=sql-server-ver16#encrypt'
 conn_str([], Acc) ->
     %% we should use this for msodbcsql 18+
     %% lists:join(";", ["Encrypt=YES", "TrustServerCertificate=YES" | Acc]);
diff --git a/scripts/install-odbc-driver.sh b/scripts/install-odbc-driver.sh
index 4ca71d88d..7ceab95a0 100755
--- a/scripts/install-odbc-driver.sh
+++ b/scripts/install-odbc-driver.sh
@@ -5,14 +5,15 @@
 set -euo pipefail
 
 # install msodbcsql17
-if ! [[ "16.04 18.04 20.04 22.04" == *"$(lsb_release -rs)"* ]];
+VERSION=$(lsb_release -rs)
+if ! [[ "16.04 18.04 20.04 22.04" == *"$VERSION"* ]];
 then
-    echo "Ubuntu $(lsb_release -rs) is not currently supported.";
+    echo "Ubuntu $VERSION is not currently supported.";
     exit 1;
 fi
 
 curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
-curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
+curl https://packages.microsoft.com/config/ubuntu/"$VERSION"/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
 ## TODO: upgrade builder image
 apt-get update && \
 ACCEPT_EULA=Y apt-get install -y msodbcsql17 unixodbc-dev mssql-tools && \

From 675f9894ab5335bdd867ae6803bf47852faf9bf3 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Tue, 11 Apr 2023 10:43:35 +0800
Subject: [PATCH 046/110] fix: fix single quotes not applied for single query

- alwasy use `emqx_plugin_libs_rule:proc_batch_sql/3` to add single quotes for string
---
 .../src/emqx_ee_connector_sqlserver.erl       | 30 ++++++-------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
index 55a5d488f..99b5c2809 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
@@ -50,8 +50,6 @@
 
 -define(ACTION_SEND_MESSAGE, send_message).
 
--define(SINGLE_INSERT, single_insert).
-
 -define(SYNC_QUERY_MODE, handover).
 -define(ASYNC_QUERY_MODE(REPLY), {handover_async, {?MODULE, do_async_reply, [REPLY]}}).
 
@@ -63,7 +61,6 @@
     maps:get(request_timeout, RESOURCE_OPTS, ?DEFAULT_REQUEST_TIMEOUT)
 ).
 
--define(SINGLE_INSERT_TEMP, single_insert_temp).
 -define(BATCH_INSERT_TEMP, batch_insert_temp).
 
 -define(BATCH_INSERT_PART, batch_insert_part).
@@ -464,20 +461,18 @@ parse_sql_template(Config) ->
             SQLTemplate -> #{?ACTION_SEND_MESSAGE => SQLTemplate}
         end,
 
-    SingleInsertTks = #{},
     BatchInsertTks = #{},
-    parse_sql_template(maps:to_list(RawSQLTemplates), SingleInsertTks, BatchInsertTks).
+    parse_sql_template(maps:to_list(RawSQLTemplates), BatchInsertTks).
 
-parse_sql_template([{Key, H} | T], SingleInsertTks, BatchInsertTks) ->
+parse_sql_template([{Key, H} | T], BatchInsertTks) ->
     case emqx_plugin_libs_rule:detect_sql_type(H) of
         {ok, select} ->
-            parse_sql_template(T, SingleInsertTks, BatchInsertTks);
+            parse_sql_template(T, BatchInsertTks);
         {ok, insert} ->
             case emqx_plugin_libs_rule:split_insert_sql(H) of
                 {ok, {InsertSQL, Params}} ->
                     parse_sql_template(
                         T,
-                        SingleInsertTks#{Key => emqx_plugin_libs_rule:preproc_tmpl(H)},
                         BatchInsertTks#{
                             Key =>
                                 #{
@@ -490,32 +485,24 @@ parse_sql_template([{Key, H} | T], SingleInsertTks, BatchInsertTks) ->
                     );
                 {error, Reason} ->
                     ?SLOG(error, #{msg => "split sql failed", sql => H, reason => Reason}),
-                    parse_sql_template(T, SingleInsertTks, BatchInsertTks)
+                    parse_sql_template(T, BatchInsertTks)
             end;
         {error, Reason} ->
             ?SLOG(error, #{msg => "detect sql type failed", sql => H, reason => Reason}),
-            parse_sql_template(T, SingleInsertTks, BatchInsertTks)
+            parse_sql_template(T, BatchInsertTks)
     end;
-parse_sql_template([], SingleInsertTks, BatchInsertTks) ->
+parse_sql_template([], BatchInsertTks) ->
     #{
-        ?SINGLE_INSERT_TEMP => SingleInsertTks,
         ?BATCH_INSERT_TEMP => BatchInsertTks
     }.
 
 %% single insert
 apply_template(
-    {?ACTION_SEND_MESSAGE = _Key, _Msg} = Query,
-    #{?SINGLE_INSERT_TEMP := _SingleInsertTks} = Templates
+    {?ACTION_SEND_MESSAGE = _Key, _Msg} = Query, Templates
 ) ->
     %% TODO: fix emqx_plugin_libs_rule:proc_tmpl/2
     %% it won't add single quotes for string
     apply_template([Query], Templates);
-%% case maps:get(Key, SingleInsertTks, undefined) of
-%%     undefined ->
-%%         Query;
-%%     Template ->
-%%         {Key, emqx_plugin_libs_rule:proc_tmpl(Template, Msg)}
-%% end;
 %% batch inserts
 apply_template(
     [{?ACTION_SEND_MESSAGE = Key, _Msg} | _T] = BatchReqs,
@@ -530,7 +517,8 @@ apply_template(
     end;
 apply_template(Query, Templates) ->
     %% TODO: more detail infomatoin
-    ?SLOG(error, #{msg => "apply sql template failed", query => Query, templates => Templates}).
+    ?SLOG(error, #{msg => "apply sql template failed", query => Query, templates => Templates}),
+    {error, failed_to_apply_sql_template}.
 
 do_async_reply(Result, {ReplyFun, Args}) ->
     erlang:apply(ReplyFun, Args ++ Result).

From 35ab1c01900ada9d1b1610c0e1d325babc5a664d Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Tue, 11 Apr 2023 11:11:09 +0800
Subject: [PATCH 047/110] style: make hocon style check and spellcheck happy

- with more human readable i18n style check format
---
 changes/ee/feat-10363.en.md                |  2 +-
 rel/i18n/emqx_ee_bridge_dynamo.hocon       |  2 +-
 rel/i18n/emqx_ee_bridge_pgsql.hocon        |  2 +-
 rel/i18n/emqx_ee_bridge_sqlserver.hocon    | 18 ++++++++----------
 rel/i18n/emqx_ee_bridge_tdengine.hocon     |  2 +-
 rel/i18n/emqx_ee_connector_sqlserver.hocon | 12 ++++--------
 scripts/check-i18n-style.escript           |  6 +++---
 7 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/changes/ee/feat-10363.en.md b/changes/ee/feat-10363.en.md
index c3b53a538..84816031d 100644
--- a/changes/ee/feat-10363.en.md
+++ b/changes/ee/feat-10363.en.md
@@ -1 +1 @@
-Add MicroSoft SQL Server data Bridge support.
+Implement Microsoft SQL Server bridge.
diff --git a/rel/i18n/emqx_ee_bridge_dynamo.hocon b/rel/i18n/emqx_ee_bridge_dynamo.hocon
index 664b13174..b93b12166 100644
--- a/rel/i18n/emqx_ee_bridge_dynamo.hocon
+++ b/rel/i18n/emqx_ee_bridge_dynamo.hocon
@@ -39,7 +39,7 @@ will be forwarded."""
 
     desc_config {
         desc {
-            en: """Configuration for an DynamoDB bridge."""
+            en: """Configuration for a DynamoDB bridge."""
             zh: """DynamoDB 桥接配置"""
         }
         label: {
diff --git a/rel/i18n/emqx_ee_bridge_pgsql.hocon b/rel/i18n/emqx_ee_bridge_pgsql.hocon
index 81d2330c5..1ce2818ca 100644
--- a/rel/i18n/emqx_ee_bridge_pgsql.hocon
+++ b/rel/i18n/emqx_ee_bridge_pgsql.hocon
@@ -39,7 +39,7 @@ will be forwarded."""
 
     desc_config {
         desc {
-            en: """Configuration for an PostgreSQL bridge."""
+            en: """Configuration for a PostgreSQL bridge."""
             zh: """PostgreSQL 桥接配置"""
         }
         label: {
diff --git a/rel/i18n/emqx_ee_bridge_sqlserver.hocon b/rel/i18n/emqx_ee_bridge_sqlserver.hocon
index bb82c82f8..007b64ae6 100644
--- a/rel/i18n/emqx_ee_bridge_sqlserver.hocon
+++ b/rel/i18n/emqx_ee_bridge_sqlserver.hocon
@@ -2,15 +2,13 @@ emqx_ee_bridge_sqlserver {
 
   local_topic {
     desc {
-      en: """The MQTT topic filter to be forwarded to MicroSoft SQL Server. All MQTT 'PUBLISH' messages with the topic
+      en: """The MQTT topic filter to be forwarded to Microsoft SQL Server. All MQTT 'PUBLISH' messages with the topic
 matching the local_topic will be forwarded.</br>
 NOTE: if this bridge is used as the action of a rule (EMQX rule engine), and also local_topic is
 configured, then both the data got from the rule and the MQTT messages that match local_topic
-will be forwarded.
-"""
-      zh: """发送到 'local_topic' 的消息都会转发到 MicroSoft SQL Server。 </br>
-注意：如果这个 Bridge 被用作规则（EMQX 规则引擎）的输出，同时也配置了 'local_topic' ，那么这两部分的消息都会被转发。
-"""
+will be forwarded."""
+      zh: """发送到 'local_topic' 的消息都会转发到 Microsoft SQL Server。 </br>
+注意：如果这个 Bridge 被用作规则（EMQX 规则引擎）的输出，同时也配置了 'local_topic' ，那么这两部分的消息都会被转发。"""
     }
     label {
       en: """Local Topic"""
@@ -53,12 +51,12 @@ will be forwarded.
 
   desc_config {
     desc {
-      en: """Configuration for an MicroSoft SQL Server bridge."""
-      zh: """MicroSoft SQL Server 桥接配置"""
+      en: """Configuration for a Microsoft SQL Server bridge."""
+      zh: """Microsoft SQL Server 桥接配置"""
     }
     label: {
-      en: """MicroSoft SQL Server Bridge Configuration"""
-      zh: """MicroSoft SQL Server 桥接配置"""
+      en: """Microsoft SQL Server Bridge Configuration"""
+      zh: """Microsoft SQL Server 桥接配置"""
     }
   }
 
diff --git a/rel/i18n/emqx_ee_bridge_tdengine.hocon b/rel/i18n/emqx_ee_bridge_tdengine.hocon
index 21fc013df..12eb6f062 100644
--- a/rel/i18n/emqx_ee_bridge_tdengine.hocon
+++ b/rel/i18n/emqx_ee_bridge_tdengine.hocon
@@ -39,7 +39,7 @@ will be forwarded."""
 
     desc_config {
         desc {
-            en: """Configuration for an TDengine bridge."""
+            en: """Configuration for a TDengine bridge."""
             zh: """TDengine 桥接配置"""
         }
         label: {
diff --git a/rel/i18n/emqx_ee_connector_sqlserver.hocon b/rel/i18n/emqx_ee_connector_sqlserver.hocon
index 9ff24c1c1..85280d833 100644
--- a/rel/i18n/emqx_ee_connector_sqlserver.hocon
+++ b/rel/i18n/emqx_ee_connector_sqlserver.hocon
@@ -2,16 +2,12 @@ emqx_ee_connector_sqlserver {
 
   server {
     desc {
-      en: """
-The IPv4 or IPv6 address or the hostname to connect to.<br/>
+      en: """The IPv4 or IPv6 address or the hostname to connect to.<br/>
 A host entry has the following form: `Host[:Port]`.<br/>
-The SQL Server default port 1433 is used if `[:Port]` is not specified.
-"""
-      zh: """
-将要连接的 IPv4 或 IPv6 地址，或者主机名。<br/>
+The SQL Server default port 1433 is used if `[:Port]` is not specified."""
+      zh: """将要连接的 IPv4 或 IPv6 地址，或者主机名。<br/>
 主机名具有以下形式：`Host[:Port]`。<br/>
-如果未指定 `[:Port]`，则使用 SQL Server 默认端口 1433。
-"""
+如果未指定 `[:Port]`，则使用 SQL Server 默认端口 1433。"""
     }
     label: {
       en: "Server Host"
diff --git a/scripts/check-i18n-style.escript b/scripts/check-i18n-style.escript
index cbe79c82e..a76fce90e 100755
--- a/scripts/check-i18n-style.escript
+++ b/scripts/check-i18n-style.escript
@@ -9,7 +9,7 @@
 -define(RESET, "\e[39m").
 
 main([Files0]) ->
-    io:format(user, "checking i18n file styles", []),
+    io:format(user, "checking i18n file styles~n", []),
     _ = put(errors, 0),
     Files = string:tokens(Files0, "\n"),
     ok = load_hocon(),
@@ -20,7 +20,7 @@ main([Files0]) ->
         N when is_integer(N) andalso N > 1 ->
             logerr("~p errors found~n", [N]);
         _ ->
-            io:format(user, "OK~n", [])
+            io:format(user, "~nOK~n", [])
     end.
 
 load_hocon() ->
@@ -42,7 +42,7 @@ die(Msg, Args) ->
     halt(1).
 
 logerr(Fmt, Args) ->
-    io:format(standard_error, ?RED ++ "ERROR: " ++ Fmt ++ ?RESET, Args),
+    io:format(standard_error, "~n" ++ ?RED ++ "ERROR: " ++ Fmt ++ ?RESET, Args),
     N = get(errors),
     _ = put(errors, N + 1),
     ok.

From 1b2cf6d421f7e3dae05ec1be1ccaa1e057b449b5 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Thu, 13 Apr 2023 17:58:06 +0800
Subject: [PATCH 048/110] ci: newest SQL Serevr 2019 image and rm deprecated
 env `SA_PASSWORD`

---
 .ci/docker-compose-file/.env                          | 2 +-
 .ci/docker-compose-file/docker-compose-sqlserver.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/docker-compose-file/.env b/.ci/docker-compose-file/.env
index b394d6bb1..d33637ea0 100644
--- a/.ci/docker-compose-file/.env
+++ b/.ci/docker-compose-file/.env
@@ -9,6 +9,6 @@ DYNAMO_TAG=1.21.0
 CASSANDRA_TAG=3.11.6
 
 MS_IMAGE_ADDR=mcr.microsoft.com/mssql/server
-SQLSERVER_TAG=2019-CU11-ubuntu-20.04
+SQLSERVER_TAG=2019-CU19-ubuntu-20.04
 
 TARGET=emqx/emqx
diff --git a/.ci/docker-compose-file/docker-compose-sqlserver.yaml b/.ci/docker-compose-file/docker-compose-sqlserver.yaml
index 37799e20b..a578983f8 100644
--- a/.ci/docker-compose-file/docker-compose-sqlserver.yaml
+++ b/.ci/docker-compose-file/docker-compose-sqlserver.yaml
@@ -11,7 +11,7 @@ services:
       # See also:
       # https://learn.microsoft.com/en-us/sql/linux/sql-server-linux-configure-environment-variables
       ACCEPT_EULA: "Y"
-      SA_PASSWORD: "mqtt_public"
+      MSSQL_SA_PASSWORD: "mqtt_public"
     restart: always
     # ports:
     #   - "1433:1433"

From 2d1b94f7f79e841802e2e3de2e898f4a8ff90af0 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Fri, 14 Apr 2023 01:34:30 +0800
Subject: [PATCH 049/110] fix: file mode 755 magic number

---
 .../src/emqx_ee_connector_sqlserver.erl                  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
index 99b5c2809..e48570c96 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
@@ -66,6 +66,11 @@
 -define(BATCH_INSERT_PART, batch_insert_part).
 -define(BATCH_PARAMS_TOKENS, batch_insert_tks).
 
+-define(FILE_MODE_755, 33261).
+%% 32768 + 8#00400 + 8#00200 + 8#00100 + 8#00040 + 8#00010 + 8#00004 + 8#00001
+%% See also
+%% https://www.erlang.org/doc/man/file.html#read_file_info-2
+
 %% Copied from odbc reference page
 %% https://www.erlang.org/doc/man/odbc.html
 
@@ -190,11 +195,11 @@ on_start(
     ODBCDir = code:priv_dir(odbc),
     OdbcserverDir = filename:join(ODBCDir, "bin/odbcserver"),
     {ok, Info = #file_info{mode = Mode}} = file:read_file_info(OdbcserverDir),
-    case 33261 =:= Mode of
+    case ?FILE_MODE_755 =:= Mode of
         true ->
             ok;
         false ->
-            _ = file:write_file_info(OdbcserverDir, Info#file_info{mode = 33261}),
+            _ = file:write_file_info(OdbcserverDir, Info#file_info{mode = ?FILE_MODE_755}),
             ok
     end,
 

From 65c4234829a9f52758803b4987a8275e8e90a24d Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Fri, 14 Apr 2023 01:39:08 +0800
Subject: [PATCH 050/110] refactor: rename instance_id, which is also PoolName

---
 .../src/emqx_ee_connector_sqlserver.erl       | 51 +++++++++----------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
index e48570c96..586444947 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
@@ -74,7 +74,6 @@
 %% Copied from odbc reference page
 %% https://www.erlang.org/doc/man/odbc.html
 
--type bridge_id() :: binary().
 %% as returned by connect/2
 -type connection_reference() :: pid().
 -type time_out() :: milliseconds() | infinity.
@@ -175,7 +174,7 @@ callback_mode() -> async_if_possible.
 is_buffer_supported() -> false.
 
 on_start(
-    BridgeId = PoolName,
+    InstanceId = PoolName,
     #{
         server := Server,
         username := Username,
@@ -188,7 +187,7 @@ on_start(
 ) ->
     ?SLOG(info, #{
         msg => "starting_sqlserver_connector",
-        connector => BridgeId,
+        connector => InstanceId,
         config => emqx_misc:redact(Config)
     }),
 
@@ -214,7 +213,7 @@ on_start(
     ],
 
     State = #{
-        %% also BridgeId
+        %% also InstanceId
         poolname => PoolName,
         sql_templates => parse_sql_template(Config),
         resource_opts => ResourceOpts
@@ -238,7 +237,7 @@ on_stop(InstanceId, #{poolname := PoolName} = _State) ->
     emqx_plugin_libs_pool:stop_pool(PoolName).
 
 -spec on_query(
-    bridge_id(),
+    manager_id(),
     {?ACTION_SEND_MESSAGE, map()},
     state()
 ) ->
@@ -246,16 +245,16 @@ on_stop(InstanceId, #{poolname := PoolName} = _State) ->
     | {ok, list()}
     | {error, {recoverable_error, term()}}
     | {error, term()}.
-on_query(BridgeId, {?ACTION_SEND_MESSAGE, _Msg} = Query, State) ->
+on_query(InstanceId, {?ACTION_SEND_MESSAGE, _Msg} = Query, State) ->
     ?TRACE(
         "SINGLE_QUERY_SYNC",
         "bridge_sqlserver_received",
-        #{requests => Query, connector => BridgeId, state => State}
+        #{requests => Query, connector => InstanceId, state => State}
     ),
-    do_query(BridgeId, Query, ?SYNC_QUERY_MODE, State).
+    do_query(InstanceId, Query, ?SYNC_QUERY_MODE, State).
 
 -spec on_query_async(
-    bridge_id(),
+    manager_id(),
     {?ACTION_SEND_MESSAGE, map()},
     {ReplyFun :: function(), Args :: list()},
     state()
@@ -263,7 +262,7 @@ on_query(BridgeId, {?ACTION_SEND_MESSAGE, _Msg} = Query, State) ->
     {ok, any()}
     | {error, term()}.
 on_query_async(
-    BridgeId,
+    InstanceId,
     {?ACTION_SEND_MESSAGE, _Msg} = Query,
     ReplyFunAndArgs,
     %% #{poolname := PoolName, sql_templates := Templates} = State
@@ -272,12 +271,12 @@ on_query_async(
     ?TRACE(
         "SINGLE_QUERY_ASYNC",
         "bridge_sqlserver_received",
-        #{requests => Query, connector => BridgeId, state => State}
+        #{requests => Query, connector => InstanceId, state => State}
     ),
-    do_query(BridgeId, Query, ?ASYNC_QUERY_MODE(ReplyFunAndArgs), State).
+    do_query(InstanceId, Query, ?ASYNC_QUERY_MODE(ReplyFunAndArgs), State).
 
 -spec on_batch_query(
-    bridge_id(),
+    manager_id(),
     [{?ACTION_SEND_MESSAGE, map()}],
     state()
 ) ->
@@ -285,27 +284,27 @@ on_query_async(
     | {ok, list()}
     | {error, {recoverable_error, term()}}
     | {error, term()}.
-on_batch_query(BridgeId, BatchRequests, State) ->
+on_batch_query(InstanceId, BatchRequests, State) ->
     ?TRACE(
         "BATCH_QUERY_SYNC",
         "bridge_sqlserver_received",
-        #{requests => BatchRequests, connector => BridgeId, state => State}
+        #{requests => BatchRequests, connector => InstanceId, state => State}
     ),
-    do_query(BridgeId, BatchRequests, ?SYNC_QUERY_MODE, State).
+    do_query(InstanceId, BatchRequests, ?SYNC_QUERY_MODE, State).
 
 -spec on_batch_query_async(
-    bridge_id(),
+    manager_id(),
     [{?ACTION_SEND_MESSAGE, map()}],
     {ReplyFun :: function(), Args :: list()},
     state()
 ) -> {ok, any()}.
-on_batch_query_async(BridgeId, Requests, ReplyFunAndArgs, State) ->
+on_batch_query_async(InstanceId, Requests, ReplyFunAndArgs, State) ->
     ?TRACE(
         "BATCH_QUERY_ASYNC",
         "bridge_sqlserver_received",
-        #{requests => Requests, connector => BridgeId, state => State}
+        #{requests => Requests, connector => InstanceId, state => State}
     ),
-    do_query(BridgeId, Requests, ?ASYNC_QUERY_MODE(ReplyFunAndArgs), State).
+    do_query(InstanceId, Requests, ?ASYNC_QUERY_MODE(ReplyFunAndArgs), State).
 
 on_get_status(_InstanceId, #{poolname := Pool, resource_opts := ResourceOpts} = _State) ->
     RequestTimeout = ?REQUEST_TIMEOUT(ResourceOpts),
@@ -369,7 +368,7 @@ conn_str([{_, _} | Opts], Acc) ->
 
 %% Sync & Async query with singe & batch sql statement
 -spec do_query(
-    bridge_id(),
+    manager_id(),
     Query :: {?ACTION_SEND_MESSAGE, map()} | [{?ACTION_SEND_MESSAGE, map()}],
     ApplyMode ::
         handover
@@ -380,7 +379,7 @@ conn_str([{_, _} | Opts], Acc) ->
     | {error, {recoverable_error, term()}}
     | {error, term()}.
 do_query(
-    BridgeId,
+    InstanceId,
     Query,
     ApplyMode,
     #{poolname := PoolName, sql_templates := Templates} = State
@@ -388,7 +387,7 @@ do_query(
     ?TRACE(
         "SINGLE_QUERY_SYNC",
         "sqlserver_connector_received",
-        #{query => Query, connector => BridgeId, state => State}
+        #{query => Query, connector => InstanceId, state => State}
     ),
 
     %% only insert sql statement for single query and batch query
@@ -412,7 +411,7 @@ do_query(
             ),
             ?SLOG(error, #{
                 msg => "sqlserver_connector_do_query_failed",
-                connector => BridgeId,
+                connector => InstanceId,
                 query => Query,
                 reason => Reason
             }),
@@ -426,9 +425,9 @@ do_query(
     end.
 
 worker_do_insert(
-    Conn, SQL, #{resource_opts := ResourceOpts, poolname := BridgeId} = State
+    Conn, SQL, #{resource_opts := ResourceOpts, poolname := InstanceId} = State
 ) ->
-    LogMeta = #{connector => BridgeId, state => State},
+    LogMeta = #{connector => InstanceId, state => State},
     try
         case execute(Conn, SQL, ?REQUEST_TIMEOUT(ResourceOpts)) of
             {selected, Rows, _} ->

From 06b1ec862efda931c975521c831b316331f964cc Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Fri, 14 Apr 2023 10:24:40 +0800
Subject: [PATCH 051/110] fix: hocon label field

---
 rel/i18n/emqx_ee_bridge_sqlserver.hocon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rel/i18n/emqx_ee_bridge_sqlserver.hocon b/rel/i18n/emqx_ee_bridge_sqlserver.hocon
index 007b64ae6..a6f96f86d 100644
--- a/rel/i18n/emqx_ee_bridge_sqlserver.hocon
+++ b/rel/i18n/emqx_ee_bridge_sqlserver.hocon
@@ -32,7 +32,7 @@ will be forwarded."""
       en: """SQL Server Driver Name"""
       zh: """SQL Server Driver 名称"""
     }
-    desc {
+    label {
       en: """SQL Server Driver Name"""
       zh: """SQL Server Driver 名称"""
     }

From 8cec62bd877f7e59e283b4e73486d02dde5cd97b Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Fri, 14 Apr 2023 12:41:34 +0800
Subject: [PATCH 052/110] fix: async reply arg list

---
 lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
index 586444947..dc9759341 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
@@ -525,4 +525,4 @@ apply_template(Query, Templates) ->
     {error, failed_to_apply_sql_template}.
 
 do_async_reply(Result, {ReplyFun, Args}) ->
-    erlang:apply(ReplyFun, Args ++ Result).
+    erlang:apply(ReplyFun, Args ++ [Result]).

From 2484a79c7aa0d712464b7c413069f3b615e0b601 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Fri, 14 Apr 2023 12:42:09 +0800
Subject: [PATCH 053/110] test: create bridge with invalid password

---
 .../docker-compose-sqlserver.yaml             |  2 +-
 .../test/emqx_ee_bridge_sqlserver_SUITE.erl   | 32 +++++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/.ci/docker-compose-file/docker-compose-sqlserver.yaml b/.ci/docker-compose-file/docker-compose-sqlserver.yaml
index a578983f8..63fcfeecd 100644
--- a/.ci/docker-compose-file/docker-compose-sqlserver.yaml
+++ b/.ci/docker-compose-file/docker-compose-sqlserver.yaml
@@ -11,7 +11,7 @@ services:
       # See also:
       # https://learn.microsoft.com/en-us/sql/linux/sql-server-linux-configure-environment-variables
       ACCEPT_EULA: "Y"
-      MSSQL_SA_PASSWORD: "mqtt_public"
+      MSSQL_SA_PASSWORD: "mqtt_public1"
     restart: always
     # ports:
     #   - "1433:1433"
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
index 7a9c1baf9..152bdf2b7 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
@@ -44,7 +44,7 @@
 % DB defaults
 -define(SQL_SERVER_DATABASE, "mqtt").
 -define(SQL_SERVER_USERNAME, "sa").
--define(SQL_SERVER_PASSWORD, "mqtt_public").
+-define(SQL_SERVER_PASSWORD, "mqtt_public1").
 -define(BATCH_SIZE, 10).
 -define(REQUEST_TIMEOUT_MS, 500).
 
@@ -56,7 +56,7 @@
     ok = disconnect(Con)
 ).
 
-%% How to run it locally:
+%% How to run it locally (all commands are run in $PROJ_ROOT dir):
 %%   A: run ct on host
 %%     1. Start all deps services
 %%       sudo docker compose -f .ci/docker-compose-file/docker-compose.yaml \
@@ -65,7 +65,7 @@
 %%                           up --build
 %%
 %%     2. Run use cases with special environment variables
-%%       11433 is toxiproxy exported port
+%%       11433 is toxiproxy exported port.
 %%       Local:
 %%       ```
 %%       SQLSERVER_HOST=toxiproxy SQLSERVER_PORT=11433 \
@@ -241,6 +241,32 @@ t_create_disconnected(Config) ->
     health_check_resource_ok(Config),
     ok.
 
+t_create_with_invalid_password(Config) ->
+    BridgeType = ?config(sqlserver_bridge_type, Config),
+    Name = ?config(sqlserver_name, Config),
+    SQLServerConfig0 = ?config(sqlserver_config, Config),
+    SQLServerConfig = SQLServerConfig0#{
+        <<"name">> => Name,
+        <<"type">> => BridgeType,
+        <<"password">> => <<"wrong_password">>
+    },
+    ?check_trace(
+        begin
+            ?assertMatch(
+                {ok, _},
+                create_bridge_http(SQLServerConfig)
+            )
+        end,
+        fun(Trace) ->
+            ?assertMatch(
+                [#{error := {start_pool_failed, _, _}}],
+                ?of_kind(sqlserver_connector_start_failed, Trace)
+            ),
+            ok
+        end
+    ),
+    ok.
+
 t_write_failure(Config) ->
     ProxyName = ?config(proxy_name, Config),
     ProxyPort = ?config(proxy_port, Config),

From 9ce0dbae7b297f27d97bd27c7a536f9e8ae02d4e Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Fri, 14 Apr 2023 13:11:45 +0800
Subject: [PATCH 054/110] test: fix batch_size parameter

---
 lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
index 152bdf2b7..c1b33c3c9 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
@@ -398,7 +398,7 @@ common_init(ConfigT) ->
         {sqlserver_port, Port},
         %% see also for `proxy_name` : $PROJ_ROOT/.ci/docker-compose-file/toxiproxy.json
         {proxy_name, "sqlserver"},
-        {batch_size, ?BATCH_SIZE}
+        {batch_size, batch_size(ConfigT)}
         | ConfigT
     ],
 

From 987ef6c51daece05188de4943190d2eb6142b34e Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Fri, 14 Apr 2023 15:42:44 +0800
Subject: [PATCH 055/110] revert: "build: docker file add unixodbc and
 msodbcsql17"

This reverts commit 611edf422719069297219370fe120968737fc0cf.
---
 .gitignore               |  1 -
 deploy/docker/Dockerfile | 16 +++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f7e268a2..62e8ddc81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,4 +71,3 @@ apps/emqx/test/emqx_static_checks_data/master.bpapi
 lux_logs/
 /.prepare
 bom.json
-.dockerignore
diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile
index dcebe9b1a..8f04c433c 100644
--- a/deploy/docker/Dockerfile
+++ b/deploy/docker/Dockerfile
@@ -29,19 +29,9 @@ COPY --from=builder /emqx-rel/emqx /opt/emqx
 
 RUN ln -s /opt/emqx/bin/* /usr/local/bin/
 
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends ca-certificates procps
-
-RUN apt-get update \
-    && apt-get install -y gnupg2 curl apt-utils \
-    && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
-    && curl https://packages.microsoft.com/config/debian/11/prod.list > /etc/apt/sources.list.d/mssql-release.list \
-    && apt-get update \
-    && ACCEPT_EULA=Y apt-get install -y msodbcsql17 unixodbc-dev \
-    && sed -i 's/ODBC Driver 17 for SQL Server/ms-sql/g' /etc/odbcinst.ini
-
-RUN apt-get clean && \
-    rm -rf /var/lib/apt/lists/*;
+RUN apt-get update; \
+    apt-get install -y --no-install-recommends ca-certificates procps; \
+    rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt/emqx
 

From be35ae2132085b82ee077ff2cfa28b9d514adcad Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Fri, 14 Apr 2023 17:14:11 +0800
Subject: [PATCH 056/110] feat: hide shared_subscription_group,rpc,slow_subs

---
 apps/emqx/src/emqx_schema.erl                     | 4 +++-
 apps/emqx_conf/src/emqx_conf_schema.erl           | 5 ++++-
 apps/emqx_slow_subs/src/emqx_slow_subs.app.src    | 2 +-
 apps/emqx_slow_subs/src/emqx_slow_subs_schema.erl | 3 ++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 851fa3d3b..ed20848d2 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -1498,12 +1498,14 @@ fields("broker") ->
                 ref("broker_perf"),
                 #{importance => ?IMPORTANCE_HIDDEN}
             )},
+        %% FIXME: Need new design for shared subscription group
         {"shared_subscription_group",
             sc(
                 map(name, ref("shared_subscription_group")),
                 #{
                     example => #{<<"example_group">> => #{<<"strategy">> => <<"random">>}},
-                    desc => ?DESC(shared_subscription_group_strategy)
+                    desc => ?DESC(shared_subscription_group_strategy),
+                    importance => ?IMPORTANCE_HIDDEN
                 }
             )}
     ];
diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl
index a24f43801..f689997c2 100644
--- a/apps/emqx_conf/src/emqx_conf_schema.erl
+++ b/apps/emqx_conf/src/emqx_conf_schema.erl
@@ -98,7 +98,10 @@ roots() ->
             {"rpc",
                 sc(
                     ?R_REF("rpc"),
-                    #{translate_to => ["gen_rpc"]}
+                    #{
+                        translate_to => ["gen_rpc"],
+                        importance => ?IMPORTANCE_HIDDEN
+                    }
                 )}
         ] ++
         emqx_schema:roots(medium) ++
diff --git a/apps/emqx_slow_subs/src/emqx_slow_subs.app.src b/apps/emqx_slow_subs/src/emqx_slow_subs.app.src
index 7d3fc341d..a06ff2595 100644
--- a/apps/emqx_slow_subs/src/emqx_slow_subs.app.src
+++ b/apps/emqx_slow_subs/src/emqx_slow_subs.app.src
@@ -1,7 +1,7 @@
 {application, emqx_slow_subs, [
     {description, "EMQX Slow Subscribers Statistics"},
     % strict semver, bump manually!
-    {vsn, "1.0.4"},
+    {vsn, "1.0.5"},
     {modules, []},
     {registered, [emqx_slow_subs_sup]},
     {applications, [kernel, stdlib, emqx]},
diff --git a/apps/emqx_slow_subs/src/emqx_slow_subs_schema.erl b/apps/emqx_slow_subs/src/emqx_slow_subs_schema.erl
index 9e9e6488a..47ea18c3c 100644
--- a/apps/emqx_slow_subs/src/emqx_slow_subs_schema.erl
+++ b/apps/emqx_slow_subs/src/emqx_slow_subs_schema.erl
@@ -22,7 +22,8 @@
 
 namespace() -> "slow_subs".
 
-roots() -> ["slow_subs"].
+roots() ->
+    [{"slow_subs", ?HOCON(?R_REF("slow_subs"), #{importance => ?IMPORTANCE_HIDDEN})}].
 
 fields("slow_subs") ->
     [

From f8e9e54393204114eaaa1afcccdf457d350e4147 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Thu, 13 Apr 2023 14:02:37 +0200
Subject: [PATCH 057/110] refactor: move emqx_json to emqx_utils_json

---
 apps/emqx/rebar.config                        |   2 +-
 apps/emqx/src/emqx_alarm.erl                  |   2 +-
 apps/emqx/src/emqx_logger_jsonfmt.erl         |   2 +-
 apps/emqx/src/emqx_schema.erl                 |   2 +-
 apps/emqx/src/emqx_sys.erl                    |   2 +-
 apps/emqx/test/emqx_common_test_helpers.erl   |   6 +-
 apps/emqx/test/emqx_common_test_http.erl      |   4 +-
 apps/emqx/test/emqx_config_SUITE.erl          |   2 +-
 apps/emqx/test/emqx_crl_cache_SUITE.erl       |   6 +-
 apps/emqx/test/emqx_ocsp_cache_SUITE.erl      |  14 +--
 apps/emqx/test/props/prop_emqx_json.erl       |   4 +-
 apps/emqx_authn/rebar.config                  |   1 +
 .../src/simple_authn/emqx_authn_http.erl      |   4 +-
 .../simple_authn/emqx_authn_jwks_client.erl   |   2 +-
 .../src/simple_authn/emqx_authn_jwt.erl       |   2 +-
 .../src/simple_authn/emqx_authn_mnesia.erl    |   2 +-
 apps/emqx_authn/test/emqx_authn_api_SUITE.erl |  24 ++---
 .../emqx_authn/test/emqx_authn_http_SUITE.erl |  20 ++--
 .../test/emqx_authn_https_SUITE.erl           |   2 +-
 apps/emqx_authn/test/emqx_authn_jwt_SUITE.erl |   2 +-
 apps/emqx_authz/rebar.config                  |   1 +
 apps/emqx_authz/src/emqx_authz_utils.erl      |   2 +-
 .../test/emqx_authz_api_cache_SUITE.erl       |   4 +-
 .../test/emqx_authz_api_sources_SUITE.erl     |  23 ++--
 .../emqx_authz/test/emqx_authz_http_SUITE.erl |   6 +-
 apps/emqx_auto_subscribe/rebar.config         |   5 +-
 .../test/emqx_auto_subscribe_SUITE.erl        |   4 +-
 apps/emqx_bridge/rebar.config                 |   8 +-
 apps/emqx_bridge/src/emqx_bridge_api.erl      |   2 +-
 .../test/emqx_bridge_api_SUITE.erl            |   2 +-
 .../emqx_bridge_kafka_impl_consumer_SUITE.erl |  18 ++--
 .../emqx_bridge_kafka_impl_producer_SUITE.erl |   2 +-
 apps/emqx_connector/rebar.config              |   1 +
 .../src/emqx_connector_http.erl               |   2 +-
 .../src/mqtt/emqx_connector_mqtt_msg.erl      |   2 +-
 apps/emqx_dashboard/rebar.config              |   5 +-
 .../test/emqx_dashboard_SUITE.erl             |   2 +-
 .../test/emqx_dashboard_error_code_SUITE.erl  |   2 +-
 .../test/emqx_dashboard_monitor_SUITE.erl     |   4 +-
 apps/emqx_exhook/rebar.config                 |   3 +-
 .../test/emqx_exhook_api_SUITE.erl            |   4 +-
 apps/emqx_gateway/rebar.config                |   3 +-
 apps/emqx_gateway/src/emqx_gateway_cli.erl    |   2 +-
 apps/emqx_gateway/src/emqx_gateway_http.erl   |   2 +-
 .../test/emqx_gateway_auth_ct.erl             |   2 +-
 .../test/emqx_gateway_authn_SUITE.erl         |   2 +-
 .../test/emqx_gateway_authz_SUITE.erl         |   6 +-
 .../test/emqx_gateway_test_utils.erl          |   4 +-
 apps/emqx_gateway_coap/rebar.config           |   8 +-
 .../test/emqx_coap_api_SUITE.erl              |   2 +-
 apps/emqx_gateway_exproto/rebar.config        |   8 +-
 .../test/emqx_exproto_echo_svr.erl            |  20 ++--
 .../src/emqx_lwm2m_message.erl                |   2 +-
 .../src/emqx_lwm2m_session.erl                |   4 +-
 .../test/emqx_lwm2m_SUITE.erl                 | 100 +++++++++---------
 .../test/emqx_lwm2m_api_SUITE.erl             |   8 +-
 apps/emqx_gateway_stomp/rebar.config          |   8 +-
 apps/emqx_machine/rebar.config                |   5 +-
 apps/emqx_machine/src/emqx_machine.app.src    |   2 +-
 apps/emqx_machine/src/emqx_machine.erl        |   2 +-
 apps/emqx_management/rebar.config             |   5 +-
 .../src/emqx_mgmt_api_banned.erl              |   2 +-
 .../test/emqx_mgmt_api_alarms_SUITE.erl       |   2 +-
 .../test/emqx_mgmt_api_api_keys_SUITE.erl     |  10 +-
 .../test/emqx_mgmt_api_banned_SUITE.erl       |   4 +-
 .../test/emqx_mgmt_api_clients_SUITE.erl      |  10 +-
 .../test/emqx_mgmt_api_configs_SUITE.erl      |  10 +-
 .../test/emqx_mgmt_api_listeners_SUITE.erl    |   2 +-
 .../test/emqx_mgmt_api_metrics_SUITE.erl      |   4 +-
 .../test/emqx_mgmt_api_nodes_SUITE.erl        |  10 +-
 .../test/emqx_mgmt_api_plugins_SUITE.erl      |  10 +-
 .../test/emqx_mgmt_api_publish_SUITE.erl      |   2 +-
 .../test/emqx_mgmt_api_stats_SUITE.erl        |   4 +-
 .../test/emqx_mgmt_api_subscription_SUITE.erl |   4 +-
 .../test/emqx_mgmt_api_test_util.erl          |   3 +-
 .../test/emqx_mgmt_api_topics_SUITE.erl       |   6 +-
 .../test/emqx_mgmt_api_trace_SUITE.erl        |   2 +-
 apps/emqx_modules/rebar.config                |   1 +
 apps/emqx_modules/src/emqx_telemetry.erl      |   2 +-
 apps/emqx_modules/src/emqx_telemetry_api.erl  |   2 +-
 .../test/emqx_delayed_api_SUITE.erl           |   2 +-
 .../test/emqx_rewrite_api_SUITE.erl           |   2 +-
 .../test/emqx_telemetry_SUITE.erl             |   2 +-
 apps/emqx_plugin_libs/rebar.config            |   5 +-
 .../emqx_plugin_libs/src/emqx_placeholder.erl |   2 +-
 .../src/emqx_plugin_libs_rule.erl             |  10 +-
 apps/emqx_prometheus/rebar.config             |   1 +
 .../test/emqx_prometheus_api_SUITE.erl        |   6 +-
 apps/emqx_retainer/rebar.config               |   5 +-
 .../test/emqx_retainer_api_SUITE.erl          |  10 +-
 apps/emqx_rule_engine/rebar.config            |   3 +-
 .../src/emqx_rule_actions.erl                 |   2 +-
 .../src/emqx_rule_engine_api.erl              |   2 +-
 apps/emqx_rule_engine/src/emqx_rule_funcs.erl |   4 +-
 apps/emqx_rule_engine/src/emqx_rule_maps.erl  |   2 +-
 .../src/emqx_rule_runtime.erl                 |   2 +-
 .../test/emqx_rule_engine_SUITE.erl           |  14 ++-
 .../test/emqx_rule_engine_api_SUITE.erl       |  10 +-
 apps/emqx_slow_subs/rebar.config              |   5 +-
 .../test/emqx_slow_subs_api_SUITE.erl         |   6 +-
 apps/emqx_statsd/rebar.config                 |   1 +
 apps/emqx_statsd/test/emqx_statsd_SUITE.erl   |   2 +-
 apps/emqx_utils/README.md                     |  43 ++++++++
 apps/emqx_utils/rebar.config                  |  11 ++
 apps/emqx_utils/src/emqx_utils.app.src        |  25 +++++
 .../src/emqx_utils_json.erl}                  |  12 +--
 apps/emqx_utils/test/emqx_utils_SUITE.erl     |  48 +++++++++
 .../test/emqx_utils_json_SUITE.erl}           |  14 +--
 lib-ee/emqx_ee_bridge/rebar.config            |   1 +
 .../test/emqx_ee_bridge_cassa_SUITE.erl       |   2 +-
 .../test/emqx_ee_bridge_dynamo_SUITE.erl      |   2 +-
 .../test/emqx_ee_bridge_gcp_pubsub_SUITE.erl  |  16 +--
 .../test/emqx_ee_bridge_influxdb_SUITE.erl    |  12 +--
 .../test/emqx_ee_bridge_mongodb_SUITE.erl     |   2 +-
 .../test/emqx_ee_bridge_mysql_SUITE.erl       |   2 +-
 .../test/emqx_ee_bridge_pgsql_SUITE.erl       |   2 +-
 .../test/emqx_ee_bridge_rocketmq_SUITE.erl    |   2 +-
 .../test/emqx_ee_bridge_tdengine_SUITE.erl    |   2 +-
 lib-ee/emqx_ee_connector/rebar.config         |   3 +-
 .../src/emqx_ee_connector_dynamo.erl          |   4 +-
 .../src/emqx_ee_connector_gcp_pubsub.erl      |   4 +-
 .../src/emqx_ee_connector_mongodb.erl         |   2 +-
 .../src/emqx_ee_connector_rocketmq.erl        |   4 +-
 lib-ee/emqx_ee_schema_registry/rebar.config   |   1 +
 .../src/emqx_ee_schema_registry_serde.erl     |   4 +-
 .../test/emqx_ee_schema_registry_SUITE.erl    |  10 +-
 ...emqx_ee_schema_registry_http_api_SUITE.erl |   6 +-
 .../emqx_ee_schema_registry_serde_SUITE.erl   |   2 +-
 lib-ee/emqx_license/rebar.config              |   5 +-
 .../test/emqx_license_http_api_SUITE.erl      |   8 +-
 130 files changed, 508 insertions(+), 331 deletions(-)
 create mode 100644 apps/emqx_utils/README.md
 create mode 100644 apps/emqx_utils/rebar.config
 create mode 100644 apps/emqx_utils/src/emqx_utils.app.src
 rename apps/{emqx/src/emqx_json.erl => emqx_utils/src/emqx_utils_json.erl} (90%)
 create mode 100644 apps/emqx_utils/test/emqx_utils_SUITE.erl
 rename apps/{emqx/test/emqx_json_SUITE.erl => emqx_utils/test/emqx_utils_json_SUITE.erl} (93%)

diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config
index 9079322eb..a3eff6c16 100644
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@@ -22,9 +22,9 @@
 %% This rebar.config is necessary because the app may be used as a
 %% `git_subdir` dependency in other projects.
 {deps, [
+    {emqx_utils, {path, "../emqx_utils"}},
     {lc, {git, "https://github.com/emqx/lc.git", {tag, "0.3.2"}}},
     {gproc, {git, "https://github.com/uwiger/gproc", {tag, "0.8.0"}}},
-    {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}},
     {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}},
     {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.6"}}},
     {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.14.6"}}},
diff --git a/apps/emqx/src/emqx_alarm.erl b/apps/emqx/src/emqx_alarm.erl
index 84c40ef2a..6aa3cb95d 100644
--- a/apps/emqx/src/emqx_alarm.erl
+++ b/apps/emqx/src/emqx_alarm.erl
@@ -423,7 +423,7 @@ do_actions(deactivate, Alarm = #deactivated_alarm{name = Name}, [log | More]) ->
     do_actions(deactivate, Alarm, More);
 do_actions(Operation, Alarm, [publish | More]) ->
     Topic = topic(Operation),
-    {ok, Payload} = emqx_json:safe_encode(normalize(Alarm)),
+    {ok, Payload} = emqx_utils_json:safe_encode(normalize(Alarm)),
     Message = emqx_message:make(
         ?MODULE,
         0,
diff --git a/apps/emqx/src/emqx_logger_jsonfmt.erl b/apps/emqx/src/emqx_logger_jsonfmt.erl
index 22cf75153..f60f5a716 100644
--- a/apps/emqx/src/emqx_logger_jsonfmt.erl
+++ b/apps/emqx/src/emqx_logger_jsonfmt.erl
@@ -92,7 +92,7 @@ format(Msg, Meta, Config) ->
                 }
         end,
     Data = maps:without([report_cb], Data0),
-    jiffy:encode(json_obj(Data, Config)).
+    emqx_utils_json:encode(json_obj(Data, Config)).
 
 maybe_format_msg({report, Report} = Msg, #{report_cb := Cb} = Meta, Config) ->
     case is_map(Report) andalso Cb =:= ?DEFAULT_FORMATTER of
diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 851fa3d3b..8c91ae782 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -2583,7 +2583,7 @@ to_url(Str) ->
     end.
 
 to_json_binary(Str) ->
-    case emqx_json:safe_decode(Str) of
+    case emqx_utils_json:safe_decode(Str) of
         {ok, _} ->
             {ok, iolist_to_binary(Str)};
         Error ->
diff --git a/apps/emqx/src/emqx_sys.erl b/apps/emqx/src/emqx_sys.erl
index a5f14e32a..af2b052aa 100644
--- a/apps/emqx/src/emqx_sys.erl
+++ b/apps/emqx/src/emqx_sys.erl
@@ -348,7 +348,7 @@ publish(Event, Payload) when
     Event == unsubscribed
 ->
     Topic = event_topic(Event, Payload),
-    safe_publish(Topic, emqx_json:encode(Payload)).
+    safe_publish(Topic, emqx_utils_json:encode(Payload)).
 
 metric_topic(Name) ->
     translate_topic("metrics/", Name).
diff --git a/apps/emqx/test/emqx_common_test_helpers.erl b/apps/emqx/test/emqx_common_test_helpers.erl
index 406183094..85cb46106 100644
--- a/apps/emqx/test/emqx_common_test_helpers.erl
+++ b/apps/emqx/test/emqx_common_test_helpers.erl
@@ -1036,7 +1036,7 @@ switch_proxy(Switch, Name, ProxyHost, ProxyPort) ->
             off -> #{<<"enabled">> => false};
             on -> #{<<"enabled">> => true}
         end,
-    BodyBin = emqx_json:encode(Body),
+    BodyBin = emqx_utils_json:encode(Body),
     {ok, {{_, 200, _}, _, _}} = httpc:request(
         post,
         {Url, [], "application/json", BodyBin},
@@ -1056,7 +1056,7 @@ timeout_proxy(on, Name, ProxyHost, ProxyPort) ->
         <<"toxicity">> => 1.0,
         <<"attributes">> => #{<<"timeout">> => 0}
     },
-    BodyBin = emqx_json:encode(Body),
+    BodyBin = emqx_utils_json:encode(Body),
     {ok, {{_, 200, _}, _, _}} = httpc:request(
         post,
         {Url, [], "application/json", BodyBin},
@@ -1091,7 +1091,7 @@ latency_up_proxy(on, Name, ProxyHost, ProxyPort) ->
             <<"jitter">> => 3_000
         }
     },
-    BodyBin = emqx_json:encode(Body),
+    BodyBin = emqx_utils_json:encode(Body),
     {ok, {{_, 200, _}, _, _}} = httpc:request(
         post,
         {Url, [], "application/json", BodyBin},
diff --git a/apps/emqx/test/emqx_common_test_http.erl b/apps/emqx/test/emqx_common_test_http.erl
index 575bed5c3..e9064715d 100644
--- a/apps/emqx/test/emqx_common_test_http.erl
+++ b/apps/emqx/test/emqx_common_test_http.erl
@@ -54,7 +54,7 @@ request_api(Method, Url, QueryParams, Auth, Body, HttpOpts) ->
             [] ->
                 {NewUrl, [Auth]};
             _ ->
-                {NewUrl, [Auth], "application/json", emqx_json:encode(Body)}
+                {NewUrl, [Auth], "application/json", emqx_utils_json:encode(Body)}
         end,
     do_request_api(Method, Request, HttpOpts).
 
@@ -70,7 +70,7 @@ do_request_api(Method, Request, HttpOpts) ->
     end.
 
 get_http_data(ResponseBody) ->
-    emqx_json:decode(ResponseBody, [return_maps]).
+    emqx_utils_json:decode(ResponseBody, [return_maps]).
 
 auth_header(User, Pass) ->
     Encoded = base64:encode_to_string(lists:append([User, ":", Pass])),
diff --git a/apps/emqx/test/emqx_config_SUITE.erl b/apps/emqx/test/emqx_config_SUITE.erl
index fe8a5fed8..7befd7a16 100644
--- a/apps/emqx/test/emqx_config_SUITE.erl
+++ b/apps/emqx/test/emqx_config_SUITE.erl
@@ -57,5 +57,5 @@ t_fill_default_values(_) ->
         WithDefaults
     ),
     %% ensure JSON compatible
-    _ = emqx_json:encode(WithDefaults),
+    _ = emqx_utils_json:encode(WithDefaults),
     ok.
diff --git a/apps/emqx/test/emqx_crl_cache_SUITE.erl b/apps/emqx/test/emqx_crl_cache_SUITE.erl
index 01f9c7172..21bfc39df 100644
--- a/apps/emqx/test/emqx_crl_cache_SUITE.erl
+++ b/apps/emqx/test/emqx_crl_cache_SUITE.erl
@@ -402,7 +402,7 @@ request(Method, Url, QueryParams, Body) ->
     Opts = #{return_all => true},
     case emqx_mgmt_api_test_util:request_api(Method, Url, QueryParams, AuthHeader, Body, Opts) of
         {ok, {Reason, Headers, BodyR}} ->
-            {ok, {Reason, Headers, emqx_json:decode(BodyR, [return_maps])}};
+            {ok, {Reason, Headers, emqx_utils_json:decode(BodyR, [return_maps])}};
         Error ->
             Error
     end.
@@ -1052,7 +1052,7 @@ do_t_validations(_Config) ->
         ),
     {error, {_, _, ResRaw1}} = update_listener_via_api(ListenerId, ListenerData1),
     #{<<"code">> := <<"BAD_REQUEST">>, <<"message">> := MsgRaw1} =
-        emqx_json:decode(ResRaw1, [return_maps]),
+        emqx_utils_json:decode(ResRaw1, [return_maps]),
     ?assertMatch(
         #{
             <<"mismatches">> :=
@@ -1064,7 +1064,7 @@ do_t_validations(_Config) ->
                         }
                 }
         },
-        emqx_json:decode(MsgRaw1, [return_maps])
+        emqx_utils_json:decode(MsgRaw1, [return_maps])
     ),
 
     ok.
diff --git a/apps/emqx/test/emqx_ocsp_cache_SUITE.erl b/apps/emqx/test/emqx_ocsp_cache_SUITE.erl
index 3c3fd0341..a9b80c276 100644
--- a/apps/emqx/test/emqx_ocsp_cache_SUITE.erl
+++ b/apps/emqx/test/emqx_ocsp_cache_SUITE.erl
@@ -430,7 +430,7 @@ request(Method, Url, QueryParams, Body) ->
     Opts = #{return_all => true},
     case emqx_mgmt_api_test_util:request_api(Method, Url, QueryParams, AuthHeader, Body, Opts) of
         {ok, {Reason, Headers, BodyR}} ->
-            {ok, {Reason, Headers, emqx_json:decode(BodyR, [return_maps])}};
+            {ok, {Reason, Headers, emqx_utils_json:decode(BodyR, [return_maps])}};
         Error ->
             Error
     end.
@@ -827,7 +827,7 @@ do_t_validations(_Config) ->
         ),
     {error, {_, _, ResRaw1}} = update_listener_via_api(ListenerId, ListenerData1),
     #{<<"code">> := <<"BAD_REQUEST">>, <<"message">> := MsgRaw1} =
-        emqx_json:decode(ResRaw1, [return_maps]),
+        emqx_utils_json:decode(ResRaw1, [return_maps]),
     ?assertMatch(
         #{
             <<"mismatches">> :=
@@ -839,7 +839,7 @@ do_t_validations(_Config) ->
                         }
                 }
         },
-        emqx_json:decode(MsgRaw1, [return_maps])
+        emqx_utils_json:decode(MsgRaw1, [return_maps])
     ),
 
     ListenerData2 =
@@ -857,7 +857,7 @@ do_t_validations(_Config) ->
         ),
     {error, {_, _, ResRaw2}} = update_listener_via_api(ListenerId, ListenerData2),
     #{<<"code">> := <<"BAD_REQUEST">>, <<"message">> := MsgRaw2} =
-        emqx_json:decode(ResRaw2, [return_maps]),
+        emqx_utils_json:decode(ResRaw2, [return_maps]),
     ?assertMatch(
         #{
             <<"mismatches">> :=
@@ -869,7 +869,7 @@ do_t_validations(_Config) ->
                         }
                 }
         },
-        emqx_json:decode(MsgRaw2, [return_maps])
+        emqx_utils_json:decode(MsgRaw2, [return_maps])
     ),
 
     ListenerData3a =
@@ -889,7 +889,7 @@ do_t_validations(_Config) ->
     ListenerData3 = emqx_map_lib:deep_remove([<<"ssl_options">>, <<"certfile">>], ListenerData3a),
     {error, {_, _, ResRaw3}} = update_listener_via_api(ListenerId, ListenerData3),
     #{<<"code">> := <<"BAD_REQUEST">>, <<"message">> := MsgRaw3} =
-        emqx_json:decode(ResRaw3, [return_maps]),
+        emqx_utils_json:decode(ResRaw3, [return_maps]),
     ?assertMatch(
         #{
             <<"mismatches">> :=
@@ -901,7 +901,7 @@ do_t_validations(_Config) ->
                         }
                 }
         },
-        emqx_json:decode(MsgRaw3, [return_maps])
+        emqx_utils_json:decode(MsgRaw3, [return_maps])
     ),
 
     ok.
diff --git a/apps/emqx/test/props/prop_emqx_json.erl b/apps/emqx/test/props/prop_emqx_json.erl
index 2bc079634..86f60b39c 100644
--- a/apps/emqx/test/props/prop_emqx_json.erl
+++ b/apps/emqx/test/props/prop_emqx_json.erl
@@ -14,10 +14,10 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
--module(prop_emqx_json).
+-module(prop_emqx_utils_json).
 
 -import(
-    emqx_json,
+    emqx_utils_json,
     [
         decode/1,
         decode/2,
diff --git a/apps/emqx_authn/rebar.config b/apps/emqx_authn/rebar.config
index 8fd9cea0f..5f0043c39 100644
--- a/apps/emqx_authn/rebar.config
+++ b/apps/emqx_authn/rebar.config
@@ -2,6 +2,7 @@
 
 {deps, [
     {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}},
     {emqx_connector, {path, "../emqx_connector"}}
 ]}.
 
diff --git a/apps/emqx_authn/src/simple_authn/emqx_authn_http.erl b/apps/emqx_authn/src/simple_authn/emqx_authn_http.erl
index 9be1d0a33..3c34d878e 100644
--- a/apps/emqx_authn/src/simple_authn/emqx_authn_http.erl
+++ b/apps/emqx_authn/src/simple_authn/emqx_authn_http.erl
@@ -357,7 +357,7 @@ qs([{K, V} | More], Acc) ->
     qs(More, [["&", uri_encode(K), "=", uri_encode(V)] | Acc]).
 
 serialize_body(<<"application/json">>, Body) ->
-    emqx_json:encode(Body);
+    emqx_utils_json:encode(Body);
 serialize_body(<<"application/x-www-form-urlencoded">>, Body) ->
     qs(maps:to_list(Body)).
 
@@ -395,7 +395,7 @@ safely_parse_body(ContentType, Body) ->
     end.
 
 parse_body(<<"application/json", _/binary>>, Body) ->
-    {ok, emqx_json:decode(Body, [return_maps])};
+    {ok, emqx_utils_json:decode(Body, [return_maps])};
 parse_body(<<"application/x-www-form-urlencoded", _/binary>>, Body) ->
     Flags = [<<"result">>, <<"is_superuser">>],
     RawMap = maps:from_list(cow_qs:parse_qs(Body)),
diff --git a/apps/emqx_authn/src/simple_authn/emqx_authn_jwks_client.erl b/apps/emqx_authn/src/simple_authn/emqx_authn_jwks_client.erl
index 5ee923859..23d939f7d 100644
--- a/apps/emqx_authn/src/simple_authn/emqx_authn_jwks_client.erl
+++ b/apps/emqx_authn/src/simple_authn/emqx_authn_jwks_client.erl
@@ -99,7 +99,7 @@ handle_info(
                 State1;
             {StatusLine, Headers, Body} ->
                 try
-                    JWKS = jose_jwk:from(emqx_json:decode(Body, [return_maps])),
+                    JWKS = jose_jwk:from(emqx_utils_json:decode(Body, [return_maps])),
                     {_, JWKs} = JWKS#jose_jwk.keys,
                     State1#{jwks := JWKs}
                 catch
diff --git a/apps/emqx_authn/src/simple_authn/emqx_authn_jwt.erl b/apps/emqx_authn/src/simple_authn/emqx_authn_jwt.erl
index 73ba6a2c1..a891a55e2 100644
--- a/apps/emqx_authn/src/simple_authn/emqx_authn_jwt.erl
+++ b/apps/emqx_authn/src/simple_authn/emqx_authn_jwt.erl
@@ -407,7 +407,7 @@ do_verify(_JWT, [], _VerifyClaims) ->
 do_verify(JWT, [JWK | More], VerifyClaims) ->
     try jose_jws:verify(JWK, JWT) of
         {true, Payload, _JWT} ->
-            Claims0 = emqx_json:decode(Payload, [return_maps]),
+            Claims0 = emqx_utils_json:decode(Payload, [return_maps]),
             Claims = try_convert_to_num(Claims0, [<<"exp">>, <<"iat">>, <<"nbf">>]),
             case verify_claims(Claims, VerifyClaims) of
                 ok ->
diff --git a/apps/emqx_authn/src/simple_authn/emqx_authn_mnesia.erl b/apps/emqx_authn/src/simple_authn/emqx_authn_mnesia.erl
index 25a3a5976..20b604e70 100644
--- a/apps/emqx_authn/src/simple_authn/emqx_authn_mnesia.erl
+++ b/apps/emqx_authn/src/simple_authn/emqx_authn_mnesia.erl
@@ -332,7 +332,7 @@ run_fuzzy_filter(
 
 %% Example: data/user-credentials.json
 import_users_from_json(Bin, #{user_group := UserGroup}) ->
-    case emqx_json:safe_decode(Bin, [return_maps]) of
+    case emqx_utils_json:safe_decode(Bin, [return_maps]) of
         {ok, List} ->
             trans(fun ?MODULE:import/2, [UserGroup, List]);
         {error, Reason} ->
diff --git a/apps/emqx_authn/test/emqx_authn_api_SUITE.erl b/apps/emqx_authn/test/emqx_authn_api_SUITE.erl
index 11e2c6773..c7f718dfc 100644
--- a/apps/emqx_authn/test/emqx_authn_api_SUITE.erl
+++ b/apps/emqx_authn/test/emqx_authn_api_SUITE.erl
@@ -29,7 +29,7 @@
 -define(assertAuthenticatorsMatch(Guard, Path),
     (fun() ->
         {ok, 200, Response} = request(get, uri(Path)),
-        ?assertMatch(Guard, jiffy:decode(Response, [return_maps]))
+        ?assertMatch(Guard, emqx_utils_json:decode(Response, [return_maps]))
     end)()
 ).
 
@@ -234,7 +234,7 @@ test_authenticator(PathPrefix) ->
         get,
         uri(PathPrefix ++ [?CONF_NS, "password_based:http", "status"])
     ),
-    {ok, RList} = emqx_json:safe_decode(Res),
+    {ok, RList} = emqx_utils_json:safe_decode(Res),
     Snd = fun({_, Val}) -> Val end,
     LookupVal = fun LookupV(List, RestJson) ->
         case List of
@@ -353,7 +353,7 @@ test_authenticator_users(PathPrefix) ->
                     <<"success">> := 0,
                     <<"nomatch">> := 1
                 }
-            } = jiffy:decode(PageData0, [return_maps]);
+            } = emqx_utils_json:decode(PageData0, [return_maps]);
         ["listeners", 'tcp:default'] ->
             #{
                 <<"metrics">> := #{
@@ -361,7 +361,7 @@ test_authenticator_users(PathPrefix) ->
                     <<"success">> := 0,
                     <<"nomatch">> := 1
                 }
-            } = jiffy:decode(PageData0, [return_maps])
+            } = emqx_utils_json:decode(PageData0, [return_maps])
     end,
 
     InvalidUsers = [
@@ -384,7 +384,7 @@ test_authenticator_users(PathPrefix) ->
     lists:foreach(
         fun(User) ->
             {ok, 201, UserData} = request(post, UsersUri, User),
-            CreatedUser = jiffy:decode(UserData, [return_maps]),
+            CreatedUser = emqx_utils_json:decode(UserData, [return_maps]),
             ?assertMatch(#{<<"user_id">> := _}, CreatedUser)
         end,
         ValidUsers
@@ -411,7 +411,7 @@ test_authenticator_users(PathPrefix) ->
                     <<"success">> := 1,
                     <<"nomatch">> := 1
                 }
-            } = jiffy:decode(PageData01, [return_maps]);
+            } = emqx_utils_json:decode(PageData01, [return_maps]);
         ["listeners", 'tcp:default'] ->
             #{
                 <<"metrics">> := #{
@@ -419,7 +419,7 @@ test_authenticator_users(PathPrefix) ->
                     <<"success">> := 1,
                     <<"nomatch">> := 1
                 }
-            } = jiffy:decode(PageData01, [return_maps])
+            } = emqx_utils_json:decode(PageData01, [return_maps])
     end,
 
     {ok, 200, Page1Data} = request(get, UsersUri ++ "?page=1&limit=2"),
@@ -433,7 +433,7 @@ test_authenticator_users(PathPrefix) ->
                 <<"count">> := 3
             }
     } =
-        jiffy:decode(Page1Data, [return_maps]),
+        emqx_utils_json:decode(Page1Data, [return_maps]),
 
     {ok, 200, Page2Data} = request(get, UsersUri ++ "?page=2&limit=2"),
 
@@ -445,7 +445,7 @@ test_authenticator_users(PathPrefix) ->
                 <<"limit">> := 2,
                 <<"count">> := 3
             }
-    } = jiffy:decode(Page2Data, [return_maps]),
+    } = emqx_utils_json:decode(Page2Data, [return_maps]),
 
     ?assertEqual(2, length(Page1Users)),
     ?assertEqual(1, length(Page2Users)),
@@ -465,7 +465,7 @@ test_authenticator_users(PathPrefix) ->
                 <<"limit">> := 3,
                 <<"count">> := 1
             }
-    } = jiffy:decode(Super1Data, [return_maps]),
+    } = emqx_utils_json:decode(Super1Data, [return_maps]),
 
     ?assertEqual(
         [<<"u2">>],
@@ -482,7 +482,7 @@ test_authenticator_users(PathPrefix) ->
                 <<"limit">> := 3,
                 <<"count">> := 2
             }
-    } = jiffy:decode(Super2Data, [return_maps]),
+    } = emqx_utils_json:decode(Super2Data, [return_maps]),
 
     ?assertEqual(
         [<<"u1">>, <<"u3">>],
@@ -509,7 +509,7 @@ test_authenticator_user(PathPrefix) ->
 
     {ok, 200, UserData} = request(get, UsersUri ++ "/u1"),
 
-    FetchedUser = jiffy:decode(UserData, [return_maps]),
+    FetchedUser = emqx_utils_json:decode(UserData, [return_maps]),
     ?assertMatch(#{<<"user_id">> := <<"u1">>}, FetchedUser),
     ?assertNotMatch(#{<<"password">> := _}, FetchedUser),
 
diff --git a/apps/emqx_authn/test/emqx_authn_http_SUITE.erl b/apps/emqx_authn/test/emqx_authn_http_SUITE.erl
index 9a3c7c833..851e80f6d 100644
--- a/apps/emqx_authn/test/emqx_authn_http_SUITE.erl
+++ b/apps/emqx_authn/test/emqx_authn_http_SUITE.erl
@@ -41,7 +41,7 @@
 
 -define(SERVER_RESPONSE_JSON(Result), ?SERVER_RESPONSE_JSON(Result, false)).
 -define(SERVER_RESPONSE_JSON(Result, IsSuperuser),
-    jiffy:encode(#{
+    emqx_utils_json:encode(#{
         result => Result,
         is_superuser => IsSuperuser
     })
@@ -172,11 +172,11 @@ t_no_value_for_placeholder(_Config) ->
         #{
             <<"cert_subject">> := <<"">>,
             <<"cert_common_name">> := <<"">>
-        } = jiffy:decode(RawBody, [return_maps]),
+        } = emqx_utils_json:decode(RawBody, [return_maps]),
         Req = cowboy_req:reply(
             200,
             #{<<"content-type">> => <<"application/json">>},
-            jiffy:encode(#{result => allow, is_superuser => false}),
+            emqx_utils_json:encode(#{result => allow, is_superuser => false}),
             Req1
         ),
         {ok, Req, State}
@@ -444,7 +444,7 @@ samples() ->
                 Req = cowboy_req:reply(
                     200,
                     #{<<"content-type">> => <<"application/json">>},
-                    jiffy:encode(#{result => allow, is_superuser => false}),
+                    emqx_utils_json:encode(#{result => allow, is_superuser => false}),
                     Req0
                 ),
                 {ok, Req, State}
@@ -459,7 +459,7 @@ samples() ->
                 Req = cowboy_req:reply(
                     200,
                     #{<<"content-type">> => <<"application/json">>},
-                    jiffy:encode(#{result => allow, is_superuser => true}),
+                    emqx_utils_json:encode(#{result => allow, is_superuser => true}),
                     Req0
                 ),
                 {ok, Req, State}
@@ -512,11 +512,11 @@ samples() ->
                 #{
                     <<"username">> := <<"plain">>,
                     <<"password">> := <<"plain">>
-                } = jiffy:decode(RawBody, [return_maps]),
+                } = emqx_utils_json:decode(RawBody, [return_maps]),
                 Req = cowboy_req:reply(
                     200,
                     #{<<"content-type">> => <<"application/json">>},
-                    jiffy:encode(#{result => allow, is_superuser => false}),
+                    emqx_utils_json:encode(#{result => allow, is_superuser => false}),
                     Req1
                 ),
                 {ok, Req, State}
@@ -539,7 +539,7 @@ samples() ->
                 Req = cowboy_req:reply(
                     200,
                     #{<<"content-type">> => <<"application/json">>},
-                    jiffy:encode(#{result => allow, is_superuser => false}),
+                    emqx_utils_json:encode(#{result => allow, is_superuser => false}),
                     Req1
                 ),
                 {ok, Req, State}
@@ -565,11 +565,11 @@ samples() ->
                     <<"peerhost">> := <<"127.0.0.1">>,
                     <<"cert_subject">> := <<"cert_subject_data">>,
                     <<"cert_common_name">> := <<"cert_common_name_data">>
-                } = jiffy:decode(RawBody, [return_maps]),
+                } = emqx_utils_json:decode(RawBody, [return_maps]),
                 Req = cowboy_req:reply(
                     200,
                     #{<<"content-type">> => <<"application/json">>},
-                    jiffy:encode(#{result => allow, is_superuser => false}),
+                    emqx_utils_json:encode(#{result => allow, is_superuser => false}),
                     Req1
                 ),
                 {ok, Req, State}
diff --git a/apps/emqx_authn/test/emqx_authn_https_SUITE.erl b/apps/emqx_authn/test/emqx_authn_https_SUITE.erl
index 7d51ff425..c4315b69f 100644
--- a/apps/emqx_authn/test/emqx_authn_https_SUITE.erl
+++ b/apps/emqx_authn/test/emqx_authn_https_SUITE.erl
@@ -168,7 +168,7 @@ cowboy_handler(Req0, State) ->
     Req = cowboy_req:reply(
         200,
         #{<<"content-type">> => <<"application/json">>},
-        jiffy:encode(#{result => allow, is_superuser => false}),
+        emqx_utils_json:encode(#{result => allow, is_superuser => false}),
         Req0
     ),
     {ok, Req, State}.
diff --git a/apps/emqx_authn/test/emqx_authn_jwt_SUITE.erl b/apps/emqx_authn/test/emqx_authn_jwt_SUITE.erl
index 7a51d2bbb..94c07ca96 100644
--- a/apps/emqx_authn/test/emqx_authn_jwt_SUITE.erl
+++ b/apps/emqx_authn/test/emqx_authn_jwt_SUITE.erl
@@ -467,7 +467,7 @@ jwks_handler(Req0, State) ->
     Req = cowboy_req:reply(
         200,
         #{<<"content-type">> => <<"application/json">>},
-        jiffy:encode(JWKS),
+        emqx_utils_json:encode(JWKS),
         Req0
     ),
     {ok, Req, State}.
diff --git a/apps/emqx_authz/rebar.config b/apps/emqx_authz/rebar.config
index da2fa7807..9fd61b060 100644
--- a/apps/emqx_authz/rebar.config
+++ b/apps/emqx_authz/rebar.config
@@ -3,6 +3,7 @@
 {erl_opts, [debug_info, nowarn_unused_import]}.
 {deps, [
     {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}},
     {emqx_connector, {path, "../emqx_connector"}}
 ]}.
 
diff --git a/apps/emqx_authz/src/emqx_authz_utils.erl b/apps/emqx_authz/src/emqx_authz_utils.erl
index df77673a2..560141d0a 100644
--- a/apps/emqx_authz/src/emqx_authz_utils.erl
+++ b/apps/emqx_authz/src/emqx_authz_utils.erl
@@ -144,7 +144,7 @@ parse_http_resp_body(<<"application/x-www-form-urlencoded", _/binary>>, Body) ->
     end;
 parse_http_resp_body(<<"application/json", _/binary>>, Body) ->
     try
-        result(emqx_json:decode(Body, [return_maps]))
+        result(emqx_utils_json:decode(Body, [return_maps]))
     catch
         _:_ -> error
     end.
diff --git a/apps/emqx_authz/test/emqx_authz_api_cache_SUITE.erl b/apps/emqx_authz/test/emqx_authz_api_cache_SUITE.erl
index 45e6d7287..cfd9f581f 100644
--- a/apps/emqx_authz/test/emqx_authz_api_cache_SUITE.erl
+++ b/apps/emqx_authz/test/emqx_authz_api_cache_SUITE.erl
@@ -67,12 +67,12 @@ t_clean_cahce(_) ->
     ok = emqtt:publish(C, <<"a/b/c">>, <<"{\"x\":1,\"y\":1}">>, 0),
 
     {ok, 200, Result3} = request(get, uri(["clients", "emqx0", "authorization", "cache"])),
-    ?assertEqual(2, length(emqx_json:decode(Result3))),
+    ?assertEqual(2, length(emqx_utils_json:decode(Result3))),
 
     request(delete, uri(["authorization", "cache"])),
 
     {ok, 200, Result4} = request(get, uri(["clients", "emqx0", "authorization", "cache"])),
-    ?assertEqual(0, length(emqx_json:decode(Result4))),
+    ?assertEqual(0, length(emqx_utils_json:decode(Result4))),
 
     ok.
 
diff --git a/apps/emqx_authz/test/emqx_authz_api_sources_SUITE.erl b/apps/emqx_authz/test/emqx_authz_api_sources_SUITE.erl
index 411399d64..b717775a6 100644
--- a/apps/emqx_authz/test/emqx_authz_api_sources_SUITE.erl
+++ b/apps/emqx_authz/test/emqx_authz_api_sources_SUITE.erl
@@ -182,7 +182,7 @@ t_api(_) ->
     {ok, 404, ErrResult} = request(get, uri(["authorization", "sources", "http"]), []),
     ?assertMatch(
         #{<<"code">> := <<"NOT_FOUND">>, <<"message">> := <<"Not found: http">>},
-        emqx_json:decode(ErrResult, [return_maps])
+        emqx_utils_json:decode(ErrResult, [return_maps])
     ),
 
     [
@@ -215,7 +215,8 @@ t_api(_) ->
     ),
     {ok, 200, Result3} = request(get, uri(["authorization", "sources", "http"]), []),
     ?assertMatch(
-        #{<<"type">> := <<"http">>, <<"enable">> := false}, emqx_json:decode(Result3, [return_maps])
+        #{<<"type">> := <<"http">>, <<"enable">> := false},
+        emqx_utils_json:decode(Result3, [return_maps])
     ),
 
     Keyfile = emqx_common_test_helpers:app_path(
@@ -253,7 +254,7 @@ t_api(_) ->
             <<"total">> := 0,
             <<"nomatch">> := 0
         }
-    } = emqx_json:decode(Status4, [return_maps]),
+    } = emqx_utils_json:decode(Status4, [return_maps]),
     ?assertMatch(
         #{
             <<"type">> := <<"mongodb">>,
@@ -265,7 +266,7 @@ t_api(_) ->
                 <<"verify">> := <<"verify_none">>
             }
         },
-        emqx_json:decode(Result4, [return_maps])
+        emqx_utils_json:decode(Result4, [return_maps])
     ),
 
     {ok, Cacert} = file:read_file(Cacertfile),
@@ -297,7 +298,7 @@ t_api(_) ->
                 <<"verify">> := <<"verify_none">>
             }
         },
-        emqx_json:decode(Result5, [return_maps])
+        emqx_utils_json:decode(Result5, [return_maps])
     ),
 
     {ok, 200, Status5_1} = request(get, uri(["authorization", "sources", "mongodb", "status"]), []),
@@ -308,7 +309,7 @@ t_api(_) ->
             <<"total">> := 0,
             <<"nomatch">> := 0
         }
-    } = emqx_json:decode(Status5_1, [return_maps]),
+    } = emqx_utils_json:decode(Status5_1, [return_maps]),
 
     #{
         ssl := #{
@@ -355,7 +356,7 @@ t_api(_) ->
             <<"code">> := <<"BAD_REQUEST">>,
             <<"message">> := <<"Type mismatch", _/binary>>
         },
-        emqx_json:decode(TypeMismatch, [return_maps])
+        emqx_utils_json:decode(TypeMismatch, [return_maps])
     ),
 
     lists:foreach(
@@ -443,7 +444,7 @@ t_api(_) ->
                     <<"total">> := 1,
                     <<"nomatch">> := 0
                 }
-            } = emqx_json:decode(Status5, [return_maps])
+            } = emqx_utils_json:decode(Status5, [return_maps])
         end
     ),
 
@@ -469,7 +470,7 @@ t_api(_) ->
                     <<"total">> := 2,
                     <<"nomatch">> := 0
                 }
-            } = emqx_json:decode(Status6, [return_maps])
+            } = emqx_utils_json:decode(Status6, [return_maps])
         end
     ),
 
@@ -495,7 +496,7 @@ t_api(_) ->
                     <<"total">> := 3,
                     <<"nomatch">> := 0
                 }
-            } = emqx_json:decode(Status7, [return_maps])
+            } = emqx_utils_json:decode(Status7, [return_maps])
         end
     ),
     ok.
@@ -621,7 +622,7 @@ t_aggregate_metrics(_) ->
     ).
 
 get_sources(Result) ->
-    maps:get(<<"sources">>, emqx_json:decode(Result, [return_maps])).
+    maps:get(<<"sources">>, emqx_utils_json:decode(Result, [return_maps])).
 
 data_dir() -> emqx:data_dir().
 
diff --git a/apps/emqx_authz/test/emqx_authz_http_SUITE.erl b/apps/emqx_authz/test/emqx_authz_http_SUITE.erl
index 0757113f3..9ff84b805 100644
--- a/apps/emqx_authz/test/emqx_authz_http_SUITE.erl
+++ b/apps/emqx_authz/test/emqx_authz_http_SUITE.erl
@@ -311,7 +311,7 @@ t_json_body(_Config) ->
                     <<"topic">> := <<"t">>,
                     <<"action">> := <<"publish">>
                 },
-                jiffy:decode(RawBody, [return_maps])
+                emqx_utils_json:decode(RawBody, [return_maps])
             ),
             {ok, ?AUTHZ_HTTP_RESP(allow, Req1), State}
         end,
@@ -366,7 +366,7 @@ t_placeholder_and_body(_Config) ->
                     <<"CN">> := ?PH_CERT_CN_NAME,
                     <<"CS">> := ?PH_CERT_SUBJECT
                 },
-                jiffy:decode(PostVars, [return_maps])
+                emqx_utils_json:decode(PostVars, [return_maps])
             ),
             {ok, ?AUTHZ_HTTP_RESP(allow, Req1), State}
         end,
@@ -418,7 +418,7 @@ t_no_value_for_placeholder(_Config) ->
                 #{
                     <<"mountpoint">> := <<"[]">>
                 },
-                jiffy:decode(RawBody, [return_maps])
+                emqx_utils_json:decode(RawBody, [return_maps])
             ),
             {ok, ?AUTHZ_HTTP_RESP(allow, Req1), State}
         end,
diff --git a/apps/emqx_auto_subscribe/rebar.config b/apps/emqx_auto_subscribe/rebar.config
index 33e077f50..a19783033 100644
--- a/apps/emqx_auto_subscribe/rebar.config
+++ b/apps/emqx_auto_subscribe/rebar.config
@@ -1,7 +1,10 @@
 %% -*- mode: erlang -*-
 
 {erl_opts, [debug_info]}.
-{deps, [{emqx, {path, "../emqx"}}]}.
+{deps, [
+    {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}}
+]}.
 
 {shell, [
     {apps, [emqx_auto_subscribe]}
diff --git a/apps/emqx_auto_subscribe/test/emqx_auto_subscribe_SUITE.erl b/apps/emqx_auto_subscribe/test/emqx_auto_subscribe_SUITE.erl
index 5c5a3ee79..9d8d47bf2 100644
--- a/apps/emqx_auto_subscribe/test/emqx_auto_subscribe_SUITE.erl
+++ b/apps/emqx_auto_subscribe/test/emqx_auto_subscribe_SUITE.erl
@@ -141,7 +141,7 @@ t_update(_) ->
     Auth = emqx_mgmt_api_test_util:auth_header_(),
     Body = [#{topic => ?TOPIC_S}],
     {ok, Response} = emqx_mgmt_api_test_util:request_api(put, Path, "", Auth, Body),
-    ResponseMap = emqx_json:decode(Response, [return_maps]),
+    ResponseMap = emqx_utils_json:decode(Response, [return_maps]),
     ?assertEqual(1, erlang:length(ResponseMap)),
 
     BadBody1 = #{topic => ?TOPIC_S},
@@ -177,7 +177,7 @@ t_update(_) ->
     emqtt:disconnect(Client),
 
     {ok, GETResponse} = emqx_mgmt_api_test_util:request_api(get, Path),
-    GETResponseMap = emqx_json:decode(GETResponse, [return_maps]),
+    GETResponseMap = emqx_utils_json:decode(GETResponse, [return_maps]),
     ?assertEqual(1, erlang:length(GETResponseMap)),
     ok.
 
diff --git a/apps/emqx_bridge/rebar.config b/apps/emqx_bridge/rebar.config
index 79f2caf50..864c45e9a 100644
--- a/apps/emqx_bridge/rebar.config
+++ b/apps/emqx_bridge/rebar.config
@@ -1,7 +1,9 @@
 {erl_opts, [debug_info]}.
-{deps, [ {emqx, {path, "../emqx"}}
-       , {emqx_resource, {path, "../../apps/emqx_resource"}}
-       ]}.
+{deps, [
+    {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}},
+    {emqx_resource, {path, "../../apps/emqx_resource"}}
+ ]}.
 
 {shell, [
     % {config, "config/sys.config"},
diff --git a/apps/emqx_bridge/src/emqx_bridge_api.erl b/apps/emqx_bridge/src/emqx_bridge_api.erl
index b29cefacd..675541311 100644
--- a/apps/emqx_bridge/src/emqx_bridge_api.erl
+++ b/apps/emqx_bridge/src/emqx_bridge_api.erl
@@ -1028,6 +1028,6 @@ deobfuscate(NewConf, OldConf) ->
     ).
 
 map_to_json(M) ->
-    emqx_json:encode(
+    emqx_utils_json:encode(
         emqx_map_lib:jsonable_map(M, fun(K, V) -> {K, emqx_map_lib:binary_string(V)} end)
     ).
diff --git a/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl b/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl
index 4d5495ffe..3ec6061d8 100644
--- a/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl
+++ b/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl
@@ -1304,4 +1304,4 @@ str(S) when is_list(S) -> S;
 str(S) when is_binary(S) -> binary_to_list(S).
 
 json(B) when is_binary(B) ->
-    emqx_json:decode(B, [return_maps]).
+    emqx_utils_json:decode(B, [return_maps]).
diff --git a/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl
index fb7cf524c..fc9a6dc29 100644
--- a/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl
+++ b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl
@@ -705,7 +705,7 @@ create_bridge_api(Config, Overrides) ->
     Res =
         case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Params, Opts) of
             {ok, {Status, Headers, Body0}} ->
-                {ok, {Status, Headers, emqx_json:decode(Body0, [return_maps])}};
+                {ok, {Status, Headers, emqx_utils_json:decode(Body0, [return_maps])}};
             Error ->
                 Error
         end,
@@ -728,7 +728,7 @@ update_bridge_api(Config, Overrides) ->
     ct:pal("updating bridge (via http): ~p", [Params]),
     Res =
         case emqx_mgmt_api_test_util:request_api(put, Path, "", AuthHeader, Params, Opts) of
-            {ok, {_Status, _Headers, Body0}} -> {ok, emqx_json:decode(Body0, [return_maps])};
+            {ok, {_Status, _Headers, Body0}} -> {ok, emqx_utils_json:decode(Body0, [return_maps])};
             Error -> Error
         end,
     ct:pal("bridge update result: ~p", [Res]),
@@ -776,7 +776,7 @@ do_wait_for_expected_published_messages(Messages, Acc, _Timeout) when map_size(M
 do_wait_for_expected_published_messages(Messages0, Acc0, Timeout) ->
     receive
         {publish, Msg0 = #{payload := Payload}} ->
-            case emqx_json:safe_decode(Payload, [return_maps]) of
+            case emqx_utils_json:safe_decode(Payload, [return_maps]) of
                 {error, _} ->
                     ct:pal("unexpected message: ~p; discarding", [Msg0]),
                     do_wait_for_expected_published_messages(Messages0, Acc0, Timeout);
@@ -928,7 +928,7 @@ create_rule_and_action_http(Config) ->
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
     ct:pal("rule action params: ~p", [Params]),
     case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Params) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
@@ -1188,7 +1188,7 @@ t_start_and_consume_ok(Config) ->
                     <<"offset">> := OffsetReply,
                     <<"headers">> := #{<<"hkey">> := <<"hvalue">>}
                 },
-                emqx_json:decode(PayloadBin, [return_maps]),
+                emqx_utils_json:decode(PayloadBin, [return_maps]),
                 #{
                     offset_reply => OffsetReply,
                     kafka_topic => KafkaTopic,
@@ -1300,7 +1300,7 @@ t_multiple_topic_mappings(Config) ->
             %% as configured.
             Payloads =
                 lists:sort([
-                    case emqx_json:safe_decode(P, [return_maps]) of
+                    case emqx_utils_json:safe_decode(P, [return_maps]) of
                         {ok, Decoded} -> Decoded;
                         {error, _} -> P
                     end
@@ -1441,7 +1441,7 @@ do_t_failed_creation_then_fixed(Config) ->
             <<"offset">> := _,
             <<"headers">> := #{<<"hkey">> := <<"hvalue">>}
         },
-        emqx_json:decode(PayloadBin, [return_maps]),
+        emqx_utils_json:decode(PayloadBin, [return_maps]),
         #{
             kafka_topic => KafkaTopic,
             payload => Payload
@@ -1636,7 +1636,7 @@ t_bridge_rule_action_source(Config) ->
                     <<"headers">> := #{<<"hkey">> := <<"hvalue">>},
                     <<"topic">> := KafkaTopic
                 },
-                emqx_json:decode(RawPayload, [return_maps])
+                emqx_utils_json:decode(RawPayload, [return_maps])
             ),
             ?retry(
                 _Interval = 200,
@@ -2004,7 +2004,7 @@ t_begin_offset_earliest(Config) ->
             %% the consumers
             Published = receive_published(#{n => NumMessages}),
             Payloads = lists:map(
-                fun(#{payload := P}) -> emqx_json:decode(P, [return_maps]) end,
+                fun(#{payload := P}) -> emqx_utils_json:decode(P, [return_maps]) end,
                 Published
             ),
             ?assert(
diff --git a/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_producer_SUITE.erl b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_producer_SUITE.erl
index 6e3ddf5bb..5e2a2a7a8 100644
--- a/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_producer_SUITE.erl
+++ b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_producer_SUITE.erl
@@ -802,7 +802,7 @@ api_path(Parts) ->
     ?HOST ++ filename:join([?BASE_PATH | Parts]).
 
 json(Data) ->
-    {ok, Jsx} = emqx_json:safe_decode(Data, [return_maps]),
+    {ok, Jsx} = emqx_utils_json:safe_decode(Data, [return_maps]),
     Jsx.
 
 delete_all_bridges() ->
diff --git a/apps/emqx_connector/rebar.config b/apps/emqx_connector/rebar.config
index 2ce6b00f8..03be87356 100644
--- a/apps/emqx_connector/rebar.config
+++ b/apps/emqx_connector/rebar.config
@@ -7,6 +7,7 @@
 
 {deps, [
     {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}},
     {emqx_resource, {path, "../emqx_resource"}},
     {eldap2, {git, "https://github.com/emqx/eldap2", {tag, "v0.2.2"}}},
     {mysql, {git, "https://github.com/emqx/mysql-otp", {tag, "1.7.2"}}},
diff --git a/apps/emqx_connector/src/emqx_connector_http.erl b/apps/emqx_connector/src/emqx_connector_http.erl
index 401fc8812..dfa6dab81 100644
--- a/apps/emqx_connector/src/emqx_connector_http.erl
+++ b/apps/emqx_connector/src/emqx_connector_http.erl
@@ -516,7 +516,7 @@ process_request(
     }.
 
 process_request_body(undefined, Msg) ->
-    emqx_json:encode(Msg);
+    emqx_utils_json:encode(Msg);
 process_request_body(BodyTks, Msg) ->
     emqx_plugin_libs_rule:proc_tmpl(BodyTks, Msg).
 
diff --git a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_msg.erl b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_msg.erl
index defbbaea2..67fc40efa 100644
--- a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_msg.erl
+++ b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_msg.erl
@@ -123,7 +123,7 @@ process_payload(From, MapMsg) ->
     do_process_payload(maps:get(payload, From, undefined), MapMsg).
 
 do_process_payload(undefined, Msg) ->
-    emqx_json:encode(Msg);
+    emqx_utils_json:encode(Msg);
 do_process_payload(Tks, Msg) ->
     replace_vars_in_str(Tks, Msg).
 
diff --git a/apps/emqx_dashboard/rebar.config b/apps/emqx_dashboard/rebar.config
index 9657d0bbf..440fde465 100644
--- a/apps/emqx_dashboard/rebar.config
+++ b/apps/emqx_dashboard/rebar.config
@@ -1,6 +1,9 @@
 %% -*- mode: erlang -*-
 
-{deps, [{emqx, {path, "../emqx"}}]}.
+{deps, [
+    {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}}
+]}.
 
 {edoc_opts, [{preprocess, true}]}.
 {erl_opts, [
diff --git a/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl b/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl
index e951a9a2a..ee850ec17 100644
--- a/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl
+++ b/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl
@@ -246,5 +246,5 @@ api_path(Parts) ->
     ?HOST ++ filename:join([?BASE_PATH | Parts]).
 
 json(Data) ->
-    {ok, Jsx} = emqx_json:safe_decode(Data, [return_maps]),
+    {ok, Jsx} = emqx_utils_json:safe_decode(Data, [return_maps]),
     Jsx.
diff --git a/apps/emqx_dashboard/test/emqx_dashboard_error_code_SUITE.erl b/apps/emqx_dashboard/test/emqx_dashboard_error_code_SUITE.erl
index 19d3f471e..c0a772d2d 100644
--- a/apps/emqx_dashboard/test/emqx_dashboard_error_code_SUITE.erl
+++ b/apps/emqx_dashboard/test/emqx_dashboard_error_code_SUITE.erl
@@ -100,7 +100,7 @@ request(Url) ->
         {ok, {{"HTTP/1.1", Code, _}, _, Return}} when
             Code >= 200 andalso Code =< 299
         ->
-            {ok, emqx_json:decode(Return, [return_maps])};
+            {ok, emqx_utils_json:decode(Return, [return_maps])};
         {ok, {Reason, _, _}} ->
             {error, Reason}
     end.
diff --git a/apps/emqx_dashboard/test/emqx_dashboard_monitor_SUITE.erl b/apps/emqx_dashboard/test/emqx_dashboard_monitor_SUITE.erl
index f35652f8e..a24fc2337 100644
--- a/apps/emqx_dashboard/test/emqx_dashboard_monitor_SUITE.erl
+++ b/apps/emqx_dashboard/test/emqx_dashboard_monitor_SUITE.erl
@@ -137,10 +137,10 @@ do_request_api(Method, Request) ->
             Code >= 200 andalso Code =< 299
         ->
             ct:pal("Resp ~p ~p~n", [Code, Return]),
-            {ok, emqx_json:decode(Return, [return_maps])};
+            {ok, emqx_utils_json:decode(Return, [return_maps])};
         {ok, {{"HTTP/1.1", Code, _}, _, Return}} ->
             ct:pal("Resp ~p ~p~n", [Code, Return]),
-            {error, {Code, emqx_json:decode(Return, [return_maps])}};
+            {error, {Code, emqx_utils_json:decode(Return, [return_maps])}};
         {error, Reason} ->
             {error, Reason}
     end.
diff --git a/apps/emqx_exhook/rebar.config b/apps/emqx_exhook/rebar.config
index fad539ed1..7abc601b4 100644
--- a/apps/emqx_exhook/rebar.config
+++ b/apps/emqx_exhook/rebar.config
@@ -5,7 +5,8 @@
 ]}.
 
 {deps, [
-    {emqx, {path, "../emqx"}}
+    {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}}
 ]}.
 
 {grpc, [
diff --git a/apps/emqx_exhook/test/emqx_exhook_api_SUITE.erl b/apps/emqx_exhook/test/emqx_exhook_api_SUITE.erl
index 8a4fb7a44..58f2f29b4 100644
--- a/apps/emqx_exhook/test/emqx_exhook_api_SUITE.erl
+++ b/apps/emqx_exhook/test/emqx_exhook_api_SUITE.erl
@@ -310,7 +310,7 @@ t_update(Cfg) ->
     ?assertMatch([], emqx_exhook_mgr:running()).
 
 decode_json(Data) ->
-    BinJosn = emqx_json:decode(Data, [return_maps]),
+    BinJosn = emqx_utils_json:decode(Data, [return_maps]),
     emqx_map_lib:unsafe_atom_key_map(BinJosn).
 
 request_api(Method, Url, Auth) ->
@@ -332,7 +332,7 @@ request_api(Method, Url, QueryParams, Auth, Body) ->
             "" -> Url;
             _ -> Url ++ "?" ++ QueryParams
         end,
-    do_request_api(Method, {NewUrl, [Auth], "application/json", emqx_json:encode(Body)}).
+    do_request_api(Method, {NewUrl, [Auth], "application/json", emqx_utils_json:encode(Body)}).
 
 do_request_api(Method, Request) ->
     case httpc:request(Method, Request, [], [{body_format, binary}]) of
diff --git a/apps/emqx_gateway/rebar.config b/apps/emqx_gateway/rebar.config
index 7e5228a9e..2340a2dd8 100644
--- a/apps/emqx_gateway/rebar.config
+++ b/apps/emqx_gateway/rebar.config
@@ -1,5 +1,6 @@
 %% -*- mode: erlang -*-
 {erl_opts, [debug_info]}.
 {deps, [
-    {emqx, {path, "../emqx"}}
+    {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}}
 ]}.
diff --git a/apps/emqx_gateway/src/emqx_gateway_cli.erl b/apps/emqx_gateway/src/emqx_gateway_cli.erl
index df808f295..fb4261065 100644
--- a/apps/emqx_gateway/src/emqx_gateway_cli.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_cli.erl
@@ -74,7 +74,7 @@ gateway(["load", Name, Conf]) ->
     case
         emqx_gateway_conf:load_gateway(
             bin(Name),
-            emqx_json:decode(Conf, [return_maps])
+            emqx_utils_json:decode(Conf, [return_maps])
         )
     of
         {ok, _} ->
diff --git a/apps/emqx_gateway/src/emqx_gateway_http.erl b/apps/emqx_gateway/src/emqx_gateway_http.erl
index a0155a126..5982334b4 100644
--- a/apps/emqx_gateway/src/emqx_gateway_http.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_http.erl
@@ -404,7 +404,7 @@ return_http_error(Code, Msg) ->
 -spec reason2msg({atom(), map()} | any()) -> error | string().
 reason2msg({badconf, #{key := Key, value := Value, reason := Reason}}) ->
     NValue =
-        case emqx_json:safe_encode(Value) of
+        case emqx_utils_json:safe_encode(Value) of
             {ok, Str} -> Str;
             {error, _} -> emqx_gateway_utils:stringfy(Value)
         end,
diff --git a/apps/emqx_gateway/test/emqx_gateway_auth_ct.erl b/apps/emqx_gateway/test/emqx_gateway_auth_ct.erl
index d75bf80eb..0ed66a38d 100644
--- a/apps/emqx_gateway/test/emqx_gateway_auth_ct.erl
+++ b/apps/emqx_gateway/test/emqx_gateway_auth_ct.erl
@@ -153,7 +153,7 @@ on_start_auth(authn_http) ->
     Handler = fun(Req0, State) ->
         ct:pal("Authn Req:~p~nState:~p~n", [Req0, State]),
         Headers = #{<<"content-type">> => <<"application/json">>},
-        Response = jiffy:encode(#{result => allow, is_superuser => false}),
+        Response = emqx_utils_json:encode(#{result => allow, is_superuser => false}),
         case cowboy_req:match_qs([username, password], Req0) of
             #{
                 username := <<"admin">>,
diff --git a/apps/emqx_gateway/test/emqx_gateway_authn_SUITE.erl b/apps/emqx_gateway/test/emqx_gateway_authn_SUITE.erl
index 1a4bab5f3..1ab36f7b8 100644
--- a/apps/emqx_gateway/test/emqx_gateway_authn_SUITE.erl
+++ b/apps/emqx_gateway/test/emqx_gateway_authn_SUITE.erl
@@ -266,7 +266,7 @@ t_case_exproto(_) ->
 
                 Mod:send(Sock, ConnBin),
                 {ok, Recv} = Mod:recv(Sock, 5000),
-                C = ?FUNCTOR(Bin, emqx_json:decode(Bin, [return_maps])),
+                C = ?FUNCTOR(Bin, emqx_utils_json:decode(Bin, [return_maps])),
                 ?assertEqual(C(Expect), C(Recv))
             end
         )
diff --git a/apps/emqx_gateway/test/emqx_gateway_authz_SUITE.erl b/apps/emqx_gateway/test/emqx_gateway_authz_SUITE.erl
index 9bbcf2711..c62e840df 100644
--- a/apps/emqx_gateway/test/emqx_gateway_authz_SUITE.erl
+++ b/apps/emqx_gateway/test/emqx_gateway_authz_SUITE.erl
@@ -165,7 +165,7 @@ t_case_lwm2m(_) ->
     Test("lwm2m", fun(SubTopic, Msg) ->
         ?assertEqual(true, lists:member(SubTopic, test_mqtt_broker:get_subscrbied_topics())),
         Payload = emqx_message:payload(Msg),
-        Cmd = emqx_json:decode(Payload, [return_maps]),
+        Cmd = emqx_utils_json:decode(Payload, [return_maps]),
         ?assertMatch(#{<<"msgType">> := <<"register">>, <<"data">> := _}, Cmd)
     end),
 
@@ -350,7 +350,7 @@ t_case_exproto_publish(_) ->
 
                 Mod:send(Sock, ConnBin),
                 {ok, Recv} = Mod:recv(Sock, 5000),
-                C = ?FUNCTOR(Bin, emqx_json:decode(Bin, [return_maps])),
+                C = ?FUNCTOR(Bin, emqx_utils_json:decode(Bin, [return_maps])),
                 ?assertEqual(C(SvrMod:frame_connack(0)), C(Recv)),
 
                 Send = fun() ->
@@ -387,7 +387,7 @@ t_case_exproto_subscribe(_) ->
 
                 Mod:send(Sock, ConnBin),
                 {ok, Recv} = Mod:recv(Sock, WaitTime),
-                C = ?FUNCTOR(Bin, emqx_json:decode(Bin, [return_maps])),
+                C = ?FUNCTOR(Bin, emqx_utils_json:decode(Bin, [return_maps])),
                 ?assertEqual(C(SvrMod:frame_connack(0)), C(Recv)),
 
                 SubBin = SvrMod:frame_subscribe(Topic, 0),
diff --git a/apps/emqx_gateway/test/emqx_gateway_test_utils.erl b/apps/emqx_gateway/test/emqx_gateway_test_utils.erl
index 7ec0c9538..6d80b63d8 100644
--- a/apps/emqx_gateway/test/emqx_gateway_test_utils.erl
+++ b/apps/emqx_gateway/test/emqx_gateway_test_utils.erl
@@ -160,7 +160,7 @@ do_request(Mth, Req) ->
                         #{};
                     _ ->
                         emqx_map_lib:unsafe_atom_key_map(
-                            emqx_json:decode(Resp, [return_maps])
+                            emqx_utils_json:decode(Resp, [return_maps])
                         )
                 end,
             {Code, NResp};
@@ -172,7 +172,7 @@ req(Path, Qs) ->
     {url(Path, Qs), auth([])}.
 
 req(Path, Qs, Body) ->
-    {url(Path, Qs), auth([]), "application/json", emqx_json:encode(Body)}.
+    {url(Path, Qs), auth([]), "application/json", emqx_utils_json:encode(Body)}.
 
 url(Path, []) ->
     lists:concat([?http_api_host, Path]);
diff --git a/apps/emqx_gateway_coap/rebar.config b/apps/emqx_gateway_coap/rebar.config
index c8675c3ba..3b070a72a 100644
--- a/apps/emqx_gateway_coap/rebar.config
+++ b/apps/emqx_gateway_coap/rebar.config
@@ -1,4 +1,6 @@
 {erl_opts, [debug_info]}.
-{deps, [ {emqx, {path, "../../apps/emqx"}},
-         {emqx_gateway, {path, "../../apps/emqx_gateway"}}
-       ]}.
+{deps, [
+    {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}},
+    {emqx_gateway, {path, "../emqx_gateway"}}
+]}.
diff --git a/apps/emqx_gateway_coap/test/emqx_coap_api_SUITE.erl b/apps/emqx_gateway_coap/test/emqx_coap_api_SUITE.erl
index a0d6dbaaa..cec09a016 100644
--- a/apps/emqx_gateway_coap/test/emqx_coap_api_SUITE.erl
+++ b/apps/emqx_gateway_coap/test/emqx_coap_api_SUITE.erl
@@ -92,7 +92,7 @@ t_send_request_api(_) ->
             Req
         ),
         #{<<"token">> := RToken, <<"payload">> := RPayload} =
-            emqx_json:decode(Response, [return_maps]),
+            emqx_utils_json:decode(Response, [return_maps]),
         ?assertEqual(Token, RToken),
         ?assertEqual(Payload, RPayload)
     end,
diff --git a/apps/emqx_gateway_exproto/rebar.config b/apps/emqx_gateway_exproto/rebar.config
index 928949c69..473fa9b67 100644
--- a/apps/emqx_gateway_exproto/rebar.config
+++ b/apps/emqx_gateway_exproto/rebar.config
@@ -1,7 +1,9 @@
 {erl_opts, [debug_info]}.
-{deps, [ {emqx, {path, "../../apps/emqx"}},
-         {emqx_gateway, {path, "../../apps/emqx_gateway"}}
-       ]}.
+{deps, [
+    {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}},
+    {emqx_gateway, {path, "../emqx_gateway"}}
+]}.
 
 {plugins, [
     {grpc_plugin, {git, "https://github.com/HJianBo/grpc_plugin", {tag, "v0.10.2"}}}
diff --git a/apps/emqx_gateway_exproto/test/emqx_exproto_echo_svr.erl b/apps/emqx_gateway_exproto/test/emqx_exproto_echo_svr.erl
index b2e3ad4a7..e04990f5f 100644
--- a/apps/emqx_gateway_exproto/test/emqx_exproto_echo_svr.erl
+++ b/apps/emqx_gateway_exproto/test/emqx_exproto_echo_svr.erl
@@ -148,7 +148,7 @@ on_received_bytes(Stream, _Md) ->
         fun(Reqs) ->
             lists:foreach(
                 fun(#{conn := Conn, bytes := Bytes}) ->
-                    #{<<"type">> := Type} = Params = emqx_json:decode(Bytes, [return_maps]),
+                    #{<<"type">> := Type} = Params = emqx_utils_json:decode(Bytes, [return_maps]),
                     _ = handle_in(Conn, Type, Params)
                 end,
                 Reqs
@@ -284,16 +284,16 @@ handle_out(Conn, ?TYPE_DISCONNECT) ->
 %% Frame
 
 frame_connect(ClientInfo, Password) ->
-    emqx_json:encode(#{
+    emqx_utils_json:encode(#{
         type => ?TYPE_CONNECT,
         clientinfo => ClientInfo,
         password => Password
     }).
 frame_connack(Code) ->
-    emqx_json:encode(#{type => ?TYPE_CONNACK, code => Code}).
+    emqx_utils_json:encode(#{type => ?TYPE_CONNACK, code => Code}).
 
 frame_publish(Topic, Qos, Payload) ->
-    emqx_json:encode(#{
+    emqx_utils_json:encode(#{
         type => ?TYPE_PUBLISH,
         topic => Topic,
         qos => Qos,
@@ -301,19 +301,19 @@ frame_publish(Topic, Qos, Payload) ->
     }).
 
 frame_puback(Code) ->
-    emqx_json:encode(#{type => ?TYPE_PUBACK, code => Code}).
+    emqx_utils_json:encode(#{type => ?TYPE_PUBACK, code => Code}).
 
 frame_subscribe(Topic, Qos) ->
-    emqx_json:encode(#{type => ?TYPE_SUBSCRIBE, topic => Topic, qos => Qos}).
+    emqx_utils_json:encode(#{type => ?TYPE_SUBSCRIBE, topic => Topic, qos => Qos}).
 
 frame_suback(Code) ->
-    emqx_json:encode(#{type => ?TYPE_SUBACK, code => Code}).
+    emqx_utils_json:encode(#{type => ?TYPE_SUBACK, code => Code}).
 
 frame_unsubscribe(Topic) ->
-    emqx_json:encode(#{type => ?TYPE_UNSUBSCRIBE, topic => Topic}).
+    emqx_utils_json:encode(#{type => ?TYPE_UNSUBSCRIBE, topic => Topic}).
 
 frame_unsuback(Code) ->
-    emqx_json:encode(#{type => ?TYPE_UNSUBACK, code => Code}).
+    emqx_utils_json:encode(#{type => ?TYPE_UNSUBACK, code => Code}).
 
 frame_disconnect() ->
-    emqx_json:encode(#{type => ?TYPE_DISCONNECT}).
+    emqx_utils_json:encode(#{type => ?TYPE_DISCONNECT}).
diff --git a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl
index 90a0306b7..c3d23d4d9 100644
--- a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl
@@ -351,7 +351,7 @@ opaque_to_json(BaseName, Binary) ->
     [#{path => BaseName, value => base64:encode(Binary)}].
 
 translate_json(JSONBin) ->
-    JSONTerm = emqx_json:decode(JSONBin, [return_maps]),
+    JSONTerm = emqx_utils_json:decode(JSONBin, [return_maps]),
     BaseName = maps:get(<<"bn">>, JSONTerm, <<>>),
     ElementList = maps:get(<<"e">>, JSONTerm, []),
     translate_element(BaseName, ElementList, []).
diff --git a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_session.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_session.erl
index 2752804dc..c8bfa8974 100644
--- a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_session.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_session.erl
@@ -737,7 +737,7 @@ proto_publish(
         Epn,
         Qos,
         MountedTopic,
-        emqx_json:encode(Payload),
+        emqx_utils_json:encode(Payload),
         #{},
         Headers
     ),
@@ -786,7 +786,7 @@ deliver_to_coap(AlternatePath, JsonData, MQTT, CacheMode, WithContext, Session)
     is_binary(JsonData)
 ->
     try
-        TermData = emqx_json:decode(JsonData, [return_maps]),
+        TermData = emqx_utils_json:decode(JsonData, [return_maps]),
         deliver_to_coap(AlternatePath, TermData, MQTT, CacheMode, WithContext, Session)
     catch
         ExClass:Error:ST ->
diff --git a/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_SUITE.erl b/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_SUITE.erl
index 33ccec2c7..9f388b07c 100644
--- a/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_SUITE.erl
+++ b/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_SUITE.erl
@@ -402,7 +402,7 @@ case01_register_report(Config) ->
     timer:sleep(50),
     true = lists:member(SubTopic, test_mqtt_broker:get_subscrbied_topics()),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"msgType">> => <<"register">>,
             <<"data">> => #{
@@ -478,7 +478,7 @@ case02_update_deregister(Config) ->
 
     ?LOGT("Options got: ~p", [Opts]),
     Location = maps:get(location_path, Opts),
-    Register = emqx_json:encode(
+    Register = emqx_utils_json:encode(
         #{
             <<"msgType">> => <<"register">>,
             <<"data">> => #{
@@ -521,7 +521,7 @@ case02_update_deregister(Config) ->
     } = test_recv_coap_response(UdpSock),
     {ok, changed} = Method2,
     MsgId2 = RspId2,
-    Update = emqx_json:encode(
+    Update = emqx_utils_json:encode(
         #{
             <<"msgType">> => <<"update">>,
             <<"data">> => #{
@@ -754,7 +754,7 @@ case08_reregister(Config) ->
     timer:sleep(50),
     true = lists:member(SubTopic, test_mqtt_broker:get_subscrbied_topics()),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"msgType">> => <<"register">>,
             <<"data">> => #{
@@ -871,7 +871,7 @@ case10_read(Config) ->
             <<"path">> => <<"/3/0/0">>
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     ?LOGT("CommandJson=~p", [CommandJson]),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
@@ -902,7 +902,7 @@ case10_read(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -957,7 +957,7 @@ case10_read_bad_request(Config) ->
             <<"path">> => <<"/3333/0/0">>
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     ?LOGT("CommandJson=~p", [CommandJson]),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
@@ -979,7 +979,7 @@ case10_read_bad_request(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(#{
+    ReadResult = emqx_utils_json:encode(#{
         <<"requestID">> => CmdId,
         <<"cacheID">> => CmdId,
         <<"msgType">> => <<"read">>,
@@ -1015,7 +1015,7 @@ case10_read_separate_ack(Config) ->
             <<"path">> => <<"/3/0/0">>
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     ?LOGT("CommandJson=~p", [CommandJson]),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
@@ -1032,7 +1032,7 @@ case10_read_separate_ack(Config) ->
     ?assertEqual(<<>>, Payload2),
 
     test_send_empty_ack(UdpSock, "127.0.0.1", ?PORT, Request2),
-    ReadResultACK = emqx_json:encode(
+    ReadResultACK = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -1057,7 +1057,7 @@ case10_read_separate_ack(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -1100,7 +1100,7 @@ case11_read_object_tlv(Config) ->
             <<"path">> => <<"/3/0">>
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     ?LOGT("CommandJson=~p", [CommandJson]),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
@@ -1132,7 +1132,7 @@ case11_read_object_tlv(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -1185,7 +1185,7 @@ case11_read_object_json(Config) ->
             <<"path">> => <<"/3/0">>
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     ?LOGT("CommandJson=~p", [CommandJson]),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
@@ -1215,7 +1215,7 @@ case11_read_object_json(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -1267,7 +1267,7 @@ case12_read_resource_opaque(Config) ->
             <<"path">> => <<"/3/0/8">>
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     ?LOGT("CommandJson=~p", [CommandJson]),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
@@ -1293,7 +1293,7 @@ case12_read_resource_opaque(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -1335,7 +1335,7 @@ case13_read_no_xml(Config) ->
         <<"msgType">> => <<"read">>,
         <<"data">> => #{<<"path">> => <<"/9723/0/0">>}
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     ?LOGT("CommandJson=~p", [CommandJson]),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
@@ -1360,7 +1360,7 @@ case13_read_no_xml(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -1399,7 +1399,7 @@ case20_single_write(Config) ->
             <<"value">> => <<"12345">>
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
     Request2 = test_recv_coap_request(UdpSock),
@@ -1426,7 +1426,7 @@ case20_single_write(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -1470,7 +1470,7 @@ case20_write(Config) ->
                 ]
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
     Request2 = test_recv_coap_request(UdpSock),
@@ -1497,7 +1497,7 @@ case20_write(Config) ->
     ),
     timer:sleep(100),
 
-    WriteResult = emqx_json:encode(
+    WriteResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -1547,7 +1547,7 @@ case21_write_object(Config) ->
                 ]
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
     Request2 = test_recv_coap_request(UdpSock),
@@ -1574,7 +1574,7 @@ case21_write_object(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -1618,7 +1618,7 @@ case22_write_error(Config) ->
                 ]
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
     Request2 = test_recv_coap_request(UdpSock),
@@ -1639,7 +1639,7 @@ case22_write_error(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -1677,7 +1677,7 @@ case_create_basic(Config) ->
             <<"basePath">> => <<"/5">>
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
     Request2 = test_recv_coap_request(UdpSock),
@@ -1703,7 +1703,7 @@ case_create_basic(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -1738,7 +1738,7 @@ case_delete_basic(Config) ->
         <<"msgType">> => <<"delete">>,
         <<"data">> => #{<<"path">> => <<"/5/0">>}
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
     Request2 = test_recv_coap_request(UdpSock),
@@ -1764,7 +1764,7 @@ case_delete_basic(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -1804,7 +1804,7 @@ case30_execute(Config) ->
             <<"args">> => <<"2,7">>
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
     Request2 = test_recv_coap_request(UdpSock),
@@ -1830,7 +1830,7 @@ case30_execute(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -1868,7 +1868,7 @@ case31_execute_error(Config) ->
             <<"args">> => <<"2,7">>
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
     Request2 = test_recv_coap_request(UdpSock),
@@ -1894,7 +1894,7 @@ case31_execute_error(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -1931,7 +1931,7 @@ case40_discover(Config) ->
             <<"path">> => <<"/3/0/7">>
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
     Request2 = test_recv_coap_request(UdpSock),
@@ -1961,7 +1961,7 @@ case40_discover(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -2006,7 +2006,7 @@ case50_write_attribute(Config) ->
             <<"lt">> => <<"5">>
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(100),
     Request2 = test_recv_coap_request(UdpSock),
@@ -2042,7 +2042,7 @@ case50_write_attribute(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -2079,7 +2079,7 @@ case60_observe(Config) ->
         <<"msgType">> => <<"observe">>,
         <<"data">> => #{<<"path">> => <<"/3/0/10">>}
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50),
     Request2 = test_recv_coap_request(UdpSock),
@@ -2106,7 +2106,7 @@ case60_observe(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -2141,7 +2141,7 @@ case60_observe(Config) ->
     timer:sleep(100),
     #coap_message{} = test_recv_coap_response(UdpSock),
 
-    ReadResult2 = emqx_json:encode(
+    ReadResult2 = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
@@ -2173,7 +2173,7 @@ case60_observe(Config) ->
             <<"path">> => <<"/3/0/10">>
         }
     },
-    CommandJson3 = emqx_json:encode(Command3),
+    CommandJson3 = emqx_utils_json:encode(Command3),
     test_mqtt_broker:publish(CommandTopic, CommandJson3, 0),
     timer:sleep(50),
     Request3 = test_recv_coap_request(UdpSock),
@@ -2200,7 +2200,7 @@ case60_observe(Config) ->
     ),
     timer:sleep(100),
 
-    ReadResult3 = emqx_json:encode(
+    ReadResult3 = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId3,
             <<"cacheID">> => CmdId3,
@@ -2242,7 +2242,7 @@ case60_observe(Config) ->
 %%       MsgId1),
 %%      #coap_message{method = Method1} = test_recv_coap_response(UdpSock),
 %%      ?assertEqual({ok,created}, Method1),
-%%      ReadResult = emqx_json:encode(
+%%      ReadResult = emqx_utils_json:encode(
 %%                     #{<<"msgType">> => <<"register">>,
 %%                       <<"data">> => #{
 %%                           <<"alternatePath">> => <<"/">>,
@@ -2268,7 +2268,7 @@ case60_observe(Config) ->
 %%                                  <<"path">> => <<"/19/0/0">>
 %%                                 }
 %%                 },
-%%      CommandJson = emqx_json:encode(Command),
+%%      CommandJson = emqx_utils_json:encode(Command),
 %%      test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
 %%      timer:sleep(50),
 %%      Request2 = test_recv_coap_request(UdpSock),
@@ -2325,7 +2325,7 @@ case60_observe(Config) ->
 %%                     <<"value">> => base64:encode(<<12345:32>>)
 %%                }},
 %%
-%%     CommandJson = emqx_json:encode(Command),
+%%     CommandJson = emqx_utils_json:encode(Command),
 %%     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
 %%     timer:sleep(50),
 %%     Request2 = test_recv_coap_request(UdpSock),
@@ -2342,7 +2342,7 @@ case60_observe(Config) ->
 %%                             {ok, changed}, #coap_content{}, Request2, true),
 %%     timer:sleep(100),
 %%
-%%     ReadResult = emqx_json:encode(
+%%     ReadResult = emqx_utils_json:encode(
 %%                    #{<<"requestID">> => CmdId,
 %%                      <<"cacheID">> => CmdId,
 %%                      <<"data">> => #{
@@ -2502,7 +2502,7 @@ send_read_command_1(CmdId, _UdpSock) ->
         <<"msgType">> => <<"read">>,
         <<"data">> => #{<<"path">> => <<"/3/0/0">>}
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
     timer:sleep(50).
 
@@ -2528,7 +2528,7 @@ verify_read_response_1(CmdId, UdpSock) ->
         true
     ),
 
-    ReadResult = emqx_json:encode(
+    ReadResult = emqx_utils_json:encode(
         #{
             <<"requestID">> => CmdId,
             <<"cacheID">> => CmdId,
diff --git a/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_api_SUITE.erl b/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_api_SUITE.erl
index b3c059b31..6fa46ebbc 100644
--- a/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_api_SUITE.erl
+++ b/apps/emqx_gateway_lwm2m/test/emqx_lwm2m_api_SUITE.erl
@@ -131,7 +131,7 @@ t_lookup_read(Config) ->
             <<"path">> => <<"/3/0/0">>
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     ?LOGT("CommandJson=~p", [CommandJson]),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
 
@@ -178,7 +178,7 @@ t_lookup_discover(Config) ->
             <<"path">> => <<"/3/0/7">>
         }
     },
-    CommandJson = emqx_json:encode(Command),
+    CommandJson = emqx_utils_json:encode(Command),
     test_mqtt_broker:publish(CommandTopic, CommandJson, 0),
 
     timer:sleep(200),
@@ -350,10 +350,10 @@ no_received_request(ClientId, Path, Action) ->
         <<"codeMsg">> => <<"reply_not_received">>,
         <<"path">> => Path
     },
-    ?assertEqual(NotReceived, emqx_json:decode(Response, [return_maps])).
+    ?assertEqual(NotReceived, emqx_utils_json:decode(Response, [return_maps])).
 normal_received_request(ClientId, Path, Action) ->
     Response = call_lookup_api(ClientId, Path, Action),
-    RCont = emqx_json:decode(Response, [return_maps]),
+    RCont = emqx_utils_json:decode(Response, [return_maps]),
     ?assertEqual(list_to_binary(ClientId), maps:get(<<"clientid">>, RCont, undefined)),
     ?assertEqual(Path, maps:get(<<"path">>, RCont, undefined)),
     ?assertEqual(Action, maps:get(<<"action">>, RCont, undefined)),
diff --git a/apps/emqx_gateway_stomp/rebar.config b/apps/emqx_gateway_stomp/rebar.config
index c8675c3ba..cfeb0a195 100644
--- a/apps/emqx_gateway_stomp/rebar.config
+++ b/apps/emqx_gateway_stomp/rebar.config
@@ -1,4 +1,6 @@
 {erl_opts, [debug_info]}.
-{deps, [ {emqx, {path, "../../apps/emqx"}},
-         {emqx_gateway, {path, "../../apps/emqx_gateway"}}
-       ]}.
+{deps, [
+  {emqx, {path, "../../apps/emqx"}},
+  {emqx_utils, {path, "../emqx_utils"}},
+  {emqx_gateway, {path, "../../apps/emqx_gateway"}}
+]}.
diff --git a/apps/emqx_machine/rebar.config b/apps/emqx_machine/rebar.config
index 9f17b7657..dee2902a5 100644
--- a/apps/emqx_machine/rebar.config
+++ b/apps/emqx_machine/rebar.config
@@ -1,5 +1,8 @@
 %% -*- mode: erlang -*-
 
-{deps, [{emqx, {path, "../emqx"}}]}.
+{deps, [
+    {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}}
+]}.
 
 {project_plugins, [erlfmt]}.
diff --git a/apps/emqx_machine/src/emqx_machine.app.src b/apps/emqx_machine/src/emqx_machine.app.src
index 0bee30e35..6bd36aab5 100644
--- a/apps/emqx_machine/src/emqx_machine.app.src
+++ b/apps/emqx_machine/src/emqx_machine.app.src
@@ -3,7 +3,7 @@
     {id, "emqx_machine"},
     {description, "The EMQX Machine"},
     % strict semver, bump manually!
-    {vsn, "0.2.1"},
+    {vsn, "0.2.2"},
     {modules, []},
     {registered, []},
     {applications, [kernel, stdlib, emqx_ctl]},
diff --git a/apps/emqx_machine/src/emqx_machine.erl b/apps/emqx_machine/src/emqx_machine.erl
index 243c4bb8c..6872b150c 100644
--- a/apps/emqx_machine/src/emqx_machine.erl
+++ b/apps/emqx_machine/src/emqx_machine.erl
@@ -88,7 +88,7 @@ start_sysmon() ->
     end.
 
 node_status() ->
-    emqx_json:encode(#{
+    emqx_utils_json:encode(#{
         backend => mria_rlog:backend(),
         role => mria_rlog:role()
     }).
diff --git a/apps/emqx_management/rebar.config b/apps/emqx_management/rebar.config
index 73cbf471f..b2f5a40af 100644
--- a/apps/emqx_management/rebar.config
+++ b/apps/emqx_management/rebar.config
@@ -1,6 +1,9 @@
 %% -*- mode: erlang -*-
 
-{deps, [{emqx, {path, "../emqx"}}]}.
+{deps, [
+    {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}}
+]}.
 
 {edoc_opts, [{preprocess, true}]}.
 {erl_opts, [
diff --git a/apps/emqx_management/src/emqx_mgmt_api_banned.erl b/apps/emqx_management/src/emqx_mgmt_api_banned.erl
index 0a5cc3afe..508cf7d07 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_banned.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_banned.erl
@@ -165,7 +165,7 @@ banned(post, #{body := Body}) ->
                 {ok, Banned} ->
                     {200, format(Banned)};
                 {error, {already_exist, Old}} ->
-                    OldBannedFormat = emqx_json:encode(format(Old)),
+                    OldBannedFormat = emqx_utils_json:encode(format(Old)),
                     {400, 'ALREADY_EXISTS', OldBannedFormat}
             end
     end.
diff --git a/apps/emqx_management/test/emqx_mgmt_api_alarms_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_alarms_SUITE.erl
index 69ace16e8..dc7be7671 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_alarms_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_alarms_SUITE.erl
@@ -56,7 +56,7 @@ get_alarms(AssertCount, Activated) ->
     Qs = "activated=" ++ Activated,
     Headers = emqx_mgmt_api_test_util:auth_header_(),
     {ok, Response} = emqx_mgmt_api_test_util:request_api(get, Path, Qs, Headers),
-    Data = emqx_json:decode(Response, [return_maps]),
+    Data = emqx_utils_json:decode(Response, [return_maps]),
     Meta = maps:get(<<"meta">>, Data),
     Page = maps:get(<<"page">>, Meta),
     Limit = maps:get(<<"limit">>, Meta),
diff --git a/apps/emqx_management/test/emqx_mgmt_api_api_keys_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_api_keys_SUITE.erl
index 241a73dc4..1a396d795 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_api_keys_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_api_keys_SUITE.erl
@@ -228,7 +228,7 @@ list_app() ->
     AuthHeader = emqx_dashboard_SUITE:auth_header_(),
     Path = emqx_mgmt_api_test_util:api_path(["api_key"]),
     case emqx_mgmt_api_test_util:request_api(get, Path, AuthHeader) of
-        {ok, Apps} -> {ok, emqx_json:decode(Apps, [return_maps])};
+        {ok, Apps} -> {ok, emqx_utils_json:decode(Apps, [return_maps])};
         Error -> Error
     end.
 
@@ -236,7 +236,7 @@ read_app(Name) ->
     AuthHeader = emqx_dashboard_SUITE:auth_header_(),
     Path = emqx_mgmt_api_test_util:api_path(["api_key", Name]),
     case emqx_mgmt_api_test_util:request_api(get, Path, AuthHeader) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
@@ -251,7 +251,7 @@ create_app(Name) ->
         enable => true
     },
     case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, App) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
@@ -260,7 +260,7 @@ create_unexpired_app(Name, Params) ->
     Path = emqx_mgmt_api_test_util:api_path(["api_key"]),
     App = maps:merge(#{name => Name, desc => <<"Note"/utf8>>, enable => true}, Params),
     case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, App) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
@@ -273,7 +273,7 @@ update_app(Name, Change) ->
     AuthHeader = emqx_dashboard_SUITE:auth_header_(),
     UpdatePath = emqx_mgmt_api_test_util:api_path(["api_key", Name]),
     case emqx_mgmt_api_test_util:request_api(put, UpdatePath, "", AuthHeader, Change) of
-        {ok, Update} -> {ok, emqx_json:decode(Update, [return_maps])};
+        {ok, Update} -> {ok, emqx_utils_json:decode(Update, [return_maps])};
         Error -> Error
     end.
 
diff --git a/apps/emqx_management/test/emqx_mgmt_api_banned_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_banned_SUITE.erl
index c765f00bc..9f1b560f7 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_banned_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_banned_SUITE.erl
@@ -160,7 +160,7 @@ t_delete(_Config) ->
 list_banned() ->
     Path = emqx_mgmt_api_test_util:api_path(["banned"]),
     case emqx_mgmt_api_test_util:request_api(get, Path) of
-        {ok, Apps} -> {ok, emqx_json:decode(Apps, [return_maps])};
+        {ok, Apps} -> {ok, emqx_utils_json:decode(Apps, [return_maps])};
         Error -> Error
     end.
 
@@ -168,7 +168,7 @@ create_banned(Banned) ->
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
     Path = emqx_mgmt_api_test_util:api_path(["banned"]),
     case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Banned) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
diff --git a/apps/emqx_management/test/emqx_mgmt_api_clients_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_clients_SUITE.erl
index 9f26f8542..6d7733b22 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_clients_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_clients_SUITE.erl
@@ -58,7 +58,7 @@ t_clients(_) ->
     %% get /clients
     ClientsPath = emqx_mgmt_api_test_util:api_path(["clients"]),
     {ok, Clients} = emqx_mgmt_api_test_util:request_api(get, ClientsPath),
-    ClientsResponse = emqx_json:decode(Clients, [return_maps]),
+    ClientsResponse = emqx_utils_json:decode(Clients, [return_maps]),
     ClientsMeta = maps:get(<<"meta">>, ClientsResponse),
     ClientsPage = maps:get(<<"page">>, ClientsMeta),
     ClientsLimit = maps:get(<<"limit">>, ClientsMeta),
@@ -70,7 +70,7 @@ t_clients(_) ->
     %% get /clients/:clientid
     Client1Path = emqx_mgmt_api_test_util:api_path(["clients", binary_to_list(ClientId1)]),
     {ok, Client1} = emqx_mgmt_api_test_util:request_api(get, Client1Path),
-    Client1Response = emqx_json:decode(Client1, [return_maps]),
+    Client1Response = emqx_utils_json:decode(Client1, [return_maps]),
     ?assertEqual(Username1, maps:get(<<"username">>, Client1Response)),
     ?assertEqual(ClientId1, maps:get(<<"clientid">>, Client1Response)),
     ?assertEqual(120, maps:get(<<"expiry_interval">>, Client1Response)),
@@ -130,7 +130,7 @@ t_clients(_) ->
         "",
         AuthHeader
     ),
-    [SubscriptionsData] = emqx_json:decode(SubscriptionsRes, [return_maps]),
+    [SubscriptionsData] = emqx_utils_json:decode(SubscriptionsRes, [return_maps]),
     ?assertMatch(
         #{
             <<"clientid">> := ClientId1,
@@ -210,7 +210,7 @@ t_query_clients_with_time(_) ->
                     GteParamRfc3339 ++ GteParamStamp
         ],
     DecodedResults = [
-        emqx_json:decode(Response, [return_maps])
+        emqx_utils_json:decode(Response, [return_maps])
      || {ok, Response} <- RequestResults
     ],
     {LteResponseDecodeds, GteResponseDecodeds} = lists:split(4, DecodedResults),
@@ -247,7 +247,7 @@ t_keepalive(_Config) ->
     {ok, C1} = emqtt:start_link(#{username => Username, clientid => ClientId}),
     {ok, _} = emqtt:connect(C1),
     {ok, NewClient} = emqx_mgmt_api_test_util:request_api(put, Path, <<"">>, AuthHeader, Body),
-    #{<<"keepalive">> := 11} = emqx_json:decode(NewClient, [return_maps]),
+    #{<<"keepalive">> := 11} = emqx_utils_json:decode(NewClient, [return_maps]),
     [Pid] = emqx_cm:lookup_channels(list_to_binary(ClientId)),
     #{conninfo := #{keepalive := Keepalive}} = emqx_connection:info(Pid),
     ?assertEqual(11, Keepalive),
diff --git a/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
index 2d24bce99..cc200a4d5 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
@@ -235,7 +235,7 @@ t_configs_node(_) ->
     ?assertEqual(error, ExpType),
     ?assertMatch({{_, 404, _}, _, _}, ExpRes),
     {_, _, Body} = ExpRes,
-    ?assertMatch(#{<<"code">> := <<"NOT_FOUND">>}, emqx_json:decode(Body, [return_maps])),
+    ?assertMatch(#{<<"code">> := <<"NOT_FOUND">>}, emqx_utils_json:decode(Body, [return_maps])),
 
     ?assertMatch({error, {_, 500, _}}, get_configs("bad_node")).
 
@@ -245,7 +245,7 @@ get_config(Name) ->
     Path = emqx_mgmt_api_test_util:api_path(["configs", Name]),
     case emqx_mgmt_api_test_util:request_api(get, Path) of
         {ok, Res} ->
-            {ok, emqx_json:decode(Res, [return_maps])};
+            {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error ->
             Error
     end.
@@ -264,8 +264,8 @@ get_configs(Node, Opts) ->
         end,
     URI = emqx_mgmt_api_test_util:api_path(Path),
     case emqx_mgmt_api_test_util:request_api(get, URI, [], [], [], Opts) of
-        {ok, {_, _, Res}} -> {ok, emqx_json:decode(Res, [return_maps])};
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, {_, _, Res}} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
@@ -273,7 +273,7 @@ update_config(Name, Change) ->
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
     UpdatePath = emqx_mgmt_api_test_util:api_path(["configs", Name]),
     case emqx_mgmt_api_test_util:request_api(put, UpdatePath, "", AuthHeader, Change) of
-        {ok, Update} -> {ok, emqx_json:decode(Update, [return_maps])};
+        {ok, Update} -> {ok, emqx_utils_json:decode(Update, [return_maps])};
         Error -> Error
     end.
 
diff --git a/apps/emqx_management/test/emqx_mgmt_api_listeners_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_listeners_SUITE.erl
index 3238588e2..90808d4be 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_listeners_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_listeners_SUITE.erl
@@ -385,7 +385,7 @@ action_listener(ID, Action, Running) ->
 request(Method, Url, QueryParams, Body) ->
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
     case emqx_mgmt_api_test_util:request_api(Method, Url, QueryParams, AuthHeader, Body) of
-        {ok, Res} -> emqx_json:decode(Res, [return_maps]);
+        {ok, Res} -> emqx_utils_json:decode(Res, [return_maps]);
         Error -> Error
     end.
 
diff --git a/apps/emqx_management/test/emqx_mgmt_api_metrics_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_metrics_SUITE.erl
index 93cb69f0a..7ecfe9817 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_metrics_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_metrics_SUITE.erl
@@ -32,13 +32,13 @@ end_per_suite(_) ->
 
 t_metrics_api(_) ->
     {ok, MetricsResponse} = request_helper("metrics?aggregate=true"),
-    MetricsFromAPI = emqx_json:decode(MetricsResponse, [return_maps]),
+    MetricsFromAPI = emqx_utils_json:decode(MetricsResponse, [return_maps]),
     AggregateMetrics = emqx_mgmt:get_metrics(),
     match_helper(AggregateMetrics, MetricsFromAPI).
 
 t_single_node_metrics_api(_) ->
     {ok, MetricsResponse} = request_helper("metrics"),
-    [MetricsFromAPI] = emqx_json:decode(MetricsResponse, [return_maps]),
+    [MetricsFromAPI] = emqx_utils_json:decode(MetricsResponse, [return_maps]),
     LocalNodeMetrics = maps:from_list(
         emqx_mgmt:get_metrics(node()) ++ [{node, to_bin(node())}]
     ),
diff --git a/apps/emqx_management/test/emqx_mgmt_api_nodes_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_nodes_SUITE.erl
index 30313e555..7e4ccc541 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_nodes_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_nodes_SUITE.erl
@@ -53,7 +53,7 @@ end_per_testcase(_, Config) ->
 t_nodes_api(_) ->
     NodesPath = emqx_mgmt_api_test_util:api_path(["nodes"]),
     {ok, Nodes} = emqx_mgmt_api_test_util:request_api(get, NodesPath),
-    NodesResponse = emqx_json:decode(Nodes, [return_maps]),
+    NodesResponse = emqx_utils_json:decode(Nodes, [return_maps]),
     LocalNodeInfo = hd(NodesResponse),
     Node = binary_to_atom(maps:get(<<"node">>, LocalNodeInfo), utf8),
     ?assertEqual(Node, node()),
@@ -63,7 +63,7 @@ t_nodes_api(_) ->
     NodePath = emqx_mgmt_api_test_util:api_path(["nodes", atom_to_list(node())]),
     {ok, NodeInfo} = emqx_mgmt_api_test_util:request_api(get, NodePath),
     NodeNameResponse =
-        binary_to_atom(maps:get(<<"node">>, emqx_json:decode(NodeInfo, [return_maps])), utf8),
+        binary_to_atom(maps:get(<<"node">>, emqx_utils_json:decode(NodeInfo, [return_maps])), utf8),
     ?assertEqual(node(), NodeNameResponse),
 
     BadNodePath = emqx_mgmt_api_test_util:api_path(["nodes", "badnode"]),
@@ -75,7 +75,7 @@ t_nodes_api(_) ->
 t_log_path(_) ->
     NodePath = emqx_mgmt_api_test_util:api_path(["nodes", atom_to_list(node())]),
     {ok, NodeInfo} = emqx_mgmt_api_test_util:request_api(get, NodePath),
-    #{<<"log_path">> := Path} = emqx_json:decode(NodeInfo, [return_maps]),
+    #{<<"log_path">> := Path} = emqx_utils_json:decode(NodeInfo, [return_maps]),
     ?assertEqual(
         <<"log">>,
         filename:basename(Path)
@@ -85,7 +85,7 @@ t_node_stats_api(_) ->
     StatsPath = emqx_mgmt_api_test_util:api_path(["nodes", atom_to_binary(node(), utf8), "stats"]),
     SystemStats = emqx_mgmt:get_stats(),
     {ok, StatsResponse} = emqx_mgmt_api_test_util:request_api(get, StatsPath),
-    Stats = emqx_json:decode(StatsResponse, [return_maps]),
+    Stats = emqx_utils_json:decode(StatsResponse, [return_maps]),
     Fun =
         fun(Key) ->
             ?assertEqual(maps:get(Key, SystemStats), maps:get(atom_to_binary(Key, utf8), Stats))
@@ -103,7 +103,7 @@ t_node_metrics_api(_) ->
         emqx_mgmt_api_test_util:api_path(["nodes", atom_to_binary(node(), utf8), "metrics"]),
     SystemMetrics = emqx_mgmt:get_metrics(),
     {ok, MetricsResponse} = emqx_mgmt_api_test_util:request_api(get, MetricsPath),
-    Metrics = emqx_json:decode(MetricsResponse, [return_maps]),
+    Metrics = emqx_utils_json:decode(MetricsResponse, [return_maps]),
     Fun =
         fun(Key) ->
             ?assertEqual(maps:get(Key, SystemMetrics), maps:get(atom_to_binary(Key, utf8), Metrics))
diff --git a/apps/emqx_management/test/emqx_mgmt_api_plugins_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_plugins_SUITE.erl
index 24e55494d..62fed8211 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_plugins_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_plugins_SUITE.erl
@@ -136,14 +136,14 @@ t_bad_plugin(Config) ->
 list_plugins() ->
     Path = emqx_mgmt_api_test_util:api_path(["plugins"]),
     case emqx_mgmt_api_test_util:request_api(get, Path) of
-        {ok, Apps} -> {ok, emqx_json:decode(Apps, [return_maps])};
+        {ok, Apps} -> {ok, emqx_utils_json:decode(Apps, [return_maps])};
         Error -> Error
     end.
 
 describe_plugins(Name) ->
     Path = emqx_mgmt_api_test_util:api_path(["plugins", Name]),
     case emqx_mgmt_api_test_util:request_api(get, Path) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
@@ -172,7 +172,7 @@ update_boot_order(Name, MoveBody) ->
     Auth = emqx_mgmt_api_test_util:auth_header_(),
     Path = emqx_mgmt_api_test_util:api_path(["plugins", Name, "move"]),
     case emqx_mgmt_api_test_util:request_api(post, Path, "", Auth, MoveBody) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
@@ -206,7 +206,7 @@ create_renamed_package(PackagePath, NewNameVsn) ->
     NewPackagePath.
 
 update_release_json(["release.json"], FileContent, NewName) ->
-    ContentMap = emqx_json:decode(FileContent, [return_maps]),
-    emqx_json:encode(ContentMap#{<<"name">> => NewName});
+    ContentMap = emqx_utils_json:decode(FileContent, [return_maps]),
+    emqx_utils_json:encode(ContentMap#{<<"name">> => NewName});
 update_release_json(_FileName, FileContent, _NewName) ->
     FileContent.
diff --git a/apps/emqx_management/test/emqx_mgmt_api_publish_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_publish_SUITE.erl
index 44b8069f5..303a73b41 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_publish_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_publish_SUITE.erl
@@ -352,4 +352,4 @@ receive_assert(Topic, Qos, Payload) ->
     end.
 
 decode_json(In) ->
-    emqx_json:decode(In, [return_maps]).
+    emqx_utils_json:decode(In, [return_maps]).
diff --git a/apps/emqx_management/test/emqx_mgmt_api_stats_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_stats_SUITE.erl
index 7236ac9e4..4099426b8 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_stats_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_stats_SUITE.erl
@@ -33,7 +33,7 @@ end_per_suite(_) ->
 t_stats_api(_) ->
     S = emqx_mgmt_api_test_util:api_path(["stats?aggregate=false"]),
     {ok, S1} = emqx_mgmt_api_test_util:request_api(get, S),
-    [Stats1] = emqx_json:decode(S1, [return_maps]),
+    [Stats1] = emqx_utils_json:decode(S1, [return_maps]),
     SystemStats1 = emqx_mgmt:get_stats(),
     Fun1 =
         fun(Key) ->
@@ -43,7 +43,7 @@ t_stats_api(_) ->
     StatsPath = emqx_mgmt_api_test_util:api_path(["stats?aggregate=true"]),
     SystemStats = emqx_mgmt:get_stats(),
     {ok, StatsResponse} = emqx_mgmt_api_test_util:request_api(get, StatsPath),
-    Stats = emqx_json:decode(StatsResponse, [return_maps]),
+    Stats = emqx_utils_json:decode(StatsResponse, [return_maps]),
     ?assertEqual(erlang:length(maps:keys(SystemStats)), erlang:length(maps:keys(Stats))),
     Fun =
         fun(Key) ->
diff --git a/apps/emqx_management/test/emqx_mgmt_api_subscription_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_subscription_SUITE.erl
index b9e9fffd8..a23d70f2f 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_subscription_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_subscription_SUITE.erl
@@ -55,7 +55,7 @@ t_subscription_api(Config) ->
     {ok, _, _} = emqtt:subscribe(Client, ?TOPIC2),
     Path = emqx_mgmt_api_test_util:api_path(["subscriptions"]),
     {ok, Response} = emqx_mgmt_api_test_util:request_api(get, Path),
-    Data = emqx_json:decode(Response, [return_maps]),
+    Data = emqx_utils_json:decode(Response, [return_maps]),
     Meta = maps:get(<<"meta">>, Data),
     ?assertEqual(1, maps:get(<<"page">>, Meta)),
     ?assertEqual(emqx_mgmt:default_row_limit(), maps:get(<<"limit">>, Meta)),
@@ -158,7 +158,7 @@ t_list_with_internal_subscription(_Config) ->
 request_json(Method, Query, Headers) when is_list(Query) ->
     Qs = uri_string:compose_query(Query),
     {ok, MatchRes} = emqx_mgmt_api_test_util:request_api(Method, path(), Qs, Headers),
-    emqx_json:decode(MatchRes, [return_maps]).
+    emqx_utils_json:decode(MatchRes, [return_maps]).
 
 path() ->
     emqx_mgmt_api_test_util:api_path(["subscriptions"]).
diff --git a/apps/emqx_management/test/emqx_mgmt_api_test_util.erl b/apps/emqx_management/test/emqx_mgmt_api_test_util.erl
index 782f493fe..5fe4ca937 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_test_util.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_test_util.erl
@@ -108,7 +108,8 @@ request_api(Method, Url, QueryParams, AuthOrHeaders, Body, Opts) when
         end,
     do_request_api(
         Method,
-        {NewUrl, build_http_header(AuthOrHeaders), "application/json", emqx_json:encode(Body)},
+        {NewUrl, build_http_header(AuthOrHeaders), "application/json",
+            emqx_utils_json:encode(Body)},
         Opts
     ).
 
diff --git a/apps/emqx_management/test/emqx_mgmt_api_topics_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_topics_SUITE.erl
index 0c2e684b4..659ae0d44 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_topics_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_topics_SUITE.erl
@@ -49,7 +49,7 @@ t_nodes_api(Config) ->
     %% list all
     Path = emqx_mgmt_api_test_util:api_path(["topics"]),
     {ok, Response} = emqx_mgmt_api_test_util:request_api(get, Path),
-    RoutesData = emqx_json:decode(Response, [return_maps]),
+    RoutesData = emqx_utils_json:decode(Response, [return_maps]),
     Meta = maps:get(<<"meta">>, RoutesData),
     ?assertEqual(1, maps:get(<<"page">>, Meta)),
     ?assertEqual(emqx_mgmt:default_row_limit(), maps:get(<<"limit">>, Meta)),
@@ -68,7 +68,7 @@ t_nodes_api(Config) ->
     ]),
     Headers = emqx_mgmt_api_test_util:auth_header_(),
     {ok, MatchResponse} = emqx_mgmt_api_test_util:request_api(get, Path, QS, Headers),
-    MatchData = emqx_json:decode(MatchResponse, [return_maps]),
+    MatchData = emqx_utils_json:decode(MatchResponse, [return_maps]),
     ?assertMatch(
         #{<<"count">> := 1, <<"page">> := 1, <<"limit">> := 100},
         maps:get(<<"meta">>, MatchData)
@@ -90,6 +90,6 @@ t_nodes_api(Config) ->
     [
         #{<<"topic">> := Topic, <<"node">> := Node1},
         #{<<"topic">> := Topic, <<"node">> := Node2}
-    ] = emqx_json:decode(RouteResponse, [return_maps]),
+    ] = emqx_utils_json:decode(RouteResponse, [return_maps]),
 
     ?assertEqual(lists:usort([Node, atom_to_binary(Slave)]), lists:usort([Node1, Node2])).
diff --git a/apps/emqx_management/test/emqx_mgmt_api_trace_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_trace_SUITE.erl
index 7922bbb40..0102eb56c 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_trace_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_trace_SUITE.erl
@@ -384,7 +384,7 @@ api_path(Path) ->
     emqx_mgmt_api_test_util:api_path([Path]).
 
 json(Data) ->
-    {ok, Jsx} = emqx_json:safe_decode(Data, [return_maps]),
+    {ok, Jsx} = emqx_utils_json:safe_decode(Data, [return_maps]),
     Jsx.
 
 load() ->
diff --git a/apps/emqx_modules/rebar.config b/apps/emqx_modules/rebar.config
index 9688d5043..ff542aed7 100644
--- a/apps/emqx_modules/rebar.config
+++ b/apps/emqx_modules/rebar.config
@@ -2,6 +2,7 @@
 
 {deps, [
     {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}},
     {emqx_conf, {path, "../emqx_conf"}}
 ]}.
 {project_plugins, [erlfmt]}.
diff --git a/apps/emqx_modules/src/emqx_telemetry.erl b/apps/emqx_modules/src/emqx_telemetry.erl
index 6d5c772f0..1d49fb3e7 100644
--- a/apps/emqx_modules/src/emqx_telemetry.erl
+++ b/apps/emqx_modules/src/emqx_telemetry.erl
@@ -356,7 +356,7 @@ get_telemetry(State0 = #state{node_uuid = NodeUUID, cluster_uuid = ClusterUUID})
 
 report_telemetry(State0 = #state{url = URL}) ->
     {State, Data} = get_telemetry(State0),
-    case emqx_json:safe_encode(Data) of
+    case emqx_utils_json:safe_encode(Data) of
         {ok, Bin} ->
             httpc_request(post, URL, [], Bin),
             ?tp(debug, telemetry_data_reported, #{});
diff --git a/apps/emqx_modules/src/emqx_telemetry_api.erl b/apps/emqx_modules/src/emqx_telemetry_api.erl
index 798c3ad17..b7209d146 100644
--- a/apps/emqx_modules/src/emqx_telemetry_api.erl
+++ b/apps/emqx_modules/src/emqx_telemetry_api.erl
@@ -243,7 +243,7 @@ status(put, #{body := Body}) ->
 data(get, _Request) ->
     case emqx_modules_conf:is_telemetry_enabled() of
         true ->
-            {200, emqx_json:encode(get_telemetry_data())};
+            {200, emqx_utils_json:encode(get_telemetry_data())};
         false ->
             {404, #{
                 code => ?NOT_FOUND,
diff --git a/apps/emqx_modules/test/emqx_delayed_api_SUITE.erl b/apps/emqx_modules/test/emqx_delayed_api_SUITE.erl
index ed3cd9292..b2d854d22 100644
--- a/apps/emqx_modules/test/emqx_delayed_api_SUITE.erl
+++ b/apps/emqx_modules/test/emqx_delayed_api_SUITE.erl
@@ -229,7 +229,7 @@ t_large_payload(_) ->
 %%--------------------------------------------------------------------
 
 decode_json(Data) ->
-    BinJson = emqx_json:decode(Data, [return_maps]),
+    BinJson = emqx_utils_json:decode(Data, [return_maps]),
     emqx_map_lib:unsafe_atom_key_map(BinJson).
 
 clear_all_record() ->
diff --git a/apps/emqx_modules/test/emqx_rewrite_api_SUITE.erl b/apps/emqx_modules/test/emqx_rewrite_api_SUITE.erl
index ddb136f1e..68d12a2c1 100644
--- a/apps/emqx_modules/test/emqx_rewrite_api_SUITE.erl
+++ b/apps/emqx_modules/test/emqx_rewrite_api_SUITE.erl
@@ -75,7 +75,7 @@ t_mqtt_topic_rewrite(_) ->
 
     ?assertEqual(
         Rules,
-        emqx_json:decode(Result, [return_maps])
+        emqx_utils_json:decode(Result, [return_maps])
     ).
 
 t_mqtt_topic_rewrite_limit(_) ->
diff --git a/apps/emqx_modules/test/emqx_telemetry_SUITE.erl b/apps/emqx_modules/test/emqx_telemetry_SUITE.erl
index a61781e13..bb5f39c1f 100644
--- a/apps/emqx_modules/test/emqx_telemetry_SUITE.erl
+++ b/apps/emqx_modules/test/emqx_telemetry_SUITE.erl
@@ -512,7 +512,7 @@ t_send_after_enable(_) ->
         ),
         receive
             {request, post, _URL, _Headers, Body} ->
-                {ok, Decoded} = emqx_json:safe_decode(Body, [return_maps]),
+                {ok, Decoded} = emqx_utils_json:safe_decode(Body, [return_maps]),
                 ?assertMatch(
                     #{
                         <<"uuid">> := _,
diff --git a/apps/emqx_plugin_libs/rebar.config b/apps/emqx_plugin_libs/rebar.config
index 9f17b7657..dee2902a5 100644
--- a/apps/emqx_plugin_libs/rebar.config
+++ b/apps/emqx_plugin_libs/rebar.config
@@ -1,5 +1,8 @@
 %% -*- mode: erlang -*-
 
-{deps, [{emqx, {path, "../emqx"}}]}.
+{deps, [
+    {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}}
+]}.
 
 {project_plugins, [erlfmt]}.
diff --git a/apps/emqx_plugin_libs/src/emqx_placeholder.erl b/apps/emqx_plugin_libs/src/emqx_placeholder.erl
index 1f93c1d3e..18ef9e8fb 100644
--- a/apps/emqx_plugin_libs/src/emqx_placeholder.erl
+++ b/apps/emqx_plugin_libs/src/emqx_placeholder.erl
@@ -240,7 +240,7 @@ sql_data(Bin) when is_binary(Bin) -> Bin;
 sql_data(Num) when is_number(Num) -> Num;
 sql_data(Bool) when is_boolean(Bool) -> Bool;
 sql_data(Atom) when is_atom(Atom) -> atom_to_binary(Atom, utf8);
-sql_data(Map) when is_map(Map) -> emqx_json:encode(Map).
+sql_data(Map) when is_map(Map) -> emqx_utils_json:encode(Map).
 
 -spec bin(term()) -> binary().
 bin(Val) -> emqx_plugin_libs_rule:bin(Val).
diff --git a/apps/emqx_plugin_libs/src/emqx_plugin_libs_rule.erl b/apps/emqx_plugin_libs/src/emqx_plugin_libs_rule.erl
index d1a821895..40f88a0dc 100644
--- a/apps/emqx_plugin_libs/src/emqx_plugin_libs_rule.erl
+++ b/apps/emqx_plugin_libs/src/emqx_plugin_libs_rule.erl
@@ -236,11 +236,11 @@ tcp_connectivity(Host, Port, Timeout) ->
 str(Bin) when is_binary(Bin) -> binary_to_list(Bin);
 str(Num) when is_number(Num) -> number_to_list(Num);
 str(Atom) when is_atom(Atom) -> atom_to_list(Atom);
-str(Map) when is_map(Map) -> binary_to_list(emqx_json:encode(Map));
+str(Map) when is_map(Map) -> binary_to_list(emqx_utils_json:encode(Map));
 str(List) when is_list(List) ->
     case io_lib:printable_list(List) of
         true -> List;
-        false -> binary_to_list(emqx_json:encode(List))
+        false -> binary_to_list(emqx_utils_json:encode(List))
     end;
 str(Data) ->
     error({invalid_str, Data}).
@@ -258,11 +258,11 @@ utf8_str(Str) ->
 bin(Bin) when is_binary(Bin) -> Bin;
 bin(Num) when is_number(Num) -> number_to_binary(Num);
 bin(Atom) when is_atom(Atom) -> atom_to_binary(Atom, utf8);
-bin(Map) when is_map(Map) -> emqx_json:encode(Map);
+bin(Map) when is_map(Map) -> emqx_utils_json:encode(Map);
 bin(List) when is_list(List) ->
     case io_lib:printable_list(List) of
         true -> list_to_binary(List);
-        false -> emqx_json:encode(List)
+        false -> emqx_utils_json:encode(List)
     end;
 bin(Data) ->
     error({invalid_bin, Data}).
@@ -312,7 +312,7 @@ float2str(Float, Precision) when is_float(Float) and is_integer(Precision) ->
     float_to_binary(Float, [{decimals, Precision}, compact]).
 
 map(Bin) when is_binary(Bin) ->
-    case emqx_json:decode(Bin, [return_maps]) of
+    case emqx_utils_json:decode(Bin, [return_maps]) of
         Map = #{} -> Map;
         _ -> error({invalid_map, Bin})
     end;
diff --git a/apps/emqx_prometheus/rebar.config b/apps/emqx_prometheus/rebar.config
index 88b3d27a2..7b9a6cc48 100644
--- a/apps/emqx_prometheus/rebar.config
+++ b/apps/emqx_prometheus/rebar.config
@@ -2,6 +2,7 @@
 
 {deps, [
     {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}},
     {prometheus, {git, "https://github.com/deadtrickster/prometheus.erl", {tag, "v4.8.1"}}}
 ]}.
 
diff --git a/apps/emqx_prometheus/test/emqx_prometheus_api_SUITE.erl b/apps/emqx_prometheus/test/emqx_prometheus_api_SUITE.erl
index c4867d9fd..e29d46720 100644
--- a/apps/emqx_prometheus/test/emqx_prometheus_api_SUITE.erl
+++ b/apps/emqx_prometheus/test/emqx_prometheus_api_SUITE.erl
@@ -66,7 +66,7 @@ t_prometheus_api(_) ->
     Auth = emqx_mgmt_api_test_util:auth_header_(),
     {ok, Response} = emqx_mgmt_api_test_util:request_api(get, Path, "", Auth),
 
-    Conf = emqx_json:decode(Response, [return_maps]),
+    Conf = emqx_utils_json:decode(Response, [return_maps]),
     ?assertMatch(
         #{
             <<"push_gateway_server">> := _,
@@ -84,7 +84,7 @@ t_prometheus_api(_) ->
     NewConf = Conf#{<<"interval">> => <<"2s">>, <<"vm_statistics_collector">> => <<"disabled">>},
     {ok, Response2} = emqx_mgmt_api_test_util:request_api(put, Path, "", Auth, NewConf),
 
-    Conf2 = emqx_json:decode(Response2, [return_maps]),
+    Conf2 = emqx_utils_json:decode(Response2, [return_maps]),
     ?assertMatch(NewConf, Conf2),
     ?assertEqual({ok, []}, application:get_env(prometheus, vm_statistics_collector_metrics)),
     ?assertEqual({ok, all}, application:get_env(prometheus, vm_memory_collector_metrics)),
@@ -106,7 +106,7 @@ t_stats_api(_) ->
     Headers = [{"accept", "application/json"}, Auth],
     {ok, Response} = emqx_mgmt_api_test_util:request_api(get, Path, "", Headers),
 
-    Data = emqx_json:decode(Response, [return_maps]),
+    Data = emqx_utils_json:decode(Response, [return_maps]),
     ?assertMatch(#{<<"client">> := _, <<"delivery">> := _}, Data),
 
     {ok, _} = emqx_mgmt_api_test_util:request_api(get, Path, "", Auth),
diff --git a/apps/emqx_retainer/rebar.config b/apps/emqx_retainer/rebar.config
index 65de71fdd..a178e10a1 100644
--- a/apps/emqx_retainer/rebar.config
+++ b/apps/emqx_retainer/rebar.config
@@ -1,6 +1,9 @@
 %% -*- mode: erlang -*-
 
-{deps, [{emqx, {path, "../emqx"}}]}.
+{deps, [
+    {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}}
+]}.
 
 {edoc_opts, [{preprocess, true}]}.
 {erl_opts, [
diff --git a/apps/emqx_retainer/test/emqx_retainer_api_SUITE.erl b/apps/emqx_retainer/test/emqx_retainer_api_SUITE.erl
index ba96887a2..2b92b3f59 100644
--- a/apps/emqx_retainer/test/emqx_retainer_api_SUITE.erl
+++ b/apps/emqx_retainer/test/emqx_retainer_api_SUITE.erl
@@ -72,7 +72,7 @@ t_config(_Config) ->
     ),
 
     UpdateConf = fun(Enable) ->
-        RawConf = emqx_json:decode(ConfJson, [return_maps]),
+        RawConf = emqx_utils_json:decode(ConfJson, [return_maps]),
         UpdateJson = RawConf#{<<"enable">> := Enable},
         {ok, UpdateResJson} = request_api(
             put,
@@ -81,7 +81,7 @@ t_config(_Config) ->
             auth_header_(),
             UpdateJson
         ),
-        UpdateRawConf = emqx_json:decode(UpdateResJson, [return_maps]),
+        UpdateRawConf = emqx_utils_json:decode(UpdateResJson, [return_maps]),
         ?assertEqual(Enable, maps:get(<<"enable">>, UpdateRawConf))
     end,
 
@@ -224,7 +224,7 @@ t_lookup_and_delete(_) ->
 t_change_storage_type(_Config) ->
     Path = api_path(["mqtt", "retainer"]),
     {ok, ConfJson} = request_api(get, Path),
-    RawConf = emqx_json:decode(ConfJson, [return_maps]),
+    RawConf = emqx_utils_json:decode(ConfJson, [return_maps]),
     %% pre-conditions
     ?assertMatch(
         #{
@@ -271,7 +271,7 @@ t_change_storage_type(_Config) ->
         auth_header_(),
         ChangedConf
     ),
-    UpdatedRawConf = emqx_json:decode(UpdateResJson, [return_maps]),
+    UpdatedRawConf = emqx_utils_json:decode(UpdateResJson, [return_maps]),
     ?assertMatch(
         #{
             <<"backend">> := #{
@@ -311,7 +311,7 @@ t_change_storage_type(_Config) ->
 %% HTTP Request
 %%--------------------------------------------------------------------
 decode_json(Data) ->
-    BinJson = emqx_json:decode(Data, [return_maps]),
+    BinJson = emqx_utils_json:decode(Data, [return_maps]),
     emqx_map_lib:unsafe_atom_key_map(BinJson).
 
 %%--------------------------------------------------------------------
diff --git a/apps/emqx_rule_engine/rebar.config b/apps/emqx_rule_engine/rebar.config
index 110caa33d..07c53d3e3 100644
--- a/apps/emqx_rule_engine/rebar.config
+++ b/apps/emqx_rule_engine/rebar.config
@@ -1,7 +1,8 @@
 %% -*- mode: erlang -*-
 
 {deps, [
-    {emqx, {path, "../emqx"}}
+    {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}}
 ]}.
 
 {erl_opts, [
diff --git a/apps/emqx_rule_engine/src/emqx_rule_actions.erl b/apps/emqx_rule_engine/src/emqx_rule_actions.erl
index c4a6e2e73..40158d342 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_actions.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_actions.erl
@@ -213,7 +213,7 @@ replace_simple_var(Val, _Data, _Default) ->
     Val.
 
 format_msg([], Selected) ->
-    emqx_json:encode(Selected);
+    emqx_utils_json:encode(Selected);
 format_msg(Tokens, Selected) ->
     emqx_plugin_libs_rule:proc_tmpl(Tokens, Selected).
 
diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl b/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl
index f640f8303..c63d6275f 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl
@@ -468,7 +468,7 @@ err_msg(Msg) ->
 encode_nested_error(RuleError, Reason) when is_tuple(Reason) ->
     encode_nested_error(RuleError, element(1, Reason));
 encode_nested_error(RuleError, Reason) ->
-    case emqx_json:safe_encode([{RuleError, Reason}]) of
+    case emqx_utils_json:safe_encode([{RuleError, Reason}]) of
         {ok, Json} ->
             Json;
         _ ->
diff --git a/apps/emqx_rule_engine/src/emqx_rule_funcs.erl b/apps/emqx_rule_engine/src/emqx_rule_funcs.erl
index 79e0406c1..944aa02f8 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_funcs.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_funcs.erl
@@ -987,10 +987,10 @@ base64_decode(Data) when is_binary(Data) ->
     base64:decode(Data).
 
 json_encode(Data) ->
-    emqx_json:encode(Data).
+    emqx_utils_json:encode(Data).
 
 json_decode(Data) ->
-    emqx_json:decode(Data, [return_maps]).
+    emqx_utils_json:decode(Data, [return_maps]).
 
 term_encode(Term) ->
     erlang:term_to_binary(Term).
diff --git a/apps/emqx_rule_engine/src/emqx_rule_maps.erl b/apps/emqx_rule_engine/src/emqx_rule_maps.erl
index 13f99c88b..3dfffca46 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_maps.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_maps.erl
@@ -86,7 +86,7 @@ general_map_put(Key, Val, Map, OrgData) ->
     ).
 
 general_find(KeyOrIndex, Data, OrgData, Handler) when is_binary(Data) ->
-    try emqx_json:decode(Data, [return_maps]) of
+    try emqx_utils_json:decode(Data, [return_maps]) of
         Json -> general_find(KeyOrIndex, Json, OrgData, Handler)
     catch
         _:_ -> Handler(not_found)
diff --git a/apps/emqx_rule_engine/src/emqx_rule_runtime.erl b/apps/emqx_rule_engine/src/emqx_rule_runtime.erl
index 51491df53..d7412d03c 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_runtime.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_runtime.erl
@@ -495,7 +495,7 @@ cache_payload(DecodedP) ->
 
 safe_decode_and_cache(MaybeJson) ->
     try
-        cache_payload(emqx_json:decode(MaybeJson, [return_maps]))
+        cache_payload(emqx_utils_json:decode(MaybeJson, [return_maps]))
     catch
         _:_ -> error({decode_json_failed, MaybeJson})
     end.
diff --git a/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl b/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl
index 93d7c7352..eb253e516 100644
--- a/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl
+++ b/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl
@@ -614,7 +614,9 @@ t_event_client_disconnected_normal(_Config) ->
     receive
         {publish, #{topic := T, payload := Payload}} ->
             ?assertEqual(RepubT, T),
-            ?assertMatch(#{<<"reason">> := <<"normal">>}, emqx_json:decode(Payload, [return_maps]))
+            ?assertMatch(
+                #{<<"reason">> := <<"normal">>}, emqx_utils_json:decode(Payload, [return_maps])
+            )
     after 1000 ->
         ct:fail(wait_for_repub_disconnected_normal)
     end,
@@ -651,7 +653,9 @@ t_event_client_disconnected_kicked(_Config) ->
     receive
         {publish, #{topic := T, payload := Payload}} ->
             ?assertEqual(RepubT, T),
-            ?assertMatch(#{<<"reason">> := <<"kicked">>}, emqx_json:decode(Payload, [return_maps]))
+            ?assertMatch(
+                #{<<"reason">> := <<"kicked">>}, emqx_utils_json:decode(Payload, [return_maps])
+            )
     after 1000 ->
         ct:fail(wait_for_repub_disconnected_kicked)
     end,
@@ -692,7 +696,7 @@ t_event_client_disconnected_discarded(_Config) ->
         {publish, #{topic := T, payload := Payload}} ->
             ?assertEqual(RepubT, T),
             ?assertMatch(
-                #{<<"reason">> := <<"discarded">>}, emqx_json:decode(Payload, [return_maps])
+                #{<<"reason">> := <<"discarded">>}, emqx_utils_json:decode(Payload, [return_maps])
             )
     after 1000 ->
         ct:fail(wait_for_repub_disconnected_discarded)
@@ -737,7 +741,7 @@ t_event_client_disconnected_takenover(_Config) ->
         {publish, #{topic := T, payload := Payload}} ->
             ?assertEqual(RepubT, T),
             ?assertMatch(
-                #{<<"reason">> := <<"takenover">>}, emqx_json:decode(Payload, [return_maps])
+                #{<<"reason">> := <<"takenover">>}, emqx_utils_json:decode(Payload, [return_maps])
             )
     after 1000 ->
         ct:fail(wait_for_repub_disconnected_discarded)
@@ -2800,7 +2804,7 @@ verify_event(EventName) ->
             [
                 begin
                     %% verify fields can be formatted to JSON string
-                    _ = emqx_json:encode(Fields),
+                    _ = emqx_utils_json:encode(Fields),
                     %% verify metadata fields
                     verify_metadata_fields(EventName, Fields),
                     %% verify available fields for each event name
diff --git a/apps/emqx_rule_engine/test/emqx_rule_engine_api_SUITE.erl b/apps/emqx_rule_engine/test/emqx_rule_engine_api_SUITE.erl
index e94806a7b..8d7546fca 100644
--- a/apps/emqx_rule_engine/test/emqx_rule_engine_api_SUITE.erl
+++ b/apps/emqx_rule_engine/test/emqx_rule_engine_api_SUITE.erl
@@ -46,13 +46,13 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_testcase(t_crud_rule_api, Config) ->
-    meck:new(emqx_json, [passthrough]),
+    meck:new(emqx_utils_json, [passthrough]),
     init_per_testcase(common, Config);
 init_per_testcase(_, Config) ->
     Config.
 
 end_per_testcase(t_crud_rule_api, Config) ->
-    meck:unload(emqx_json),
+    meck:unload(emqx_utils_json),
     end_per_testcase(common, Config);
 end_per_testcase(_, _Config) ->
     {200, #{data := Rules}} =
@@ -136,7 +136,7 @@ t_crud_rule_api(_Config) ->
         ),
     ?assertMatch(
         #{<<"select_and_transform_error">> := <<"decode_json_failed">>},
-        emqx_json:decode(SelectAndTransformJsonError, [return_maps])
+        emqx_utils_json:decode(SelectAndTransformJsonError, [return_maps])
     ),
     {400, #{
         code := 'BAD_REQUEST',
@@ -150,7 +150,7 @@ t_crud_rule_api(_Config) ->
         ),
     ?assertMatch(
         #{<<"select_and_transform_error">> := <<"badarg">>},
-        emqx_json:decode(SelectAndTransformBadArgError, [return_maps])
+        emqx_utils_json:decode(SelectAndTransformBadArgError, [return_maps])
     ),
     {400, #{
         code := 'BAD_REQUEST',
@@ -162,7 +162,7 @@ t_crud_rule_api(_Config) ->
         )
     ),
     ?assertMatch({match, _}, re:run(BadSqlMessage, "syntax error")),
-    meck:expect(emqx_json, safe_encode, 1, {error, foo}),
+    meck:expect(emqx_utils_json, safe_encode, 1, {error, foo}),
     ?assertMatch(
         {400, #{
             code := 'BAD_REQUEST',
diff --git a/apps/emqx_slow_subs/rebar.config b/apps/emqx_slow_subs/rebar.config
index 9f17b7657..dee2902a5 100644
--- a/apps/emqx_slow_subs/rebar.config
+++ b/apps/emqx_slow_subs/rebar.config
@@ -1,5 +1,8 @@
 %% -*- mode: erlang -*-
 
-{deps, [{emqx, {path, "../emqx"}}]}.
+{deps, [
+    {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}}
+]}.
 
 {project_plugins, [erlfmt]}.
diff --git a/apps/emqx_slow_subs/test/emqx_slow_subs_api_SUITE.erl b/apps/emqx_slow_subs/test/emqx_slow_subs_api_SUITE.erl
index 6b0721e3d..ae74348e0 100644
--- a/apps/emqx_slow_subs/test/emqx_slow_subs_api_SUITE.erl
+++ b/apps/emqx_slow_subs/test/emqx_slow_subs_api_SUITE.erl
@@ -108,7 +108,7 @@ t_get_history(_) ->
         "page=1&limit=10",
         auth_header_()
     ),
-    #{<<"data">> := [First | _]} = emqx_json:decode(Data, [return_maps]),
+    #{<<"data">> := [First | _]} = emqx_utils_json:decode(Data, [return_maps]),
 
     ?assertMatch(
         #{
@@ -165,7 +165,7 @@ t_settting(_) ->
     ?assertEqual(Conf2#{stats_type := <<"internal">>}, GetReturn).
 
 decode_json(Data) ->
-    BinJosn = emqx_json:decode(Data, [return_maps]),
+    BinJosn = emqx_utils_json:decode(Data, [return_maps]),
     emqx_map_lib:unsafe_atom_key_map(BinJosn).
 
 request_api(Method, Url, Auth) ->
@@ -187,7 +187,7 @@ request_api(Method, Url, QueryParams, Auth, Body) ->
             "" -> Url;
             _ -> Url ++ "?" ++ QueryParams
         end,
-    do_request_api(Method, {NewUrl, [Auth], "application/json", emqx_json:encode(Body)}).
+    do_request_api(Method, {NewUrl, [Auth], "application/json", emqx_utils_json:encode(Body)}).
 
 do_request_api(Method, Request) ->
     ct:pal("Method: ~p, Request: ~p", [Method, Request]),
diff --git a/apps/emqx_statsd/rebar.config b/apps/emqx_statsd/rebar.config
index bb9a14272..a1383d920 100644
--- a/apps/emqx_statsd/rebar.config
+++ b/apps/emqx_statsd/rebar.config
@@ -3,6 +3,7 @@
 {erl_opts, [debug_info]}.
 {deps, [
     {emqx, {path, "../emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}},
     {estatsd, {git, "https://github.com/emqx/estatsd", {tag, "0.1.0"}}}
 ]}.
 
diff --git a/apps/emqx_statsd/test/emqx_statsd_SUITE.erl b/apps/emqx_statsd/test/emqx_statsd_SUITE.erl
index bcc710050..b5669e4b9 100644
--- a/apps/emqx_statsd/test/emqx_statsd_SUITE.erl
+++ b/apps/emqx_statsd/test/emqx_statsd_SUITE.erl
@@ -200,7 +200,7 @@ request(Method) -> request(Method, []).
 request(Method, Body) ->
     case request(Method, uri(["statsd"]), Body) of
         {ok, 200, Res} ->
-            {ok, emqx_json:decode(Res, [return_maps])};
+            {ok, emqx_utils_json:decode(Res, [return_maps])};
         {ok, _Status, _} ->
             error
     end.
diff --git a/apps/emqx_utils/README.md b/apps/emqx_utils/README.md
new file mode 100644
index 000000000..482b7a947
--- /dev/null
+++ b/apps/emqx_utils/README.md
@@ -0,0 +1,43 @@
+# [Application Name] - [Mandatory]
+> 0. App overview introduction
+> 1. let people know what your project can do specifically. Is it a base
+> library dependency, or what kind of functionality is provided to the user?
+> 2. Provide context and add a link to any reference visitors might be
+> unfamiliar with.
+> 3. Design details, implementation technology architecture, Roadmap, etc.
+
+# [Features] - [Optional]
+> A List of features your application provided. If the feature is quite simple, just
+> list in the previous section.
+
+# [Limitation] - [Optional]
+> Explain the limitations of the implementation used in your application.
+
+# [Documention links] - [Mandatory]
+> You can use the official docs link to provide a detailed explanation of
+> the concept and functions of this application.
+
+# [Installation] - [Optional]
+> How users can obtain this application. In most cases, this section is unnecessary.
+> Most of the applications are released with the EMQX distribution package.
+> Otherwise, it is necessary to provide step-by-step instructions on how
+> to install this application.
+
+# [Usage] - [Optional]
+> This section explains how users can use the features provided by the application.
+
+# [Basic Usage Guide] - [Optional]
+> Simple and reproducible introduction on how to use/start it.
+
+# [Configurations] - [Mandatory]
+> Most important configurations that this application depends on.
+> It would be best to attach official documentation if it's available.
+
+# [HTTP APIs] - [Optional]
+> Same as configuration.
+
+# [Other] - [Optional]
+> Other topics that users may need to know can be placed here.
+
+# Contributing - [Mandatory]
+Please see our [contributing.md](../../CONTRIBUTING.md).
diff --git a/apps/emqx_utils/rebar.config b/apps/emqx_utils/rebar.config
new file mode 100644
index 000000000..4c39cfe64
--- /dev/null
+++ b/apps/emqx_utils/rebar.config
@@ -0,0 +1,11 @@
+%% -*- mode: erlang -*-
+
+{erl_opts, [
+    debug_info
+]}.
+
+{deps, [
+    {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}}
+]}.
+
+{project_plugins, [erlfmt]}.
diff --git a/apps/emqx_utils/src/emqx_utils.app.src b/apps/emqx_utils/src/emqx_utils.app.src
new file mode 100644
index 000000000..e1f10c139
--- /dev/null
+++ b/apps/emqx_utils/src/emqx_utils.app.src
@@ -0,0 +1,25 @@
+%% -*- mode: erlang -*-
+{application, emqx_utils, [
+    {description, "An OTP application"},
+    % strict semver, bump manually!
+    {vsn, "5.0.0"},
+    {modules, [
+        emqx_utils,
+        emqx_utils_binary,
+        emqx_utils_ets,
+        emqx_utils_json,
+        emqx_utils_maps
+    ]},
+    {registered, []},
+    {applications, [
+        kernel,
+        stdlib
+    ]},
+    {env, []},
+    {licenses, ["Apache-2.0"]},
+    {maintainers, ["EMQX Team <contact@emqx.io>"]},
+    {links, [
+        {"Homepage", "https://emqx.io/"},
+        {"Github", "https://github.com/emqx/emqx"}
+    ]}
+]}.
diff --git a/apps/emqx/src/emqx_json.erl b/apps/emqx_utils/src/emqx_utils_json.erl
similarity index 90%
rename from apps/emqx/src/emqx_json.erl
rename to apps/emqx_utils/src/emqx_utils_json.erl
index 7827b98c9..2f0c6f88b 100644
--- a/apps/emqx/src/emqx_json.erl
+++ b/apps/emqx_utils/src/emqx_utils_json.erl
@@ -14,7 +14,7 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
--module(emqx_json).
+-module(emqx_utils_json).
 
 -compile(inline).
 
@@ -46,11 +46,11 @@
     ]}
 ).
 
--type encode_options() :: jiffy:encode_options().
--type decode_options() :: jiffy:decode_options().
+-type encode_options() :: emqx_utils_json:encode_options().
+-type decode_options() :: emqx_utils_json:decode_options().
 
 -type json_text() :: iolist() | binary().
--type json_term() :: jiffy:jiffy_decode_result().
+-type json_term() :: emqx_utils_json:jiffy_decode_result().
 
 -export_type([json_text/0, json_term/0]).
 -export_type([decode_options/0, encode_options/0]).
@@ -61,7 +61,7 @@ encode(Term) ->
 
 -spec encode(json_term(), encode_options()) -> json_text().
 encode(Term, Opts) ->
-    to_binary(jiffy:encode(to_ejson(Term), Opts)).
+    to_binary(emqx_utils_json:encode(to_ejson(Term), Opts)).
 
 -spec safe_encode(json_term()) ->
     {ok, json_text()} | {error, Reason :: term()}.
@@ -83,7 +83,7 @@ decode(Json) -> decode(Json, []).
 
 -spec decode(json_text(), decode_options()) -> json_term().
 decode(Json, Opts) ->
-    from_ejson(jiffy:decode(Json, Opts)).
+    from_ejson(emqx_utils_json:decode(Json, Opts)).
 
 -spec safe_decode(json_text()) ->
     {ok, json_term()} | {error, Reason :: term()}.
diff --git a/apps/emqx_utils/test/emqx_utils_SUITE.erl b/apps/emqx_utils/test/emqx_utils_SUITE.erl
new file mode 100644
index 000000000..09a8d085c
--- /dev/null
+++ b/apps/emqx_utils/test/emqx_utils_SUITE.erl
@@ -0,0 +1,48 @@
+%%--------------------------------------------------------------------
+%% Copyright (c) 2020-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%--------------------------------------------------------------------
+
+-module(emqx_utils_SUITE).
+
+-compile(export_all).
+-compile(nowarn_export_all).
+
+-include_lib("eunit/include/eunit.hrl").
+-include_lib("common_test/include/ct.hrl").
+
+all() ->
+    emqx_common_test_helpers:all(?MODULE).
+
+init_per_suite(Config) ->
+    emqx_common_test_helpers:start_apps([emqx_conf, emqx_utils]),
+    Config.
+
+end_per_suite(_Config) ->
+    emqx_common_test_helpers:stop_apps([emqx_conf, emqx_utils]),
+    ok.
+
+init_per_testcase(TestCase, Config) ->
+    emqx_common_test_helpers:init_per_testcase(?MODULE, TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    emqx_common_test_helpers:end_per_testcase(?MODULE, TestCase, Config).
+
+t_fail(init, Config) ->
+    Config;
+t_fail('end', _Config) ->
+    ok.
+
+t_fail(_Config) ->
+    ?assert(false).
diff --git a/apps/emqx/test/emqx_json_SUITE.erl b/apps/emqx_utils/test/emqx_utils_json_SUITE.erl
similarity index 93%
rename from apps/emqx/test/emqx_json_SUITE.erl
rename to apps/emqx_utils/test/emqx_utils_json_SUITE.erl
index a0bf48e4e..889cde595 100644
--- a/apps/emqx/test/emqx_json_SUITE.erl
+++ b/apps/emqx_utils/test/emqx_utils_json_SUITE.erl
@@ -14,7 +14,7 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
--module(emqx_json_SUITE).
+-module(emqx_utils_json_SUITE).
 
 -compile(export_all).
 -compile(nowarn_export_all).
@@ -22,7 +22,7 @@
 -include_lib("eunit/include/eunit.hrl").
 
 -import(
-    emqx_json,
+    emqx_utils_json,
     [
         encode/1,
         decode/1,
@@ -51,7 +51,7 @@
 %% #{<<"foo">> => <<"bar">>}  -> {"foo": "bar"} -> #{<<"foo">> => <<"bar">>}
 %%--------------------------------------------------------------------
 
-%% but in emqx_json, we use the jsx style for it:
+%% but in emqx_utils_json, we use the jsx style for it:
 %%--------------------------------------------------------------------
 %% Erlang                     JSON              Erlang
 %% -------------------------------------------------------------------
@@ -127,12 +127,12 @@ t_safe_decode_encode(_) ->
     [{<<"foo">>, <<"bar">>}] = safe_encode_decode([{foo, bar}]),
     [{<<"foo">>, <<"bar">>}] = safe_encode_decode([{<<"foo">>, <<"bar">>}]),
     [[{<<"foo">>, <<"bar">>}]] = safe_encode_decode([[{<<"foo">>, <<"bar">>}]]),
-    {ok, Json} = emqx_json:safe_encode(#{<<"foo">> => <<"bar">>}),
-    {ok, #{<<"foo">> := <<"bar">>}} = emqx_json:safe_decode(Json, [return_maps]).
+    {ok, Json} = emqx_utils_json:safe_encode(#{<<"foo">> => <<"bar">>}),
+    {ok, #{<<"foo">> := <<"bar">>}} = emqx_utils_json:safe_decode(Json, [return_maps]).
 
 safe_encode_decode(Term) ->
-    {ok, Json} = emqx_json:safe_encode(Term),
-    case emqx_json:safe_decode(Json) of
+    {ok, Json} = emqx_utils_json:safe_encode(Term),
+    case emqx_utils_json:safe_decode(Json) of
         {ok, {NTerm}} -> NTerm;
         {ok, NTerm} -> NTerm
     end.
diff --git a/lib-ee/emqx_ee_bridge/rebar.config b/lib-ee/emqx_ee_bridge/rebar.config
index afd90f622..b26df658a 100644
--- a/lib-ee/emqx_ee_bridge/rebar.config
+++ b/lib-ee/emqx_ee_bridge/rebar.config
@@ -3,6 +3,7 @@
        , {emqx_connector, {path, "../../apps/emqx_connector"}}
        , {emqx_resource, {path, "../../apps/emqx_resource"}}
        , {emqx_bridge, {path, "../../apps/emqx_bridge"}}
+       , {emqx_utils, {path, "../emqx_utils"}}
        ]}.
 
 {shell, [
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_cassa_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_cassa_SUITE.erl
index 208b68de6..f37d7fb6a 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_cassa_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_cassa_SUITE.erl
@@ -273,7 +273,7 @@ create_bridge_http(Params) ->
     Path = emqx_mgmt_api_test_util:api_path(["bridges"]),
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
     case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Params) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_dynamo_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_dynamo_SUITE.erl
index 0c0dbbe04..e899b0fcd 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_dynamo_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_dynamo_SUITE.erl
@@ -208,7 +208,7 @@ create_bridge_http(Params) ->
     Path = emqx_mgmt_api_test_util:api_path(["bridges"]),
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
     case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Params) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_gcp_pubsub_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_gcp_pubsub_SUITE.erl
index 75d2d2d8c..3cc4c75e4 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_gcp_pubsub_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_gcp_pubsub_SUITE.erl
@@ -204,7 +204,7 @@ create_bridge_http(Config, GCPPubSubConfigOverrides) ->
     ct:pal("probe result: ~p", [ProbeResult]),
     Res =
         case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Params) of
-            {ok, Res0} -> {ok, emqx_json:decode(Res0, [return_maps])};
+            {ok, Res0} -> {ok, emqx_utils_json:decode(Res0, [return_maps])};
             Error -> Error
         end,
     ct:pal("bridge creation result: ~p", [Res]),
@@ -222,7 +222,7 @@ create_rule_and_action_http(Config) ->
     Path = emqx_mgmt_api_test_util:api_path(["rules"]),
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
     case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Params) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
@@ -234,7 +234,7 @@ success_http_handler() ->
         Rep = cowboy_req:reply(
             200,
             #{<<"content-type">> => <<"application/json">>},
-            jiffy:encode(#{messageIds => [<<"6058891368195201">>]}),
+            emqx_utils_json:encode(#{messageIds => [<<"6058891368195201">>]}),
             Req
         ),
         {ok, Rep, State}
@@ -274,7 +274,7 @@ gcp_pubsub_config(Config) ->
     PubSubTopic = proplists:get_value(pubsub_topic, Config, <<"mytopic">>),
     PipelineSize = proplists:get_value(pipeline_size, Config, 100),
     ServiceAccountJSON = proplists:get_value(pubsub_topic, Config, generate_service_account_json()),
-    ServiceAccountJSONStr = emqx_json:encode(ServiceAccountJSON),
+    ServiceAccountJSONStr = emqx_utils_json:encode(ServiceAccountJSON),
     GUID = emqx_guid:to_hexstr(emqx_guid:gen()),
     Name = <<(atom_to_binary(?MODULE))/binary, (GUID)/binary>>,
     ConfigString =
@@ -463,7 +463,7 @@ assert_valid_request_headers(Headers, ServiceAccountJSON) ->
     end.
 
 assert_valid_request_body(Body) ->
-    BodyMap = emqx_json:decode(Body, [return_maps]),
+    BodyMap = emqx_utils_json:decode(Body, [return_maps]),
     ?assertMatch(#{<<"messages">> := [_ | _]}, BodyMap),
     #{<<"messages">> := Messages} = BodyMap,
     lists:map(
@@ -471,7 +471,7 @@ assert_valid_request_body(Body) ->
             ?assertMatch(#{<<"data">> := <<_/binary>>}, Msg),
             #{<<"data">> := Content64} = Msg,
             Content = base64:decode(Content64),
-            Decoded = emqx_json:decode(Content, [return_maps]),
+            Decoded = emqx_utils_json:decode(Content, [return_maps]),
             ct:pal("decoded payload: ~p", [Decoded]),
             ?assert(is_map(Decoded)),
             Decoded
@@ -1014,7 +1014,7 @@ t_publish_timeout(Config) ->
             Rep = cowboy_req:reply(
                 200,
                 #{<<"content-type">> => <<"application/json">>},
-                jiffy:encode(#{messageIds => [<<"6058891368195201">>]}),
+                emqx_utils_json:encode(#{messageIds => [<<"6058891368195201">>]}),
                 Req
             ),
             {ok, Rep, State}
@@ -1180,7 +1180,7 @@ t_failure_with_body(Config) ->
             Rep = cowboy_req:reply(
                 400,
                 #{<<"content-type">> => <<"application/json">>},
-                jiffy:encode(#{}),
+                emqx_utils_json:encode(#{}),
                 Req
             ),
             {ok, Rep, State}
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_influxdb_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_influxdb_SUITE.erl
index 1b4b4aeb2..4891d5d9b 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_influxdb_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_influxdb_SUITE.erl
@@ -394,7 +394,7 @@ create_rule_and_action_http(Config, Overrides) ->
     Path = emqx_mgmt_api_test_util:api_path(["rules"]),
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
     case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Params) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
@@ -435,7 +435,7 @@ query_by_clientid(ClientId, Config) ->
         {"Content-Type", "application/json"}
     ],
     Body =
-        emqx_json:encode(#{
+        emqx_utils_json:encode(#{
             query => Query,
             dialect => #{
                 header => true,
@@ -545,7 +545,7 @@ t_start_ok(Config) ->
                 int_value => <<"-123">>,
                 uint_value => <<"123">>,
                 float_value => <<"24.5">>,
-                payload => emqx_json:encode(Payload)
+                payload => emqx_utils_json:encode(Payload)
             },
             assert_persisted_data(ClientId, Expected, PersistedData),
             ok
@@ -764,7 +764,7 @@ t_boolean_variants(Config) ->
                 bool => atom_to_binary(Translation),
                 int_value => <<"-123">>,
                 uint_value => <<"123">>,
-                payload => emqx_json:encode(Payload)
+                payload => emqx_utils_json:encode(Payload)
             },
             assert_persisted_data(ClientId, Expected, PersistedData),
             ok
@@ -1024,9 +1024,9 @@ t_missing_field(Config) ->
     ClientId0 = emqx_guid:to_hexstr(emqx_guid:gen()),
     ClientId1 = emqx_guid:to_hexstr(emqx_guid:gen()),
     %% Message with the field that we "forgot" to select in the rule
-    Msg0 = emqx_message:make(ClientId0, <<"t/topic">>, emqx_json:encode(#{foo => 123})),
+    Msg0 = emqx_message:make(ClientId0, <<"t/topic">>, emqx_utils_json:encode(#{foo => 123})),
     %% Message without any fields
-    Msg1 = emqx_message:make(ClientId1, <<"t/topic">>, emqx_json:encode(#{})),
+    Msg1 = emqx_message:make(ClientId1, <<"t/topic">>, emqx_utils_json:encode(#{})),
     ?check_trace(
         begin
             emqx:publish(Msg0),
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_mongodb_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_mongodb_SUITE.erl
index 116dcc729..2d4ee9222 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_mongodb_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_mongodb_SUITE.erl
@@ -258,7 +258,7 @@ create_bridge_http(Params) ->
     Path = emqx_mgmt_api_test_util:api_path(["bridges"]),
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
     case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Params) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_mysql_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_mysql_SUITE.erl
index 38e31c7ae..69b1e26ce 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_mysql_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_mysql_SUITE.erl
@@ -226,7 +226,7 @@ create_bridge_http(Params) ->
     Path = emqx_mgmt_api_test_util:api_path(["bridges"]),
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
     case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Params) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_pgsql_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_pgsql_SUITE.erl
index 83cb8b1f3..8f0b9ad9c 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_pgsql_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_pgsql_SUITE.erl
@@ -241,7 +241,7 @@ create_bridge_http(Params) ->
     Path = emqx_mgmt_api_test_util:api_path(["bridges"]),
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
     case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Params) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_rocketmq_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_rocketmq_SUITE.erl
index 95ec47e7f..0cb14e5c3 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_rocketmq_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_rocketmq_SUITE.erl
@@ -176,7 +176,7 @@ create_bridge_http(Params) ->
     Path = emqx_mgmt_api_test_util:api_path(["bridges"]),
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
     case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Params) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_tdengine_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_tdengine_SUITE.erl
index c956a93c6..8e058f2f1 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_tdengine_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_tdengine_SUITE.erl
@@ -219,7 +219,7 @@ create_bridge_http(Params) ->
     Path = emqx_mgmt_api_test_util:api_path(["bridges"]),
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
     case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Params) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
diff --git a/lib-ee/emqx_ee_connector/rebar.config b/lib-ee/emqx_ee_connector/rebar.config
index e754bd573..352c54629 100644
--- a/lib-ee/emqx_ee_connector/rebar.config
+++ b/lib-ee/emqx_ee_connector/rebar.config
@@ -6,7 +6,8 @@
   {clickhouse, {git, "https://github.com/emqx/clickhouse-client-erl", {tag, "0.3"}}},
   {erlcloud, {git, "https://github.com/emqx/erlcloud.git", {tag,"3.5.16-emqx-1"}}},
   {rocketmq, {git, "https://github.com/emqx/rocketmq-client-erl.git", {tag, "v0.5.1"}}},
-  {emqx, {path, "../../apps/emqx"}}
+  {emqx, {path, "../../apps/emqx"}},
+  {emqx_utils, {path, "../../apps/emqx_utils"}}
 ]}.
 
 {shell, [
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_dynamo.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_dynamo.erl
index 4703e0a21..ee56e0c5f 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_dynamo.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_dynamo.erl
@@ -322,7 +322,7 @@ convert_to_item(Msg) when is_map(Msg), map_size(Msg) > 0 ->
         Msg
     );
 convert_to_item(MsgBin) when is_binary(MsgBin) ->
-    Msg = emqx_json:decode(MsgBin),
+    Msg = emqx_utils_json:decode(MsgBin),
     convert_to_item(Msg);
 convert_to_item(Item) ->
     erlang:throw({invalid_item, Item}).
@@ -334,7 +334,7 @@ convert2binary(Value) when is_binary(Value); is_number(Value) ->
 convert2binary(Value) when is_list(Value) ->
     unicode:characters_to_binary(Value);
 convert2binary(Value) when is_map(Value) ->
-    emqx_json:encode(Value).
+    emqx_utils_json:encode(Value).
 
 do_async_reply(Result, {ReplyFun, [Context]}) ->
     ReplyFun(Context, Result).
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_gcp_pubsub.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_gcp_pubsub.erl
index f07cbceab..a2045b8c5 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_gcp_pubsub.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_gcp_pubsub.erl
@@ -334,14 +334,14 @@ ensure_jwt_worker(InstanceId, #{
 encode_payload(_State = #{payload_template := PayloadTemplate}, Selected) ->
     Interpolated =
         case PayloadTemplate of
-            [] -> emqx_json:encode(Selected);
+            [] -> emqx_utils_json:encode(Selected);
             _ -> emqx_plugin_libs_rule:proc_tmpl(PayloadTemplate, Selected)
         end,
     #{data => base64:encode(Interpolated)}.
 
 -spec to_pubsub_request([#{data := binary()}]) -> binary().
 to_pubsub_request(Payloads) ->
-    emqx_json:encode(#{messages => Payloads}).
+    emqx_utils_json:encode(#{messages => Payloads}).
 
 -spec publish_path(state()) -> binary().
 publish_path(
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_mongodb.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_mongodb.erl
index aa03863b0..4e7adcd6e 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_mongodb.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_mongodb.erl
@@ -84,4 +84,4 @@ render_message(PayloadTemplate, Message) ->
     %% Note: mongo expects a map as a document, so the rendered result
     %% must be JSON-serializable
     Rendered = emqx_plugin_libs_rule:proc_tmpl(PayloadTemplate, Message),
-    emqx_json:decode(Rendered, [return_maps]).
+    emqx_utils_json:decode(Rendered, [return_maps]).
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_rocketmq.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_rocketmq.erl
index 84f2e2a89..d296b0b4f 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_rocketmq.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_rocketmq.erl
@@ -248,14 +248,14 @@ get_topic_key([Query | _], RawTopic, TopicTks) ->
 apply_template({Key, Msg} = _Req, Templates) ->
     case maps:get(Key, Templates, undefined) of
         undefined ->
-            emqx_json:encode(Msg);
+            emqx_utils_json:encode(Msg);
         Template ->
             emqx_plugin_libs_rule:proc_tmpl(Template, Msg)
     end;
 apply_template([{Key, _} | _] = Reqs, Templates) ->
     case maps:get(Key, Templates, undefined) of
         undefined ->
-            [emqx_json:encode(Msg) || {_, Msg} <- Reqs];
+            [emqx_utils_json:encode(Msg) || {_, Msg} <- Reqs];
         Template ->
             [emqx_plugin_libs_rule:proc_tmpl(Template, Msg) || {_, Msg} <- Reqs]
     end.
diff --git a/lib-ee/emqx_ee_schema_registry/rebar.config b/lib-ee/emqx_ee_schema_registry/rebar.config
index b19fb05ae..223ebf533 100644
--- a/lib-ee/emqx_ee_schema_registry/rebar.config
+++ b/lib-ee/emqx_ee_schema_registry/rebar.config
@@ -3,6 +3,7 @@
 {erl_opts, [debug_info]}.
 {deps, [
   {emqx, {path, "../../apps/emqx"}},
+  {emqx_utils, {path, "../../apps/emqx_utils"}},
   {erlavro, {git, "https://github.com/klarna/erlavro.git", {tag, "2.9.8"}}}
 ]}.
 
diff --git a/lib-ee/emqx_ee_schema_registry/src/emqx_ee_schema_registry_serde.erl b/lib-ee/emqx_ee_schema_registry/src/emqx_ee_schema_registry_serde.erl
index 43145fb16..9835ec7c2 100644
--- a/lib-ee/emqx_ee_schema_registry/src/emqx_ee_schema_registry_serde.erl
+++ b/lib-ee/emqx_ee_schema_registry/src/emqx_ee_schema_registry_serde.erl
@@ -65,6 +65,6 @@ make_serde(avro, Name, Source0) ->
 inject_avro_name(Name, Source0) ->
     %% The schema checks that the source is a valid JSON when
     %% typechecking, so we shouldn't need to validate here.
-    Schema0 = emqx_json:decode(Source0, [return_maps]),
+    Schema0 = emqx_utils_json:decode(Source0, [return_maps]),
     Schema = Schema0#{<<"name">> => Name},
-    emqx_json:encode(Schema).
+    emqx_utils_json:encode(Schema).
diff --git a/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_SUITE.erl b/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_SUITE.erl
index 9b2f64c03..3c26d1966 100644
--- a/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_SUITE.erl
+++ b/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_SUITE.erl
@@ -95,7 +95,7 @@ create_rule_http(RuleParams) ->
     Path = emqx_mgmt_api_test_util:api_path(["rules"]),
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
     case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Params) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 
@@ -107,7 +107,7 @@ schema_params(avro) ->
             #{name => <<"s">>, type => <<"string">>}
         ]
     },
-    SourceBin = emqx_json:encode(Source),
+    SourceBin = emqx_utils_json:encode(Source),
     #{type => avro, source => SourceBin}.
 
 create_serde(SerdeType, SerdeName) ->
@@ -162,7 +162,7 @@ receive_published(Line) ->
             maps:update_with(
                 payload,
                 fun(Raw) ->
-                    case emqx_json:safe_decode(Raw, [return_maps]) of
+                    case emqx_utils_json:safe_decode(Raw, [return_maps]) of
                         {ok, Decoded} -> Decoded;
                         {error, _} -> Raw
                     end
@@ -262,7 +262,7 @@ t_encode_decode(Config) ->
     {ok, #{<<"id">> := RuleId}} = create_rule_http(#{sql => sql_for(SerdeType, encode_decode1)}),
     on_exit(fun() -> ok = emqx_rule_engine:delete_rule(RuleId) end),
     Payload = #{<<"i">> => 10, <<"s">> => <<"text">>},
-    PayloadBin = emqx_json:encode(Payload),
+    PayloadBin = emqx_utils_json:encode(Payload),
     emqx:publish(emqx_message:make(<<"t">>, PayloadBin)),
     Res = receive_action_results(),
     ?assertMatch(
@@ -311,7 +311,7 @@ t_encode(Config) ->
     {ok, #{<<"id">> := RuleId}} = create_rule_http(#{sql => sql_for(SerdeType, encode1)}),
     on_exit(fun() -> ok = emqx_rule_engine:delete_rule(RuleId) end),
     Payload = #{<<"i">> => 10, <<"s">> => <<"text">>},
-    PayloadBin = emqx_json:encode(Payload),
+    PayloadBin = emqx_utils_json:encode(Payload),
     emqx:publish(emqx_message:make(<<"t">>, PayloadBin)),
     Published = receive_published(?LINE),
     ?assertMatch(
diff --git a/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_http_api_SUITE.erl b/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_http_api_SUITE.erl
index bbb6d5ef0..e7034d562 100644
--- a/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_http_api_SUITE.erl
+++ b/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_http_api_SUITE.erl
@@ -64,7 +64,7 @@ do_request(Method, PathParts, Body) ->
         {ok, Code, <<>>} ->
             {ok, Code, <<>>};
         {ok, Code, Res1} ->
-            Res2 = emqx_json:decode(Res1, [return_maps]),
+            Res2 = emqx_utils_json:decode(Res1, [return_maps]),
             Res3 = try_decode_error_message(Res2),
             {ok, Code, Res3};
         Error ->
@@ -72,7 +72,7 @@ do_request(Method, PathParts, Body) ->
     end.
 
 try_decode_error_message(#{<<"message">> := Msg0} = Res0) ->
-    case emqx_json:safe_decode(Msg0, [return_maps]) of
+    case emqx_utils_json:safe_decode(Msg0, [return_maps]) of
         {ok, Msg} ->
             Res0#{<<"message">> := Msg};
         {error, _} ->
@@ -102,7 +102,7 @@ t_crud(_Config) ->
             #{name => <<"s">>, type => <<"string">>}
         ]
     },
-    SourceBin = emqx_json:encode(Source),
+    SourceBin = emqx_utils_json:encode(Source),
     Params = #{
         <<"type">> => <<"avro">>,
         <<"source">> => SourceBin,
diff --git a/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_serde_SUITE.erl b/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_serde_SUITE.erl
index be62717d3..12798c6a2 100644
--- a/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_serde_SUITE.erl
+++ b/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_serde_SUITE.erl
@@ -59,7 +59,7 @@ schema_params(avro) ->
             #{name => <<"s">>, type => <<"string">>}
         ]
     },
-    SourceBin = emqx_json:encode(Source),
+    SourceBin = emqx_utils_json:encode(Source),
     #{type => avro, source => SourceBin}.
 
 assert_roundtrip(SerdeName, Original) ->
diff --git a/lib-ee/emqx_license/rebar.config b/lib-ee/emqx_license/rebar.config
index 1cb5ace88..e7620387a 100644
--- a/lib-ee/emqx_license/rebar.config
+++ b/lib-ee/emqx_license/rebar.config
@@ -1,3 +1,6 @@
-{deps, [{emqx, {path, "../../apps/emqx"}}]}.
+{deps, [
+    {emqx, {path, "../../apps/emqx"}},
+    {emqx_utils, {path, "../emqx_utils"}}
+]}.
 
 {project_plugins, [erlfmt]}.
diff --git a/lib-ee/emqx_license/test/emqx_license_http_api_SUITE.erl b/lib-ee/emqx_license/test/emqx_license_http_api_SUITE.erl
index 11ac1ca89..3de5ae121 100644
--- a/lib-ee/emqx_license/test/emqx_license_http_api_SUITE.erl
+++ b/lib-ee/emqx_license/test/emqx_license_http_api_SUITE.erl
@@ -103,7 +103,7 @@ t_license_info(_Config) ->
             <<"start_at">> => <<"2022-01-11">>,
             <<"type">> => <<"trial">>
         },
-        emqx_json:decode(Payload, [return_maps])
+        emqx_utils_json:decode(Payload, [return_maps])
     ),
     ok.
 
@@ -128,7 +128,7 @@ t_license_upload_key_success(_Config) ->
             <<"start_at">> => <<"2022-01-11">>,
             <<"type">> => <<"trial">>
         },
-        emqx_json:decode(Payload, [return_maps])
+        emqx_utils_json:decode(Payload, [return_maps])
     ),
     ?assertMatch(
         #{max_connections := 999},
@@ -150,7 +150,7 @@ t_license_upload_key_bad_key(_Config) ->
             <<"code">> => <<"BAD_REQUEST">>,
             <<"message">> => <<"Bad license key">>
         },
-        emqx_json:decode(Payload, [return_maps])
+        emqx_utils_json:decode(Payload, [return_maps])
     ),
     assert_untouched_license(),
     ok.
@@ -168,7 +168,7 @@ t_license_upload_key_not_json(_Config) ->
             <<"code">> => <<"BAD_REQUEST">>,
             <<"message">> => <<"Invalid request params">>
         },
-        emqx_json:decode(Payload, [return_maps])
+        emqx_utils_json:decode(Payload, [return_maps])
     ),
     assert_untouched_license(),
     ok.

From 1880da0a2e69df8a798de27d73bea17931da92c1 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Thu, 13 Apr 2023 14:38:49 +0200
Subject: [PATCH 058/110] refactor: move binary_util to emqx_utils_binary

---
 apps/emqx_gateway_lwm2m/src/emqx_lwm2m_api.erl     |  2 +-
 apps/emqx_gateway_lwm2m/src/emqx_lwm2m_cmd.erl     |  4 ++--
 apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl | 14 +++++++-------
 apps/emqx_gateway_lwm2m/src/emqx_lwm2m_session.erl |  6 +++---
 .../src/emqx_utils_binary.erl}                     |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename apps/{emqx_gateway_lwm2m/src/binary_util.erl => emqx_utils/src/emqx_utils_binary.erl} (99%)

diff --git a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_api.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_api.erl
index 80afadb8e..ca32d03db 100644
--- a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_api.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_api.erl
@@ -227,7 +227,7 @@ to_operations(Obj, ObjDefinition) ->
     }.
 
 path_list(Path) ->
-    case binary:split(binary_util:trim(Path, $/), [<<$/>>], [global]) of
+    case binary:split(emqx_utils_binary:trim(Path, $/), [<<$/>>], [global]) of
         [ObjId, ObjInsId, ResId, ResInstId] -> [ObjId, ObjInsId, ResId, ResInstId];
         [ObjId, ObjInsId, ResId] -> [ObjId, ObjInsId, ResId];
         [ObjId, ObjInsId] -> [ObjId, ObjInsId];
diff --git a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_cmd.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_cmd.erl
index 53995c97c..8e4286343 100644
--- a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_cmd.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_cmd.erl
@@ -335,7 +335,7 @@ remove_tmp_fields(Ref) ->
 
 -spec path_list(Path :: binary()) -> {[PathWord :: binary()], [Query :: binary()]}.
 path_list(Path) ->
-    case binary:split(binary_util:trim(Path, $/), [<<$/>>], [global]) of
+    case binary:split(emqx_utils_binary:trim(Path, $/), [<<$/>>], [global]) of
         [ObjId, ObjInsId, ResId, LastPart] ->
             {ResInstId, QueryList} = query_list(LastPart),
             {[ObjId, ObjInsId, ResId, ResInstId], QueryList};
@@ -389,7 +389,7 @@ observe_seq(Options) ->
 add_alternate_path_prefix(<<"/">>, PathList) ->
     PathList;
 add_alternate_path_prefix(AlternatePath, PathList) ->
-    [binary_util:trim(AlternatePath, $/) | PathList].
+    [emqx_utils_binary:trim(AlternatePath, $/) | PathList].
 
 extract_path(Ref = #{}) ->
     drop_query(
diff --git a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl
index c3d23d4d9..c65fff441 100644
--- a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl
@@ -97,7 +97,7 @@ tlv_single_resource(BaseName, Id, Value, ObjDefinition) ->
     [#{path => BaseName, value => Val}].
 
 basename(OldBaseName, _ObjectId, ObjectInstanceId, ResourceId, 3) ->
-    case binary:split(binary_util:trim(OldBaseName, $/), [<<$/>>], [global]) of
+    case binary:split(emqx_utils_binary:trim(OldBaseName, $/), [<<$/>>], [global]) of
         [ObjId, ObjInsId, ResId] ->
             <<$/, ObjId/binary, $/, ObjInsId/binary, $/, ResId/binary>>;
         [ObjId, ObjInsId] ->
@@ -113,13 +113,13 @@ basename(OldBaseName, _ObjectId, ObjectInstanceId, ResourceId, 3) ->
             >>
     end;
 basename(OldBaseName, _ObjectId, ObjectInstanceId, _ResourceId, 2) ->
-    case binary:split(binary_util:trim(OldBaseName, $/), [<<$/>>], [global]) of
+    case binary:split(emqx_utils_binary:trim(OldBaseName, $/), [<<$/>>], [global]) of
         [ObjId, ObjInsId, _ResId] -> <<$/, ObjId/binary, $/, ObjInsId/binary>>;
         [ObjId, ObjInsId] -> <<$/, ObjId/binary, $/, ObjInsId/binary>>;
         [ObjId] -> <<$/, ObjId/binary, $/, (integer_to_binary(ObjectInstanceId))/binary>>
     end.
 % basename(OldBaseName, _ObjectId, _ObjectInstanceId, _ResourceId, 1) ->
-%    case binary:split(binary_util:trim(OldBaseName, $/), [<<$/>>], [global]) of
+%    case binary:split(emqx_utils_binary:trim(OldBaseName, $/), [<<$/>>], [global]) of
 %        [ObjId, _ObjInsId, _ResId]       -> <<$/, ObjId/binary>>;
 %        [ObjId, _ObjInsId]               -> <<$/, ObjId/binary>>;
 %        [ObjId]                          -> <<$/, ObjId/binary>>
@@ -129,7 +129,7 @@ make_path(RelativePath, Id) ->
     <<RelativePath/binary, $/, (integer_to_binary(Id))/binary>>.
 
 object_id(BaseName) ->
-    case binary:split(binary_util:trim(BaseName, $/), [<<$/>>], [global]) of
+    case binary:split(emqx_utils_binary:trim(BaseName, $/), [<<$/>>], [global]) of
         [ObjId] -> binary_to_integer(ObjId);
         [ObjId, _] -> binary_to_integer(ObjId);
         [ObjId, _, _] -> binary_to_integer(ObjId);
@@ -137,7 +137,7 @@ object_id(BaseName) ->
     end.
 
 object_resource_id(BaseName) ->
-    case binary:split(binary_util:trim(BaseName, $/), [<<$/>>], [global]) of
+    case binary:split(emqx_utils_binary:trim(BaseName, $/), [<<$/>>], [global]) of
         [_ObjIdBin1] ->
             error({invalid_basename, BaseName});
         [_ObjIdBin2, _] ->
@@ -371,8 +371,8 @@ translate_element(BaseName, [Element | ElementList], Acc) ->
     translate_element(BaseName, ElementList, NewAcc).
 
 full_path(BaseName, RelativePath) ->
-    Prefix = binary_util:rtrim(BaseName, $/),
-    Path = binary_util:ltrim(RelativePath, $/),
+    Prefix = emqx_utils_binary:rtrim(BaseName, $/),
+    Path = emqx_utils_binary:ltrim(RelativePath, $/),
     <<Prefix/binary, $/, Path/binary>>.
 
 get_element_value(#{<<"t">> := Value}) -> Value;
diff --git a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_session.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_session.erl
index c8bfa8974..e267692a6 100644
--- a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_session.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_session.erl
@@ -386,11 +386,11 @@ is_alternate_path(LinkAttrs) ->
         LinkAttrs
     ).
 
-trim(Str) -> binary_util:trim(Str, $\s).
+trim(Str) -> emqx_utils_binary:trim(Str, $\s).
 
 delink(Str) ->
-    Ltrim = binary_util:ltrim(Str, $<),
-    binary_util:rtrim(Ltrim, $>).
+    Ltrim = emqx_utils_binary:ltrim(Str, $<),
+    emqx_utils_binary:rtrim(Ltrim, $>).
 
 get_lifetime(#{<<"lt">> := LT}) ->
     case LT of
diff --git a/apps/emqx_gateway_lwm2m/src/binary_util.erl b/apps/emqx_utils/src/emqx_utils_binary.erl
similarity index 99%
rename from apps/emqx_gateway_lwm2m/src/binary_util.erl
rename to apps/emqx_utils/src/emqx_utils_binary.erl
index 68ac7a0d7..d9e504f46 100644
--- a/apps/emqx_gateway_lwm2m/src/binary_util.erl
+++ b/apps/emqx_utils/src/emqx_utils_binary.erl
@@ -14,7 +14,7 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
--module(binary_util).
+-module(emqx_utils_binary).
 
 %% copied from https://github.com/arcusfelis/binary2
 

From 9c11bfce8041e8d110b870d0b8ebffbefc9ea5e0 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Thu, 13 Apr 2023 14:45:18 +0200
Subject: [PATCH 059/110] refactor: rename emqx_misc to emqx_utils

---
 apps/emqx/src/emqx_api_lib.erl                |   2 +-
 apps/emqx/src/emqx_authentication_config.erl  |   4 +-
 apps/emqx/src/emqx_banned.erl                 |   6 +-
 apps/emqx/src/emqx_batch.erl                  |   2 +-
 apps/emqx/src/emqx_broker.erl                 |   2 +-
 apps/emqx/src/emqx_broker_helper.erl          |   2 +-
 apps/emqx/src/emqx_channel.erl                |  12 +-
 apps/emqx/src/emqx_cm.erl                     |   2 +-
 apps/emqx/src/emqx_connection.erl             |  16 +-
 apps/emqx/src/emqx_crl_cache.erl              |   8 +-
 apps/emqx/src/emqx_flapping.erl               |   2 +-
 apps/emqx/src/emqx_guid.erl                   |   4 +-
 .../src/emqx_limiter/src/emqx_htb_limiter.erl |   2 +-
 apps/emqx/src/emqx_listeners.erl              |   4 +-
 apps/emqx/src/emqx_ocsp_cache.erl             |   4 +-
 apps/emqx/src/emqx_os_mon.erl                 |   6 +-
 apps/emqx/src/emqx_pool.erl                   |   2 +-
 apps/emqx/src/emqx_router.erl                 |   2 +-
 apps/emqx/src/emqx_schema.erl                 |   2 +-
 apps/emqx/src/emqx_session.erl                |   2 +-
 apps/emqx/src/emqx_session_router.erl         |   2 +-
 apps/emqx/src/emqx_stats.erl                  |   4 +-
 apps/emqx/src/emqx_sys.erl                    |   4 +-
 apps/emqx/src/emqx_sys_mon.erl                |   4 +-
 apps/emqx/src/emqx_trace/emqx_trace.erl       |   6 +-
 .../src/emqx_trace/emqx_trace_handler.erl     |   2 +-
 apps/emqx/src/emqx_vm_mon.erl                 |   2 +-
 apps/emqx/src/emqx_ws_connection.erl          |  14 +-
 apps/emqx/test/emqx_connection_SUITE.erl      |   6 +-
 apps/emqx/test/emqx_misc_SUITE.erl            | 209 ------------------
 apps/emqx/test/emqx_router_SUITE.erl          |   2 +-
 apps/emqx_authz/src/emqx_authz_file.erl       |   2 +-
 .../test/emqx_authz_api_sources_SUITE.erl     |   6 +-
 apps/emqx_bridge/src/emqx_bridge.erl          |   2 +-
 apps/emqx_bridge/src/emqx_bridge_api.erl      |   8 +-
 apps/emqx_bridge/src/emqx_bridge_resource.erl |  10 +-
 .../test/emqx_bridge_api_SUITE.erl            |   2 +-
 .../src/emqx_bridge_kafka_impl_consumer.erl   |   4 +-
 .../emqx_bridge_kafka_impl_consumer_SUITE.erl |   8 +-
 apps/emqx_conf/src/emqx_cluster_rpc.erl       |  10 +-
 .../src/emqx_cluster_rpc_cleaner.erl          |   4 +-
 .../src/emqx_connector_http.erl               |   6 +-
 .../src/emqx_connector_ldap.erl               |   2 +-
 .../src/emqx_connector_mongo.erl              |   2 +-
 .../src/emqx_connector_mqtt.erl               |   2 +-
 .../src/emqx_connector_mysql.erl              |   2 +-
 .../src/emqx_connector_pgsql.erl              |   2 +-
 .../src/emqx_connector_redis.erl              |   2 +-
 .../src/mqtt/emqx_connector_mqtt_msg.erl      |   4 +-
 .../src/mqtt/emqx_connector_mqtt_worker.erl   |   2 +-
 .../src/emqx_dashboard_swagger.erl            |   2 +-
 apps/emqx_exhook/src/emqx_exhook_api.erl      |   2 +-
 .../src/bhvrs/emqx_gateway_conn.erl           |  18 +-
 .../src/emqx_gateway_api_clients.erl          |   2 +-
 apps/emqx_gateway/src/emqx_gateway_cm.erl     |   2 +-
 apps/emqx_gateway/src/emqx_gateway_http.erl   |   2 +-
 apps/emqx_gateway/src/emqx_gateway_utils.erl  |   4 +-
 .../src/emqx_coap_channel.erl                 |   6 +-
 .../src/emqx_coap_session.erl                 |   2 +-
 apps/emqx_gateway_coap/src/emqx_coap_tm.erl   |   6 +-
 .../src/emqx_coap_transport.erl               |   2 +-
 .../src/emqx_exproto_channel.erl              |   6 +-
 .../src/emqx_exproto_gcli.erl                 |   2 +-
 .../src/emqx_lwm2m_channel.erl                |   8 +-
 .../src/emqx_mqttsn_channel.erl               |  22 +-
 .../src/emqx_stomp_channel.erl                |  12 +-
 apps/emqx_machine/src/emqx_global_gc.erl      |   2 +-
 .../src/emqx_mgmt_api_clients.erl             |   2 +-
 .../src/emqx_mgmt_api_subscriptions.erl       |   2 +-
 .../src/emqx_mgmt_api_trace.erl               |   2 +-
 apps/emqx_management/src/emqx_mgmt_auth.erl   |   6 +-
 apps/emqx_management/src/emqx_mgmt_cli.erl    |  18 +-
 apps/emqx_modules/src/emqx_delayed.erl        |   8 +-
 apps/emqx_modules/src/emqx_telemetry.erl      |   4 +-
 .../src/emqx_plugin_libs_pool.erl             |   2 +-
 .../src/emqx_plugin_libs_rule.erl             |   2 +-
 apps/emqx_prometheus/src/emqx_prometheus.erl  |   2 +-
 .../src/emqx_resource_buffer_worker.erl       |   2 +-
 .../src/emqx_resource_manager.erl             |   4 +-
 apps/emqx_retainer/src/emqx_retainer.app.src  |   2 +-
 .../src/emqx_retainer_dispatcher.erl          |   2 +-
 .../src/emqx_rule_actions.erl                 |   2 +-
 .../src/emqx_rule_engine_api.erl              |   8 +-
 apps/emqx_rule_engine/src/emqx_rule_funcs.erl |   6 +-
 .../src/emqx_rule_sqltester.erl               |   2 +-
 apps/emqx_statsd/src/emqx_statsd.app.src      |   2 +-
 apps/emqx_statsd/src/emqx_statsd.erl          |   2 +-
 .../src/emqx_utils.erl}                       |  10 +-
 apps/emqx_utils/test/emqx_utils_SUITE.erl     | 199 +++++++++++++++--
 .../test/emqx_ee_bridge_dynamo_SUITE.erl      |   6 +-
 .../test/emqx_ee_bridge_gcp_pubsub_SUITE.erl  |   2 +-
 .../test/emqx_ee_bridge_mysql_SUITE.erl       |   2 +-
 .../src/emqx_ee_connector_cassa.erl           |   2 +-
 .../src/emqx_ee_connector_clickhouse.erl      |   6 +-
 .../src/emqx_ee_connector_dynamo.erl          |   2 +-
 .../src/emqx_ee_connector_gcp_pubsub.erl      |   4 +-
 .../src/emqx_ee_connector_influxdb.erl        |   6 +-
 .../src/emqx_ee_connector_rocketmq.erl        |   2 +-
 .../src/emqx_ee_connector_tdengine.erl        |   2 +-
 .../test/emqx_ee_schema_registry_SUITE.erl    |   2 +-
 .../src/emqx_license_http_api.erl             |   2 +-
 101 files changed, 401 insertions(+), 447 deletions(-)
 delete mode 100644 apps/emqx/test/emqx_misc_SUITE.erl
 rename apps/{emqx/src/emqx_misc.erl => emqx_utils/src/emqx_utils.erl} (99%)

diff --git a/apps/emqx/src/emqx_api_lib.erl b/apps/emqx/src/emqx_api_lib.erl
index f1d65f350..5eddf6188 100644
--- a/apps/emqx/src/emqx_api_lib.erl
+++ b/apps/emqx/src/emqx_api_lib.erl
@@ -51,7 +51,7 @@ with_node_or_cluster(Node, Fun) ->
 
 -spec lookup_node(atom() | binary()) -> {ok, atom()} | not_found.
 lookup_node(BinNode) when is_binary(BinNode) ->
-    case emqx_misc:safe_to_existing_atom(BinNode, utf8) of
+    case emqx_utils:safe_to_existing_atom(BinNode, utf8) of
         {ok, Node} ->
             is_running_node(Node);
         _Error ->
diff --git a/apps/emqx/src/emqx_authentication_config.erl b/apps/emqx/src/emqx_authentication_config.erl
index 5471b66fc..be3b35f57 100644
--- a/apps/emqx/src/emqx_authentication_config.erl
+++ b/apps/emqx/src/emqx_authentication_config.erl
@@ -277,9 +277,9 @@ atom(Bin) -> binary_to_existing_atom(Bin, utf8).
 certs_dir(ChainName, ConfigOrID) ->
     DirName = dir(ChainName, ConfigOrID),
     SubDir = iolist_to_binary(filename:join(["authn", DirName])),
-    emqx_misc:safe_filename(SubDir).
+    emqx_utils:safe_filename(SubDir).
 
 dir(ChainName, ID) when is_binary(ID) ->
-    emqx_misc:safe_filename(iolist_to_binary([to_bin(ChainName), "-", ID]));
+    emqx_utils:safe_filename(iolist_to_binary([to_bin(ChainName), "-", ID]));
 dir(ChainName, Config) when is_map(Config) ->
     dir(ChainName, authenticator_id(Config)).
diff --git a/apps/emqx/src/emqx_banned.erl b/apps/emqx/src/emqx_banned.erl
index 758c570da..a0ccd93d7 100644
--- a/apps/emqx/src/emqx_banned.erl
+++ b/apps/emqx/src/emqx_banned.erl
@@ -243,7 +243,7 @@ handle_info(Info, State) ->
     {noreply, State}.
 
 terminate(_Reason, #{expiry_timer := TRef}) ->
-    emqx_misc:cancel_timer(TRef).
+    emqx_utils:cancel_timer(TRef).
 
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
@@ -254,10 +254,10 @@ code_change(_OldVsn, State, _Extra) ->
 
 -ifdef(TEST).
 ensure_expiry_timer(State) ->
-    State#{expiry_timer := emqx_misc:start_timer(10, expire)}.
+    State#{expiry_timer := emqx_utils:start_timer(10, expire)}.
 -else.
 ensure_expiry_timer(State) ->
-    State#{expiry_timer := emqx_misc:start_timer(timer:minutes(1), expire)}.
+    State#{expiry_timer := emqx_utils:start_timer(timer:minutes(1), expire)}.
 -endif.
 
 expire_banned_items(Now) ->
diff --git a/apps/emqx/src/emqx_batch.erl b/apps/emqx/src/emqx_batch.erl
index 2fe09942c..22e812975 100644
--- a/apps/emqx/src/emqx_batch.erl
+++ b/apps/emqx/src/emqx_batch.erl
@@ -85,7 +85,7 @@ commit(Batch = #batch{batch_q = Q, commit_fun = Commit}) ->
     reset(Batch).
 
 reset(Batch = #batch{linger_timer = TRef}) ->
-    _ = emqx_misc:cancel_timer(TRef),
+    _ = emqx_utils:cancel_timer(TRef),
     Batch#batch{batch_q = [], linger_timer = undefined}.
 
 -spec size(batch()) -> non_neg_integer().
diff --git a/apps/emqx/src/emqx_broker.erl b/apps/emqx/src/emqx_broker.erl
index d56620123..7e00c050e 100644
--- a/apps/emqx/src/emqx_broker.erl
+++ b/apps/emqx/src/emqx_broker.erl
@@ -92,7 +92,7 @@
 start_link(Pool, Id) ->
     ok = create_tabs(),
     gen_server:start_link(
-        {local, emqx_misc:proc_name(?BROKER, Id)},
+        {local, emqx_utils:proc_name(?BROKER, Id)},
         ?MODULE,
         [Pool, Id],
         []
diff --git a/apps/emqx/src/emqx_broker_helper.erl b/apps/emqx/src/emqx_broker_helper.erl
index 91b4c4994..87b291361 100644
--- a/apps/emqx/src/emqx_broker_helper.erl
+++ b/apps/emqx/src/emqx_broker_helper.erl
@@ -131,7 +131,7 @@ handle_cast(Msg, State) ->
     {noreply, State}.
 
 handle_info({'DOWN', _MRef, process, SubPid, _Reason}, State = #{pmon := PMon}) ->
-    SubPids = [SubPid | emqx_misc:drain_down(?BATCH_SIZE)],
+    SubPids = [SubPid | emqx_utils:drain_down(?BATCH_SIZE)],
     ok = emqx_pool:async_submit(
         fun lists:foreach/2, [fun clean_down/1, SubPids]
     ),
diff --git a/apps/emqx/src/emqx_channel.erl b/apps/emqx/src/emqx_channel.erl
index 29a59e482..745429536 100644
--- a/apps/emqx/src/emqx_channel.erl
+++ b/apps/emqx/src/emqx_channel.erl
@@ -61,7 +61,7 @@
 -export([set_field/3]).
 
 -import(
-    emqx_misc,
+    emqx_utils,
     [
         run_fold/3,
         pipeline/3,
@@ -622,7 +622,7 @@ process_connect(
             NChannel = Channel#channel{session = Session},
             handle_out(connack, {?RC_SUCCESS, sp(false), AckProps}, ensure_connected(NChannel));
         {ok, #{session := Session, present := true, pendings := Pendings}} ->
-            Pendings1 = lists:usort(lists:append(Pendings, emqx_misc:drain_deliver())),
+            Pendings1 = lists:usort(lists:append(Pendings, emqx_utils:drain_deliver())),
             NChannel = Channel#channel{
                 session = Session,
                 resuming = true,
@@ -1203,7 +1203,7 @@ handle_call(
 ) ->
     ok = emqx_session:takeover(Session),
     %% TODO: Should not drain deliver here (side effect)
-    Delivers = emqx_misc:drain_deliver(),
+    Delivers = emqx_utils:drain_deliver(),
     AllPendings = lists:append(Delivers, Pendings),
     disconnect_and_shutdown(takenover, AllPendings, Channel);
 handle_call(list_authz_cache, Channel) ->
@@ -1402,7 +1402,7 @@ ensure_timer(Name, Channel = #channel{timers = Timers}) ->
 
 ensure_timer(Name, Time, Channel = #channel{timers = Timers}) ->
     Msg = maps:get(Name, ?TIMER_TABLE),
-    TRef = emqx_misc:start_timer(Time, Msg),
+    TRef = emqx_utils:start_timer(Time, Msg),
     Channel#channel{timers = Timers#{Name => TRef}}.
 
 reset_timer(Name, Channel) ->
@@ -2045,7 +2045,7 @@ clear_keepalive(Channel = #channel{timers = Timers}) ->
         undefined ->
             Channel;
         TRef ->
-            emqx_misc:cancel_timer(TRef),
+            emqx_utils:cancel_timer(TRef),
             Channel#channel{timers = maps:without([alive_timer], Timers)}
     end.
 %%--------------------------------------------------------------------
@@ -2241,7 +2241,7 @@ get_mqtt_conf(Zone, Key, Default) ->
 %%--------------------------------------------------------------------
 
 set_field(Name, Value, Channel) ->
-    Pos = emqx_misc:index_of(Name, record_info(fields, channel)),
+    Pos = emqx_utils:index_of(Name, record_info(fields, channel)),
     setelement(Pos + 1, Channel, Value).
 
 get_mqueue(#channel{session = Session}) ->
diff --git a/apps/emqx/src/emqx_cm.erl b/apps/emqx/src/emqx_cm.erl
index f8c510482..346e8dcb5 100644
--- a/apps/emqx/src/emqx_cm.erl
+++ b/apps/emqx/src/emqx_cm.erl
@@ -672,7 +672,7 @@ handle_cast(Msg, State) ->
 
 handle_info({'DOWN', _MRef, process, Pid, _Reason}, State = #{chan_pmon := PMon}) ->
     ?tp(emqx_cm_process_down, #{stale_pid => Pid, reason => _Reason}),
-    ChanPids = [Pid | emqx_misc:drain_down(?BATCH_SIZE)],
+    ChanPids = [Pid | emqx_utils:drain_down(?BATCH_SIZE)],
     {Items, PMon1} = emqx_pmon:erase_all(ChanPids, PMon),
     lists:foreach(fun mark_channel_disconnected/1, ChanPids),
     ok = emqx_pool:async_submit(fun lists:foreach/2, [fun ?MODULE:clean_down/1, Items]),
diff --git a/apps/emqx/src/emqx_connection.erl b/apps/emqx/src/emqx_connection.erl
index e5002cab4..8d47f033c 100644
--- a/apps/emqx/src/emqx_connection.erl
+++ b/apps/emqx/src/emqx_connection.erl
@@ -77,7 +77,7 @@
 -export([set_field/3]).
 
 -import(
-    emqx_misc,
+    emqx_utils,
     [start_timer/2]
 ).
 
@@ -260,7 +260,7 @@ stats(#state{
             {error, _} -> []
         end,
     ChanStats = emqx_channel:stats(Channel),
-    ProcStats = emqx_misc:proc_stats(),
+    ProcStats = emqx_utils:proc_stats(),
     lists:append([SockStats, ChanStats, ProcStats]).
 
 %% @doc Set TCP keepalive socket options to override system defaults.
@@ -392,7 +392,7 @@ run_loop(
         emqx_channel:info(zone, Channel),
         [force_shutdown]
     ),
-    emqx_misc:tune_heap_size(ShutdownPolicy),
+    emqx_utils:tune_heap_size(ShutdownPolicy),
     case activate_socket(State) of
         {ok, NState} ->
             hibernate(Parent, NState);
@@ -472,7 +472,7 @@ ensure_stats_timer(_Timeout, State) ->
 -compile({inline, [cancel_stats_timer/1]}).
 cancel_stats_timer(State = #state{stats_timer = TRef}) when is_reference(TRef) ->
     ?tp(debug, cancel_stats_timer, #{}),
-    ok = emqx_misc:cancel_timer(TRef),
+    ok = emqx_utils:cancel_timer(TRef),
     State#state{stats_timer = undefined};
 cancel_stats_timer(State) ->
     State.
@@ -558,7 +558,7 @@ handle_msg(
     {incoming, Packet = ?CONNECT_PACKET(ConnPkt)},
     State = #state{idle_timer = IdleTimer}
 ) ->
-    ok = emqx_misc:cancel_timer(IdleTimer),
+    ok = emqx_utils:cancel_timer(IdleTimer),
     Serialize = emqx_frame:serialize_opts(ConnPkt),
     NState = State#state{
         serialize = Serialize,
@@ -593,7 +593,7 @@ handle_msg(
     #state{listener = {Type, Listener}} = State
 ) ->
     ActiveN = get_active_n(Type, Listener),
-    Delivers = [Deliver | emqx_misc:drain_deliver(ActiveN)],
+    Delivers = [Deliver | emqx_utils:drain_deliver(ActiveN)],
     with_channel(handle_deliver, [Delivers], State);
 %% Something sent
 handle_msg({inet_reply, _Sock, ok}, State = #state{listener = {Type, Listener}}) ->
@@ -1073,7 +1073,7 @@ check_oom(State = #state{channel = Channel}) ->
         emqx_channel:info(zone, Channel), [force_shutdown]
     ),
     ?tp(debug, check_oom, #{policy => ShutdownPolicy}),
-    case emqx_misc:check_oom(ShutdownPolicy) of
+    case emqx_utils:check_oom(ShutdownPolicy) of
         {shutdown, Reason} ->
             %% triggers terminate/2 callback immediately
             erlang:exit({shutdown, Reason});
@@ -1200,7 +1200,7 @@ inc_counter(Key, Inc) ->
 %%--------------------------------------------------------------------
 
 set_field(Name, Value, State) ->
-    Pos = emqx_misc:index_of(Name, record_info(fields, state)),
+    Pos = emqx_utils:index_of(Name, record_info(fields, state)),
     setelement(Pos + 1, State, Value).
 
 get_state(Pid) ->
diff --git a/apps/emqx/src/emqx_crl_cache.erl b/apps/emqx/src/emqx_crl_cache.erl
index 79e47a6dc..084313420 100644
--- a/apps/emqx/src/emqx_crl_cache.erl
+++ b/apps/emqx/src/emqx_crl_cache.erl
@@ -117,7 +117,7 @@ handle_call(Call, _From, State) ->
 handle_cast({evict, URL}, State0 = #state{refresh_timers = RefreshTimers0}) ->
     emqx_ssl_crl_cache:delete(URL),
     MTimer = maps:get(URL, RefreshTimers0, undefined),
-    emqx_misc:cancel_timer(MTimer),
+    emqx_utils:cancel_timer(MTimer),
     RefreshTimers = maps:without([URL], RefreshTimers0),
     State = State0#state{refresh_timers = RefreshTimers},
     ?tp(
@@ -223,9 +223,9 @@ ensure_timer(URL, State = #state{refresh_interval = Timeout}) ->
 ensure_timer(URL, State = #state{refresh_timers = RefreshTimers0}, Timeout) ->
     ?tp(crl_cache_ensure_timer, #{url => URL, timeout => Timeout}),
     MTimer = maps:get(URL, RefreshTimers0, undefined),
-    emqx_misc:cancel_timer(MTimer),
+    emqx_utils:cancel_timer(MTimer),
     RefreshTimers = RefreshTimers0#{
-        URL => emqx_misc:start_timer(
+        URL => emqx_utils:start_timer(
             Timeout,
             {refresh, URL}
         )
@@ -297,7 +297,7 @@ handle_cache_overflow(State0) ->
             {_Time, OldestURL, InsertionTimes} = gb_trees:take_smallest(InsertionTimes0),
             emqx_ssl_crl_cache:delete(OldestURL),
             MTimer = maps:get(OldestURL, RefreshTimers0, undefined),
-            emqx_misc:cancel_timer(MTimer),
+            emqx_utils:cancel_timer(MTimer),
             RefreshTimers = maps:remove(OldestURL, RefreshTimers0),
             CachedURLs = sets:del_element(OldestURL, CachedURLs0),
             ?tp(debug, crl_cache_overflow, #{oldest_url => OldestURL}),
diff --git a/apps/emqx/src/emqx_flapping.erl b/apps/emqx/src/emqx_flapping.erl
index 64e4ed6c3..2cfed0a8e 100644
--- a/apps/emqx/src/emqx_flapping.erl
+++ b/apps/emqx/src/emqx_flapping.erl
@@ -184,7 +184,7 @@ code_change(_OldVsn, State, _Extra) ->
 
 start_timer(Zone) ->
     WindTime = maps:get(window_time, get_policy(Zone)),
-    emqx_misc:start_timer(WindTime, {garbage_collect, Zone}).
+    emqx_utils:start_timer(WindTime, {garbage_collect, Zone}).
 
 start_timers() ->
     lists:foreach(
diff --git a/apps/emqx/src/emqx_guid.erl b/apps/emqx/src/emqx_guid.erl
index fea4e70b0..d313723fb 100644
--- a/apps/emqx/src/emqx_guid.erl
+++ b/apps/emqx/src/emqx_guid.erl
@@ -145,10 +145,10 @@ npid() ->
     NPid.
 
 to_hexstr(I) when byte_size(I) =:= 16 ->
-    emqx_misc:bin_to_hexstr(I, upper).
+    emqx_utils:bin_to_hexstr(I, upper).
 
 from_hexstr(S) when byte_size(S) =:= 32 ->
-    emqx_misc:hexstr_to_bin(S).
+    emqx_utils:hexstr_to_bin(S).
 
 to_base62(<<I:128>>) ->
     emqx_base62:encode(I).
diff --git a/apps/emqx/src/emqx_limiter/src/emqx_htb_limiter.erl b/apps/emqx/src/emqx_limiter/src/emqx_htb_limiter.erl
index 83bc2ec72..bbebd9460 100644
--- a/apps/emqx/src/emqx_limiter/src/emqx_htb_limiter.erl
+++ b/apps/emqx/src/emqx_limiter/src/emqx_htb_limiter.erl
@@ -375,7 +375,7 @@ return_pause(infinity, PauseType, Fun, Diff, Limiter) ->
     {PauseType, ?MINIMUM_PAUSE, make_retry_context(Fun, Diff), Limiter};
 return_pause(Rate, PauseType, Fun, Diff, Limiter) ->
     Val = erlang:round(Diff * emqx_limiter_schema:default_period() / Rate),
-    Pause = emqx_misc:clamp(Val, ?MINIMUM_PAUSE, ?MAXIMUM_PAUSE),
+    Pause = emqx_utils:clamp(Val, ?MINIMUM_PAUSE, ?MAXIMUM_PAUSE),
     {PauseType, Pause, make_retry_context(Fun, Diff), Limiter}.
 
 -spec make_retry_context(undefined | retry_fun(Limiter), non_neg_integer()) ->
diff --git a/apps/emqx/src/emqx_listeners.erl b/apps/emqx/src/emqx_listeners.erl
index 4e5843166..96e28b1de 100644
--- a/apps/emqx/src/emqx_listeners.erl
+++ b/apps/emqx/src/emqx_listeners.erl
@@ -538,7 +538,7 @@ esockd_access_rules(StrRules) ->
         [A, CIDR] = string:tokens(S, " "),
         %% esockd rules only use words 'allow' and 'deny', both are existing
         %% comparison of strings may be better, but there is a loss of backward compatibility
-        case emqx_misc:safe_to_existing_atom(A) of
+        case emqx_utils:safe_to_existing_atom(A) of
             {ok, Action} ->
                 [
                     {
@@ -560,7 +560,7 @@ esockd_access_rules(StrRules) ->
 merge_default(Options) ->
     case lists:keytake(tcp_options, 1, Options) of
         {value, {tcp_options, TcpOpts}, Options1} ->
-            [{tcp_options, emqx_misc:merge_opts(?MQTT_SOCKOPTS, TcpOpts)} | Options1];
+            [{tcp_options, emqx_utils:merge_opts(?MQTT_SOCKOPTS, TcpOpts)} | Options1];
         false ->
             [{tcp_options, ?MQTT_SOCKOPTS} | Options]
     end.
diff --git a/apps/emqx/src/emqx_ocsp_cache.erl b/apps/emqx/src/emqx_ocsp_cache.erl
index 4e7ada044..7044d992e 100644
--- a/apps/emqx/src/emqx_ocsp_cache.erl
+++ b/apps/emqx/src/emqx_ocsp_cache.erl
@@ -476,9 +476,9 @@ ensure_timer(ListenerID, State, Timeout) ->
     ensure_timer(ListenerID, {refresh, ListenerID}, State, Timeout).
 
 ensure_timer(ListenerID, Message, State, Timeout) ->
-    emqx_misc:cancel_timer(maps:get(?REFRESH_TIMER(ListenerID), State, undefined)),
+    emqx_utils:cancel_timer(maps:get(?REFRESH_TIMER(ListenerID), State, undefined)),
     State#{
-        ?REFRESH_TIMER(ListenerID) => emqx_misc:start_timer(
+        ?REFRESH_TIMER(ListenerID) => emqx_utils:start_timer(
             Timeout,
             Message
         )
diff --git a/apps/emqx/src/emqx_os_mon.erl b/apps/emqx/src/emqx_os_mon.erl
index c5ce35bf9..4810798eb 100644
--- a/apps/emqx/src/emqx_os_mon.erl
+++ b/apps/emqx/src/emqx_os_mon.erl
@@ -180,8 +180,8 @@ code_change(_OldVsn, State, _Extra) ->
 %% Internal functions
 %%--------------------------------------------------------------------
 cancel_outdated_timer(#{mem_time_ref := MemRef, cpu_time_ref := CpuRef}) ->
-    emqx_misc:cancel_timer(MemRef),
-    emqx_misc:cancel_timer(CpuRef),
+    emqx_utils:cancel_timer(MemRef),
+    emqx_utils:cancel_timer(CpuRef),
     ok.
 
 start_cpu_check_timer() ->
@@ -204,7 +204,7 @@ start_mem_check_timer() ->
     end.
 
 start_timer(Interval, Msg) ->
-    emqx_misc:start_timer(Interval, Msg).
+    emqx_utils:start_timer(Interval, Msg).
 
 update_mem_alarm_status(HWM) when HWM > 1.0 orelse HWM < 0.0 ->
     ?SLOG(warning, #{msg => "discarded_out_of_range_mem_alarm_threshold", value => HWM}),
diff --git a/apps/emqx/src/emqx_pool.erl b/apps/emqx/src/emqx_pool.erl
index 1691a533a..1cb5f429c 100644
--- a/apps/emqx/src/emqx_pool.erl
+++ b/apps/emqx/src/emqx_pool.erl
@@ -57,7 +57,7 @@
 -spec start_link(atom(), pos_integer()) -> startlink_ret().
 start_link(Pool, Id) ->
     gen_server:start_link(
-        {local, emqx_misc:proc_name(?MODULE, Id)},
+        {local, emqx_utils:proc_name(?MODULE, Id)},
         ?MODULE,
         [Pool, Id],
         [{hibernate_after, 1000}]
diff --git a/apps/emqx/src/emqx_router.erl b/apps/emqx/src/emqx_router.erl
index 7c9cc61b0..42430af5d 100644
--- a/apps/emqx/src/emqx_router.erl
+++ b/apps/emqx/src/emqx_router.erl
@@ -98,7 +98,7 @@ mnesia(boot) ->
 -spec start_link(atom(), pos_integer()) -> startlink_ret().
 start_link(Pool, Id) ->
     gen_server:start_link(
-        {local, emqx_misc:proc_name(?MODULE, Id)},
+        {local, emqx_utils:proc_name(?MODULE, Id)},
         ?MODULE,
         [Pool, Id],
         [{hibernate_after, 1000}]
diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 8c91ae782..96d9aea34 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -2327,7 +2327,7 @@ mqtt_ssl_listener_ssl_options_validator(Conf) ->
         fun ocsp_outer_validator/1,
         fun crl_outer_validator/1
     ],
-    case emqx_misc:pipeline(Checks, Conf, not_used) of
+    case emqx_utils:pipeline(Checks, Conf, not_used) of
         {ok, _, _} ->
             ok;
         {error, Reason, _NotUsed} ->
diff --git a/apps/emqx/src/emqx_session.erl b/apps/emqx/src/emqx_session.erl
index a13dfe491..8b15340e9 100644
--- a/apps/emqx/src/emqx_session.erl
+++ b/apps/emqx/src/emqx_session.erl
@@ -941,7 +941,7 @@ age(Now, Ts) -> Now - Ts.
 %%--------------------------------------------------------------------
 
 set_field(Name, Value, Session) ->
-    Pos = emqx_misc:index_of(Name, record_info(fields, session)),
+    Pos = emqx_utils:index_of(Name, record_info(fields, session)),
     setelement(Pos + 1, Session, Value).
 
 get_mqueue(#session{mqueue = Q}) ->
diff --git a/apps/emqx/src/emqx_session_router.erl b/apps/emqx/src/emqx_session_router.erl
index 0d4972e8c..8a21d4d03 100644
--- a/apps/emqx/src/emqx_session_router.erl
+++ b/apps/emqx/src/emqx_session_router.erl
@@ -104,7 +104,7 @@ create_init_tab() ->
 -spec start_link(atom(), pos_integer()) -> startlink_ret().
 start_link(Pool, Id) ->
     gen_server:start_link(
-        {local, emqx_misc:proc_name(?MODULE, Id)},
+        {local, emqx_utils:proc_name(?MODULE, Id)},
         ?MODULE,
         [Pool, Id],
         [{hibernate_after, 1000}]
diff --git a/apps/emqx/src/emqx_stats.erl b/apps/emqx/src/emqx_stats.erl
index ed901d9a9..017b83116 100644
--- a/apps/emqx/src/emqx_stats.erl
+++ b/apps/emqx/src/emqx_stats.erl
@@ -213,7 +213,7 @@ init(#{tick_ms := TickMs}) ->
     {ok, start_timer(#state{updates = [], tick_ms = TickMs}), hibernate}.
 
 start_timer(#state{tick_ms = Ms} = State) ->
-    State#state{timer = emqx_misc:start_timer(Ms, tick)}.
+    State#state{timer = emqx_utils:start_timer(Ms, tick)}.
 
 handle_call(stop, _From, State) ->
     {stop, normal, ok, State};
@@ -301,7 +301,7 @@ handle_info(Info, State) ->
     {noreply, State}.
 
 terminate(_Reason, #state{timer = TRef}) ->
-    emqx_misc:cancel_timer(TRef).
+    emqx_utils:cancel_timer(TRef).
 
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
diff --git a/apps/emqx/src/emqx_sys.erl b/apps/emqx/src/emqx_sys.erl
index af2b052aa..509429796 100644
--- a/apps/emqx/src/emqx_sys.erl
+++ b/apps/emqx/src/emqx_sys.erl
@@ -62,7 +62,7 @@
 -endif.
 
 -import(emqx_topic, [systop/1]).
--import(emqx_misc, [start_timer/2]).
+-import(emqx_utils, [start_timer/2]).
 
 -record(state, {
     heartbeat :: maybe(reference()),
@@ -222,7 +222,7 @@ handle_info(Info, State) ->
 terminate(_Reason, #state{heartbeat = TRef1, ticker = TRef2}) ->
     _ = emqx_config_handler:remove_handler(?CONF_KEY_PATH),
     unload_event_hooks(sys_event_messages()),
-    lists:foreach(fun emqx_misc:cancel_timer/1, [TRef1, TRef2]).
+    lists:foreach(fun emqx_utils:cancel_timer/1, [TRef1, TRef2]).
 
 unload_event_hooks([]) ->
     ok;
diff --git a/apps/emqx/src/emqx_sys_mon.erl b/apps/emqx/src/emqx_sys_mon.erl
index 6ff68820e..f1190f586 100644
--- a/apps/emqx/src/emqx_sys_mon.erl
+++ b/apps/emqx/src/emqx_sys_mon.erl
@@ -77,7 +77,7 @@ init([]) ->
     {ok, start_timer(#{timer => undefined, events => []})}.
 
 start_timer(State) ->
-    State#{timer := emqx_misc:start_timer(timer:seconds(2), reset)}.
+    State#{timer := emqx_utils:start_timer(timer:seconds(2), reset)}.
 
 sysm_opts(VM) ->
     sysm_opts(maps:to_list(VM), []).
@@ -204,7 +204,7 @@ handle_info(Info, State) ->
     {noreply, State}.
 
 terminate(_Reason, #{timer := TRef}) ->
-    emqx_misc:cancel_timer(TRef),
+    emqx_utils:cancel_timer(TRef),
     ok.
 
 code_change(_OldVsn, State, _Extra) ->
diff --git a/apps/emqx/src/emqx_trace/emqx_trace.erl b/apps/emqx/src/emqx_trace/emqx_trace.erl
index f14dc0c15..91194772f 100644
--- a/apps/emqx/src/emqx_trace/emqx_trace.erl
+++ b/apps/emqx/src/emqx_trace/emqx_trace.erl
@@ -272,7 +272,7 @@ handle_info({timeout, TRef, update_trace}, #{timer := TRef} = State) ->
     ?tp(update_trace_done, #{}),
     {noreply, State#{timer => NextTRef}};
 handle_info({mnesia_table_event, _Events}, State = #{timer := TRef}) ->
-    emqx_misc:cancel_timer(TRef),
+    emqx_utils:cancel_timer(TRef),
     handle_info({timeout, TRef, update_trace}, State);
 handle_info(Info, State) ->
     ?SLOG(error, #{unexpected_info => Info}),
@@ -280,7 +280,7 @@ handle_info(Info, State) ->
 
 terminate(_Reason, #{timer := TRef}) ->
     _ = mnesia:unsubscribe({table, ?TRACE, simple}),
-    emqx_misc:cancel_timer(TRef),
+    emqx_utils:cancel_timer(TRef),
     stop_all_trace_handler(),
     update_trace_handler(),
     _ = file:del_dir_r(zip_dir()),
@@ -302,7 +302,7 @@ update_trace(Traces) ->
     ok = stop_trace(NeedStop, Started),
     clean_stale_trace_files(),
     NextTime = find_closest_time(Traces, Now),
-    emqx_misc:start_timer(NextTime, update_trace).
+    emqx_utils:start_timer(NextTime, update_trace).
 
 stop_all_trace_handler() ->
     lists:foreach(
diff --git a/apps/emqx/src/emqx_trace/emqx_trace_handler.erl b/apps/emqx/src/emqx_trace/emqx_trace_handler.erl
index 231fd5e7b..528bc4d42 100644
--- a/apps/emqx/src/emqx_trace/emqx_trace_handler.erl
+++ b/apps/emqx/src/emqx_trace/emqx_trace_handler.erl
@@ -196,7 +196,7 @@ handler_id(Name, Type) ->
         do_handler_id(Name, Type)
     catch
         _:_ ->
-            Hash = emqx_misc:bin_to_hexstr(crypto:hash(md5, Name), lower),
+            Hash = emqx_utils:bin_to_hexstr(crypto:hash(md5, Name), lower),
             do_handler_id(Hash, Type)
     end.
 
diff --git a/apps/emqx/src/emqx_vm_mon.erl b/apps/emqx/src/emqx_vm_mon.erl
index 1327a1bb0..d90d4139b 100644
--- a/apps/emqx/src/emqx_vm_mon.erl
+++ b/apps/emqx/src/emqx_vm_mon.erl
@@ -107,7 +107,7 @@ code_change(_OldVsn, State, _Extra) ->
 
 start_check_timer() ->
     Interval = emqx:get_config([sysmon, vm, process_check_interval]),
-    emqx_misc:start_timer(Interval, check).
+    emqx_utils:start_timer(Interval, check).
 
 usage(Percent) ->
     integer_to_list(floor(Percent * 100)) ++ "%".
diff --git a/apps/emqx/src/emqx_ws_connection.erl b/apps/emqx/src/emqx_ws_connection.erl
index ead609ed8..20962809f 100644
--- a/apps/emqx/src/emqx_ws_connection.erl
+++ b/apps/emqx/src/emqx_ws_connection.erl
@@ -52,7 +52,7 @@
 -export([set_field/3]).
 
 -import(
-    emqx_misc,
+    emqx_utils,
     [
         maybe_apply/2,
         start_timer/2
@@ -172,7 +172,7 @@ stats(WsPid) when is_pid(WsPid) ->
 stats(#state{channel = Channel}) ->
     SockStats = emqx_pd:get_counters(?SOCK_STATS),
     ChanStats = emqx_channel:stats(Channel),
-    ProcStats = emqx_misc:proc_stats(),
+    ProcStats = emqx_utils:proc_stats(),
     lists:append([SockStats, ChanStats, ProcStats]).
 
 %% kick|discard|takeover
@@ -340,7 +340,7 @@ tune_heap_size(Channel) ->
         )
     of
         #{enable := false} -> ok;
-        ShutdownPolicy -> emqx_misc:tune_heap_size(ShutdownPolicy)
+        ShutdownPolicy -> emqx_utils:tune_heap_size(ShutdownPolicy)
     end.
 
 get_stats_enable(Zone) ->
@@ -454,7 +454,7 @@ websocket_info(
     State = #state{listener = {Type, Listener}}
 ) ->
     ActiveN = get_active_n(Type, Listener),
-    Delivers = [Deliver | emqx_misc:drain_deliver(ActiveN)],
+    Delivers = [Deliver | emqx_utils:drain_deliver(ActiveN)],
     with_channel(handle_deliver, [Delivers], State);
 websocket_info(
     {timeout, _, limit_timeout},
@@ -678,7 +678,7 @@ check_oom(State = #state{channel = Channel}) ->
         #{enable := false} ->
             State;
         #{enable := true} ->
-            case emqx_misc:check_oom(ShutdownPolicy) of
+            case emqx_utils:check_oom(ShutdownPolicy) of
                 Shutdown = {shutdown, _Reason} ->
                     postpone(Shutdown, State);
                 _Other ->
@@ -913,7 +913,7 @@ inc_qos_stats_key(_, _) -> undefined.
 %% Cancel idle timer
 
 cancel_idle_timer(State = #state{idle_timer = IdleTimer}) ->
-    ok = emqx_misc:cancel_timer(IdleTimer),
+    ok = emqx_utils:cancel_timer(IdleTimer),
     State#state{idle_timer = undefined}.
 
 %%--------------------------------------------------------------------
@@ -1046,7 +1046,7 @@ check_max_connection(Type, Listener) ->
 %%--------------------------------------------------------------------
 
 set_field(Name, Value, State) ->
-    Pos = emqx_misc:index_of(Name, record_info(fields, state)),
+    Pos = emqx_utils:index_of(Name, record_info(fields, state)),
     setelement(Pos + 1, State, Value).
 
 %% ensure lowercase letters in headers
diff --git a/apps/emqx/test/emqx_connection_SUITE.erl b/apps/emqx/test/emqx_connection_SUITE.erl
index cc9e03168..21ed45119 100644
--- a/apps/emqx/test/emqx_connection_SUITE.erl
+++ b/apps/emqx/test/emqx_connection_SUITE.erl
@@ -496,16 +496,16 @@ t_get_conn_info(_) ->
 
 t_oom_shutdown(init, Config) ->
     ok = snabbkaffe:start_trace(),
-    ok = meck:new(emqx_misc, [non_strict, passthrough, no_history, no_link]),
+    ok = meck:new(emqx_utils, [non_strict, passthrough, no_history, no_link]),
     meck:expect(
-        emqx_misc,
+        emqx_utils,
         check_oom,
         fun(_) -> {shutdown, "fake_oom"} end
     ),
     Config;
 t_oom_shutdown('end', _Config) ->
     snabbkaffe:stop(),
-    meck:unload(emqx_misc),
+    meck:unload(emqx_utils),
     ok.
 
 t_oom_shutdown(_) ->
diff --git a/apps/emqx/test/emqx_misc_SUITE.erl b/apps/emqx/test/emqx_misc_SUITE.erl
deleted file mode 100644
index c068a087e..000000000
--- a/apps/emqx/test/emqx_misc_SUITE.erl
+++ /dev/null
@@ -1,209 +0,0 @@
-%%--------------------------------------------------------------------
-%% Copyright (c) 2018-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%--------------------------------------------------------------------
-
--module(emqx_misc_SUITE).
-
--compile(export_all).
--compile(nowarn_export_all).
-
--include_lib("eunit/include/eunit.hrl").
-
--define(SOCKOPTS, [
-    binary,
-    {packet, raw},
-    {reuseaddr, true},
-    {backlog, 512},
-    {nodelay, true}
-]).
-
-all() -> emqx_common_test_helpers:all(?MODULE).
-
-t_merge_opts(_) ->
-    Opts = emqx_misc:merge_opts(?SOCKOPTS, [
-        raw,
-        binary,
-        {backlog, 1024},
-        {nodelay, false},
-        {max_clients, 1024},
-        {acceptors, 16}
-    ]),
-    ?assertEqual(1024, proplists:get_value(backlog, Opts)),
-    ?assertEqual(1024, proplists:get_value(max_clients, Opts)),
-    ?assertEqual(
-        [
-            binary,
-            raw,
-            {acceptors, 16},
-            {backlog, 1024},
-            {max_clients, 1024},
-            {nodelay, false},
-            {packet, raw},
-            {reuseaddr, true}
-        ],
-        lists:sort(Opts)
-    ).
-
-t_maybe_apply(_) ->
-    ?assertEqual(undefined, emqx_misc:maybe_apply(fun(A) -> A end, undefined)),
-    ?assertEqual(a, emqx_misc:maybe_apply(fun(A) -> A end, a)).
-
-t_run_fold(_) ->
-    ?assertEqual(1, emqx_misc:run_fold([], 1, state)),
-    Add = fun(I, St) -> I + St end,
-    Mul = fun(I, St) -> I * St end,
-    ?assertEqual(6, emqx_misc:run_fold([Add, Mul], 1, 2)).
-
-t_pipeline(_) ->
-    ?assertEqual({ok, input, state}, emqx_misc:pipeline([], input, state)),
-    Funs = [
-        fun(_I, _St) -> ok end,
-        fun(_I, St) -> {ok, St + 1} end,
-        fun(I, St) -> {ok, I + 1, St + 1} end,
-        fun(I, St) -> {ok, I * 2, St * 2} end
-    ],
-    ?assertEqual({ok, 4, 6}, emqx_misc:pipeline(Funs, 1, 1)),
-    ?assertEqual(
-        {error, undefined, 1}, emqx_misc:pipeline([fun(_I) -> {error, undefined} end], 1, 1)
-    ),
-    ?assertEqual(
-        {error, undefined, 2}, emqx_misc:pipeline([fun(_I, _St) -> {error, undefined, 2} end], 1, 1)
-    ).
-
-t_start_timer(_) ->
-    TRef = emqx_misc:start_timer(1, tmsg),
-    timer:sleep(2),
-    ?assertEqual([{timeout, TRef, tmsg}], drain()),
-    ok = emqx_misc:cancel_timer(TRef).
-
-t_cancel_timer(_) ->
-    Timer = emqx_misc:start_timer(0, foo),
-    ok = emqx_misc:cancel_timer(Timer),
-    ?assertEqual([], drain()),
-    ok = emqx_misc:cancel_timer(undefined).
-
-t_proc_name(_) ->
-    ?assertEqual(emqx_pool_1, emqx_misc:proc_name(emqx_pool, 1)).
-
-t_proc_stats(_) ->
-    Pid1 = spawn(fun() -> exit(normal) end),
-    timer:sleep(10),
-    ?assertEqual([], emqx_misc:proc_stats(Pid1)),
-    Pid2 = spawn(fun() ->
-        ?assertMatch([{mailbox_len, 0} | _], emqx_misc:proc_stats()),
-        timer:sleep(200)
-    end),
-    timer:sleep(10),
-    Pid2 ! msg,
-    timer:sleep(10),
-    ?assertMatch([{mailbox_len, 1} | _], emqx_misc:proc_stats(Pid2)).
-
-t_drain_deliver(_) ->
-    self() ! {deliver, t1, m1},
-    self() ! {deliver, t2, m2},
-    ?assertEqual(
-        [
-            {deliver, t1, m1},
-            {deliver, t2, m2}
-        ],
-        emqx_misc:drain_deliver(2)
-    ).
-
-t_drain_down(_) ->
-    {Pid1, _Ref1} = erlang:spawn_monitor(fun() -> ok end),
-    {Pid2, _Ref2} = erlang:spawn_monitor(fun() -> ok end),
-    timer:sleep(100),
-    ?assertEqual([Pid1, Pid2], lists:sort(emqx_misc:drain_down(2))),
-    ?assertEqual([], emqx_misc:drain_down(1)).
-
-t_index_of(_) ->
-    try emqx_misc:index_of(a, []) of
-        _ -> ct:fail(should_throw_error)
-    catch
-        error:Reason ->
-            ?assertEqual(badarg, Reason)
-    end,
-    ?assertEqual(3, emqx_misc:index_of(a, [b, c, a, e, f])).
-
-t_check(_) ->
-    Policy = #{
-        max_message_queue_len => 10,
-        max_heap_size => 1024 * 1024 * 8,
-        enable => true
-    },
-    [self() ! {msg, I} || I <- lists:seq(1, 5)],
-    ?assertEqual(ok, emqx_misc:check_oom(Policy)),
-    [self() ! {msg, I} || I <- lists:seq(1, 6)],
-    ?assertEqual(
-        {shutdown, #{reason => message_queue_too_long, value => 11, max => 10}},
-        emqx_misc:check_oom(Policy)
-    ).
-
-drain() ->
-    drain([]).
-
-drain(Acc) ->
-    receive
-        Msg -> drain([Msg | Acc])
-    after 0 ->
-        lists:reverse(Acc)
-    end.
-
-t_rand_seed(_) ->
-    ?assert(is_tuple(emqx_misc:rand_seed())).
-
-t_now_to_secs(_) ->
-    ?assert(is_integer(emqx_misc:now_to_secs(os:timestamp()))).
-
-t_now_to_ms(_) ->
-    ?assert(is_integer(emqx_misc:now_to_ms(os:timestamp()))).
-
-t_gen_id(_) ->
-    ?assertEqual(10, length(emqx_misc:gen_id(10))),
-    ?assertEqual(20, length(emqx_misc:gen_id(20))).
-
-t_pmap_normal(_) ->
-    ?assertEqual(
-        [5, 7, 9],
-        emqx_misc:pmap(
-            fun({A, B}) -> A + B end,
-            [{2, 3}, {3, 4}, {4, 5}]
-        )
-    ).
-
-t_pmap_timeout(_) ->
-    ?assertExit(
-        timeout,
-        emqx_misc:pmap(
-            fun
-                (timeout) -> ct:sleep(1000);
-                ({A, B}) -> A + B
-            end,
-            [{2, 3}, {3, 4}, timeout],
-            100
-        )
-    ).
-
-t_pmap_exception(_) ->
-    ?assertError(
-        foobar,
-        emqx_misc:pmap(
-            fun
-                (error) -> error(foobar);
-                ({A, B}) -> A + B
-            end,
-            [{2, 3}, {3, 4}, error]
-        )
-    ).
diff --git a/apps/emqx/test/emqx_router_SUITE.erl b/apps/emqx/test/emqx_router_SUITE.erl
index 298a33fe8..2db0acf82 100644
--- a/apps/emqx/test/emqx_router_SUITE.erl
+++ b/apps/emqx/test/emqx_router_SUITE.erl
@@ -119,7 +119,7 @@ t_has_routes(_) ->
     ?R:delete_route(<<"devices/+/messages">>).
 
 t_unexpected(_) ->
-    Router = emqx_misc:proc_name(?R, 1),
+    Router = emqx_utils:proc_name(?R, 1),
     ?assertEqual(ignored, gen_server:call(Router, bad_request)),
     ?assertEqual(ok, gen_server:cast(Router, bad_message)),
     Router ! bad_info.
diff --git a/apps/emqx_authz/src/emqx_authz_file.erl b/apps/emqx_authz/src/emqx_authz_file.erl
index 9aa2d506f..ede4a9582 100644
--- a/apps/emqx_authz/src/emqx_authz_file.erl
+++ b/apps/emqx_authz/src/emqx_authz_file.erl
@@ -47,7 +47,7 @@ create(#{path := Path} = Source) ->
                 ?SLOG(alert, #{
                     msg => failed_to_read_acl_file,
                     path => Path,
-                    explain => emqx_misc:explain_posix(Reason)
+                    explain => emqx_utils:explain_posix(Reason)
                 }),
                 throw(failed_to_read_acl_file);
             {error, Reason} ->
diff --git a/apps/emqx_authz/test/emqx_authz_api_sources_SUITE.erl b/apps/emqx_authz/test/emqx_authz_api_sources_SUITE.erl
index b717775a6..7a7dbb7e9 100644
--- a/apps/emqx_authz/test/emqx_authz_api_sources_SUITE.erl
+++ b/apps/emqx_authz/test/emqx_authz_api_sources_SUITE.erl
@@ -148,8 +148,8 @@ set_special_configs(_App) ->
     ok.
 
 init_per_testcase(t_api, Config) ->
-    meck:new(emqx_misc, [non_strict, passthrough, no_history, no_link]),
-    meck:expect(emqx_misc, gen_id, fun() -> "fake" end),
+    meck:new(emqx_utils, [non_strict, passthrough, no_history, no_link]),
+    meck:expect(emqx_utils, gen_id, fun() -> "fake" end),
 
     meck:new(emqx, [non_strict, passthrough, no_history, no_link]),
     meck:expect(
@@ -165,7 +165,7 @@ init_per_testcase(_, Config) ->
     Config.
 
 end_per_testcase(t_api, _Config) ->
-    meck:unload(emqx_misc),
+    meck:unload(emqx_utils),
     meck:unload(emqx),
     ok;
 end_per_testcase(_, _Config) ->
diff --git a/apps/emqx_bridge/src/emqx_bridge.erl b/apps/emqx_bridge/src/emqx_bridge.erl
index 2a20c5994..087bc6a3f 100644
--- a/apps/emqx_bridge/src/emqx_bridge.erl
+++ b/apps/emqx_bridge/src/emqx_bridge.erl
@@ -296,7 +296,7 @@ create(BridgeType, BridgeName, RawConf) ->
         brige_action => create,
         bridge_type => BridgeType,
         bridge_name => BridgeName,
-        bridge_raw_config => emqx_misc:redact(RawConf)
+        bridge_raw_config => emqx_utils:redact(RawConf)
     }),
     emqx_conf:update(
         emqx_bridge:config_key_path() ++ [BridgeType, BridgeName],
diff --git a/apps/emqx_bridge/src/emqx_bridge_api.erl b/apps/emqx_bridge/src/emqx_bridge_api.erl
index 675541311..814fcdeb7 100644
--- a/apps/emqx_bridge/src/emqx_bridge_api.erl
+++ b/apps/emqx_bridge/src/emqx_bridge_api.erl
@@ -668,7 +668,7 @@ get_metrics_from_local_node(BridgeType, BridgeName) ->
                     false ->
                         ?BRIDGE_NOT_ENABLED;
                     true ->
-                        case emqx_misc:safe_to_existing_atom(Node, utf8) of
+                        case emqx_utils:safe_to_existing_atom(Node, utf8) of
                             {ok, TargetNode} ->
                                 call_operation(TargetNode, OperFunc, [
                                     TargetNode, BridgeType, BridgeName
@@ -835,7 +835,7 @@ format_resource_data(ResData) ->
 format_resource_data(error, undefined, Result) ->
     Result;
 format_resource_data(error, Error, Result) ->
-    Result#{status_reason => emqx_misc:readable_error_msg(Error)};
+    Result#{status_reason => emqx_utils:readable_error_msg(Error)};
 format_resource_data(K, V, Result) ->
     Result#{K => V}.
 
@@ -1004,7 +1004,7 @@ supported_versions(get_metrics_from_all_nodes) -> [4];
 supported_versions(_Call) -> [1, 2, 3, 4].
 
 redact(Term) ->
-    emqx_misc:redact(Term).
+    emqx_utils:redact(Term).
 
 deobfuscate(NewConf, OldConf) ->
     maps:fold(
@@ -1015,7 +1015,7 @@ deobfuscate(NewConf, OldConf) ->
                 {ok, OldV} when is_map(V), is_map(OldV) ->
                     Acc#{K => deobfuscate(V, OldV)};
                 {ok, OldV} ->
-                    case emqx_misc:is_redacted(K, V) of
+                    case emqx_utils:is_redacted(K, V) of
                         true ->
                             Acc#{K => OldV};
                         _ ->
diff --git a/apps/emqx_bridge/src/emqx_bridge_resource.erl b/apps/emqx_bridge/src/emqx_bridge_resource.erl
index b43cbe0ec..903e86443 100644
--- a/apps/emqx_bridge/src/emqx_bridge_resource.erl
+++ b/apps/emqx_bridge/src/emqx_bridge_resource.erl
@@ -157,7 +157,7 @@ create(Type, Name, Conf, Opts0) ->
         msg => "create bridge",
         type => Type,
         name => Name,
-        config => emqx_misc:redact(Conf)
+        config => emqx_utils:redact(Conf)
     }),
     Opts = override_start_after_created(Conf, Opts0),
     {ok, _Data} = emqx_resource:create_local(
@@ -192,7 +192,7 @@ update(Type, Name, {OldConf, Conf}, Opts0) ->
                 msg => "update bridge",
                 type => Type,
                 name => Name,
-                config => emqx_misc:redact(Conf)
+                config => emqx_utils:redact(Conf)
             }),
             case recreate(Type, Name, Conf, Opts) of
                 {ok, _} ->
@@ -202,7 +202,7 @@ update(Type, Name, {OldConf, Conf}, Opts0) ->
                         msg => "updating_a_non_existing_bridge",
                         type => Type,
                         name => Name,
-                        config => emqx_misc:redact(Conf)
+                        config => emqx_utils:redact(Conf)
                     }),
                     create(Type, Name, Conf, Opts);
                 {error, Reason} ->
@@ -236,8 +236,8 @@ recreate(Type, Name, Conf, Opts) ->
     ).
 
 create_dry_run(Type, Conf0) ->
-    TmpPath0 = iolist_to_binary([?TEST_ID_PREFIX, emqx_misc:gen_id(8)]),
-    TmpPath = emqx_misc:safe_filename(TmpPath0),
+    TmpPath0 = iolist_to_binary([?TEST_ID_PREFIX, emqx_utils:gen_id(8)]),
+    TmpPath = emqx_utils:safe_filename(TmpPath0),
     Conf = emqx_map_lib:safe_atom_key_map(Conf0),
     case emqx_connector_ssl:convert_certs(TmpPath, Conf) of
         {error, Reason} ->
diff --git a/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl b/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl
index 3ec6061d8..ef997f7e3 100644
--- a/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl
+++ b/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl
@@ -975,7 +975,7 @@ t_with_redact_update(Config) ->
     ),
 
     %% update with redacted config
-    BridgeConf = emqx_misc:redact(Template),
+    BridgeConf = emqx_utils:redact(Template),
     BridgeID = emqx_bridge_resource:bridge_id(Type, Name),
     {ok, 200, _} = request(put, uri(["bridges", BridgeID]), BridgeConf, Config),
     ?assertEqual(
diff --git a/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl_consumer.erl b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl_consumer.erl
index 2dc43a130..fdfa3300c 100644
--- a/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl_consumer.erl
+++ b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl_consumer.erl
@@ -156,7 +156,7 @@ on_start(InstanceId, Config) ->
                 msg => "failed_to_start_kafka_consumer_client",
                 instance_id => InstanceId,
                 kafka_hosts => BootstrapHosts,
-                reason => emqx_misc:redact(Reason)
+                reason => emqx_utils:redact(Reason)
             }),
             throw(?CLIENT_DOWN_MESSAGE)
     end,
@@ -344,7 +344,7 @@ start_consumer(Config, InstanceId, ClientID) ->
                 msg => "failed_to_start_kafka_consumer",
                 instance_id => InstanceId,
                 kafka_hosts => emqx_bridge_kafka_impl:hosts(BootstrapHosts0),
-                reason => emqx_misc:redact(Reason2)
+                reason => emqx_utils:redact(Reason2)
             }),
             stop_client(ClientID),
             throw(failed_to_start_kafka_consumer)
diff --git a/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl
index fc9a6dc29..254284b75 100644
--- a/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl
+++ b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl
@@ -299,7 +299,7 @@ init_per_testcase(TestCase, Config) when
             common_init_per_testcase(TestCase, Config)
     end;
 init_per_testcase(t_cluster_group = TestCase, Config0) ->
-    Config = emqx_misc:merge_opts(Config0, [{num_partitions, 6}]),
+    Config = emqx_utils:merge_opts(Config0, [{num_partitions, 6}]),
     common_init_per_testcase(TestCase, Config);
 init_per_testcase(t_multiple_topic_mappings = TestCase, Config0) ->
     KafkaTopicBase =
@@ -1543,7 +1543,7 @@ do_t_receive_after_recovery(Config) ->
                 %% 2) publish messages while the consumer is down.
                 %% we use `pmap' to avoid wolff sending the whole
                 %% batch to a single partition.
-                emqx_misc:pmap(fun(Msg) -> publish(Config, [Msg]) end, Messages1),
+                emqx_utils:pmap(fun(Msg) -> publish(Config, [Msg]) end, Messages1),
                 ok
             end),
             %% 3) restore and consume messages
@@ -1667,7 +1667,7 @@ t_cluster_group(Config) ->
                  || {Name, Opts} <- Cluster
                 ],
             on_exit(fun() ->
-                emqx_misc:pmap(
+                emqx_utils:pmap(
                     fun(N) ->
                         ct:pal("stopping ~p", [N]),
                         ok = emqx_common_test_helpers:stop_slave(N)
@@ -1889,7 +1889,7 @@ t_cluster_node_down(Config) ->
                     Cluster
                 ),
             on_exit(fun() ->
-                emqx_misc:pmap(
+                emqx_utils:pmap(
                     fun(N) ->
                         ct:pal("stopping ~p", [N]),
                         ok = emqx_common_test_helpers:stop_slave(N)
diff --git a/apps/emqx_conf/src/emqx_cluster_rpc.erl b/apps/emqx_conf/src/emqx_cluster_rpc.erl
index 0382045d4..c82191bc3 100644
--- a/apps/emqx_conf/src/emqx_cluster_rpc.erl
+++ b/apps/emqx_conf/src/emqx_cluster_rpc.erl
@@ -501,15 +501,17 @@ log_and_alarm(IsSuccess, Res, #{kind := ?APPLY_KIND_INITIATE} = Meta) ->
     %% because nothing is committed
     case IsSuccess of
         true ->
-            ?SLOG(debug, Meta#{msg => "cluster_rpc_apply_result", result => emqx_misc:redact(Res)});
+            ?SLOG(debug, Meta#{msg => "cluster_rpc_apply_result", result => emqx_utils:redact(Res)});
         false ->
-            ?SLOG(warning, Meta#{msg => "cluster_rpc_apply_result", result => emqx_misc:redact(Res)})
+            ?SLOG(warning, Meta#{
+                msg => "cluster_rpc_apply_result", result => emqx_utils:redact(Res)
+            })
     end;
 log_and_alarm(true, Res, Meta) ->
-    ?SLOG(debug, Meta#{msg => "cluster_rpc_apply_ok", result => emqx_misc:redact(Res)}),
+    ?SLOG(debug, Meta#{msg => "cluster_rpc_apply_ok", result => emqx_utils:redact(Res)}),
     do_alarm(deactivate, Res, Meta);
 log_and_alarm(false, Res, Meta) ->
-    ?SLOG(error, Meta#{msg => "cluster_rpc_apply_failed", result => emqx_misc:redact(Res)}),
+    ?SLOG(error, Meta#{msg => "cluster_rpc_apply_failed", result => emqx_utils:redact(Res)}),
     do_alarm(activate, Res, Meta).
 
 do_alarm(Fun, Res, #{tnx_id := Id} = Meta) ->
diff --git a/apps/emqx_conf/src/emqx_cluster_rpc_cleaner.erl b/apps/emqx_conf/src/emqx_cluster_rpc_cleaner.erl
index bce866c2d..fe72cd65b 100644
--- a/apps/emqx_conf/src/emqx_cluster_rpc_cleaner.erl
+++ b/apps/emqx_conf/src/emqx_cluster_rpc_cleaner.erl
@@ -73,7 +73,7 @@ handle_info(Info, State) ->
     {noreply, State}.
 
 terminate(_Reason, #{timer := TRef}) ->
-    emqx_misc:cancel_timer(TRef).
+    emqx_utils:cancel_timer(TRef).
 
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
@@ -82,7 +82,7 @@ code_change(_OldVsn, State, _Extra) ->
 %% Internal functions
 %%--------------------------------------------------------------------
 ensure_timer(State = #{cleanup_ms := Ms}) ->
-    State#{timer := emqx_misc:start_timer(Ms, del_stale_mfa)}.
+    State#{timer := emqx_utils:start_timer(Ms, del_stale_mfa)}.
 
 %% @doc Keep the latest completed 100 records for querying and troubleshooting.
 del_stale_mfa(MaxHistory) ->
diff --git a/apps/emqx_connector/src/emqx_connector_http.erl b/apps/emqx_connector/src/emqx_connector_http.erl
index dfa6dab81..ef2e11eb7 100644
--- a/apps/emqx_connector/src/emqx_connector_http.erl
+++ b/apps/emqx_connector/src/emqx_connector_http.erl
@@ -219,7 +219,7 @@ on_start(
                 SSLOpts = emqx_tls_lib:to_client_opts(maps:get(ssl, Config)),
                 {tls, SSLOpts}
         end,
-    NTransportOpts = emqx_misc:ipv6_probe(TransportOpts),
+    NTransportOpts = emqx_utils:ipv6_probe(TransportOpts),
     PoolOpts = [
         {host, Host},
         {port, Port},
@@ -425,7 +425,7 @@ do_get_status(PoolName, Timeout) ->
                     Error
             end
         end,
-    try emqx_misc:pmap(DoPerWorker, Workers, Timeout) of
+    try emqx_utils:pmap(DoPerWorker, Workers, Timeout) of
         % we crash in case of non-empty lists since we don't know what to do in that case
         [_ | _] = Results ->
             case [E || {error, _} = E <- Results] of
@@ -603,7 +603,7 @@ is_sensitive_key(_) ->
 %% Function that will do a deep traversal of Data and remove sensitive
 %% information (i.e., passwords)
 redact(Data) ->
-    emqx_misc:redact(Data, fun is_sensitive_key/1).
+    emqx_utils:redact(Data, fun is_sensitive_key/1).
 
 %% because the body may contain some sensitive data
 %% and at the same time the redact function will not scan the binary data
diff --git a/apps/emqx_connector/src/emqx_connector_ldap.erl b/apps/emqx_connector/src/emqx_connector_ldap.erl
index 82d622e09..ac2af301e 100644
--- a/apps/emqx_connector/src/emqx_connector_ldap.erl
+++ b/apps/emqx_connector/src/emqx_connector_ldap.erl
@@ -65,7 +65,7 @@ on_start(
     ?SLOG(info, #{
         msg => "starting_ldap_connector",
         connector => InstId,
-        config => emqx_misc:redact(Config)
+        config => emqx_utils:redact(Config)
     }),
     Servers = emqx_schema:parse_servers(Servers0, ?LDAP_HOST_OPTIONS),
     SslOpts =
diff --git a/apps/emqx_connector/src/emqx_connector_mongo.erl b/apps/emqx_connector/src/emqx_connector_mongo.erl
index ead3e2e49..a5873bcf6 100644
--- a/apps/emqx_connector/src/emqx_connector_mongo.erl
+++ b/apps/emqx_connector/src/emqx_connector_mongo.erl
@@ -162,7 +162,7 @@ on_start(
             rs -> "starting_mongodb_replica_set_connector";
             sharded -> "starting_mongodb_sharded_connector"
         end,
-    ?SLOG(info, #{msg => Msg, connector => InstId, config => emqx_misc:redact(Config)}),
+    ?SLOG(info, #{msg => Msg, connector => InstId, config => emqx_utils:redact(Config)}),
     NConfig = #{hosts := Hosts} = maybe_resolve_srv_and_txt_records(Config),
     SslOpts =
         case maps:get(enable, SSL) of
diff --git a/apps/emqx_connector/src/emqx_connector_mqtt.erl b/apps/emqx_connector/src/emqx_connector_mqtt.erl
index 8f2d06517..5b488825b 100644
--- a/apps/emqx_connector/src/emqx_connector_mqtt.erl
+++ b/apps/emqx_connector/src/emqx_connector_mqtt.erl
@@ -149,7 +149,7 @@ on_start(InstanceId, Conf) ->
     ?SLOG(info, #{
         msg => "starting_mqtt_connector",
         connector => InstanceId,
-        config => emqx_misc:redact(Conf)
+        config => emqx_utils:redact(Conf)
     }),
     BasicConf = basic_config(Conf),
     BridgeConf = BasicConf#{
diff --git a/apps/emqx_connector/src/emqx_connector_mysql.erl b/apps/emqx_connector/src/emqx_connector_mysql.erl
index c69cf5ca0..6600a5f77 100644
--- a/apps/emqx_connector/src/emqx_connector_mysql.erl
+++ b/apps/emqx_connector/src/emqx_connector_mysql.erl
@@ -102,7 +102,7 @@ on_start(
     ?SLOG(info, #{
         msg => "starting_mysql_connector",
         connector => InstId,
-        config => emqx_misc:redact(Config)
+        config => emqx_utils:redact(Config)
     }),
     SslOpts =
         case maps:get(enable, SSL) of
diff --git a/apps/emqx_connector/src/emqx_connector_pgsql.erl b/apps/emqx_connector/src/emqx_connector_pgsql.erl
index 14cbbc80f..8796e00a5 100644
--- a/apps/emqx_connector/src/emqx_connector_pgsql.erl
+++ b/apps/emqx_connector/src/emqx_connector_pgsql.erl
@@ -95,7 +95,7 @@ on_start(
     ?SLOG(info, #{
         msg => "starting_postgresql_connector",
         connector => InstId,
-        config => emqx_misc:redact(Config)
+        config => emqx_utils:redact(Config)
     }),
     SslOpts =
         case maps:get(enable, SSL) of
diff --git a/apps/emqx_connector/src/emqx_connector_redis.erl b/apps/emqx_connector/src/emqx_connector_redis.erl
index c70e766af..4ef778e6b 100644
--- a/apps/emqx_connector/src/emqx_connector_redis.erl
+++ b/apps/emqx_connector/src/emqx_connector_redis.erl
@@ -123,7 +123,7 @@ on_start(
     ?SLOG(info, #{
         msg => "starting_redis_connector",
         connector => InstId,
-        config => emqx_misc:redact(Config)
+        config => emqx_utils:redact(Config)
     }),
     ConfKey =
         case Type of
diff --git a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_msg.erl b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_msg.erl
index 67fc40efa..df1114483 100644
--- a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_msg.erl
+++ b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_msg.erl
@@ -85,7 +85,7 @@ to_remote_msg(MapMsg, #{
         qos = QoS,
         retain = Retain,
         topic = topic(Mountpoint, Topic),
-        props = emqx_misc:pub_props_to_packet(PubProps),
+        props = emqx_utils:pub_props_to_packet(PubProps),
         payload = Payload
     };
 to_remote_msg(#message{topic = Topic} = Msg, #{mountpoint := Mountpoint}) ->
@@ -112,7 +112,7 @@ to_broker_msg(
     Retain = replace_simple_var(RetainToken, MapMsg),
     PubProps = maps:get(pub_props, MapMsg, #{}),
     set_headers(
-        Props#{properties => emqx_misc:pub_props_to_packet(PubProps)},
+        Props#{properties => emqx_utils:pub_props_to_packet(PubProps)},
         emqx_message:set_flags(
             #{dup => Dup, retain => Retain},
             emqx_message:make(bridge, QoS, topic(Mountpoint, Topic), Payload)
diff --git a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_worker.erl b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_worker.erl
index 8e41a9f0f..5197a35df 100644
--- a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_worker.erl
+++ b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_worker.erl
@@ -124,7 +124,7 @@ start_link(Name, BridgeOpts) ->
         {error, Reason} = Error ->
             ?SLOG(error, #{
                 msg => "client_start_failed",
-                config => emqx_misc:redact(BridgeOpts),
+                config => emqx_utils:redact(BridgeOpts),
                 reason => Reason
             }),
             Error
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_swagger.erl b/apps/emqx_dashboard/src/emqx_dashboard_swagger.erl
index eb7f6c741..22cf484ff 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_swagger.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_swagger.erl
@@ -915,4 +915,4 @@ schema_converter(Options) ->
     maps:get(schema_converter, Options, fun hocon_schema_to_spec/2).
 
 hocon_error_msg(Reason) ->
-    emqx_misc:readable_error_msg(Reason).
+    emqx_utils:readable_error_msg(Reason).
diff --git a/apps/emqx_exhook/src/emqx_exhook_api.erl b/apps/emqx_exhook/src/emqx_exhook_api.erl
index aa5d1897f..9bfae9579 100644
--- a/apps/emqx_exhook/src/emqx_exhook_api.erl
+++ b/apps/emqx_exhook/src/emqx_exhook_api.erl
@@ -478,7 +478,7 @@ call_cluster(Fun) ->
 %%--------------------------------------------------------------------
 %% Internal Funcs
 %%--------------------------------------------------------------------
-err_msg(Msg) -> emqx_misc:readable_error_msg(Msg).
+err_msg(Msg) -> emqx_utils:readable_error_msg(Msg).
 
 get_raw_config() ->
     RawConfig = emqx:get_raw_config([exhook, servers], []),
diff --git a/apps/emqx_gateway/src/bhvrs/emqx_gateway_conn.erl b/apps/emqx_gateway/src/bhvrs/emqx_gateway_conn.erl
index 7f37061ac..4145a92a7 100644
--- a/apps/emqx_gateway/src/bhvrs/emqx_gateway_conn.erl
+++ b/apps/emqx_gateway/src/bhvrs/emqx_gateway_conn.erl
@@ -173,7 +173,7 @@ stats(#state{
         end,
     ConnStats = emqx_pd:get_counters(?CONN_STATS),
     ChanStats = ChannMod:stats(Channel),
-    ProcStats = emqx_misc:proc_stats(),
+    ProcStats = emqx_utils:proc_stats(),
     lists:append([SockStats, ConnStats, ChanStats, ProcStats]).
 
 call(Pid, Req) ->
@@ -297,7 +297,7 @@ init_state(WrappedSock, Peername, Options, FrameMod, ChannMod) ->
     StatsTimer = emqx_gateway_utils:stats_timer(Options),
     IdleTimeout = emqx_gateway_utils:idle_timeout(Options),
     OomPolicy = emqx_gateway_utils:oom_policy(Options),
-    IdleTimer = emqx_misc:start_timer(IdleTimeout, idle_timeout),
+    IdleTimer = emqx_utils:start_timer(IdleTimeout, idle_timeout),
     #state{
         socket = WrappedSock,
         peername = Peername,
@@ -327,7 +327,7 @@ run_loop(
     }
 ) ->
     emqx_logger:set_metadata_peername(esockd:format(Peername)),
-    _ = emqx_misc:tune_heap_size(OomPolicy),
+    _ = emqx_utils:tune_heap_size(OomPolicy),
     case activate_socket(State) of
         {ok, NState} ->
             hibernate(Parent, NState);
@@ -383,14 +383,14 @@ wakeup_from_hib(Parent, State) ->
 %% Ensure/cancel stats timer
 
 ensure_stats_timer(Timeout, State = #state{stats_timer = undefined}) ->
-    State#state{stats_timer = emqx_misc:start_timer(Timeout, emit_stats)};
+    State#state{stats_timer = emqx_utils:start_timer(Timeout, emit_stats)};
 ensure_stats_timer(_Timeout, State) ->
     State.
 
 cancel_stats_timer(State = #state{stats_timer = TRef}) when
     is_reference(TRef)
 ->
-    ok = emqx_misc:cancel_timer(TRef),
+    ok = emqx_utils:cancel_timer(TRef),
     State#state{stats_timer = undefined};
 cancel_stats_timer(State) ->
     State.
@@ -471,7 +471,7 @@ handle_msg(
     State = #state{idle_timer = IdleTimer}
 ) ->
     IdleTimer /= undefined andalso
-        emqx_misc:cancel_timer(IdleTimer),
+        emqx_utils:cancel_timer(IdleTimer),
     NState = State#state{idle_timer = undefined},
     handle_incoming(Packet, NState);
 handle_msg({outgoing, Data}, State) ->
@@ -501,7 +501,7 @@ handle_msg(
     Deliver = {deliver, _Topic, _Msg},
     State = #state{active_n = ActiveN}
 ) ->
-    Delivers = [Deliver | emqx_misc:drain_deliver(ActiveN)],
+    Delivers = [Deliver | emqx_utils:drain_deliver(ActiveN)],
     with_channel(handle_deliver, [Delivers], State);
 %% Something sent
 %% TODO: Who will deliver this message?
@@ -904,7 +904,7 @@ handle_info(Info, State) ->
 %%                 msg => "reach_rate_limit",
 %%                 pause => Time
 %%             }),
-%%             TRef = emqx_misc:start_timer(Time, limit_timeout),
+%%             TRef = emqx_utils:start_timer(Time, limit_timeout),
 %%             State#state{
 %%                 sockstate = blocked,
 %%                 limiter = Limiter1,
@@ -928,7 +928,7 @@ run_gc(Stats, State = #state{gc_state = GcSt}) ->
     end.
 
 check_oom(State = #state{oom_policy = OomPolicy}) ->
-    case ?ENABLED(OomPolicy) andalso emqx_misc:check_oom(OomPolicy) of
+    case ?ENABLED(OomPolicy) andalso emqx_utils:check_oom(OomPolicy) of
         {shutdown, Reason} ->
             %% triggers terminate/2 callback immediately
             erlang:exit({shutdown, Reason});
diff --git a/apps/emqx_gateway/src/emqx_gateway_api_clients.erl b/apps/emqx_gateway/src/emqx_gateway_api_clients.erl
index e64e918b4..cd387e3bb 100644
--- a/apps/emqx_gateway/src/emqx_gateway_api_clients.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_api_clients.erl
@@ -115,7 +115,7 @@ clients(get, #{
                         fun ?MODULE:format_channel_info/2
                     );
                 Node0 ->
-                    case emqx_misc:safe_to_existing_atom(Node0) of
+                    case emqx_utils:safe_to_existing_atom(Node0) of
                         {ok, Node1} ->
                             QStringWithoutNode = maps:without([<<"node">>], QString),
                             emqx_mgmt_api:node_query(
diff --git a/apps/emqx_gateway/src/emqx_gateway_cm.erl b/apps/emqx_gateway/src/emqx_gateway_cm.erl
index 71ec4bf59..5de6da63f 100644
--- a/apps/emqx_gateway/src/emqx_gateway_cm.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_cm.erl
@@ -802,7 +802,7 @@ handle_info(
     {'DOWN', _MRef, process, Pid, _Reason},
     State = #state{gwname = GwName, chan_pmon = PMon}
 ) ->
-    ChanPids = [Pid | emqx_misc:drain_down(?DEFAULT_BATCH_SIZE)],
+    ChanPids = [Pid | emqx_utils:drain_down(?DEFAULT_BATCH_SIZE)],
     {Items, PMon1} = emqx_pmon:erase_all(ChanPids, PMon),
 
     CmTabs = cmtabs(GwName),
diff --git a/apps/emqx_gateway/src/emqx_gateway_http.erl b/apps/emqx_gateway/src/emqx_gateway_http.erl
index 5982334b4..9bb5821f5 100644
--- a/apps/emqx_gateway/src/emqx_gateway_http.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_http.erl
@@ -495,7 +495,7 @@ reason2msg(
 reason2msg(
     {#{roots := [{gateway, _}]}, [_ | _]} = Error
 ) ->
-    Bin = emqx_misc:readable_error_msg(Error),
+    Bin = emqx_utils:readable_error_msg(Error),
     <<"Invalid configurations: ", Bin/binary>>;
 reason2msg(_) ->
     error.
diff --git a/apps/emqx_gateway/src/emqx_gateway_utils.erl b/apps/emqx_gateway/src/emqx_gateway_utils.erl
index 9d80de00e..07185ef42 100644
--- a/apps/emqx_gateway/src/emqx_gateway_utils.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_utils.erl
@@ -223,7 +223,7 @@ merge_default(Udp, Options) ->
     case lists:keytake(Key, 1, Options) of
         {value, {Key, TcpOpts}, Options1} ->
             [
-                {Key, emqx_misc:merge_opts(Default, TcpOpts)}
+                {Key, emqx_utils:merge_opts(Default, TcpOpts)}
                 | Options1
             ];
         false ->
@@ -482,7 +482,7 @@ frame_options(Options) ->
 
 -spec init_gc_state(map()) -> emqx_gc:gc_state() | undefined.
 init_gc_state(Options) ->
-    emqx_misc:maybe_apply(fun emqx_gc:init/1, force_gc_policy(Options)).
+    emqx_utils:maybe_apply(fun emqx_gc:init/1, force_gc_policy(Options)).
 
 -spec force_gc_policy(map()) -> emqx_gc:opts() | undefined.
 force_gc_policy(Options) ->
diff --git a/apps/emqx_gateway_coap/src/emqx_coap_channel.erl b/apps/emqx_gateway_coap/src/emqx_coap_channel.erl
index 4cf362d9d..b90fd630d 100644
--- a/apps/emqx_gateway_coap/src/emqx_coap_channel.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_channel.erl
@@ -111,7 +111,7 @@ info(conn_state, #channel{conn_state = ConnState}) ->
 info(clientinfo, #channel{clientinfo = ClientInfo}) ->
     ClientInfo;
 info(session, #channel{session = Session}) ->
-    emqx_misc:maybe_apply(fun emqx_coap_session:info/1, Session);
+    emqx_utils:maybe_apply(fun emqx_coap_session:info/1, Session);
 info(clientid, #channel{clientinfo = #{clientid := ClientId}}) ->
     ClientId;
 info(ctx, #channel{ctx = Ctx}) ->
@@ -366,7 +366,7 @@ ensure_timer(Name, Time, Msg, #channel{timers = Timers} = Channel) ->
     end.
 
 make_timer(Name, Time, Msg, Channel = #channel{timers = Timers}) ->
-    TRef = emqx_misc:start_timer(Time, Msg),
+    TRef = emqx_utils:start_timer(Time, Msg),
     Channel#channel{timers = Timers#{Name => TRef}}.
 
 ensure_keepalive_timer(Channel) ->
@@ -710,7 +710,7 @@ process_connection(
 ) ->
     Queries = emqx_coap_message:get_option(uri_query, Req),
     case
-        emqx_misc:pipeline(
+        emqx_utils:pipeline(
             [
                 fun enrich_conninfo/2,
                 fun run_conn_hooks/2,
diff --git a/apps/emqx_gateway_coap/src/emqx_coap_session.erl b/apps/emqx_gateway_coap/src/emqx_coap_session.erl
index 688defcbb..5ae169675 100644
--- a/apps/emqx_gateway_coap/src/emqx_coap_session.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_session.erl
@@ -81,7 +81,7 @@
 %%%-------------------------------------------------------------------
 -spec new() -> session().
 new() ->
-    _ = emqx_misc:rand_seed(),
+    _ = emqx_utils:rand_seed(),
     #session{
         transport_manager = emqx_coap_tm:new(),
         observe_manager = emqx_coap_observe_res:new_manager(),
diff --git a/apps/emqx_gateway_coap/src/emqx_coap_tm.erl b/apps/emqx_gateway_coap/src/emqx_coap_tm.erl
index 82f616b25..68a7ae237 100644
--- a/apps/emqx_gateway_coap/src/emqx_coap_tm.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_tm.erl
@@ -272,12 +272,12 @@ cancel_state_timer(#state_machine{timers = Timers} = Machine) ->
         undefined ->
             Machine;
         Ref ->
-            _ = emqx_misc:cancel_timer(Ref),
+            _ = emqx_utils:cancel_timer(Ref),
             Machine#state_machine{timers = maps:remove(state_timer, Timers)}
     end.
 
 process_timer(SeqId, {Type, Interval, Msg}, Timers) ->
-    Ref = emqx_misc:start_timer(Interval, {state_machine, {SeqId, Type, Msg}}),
+    Ref = emqx_utils:start_timer(Interval, {state_machine, {SeqId, Type, Msg}}),
     Timers#{Type => Ref}.
 
 -spec delete_machine(manager_key(), manager()) -> manager().
@@ -293,7 +293,7 @@ delete_machine(Id, Manager) ->
         } ->
             lists:foreach(
                 fun({_, Ref}) ->
-                    emqx_misc:cancel_timer(Ref)
+                    emqx_utils:cancel_timer(Ref)
                 end,
                 maps:to_list(Timers)
             ),
diff --git a/apps/emqx_gateway_coap/src/emqx_coap_transport.erl b/apps/emqx_gateway_coap/src/emqx_coap_transport.erl
index 1948c969d..daea13ba8 100644
--- a/apps/emqx_gateway_coap/src/emqx_coap_transport.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_transport.erl
@@ -119,7 +119,7 @@ idle(out, #coap_message{type = non} = Msg, _) ->
         timeouts => [{stop_timeout, ?NON_LIFETIME}]
     });
 idle(out, Msg, Transport) ->
-    _ = emqx_misc:rand_seed(),
+    _ = emqx_utils:rand_seed(),
     Timeout = ?ACK_TIMEOUT + rand:uniform(?ACK_RANDOM_FACTOR),
     out(Msg, #{
         next => wait_ack,
diff --git a/apps/emqx_gateway_exproto/src/emqx_exproto_channel.erl b/apps/emqx_gateway_exproto/src/emqx_exproto_channel.erl
index 7234e7a2f..3b2c8d73b 100644
--- a/apps/emqx_gateway_exproto/src/emqx_exproto_channel.erl
+++ b/apps/emqx_gateway_exproto/src/emqx_exproto_channel.erl
@@ -681,14 +681,14 @@ ensure_timer(Name, Channel = #channel{timers = Timers}) ->
 
 ensure_timer(Name, Time, Channel = #channel{timers = Timers}) ->
     Msg = maps:get(Name, ?TIMER_TABLE),
-    TRef = emqx_misc:start_timer(Time, Msg),
+    TRef = emqx_utils:start_timer(Time, Msg),
     Channel#channel{timers = Timers#{Name => TRef}}.
 
 reset_timer(Name, Channel) ->
     ensure_timer(Name, remove_timer_ref(Name, Channel)).
 
 cancel_timer(Name, Channel = #channel{timers = Timers}) ->
-    emqx_misc:cancel_timer(maps:get(Name, Timers, undefined)),
+    emqx_utils:cancel_timer(maps:get(Name, Timers, undefined)),
     remove_timer_ref(Name, Channel).
 
 remove_timer_ref(Name, Channel = #channel{timers = Timers}) ->
@@ -792,4 +792,4 @@ proto_name_to_protocol(ProtoName) when is_binary(ProtoName) ->
     binary_to_atom(ProtoName).
 
 anonymous_clientid() ->
-    iolist_to_binary(["exproto-", emqx_misc:gen_id()]).
+    iolist_to_binary(["exproto-", emqx_utils:gen_id()]).
diff --git a/apps/emqx_gateway_exproto/src/emqx_exproto_gcli.erl b/apps/emqx_gateway_exproto/src/emqx_exproto_gcli.erl
index af15ef9d3..34883cdce 100644
--- a/apps/emqx_gateway_exproto/src/emqx_exproto_gcli.erl
+++ b/apps/emqx_gateway_exproto/src/emqx_exproto_gcli.erl
@@ -50,7 +50,7 @@
 
 start_link(Pool, Id) ->
     gen_server:start_link(
-        {local, emqx_misc:proc_name(?MODULE, Id)},
+        {local, emqx_utils:proc_name(?MODULE, Id)},
         ?MODULE,
         [Pool, Id],
         []
diff --git a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_channel.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_channel.erl
index a424375dd..77652744a 100644
--- a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_channel.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_channel.erl
@@ -105,7 +105,7 @@ info(conn_state, #channel{conn_state = ConnState}) ->
 info(clientinfo, #channel{clientinfo = ClientInfo}) ->
     ClientInfo;
 info(session, #channel{session = Session}) ->
-    emqx_misc:maybe_apply(fun emqx_lwm2m_session:info/1, Session);
+    emqx_utils:maybe_apply(fun emqx_lwm2m_session:info/1, Session);
 info(clientid, #channel{clientinfo = #{clientid := ClientId}}) ->
     ClientId;
 info(ctx, #channel{ctx = Ctx}) ->
@@ -286,7 +286,7 @@ handle_call(discard, _From, Channel) ->
 %                                                  pendings = Pendings}) ->
 %    ok = emqx_session:takeover(Session),
 %    %% TODO: Should not drain deliver here (side effect)
-%    Delivers = emqx_misc:drain_deliver(),
+%    Delivers = emqx_utils:drain_deliver(),
 %    AllPendings = lists:append(Delivers, Pendings),
 %    shutdown_and_reply(takenover, AllPendings, Channel);
 
@@ -390,7 +390,7 @@ set_peercert_infos(Peercert, ClientInfo) ->
     ClientInfo#{dn => DN, cn => CN}.
 
 make_timer(Name, Time, Msg, Channel = #channel{timers = Timers}) ->
-    TRef = emqx_misc:start_timer(Time, Msg),
+    TRef = emqx_utils:start_timer(Time, Msg),
     Channel#channel{timers = Timers#{Name => TRef}}.
 
 update_life_timer(#channel{session = Session, timers = Timers} = Channel) ->
@@ -413,7 +413,7 @@ do_takeover(_DesireId, Msg, Channel) ->
 
 do_connect(Req, Result, Channel, Iter) ->
     case
-        emqx_misc:pipeline(
+        emqx_utils:pipeline(
             [
                 fun check_lwm2m_version/2,
                 fun enrich_conninfo/2,
diff --git a/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_channel.erl b/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_channel.erl
index c27c0ba3f..1ccc8b95a 100644
--- a/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_channel.erl
+++ b/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_channel.erl
@@ -218,7 +218,7 @@ info(conn_state, #channel{conn_state = ConnState}) ->
 info(clientinfo, #channel{clientinfo = ClientInfo}) ->
     ClientInfo;
 info(session, #channel{session = Session}) ->
-    emqx_misc:maybe_apply(fun emqx_session:info/1, Session);
+    emqx_utils:maybe_apply(fun emqx_session:info/1, Session);
 info(will_msg, #channel{will_msg = WillMsg}) ->
     WillMsg;
 info(clientid, #channel{clientinfo = #{clientid := ClientId}}) ->
@@ -282,7 +282,7 @@ enrich_clientinfo(
         feedvar(Override, Packet, ConnInfo, ClientInfo0),
         ClientInfo0
     ),
-    {ok, NPacket, NClientInfo} = emqx_misc:pipeline(
+    {ok, NPacket, NClientInfo} = emqx_utils:pipeline(
         [
             fun maybe_assign_clientid/2,
             %% FIXME: CALL After authentication successfully
@@ -414,7 +414,7 @@ process_connect(
                 Channel#channel{session = Session}
             );
         {ok, #{session := Session, present := true, pendings := Pendings}} ->
-            Pendings1 = lists:usort(lists:append(Pendings, emqx_misc:drain_deliver())),
+            Pendings1 = lists:usort(lists:append(Pendings, emqx_utils:drain_deliver())),
             NChannel = Channel#channel{
                 session = Session,
                 resuming = true,
@@ -595,7 +595,7 @@ handle_in(
     Channel = #channel{conn_state = idle}
 ) ->
     case
-        emqx_misc:pipeline(
+        emqx_utils:pipeline(
             [
                 fun enrich_conninfo/2,
                 fun run_conn_hooks/2,
@@ -718,7 +718,7 @@ handle_in(PubPkt = ?SN_PUBLISH_MSG(_Flags, TopicId0, MsgId, _Data), Channel) ->
                 Id
         end,
     case
-        emqx_misc:pipeline(
+        emqx_utils:pipeline(
             [
                 fun check_qos3_enable/2,
                 fun preproc_pub_pkt/2,
@@ -877,7 +877,7 @@ handle_in(
     end;
 handle_in(SubPkt = ?SN_SUBSCRIBE_MSG(_, MsgId, _), Channel) ->
     case
-        emqx_misc:pipeline(
+        emqx_utils:pipeline(
             [
                 fun preproc_subs_type/2,
                 fun check_subscribe_authz/2,
@@ -911,7 +911,7 @@ handle_in(
     Channel
 ) ->
     case
-        emqx_misc:pipeline(
+        emqx_utils:pipeline(
             [
                 fun preproc_unsub_type/2,
                 fun run_client_unsub_hook/2,
@@ -1823,7 +1823,7 @@ handle_call(
 ) ->
     ok = emqx_session:takeover(Session),
     %% TODO: Should not drain deliver here (side effect)
-    Delivers = emqx_misc:drain_deliver(),
+    Delivers = emqx_utils:drain_deliver(),
     AllPendings = lists:append(Delivers, Pendings),
     shutdown_and_reply(takenover, AllPendings, Channel);
 %handle_call(list_authz_cache, _From, Channel) ->
@@ -2247,7 +2247,7 @@ ensure_register_timer(Channel) ->
 
 ensure_register_timer(RetryTimes, Channel = #channel{timers = Timers}) ->
     Msg = maps:get(register_timer, ?TIMER_TABLE),
-    TRef = emqx_misc:start_timer(?REGISTER_TIMEOUT, {Msg, RetryTimes}),
+    TRef = emqx_utils:start_timer(?REGISTER_TIMEOUT, {Msg, RetryTimes}),
     Channel#channel{timers = Timers#{register_timer => TRef}}.
 
 cancel_timer(Name, Channel = #channel{timers = Timers}) ->
@@ -2255,7 +2255,7 @@ cancel_timer(Name, Channel = #channel{timers = Timers}) ->
         undefined ->
             Channel;
         TRef ->
-            emqx_misc:cancel_timer(TRef),
+            emqx_utils:cancel_timer(TRef),
             Channel#channel{timers = maps:without([Name], Timers)}
     end.
 
@@ -2270,7 +2270,7 @@ ensure_timer(Name, Channel = #channel{timers = Timers}) ->
 
 ensure_timer(Name, Time, Channel = #channel{timers = Timers}) ->
     Msg = maps:get(Name, ?TIMER_TABLE),
-    TRef = emqx_misc:start_timer(Time, Msg),
+    TRef = emqx_utils:start_timer(Time, Msg),
     Channel#channel{timers = Timers#{Name => TRef}}.
 
 reset_timer(Name, Channel) ->
diff --git a/apps/emqx_gateway_stomp/src/emqx_stomp_channel.erl b/apps/emqx_gateway_stomp/src/emqx_stomp_channel.erl
index 13b70348a..316432dea 100644
--- a/apps/emqx_gateway_stomp/src/emqx_stomp_channel.erl
+++ b/apps/emqx_gateway_stomp/src/emqx_stomp_channel.erl
@@ -252,7 +252,7 @@ enrich_clientinfo(
         feedvar(Override, Packet, ConnInfo, ClientInfo0),
         ClientInfo0
     ),
-    {ok, NPacket, NClientInfo} = emqx_misc:pipeline(
+    {ok, NPacket, NClientInfo} = emqx_utils:pipeline(
         [
             fun maybe_assign_clientid/2,
             fun parse_heartbeat/2,
@@ -416,7 +416,7 @@ handle_in(
     {error, unexpected_connect, Channel};
 handle_in(Packet = ?PACKET(?CMD_CONNECT), Channel) ->
     case
-        emqx_misc:pipeline(
+        emqx_utils:pipeline(
             [
                 fun enrich_conninfo/2,
                 fun negotiate_version/2,
@@ -474,7 +474,7 @@ handle_in(
     Topic = header(<<"destination">>, Headers),
     Ack = header(<<"ack">>, Headers, <<"auto">>),
     case
-        emqx_misc:pipeline(
+        emqx_utils:pipeline(
             [
                 fun parse_topic_filter/2,
                 fun check_subscribed_status/2,
@@ -796,7 +796,7 @@ handle_call(
             reply({error, no_subid}, Channel);
         SubId ->
             case
-                emqx_misc:pipeline(
+                emqx_utils:pipeline(
                     [
                         fun parse_topic_filter/2,
                         fun check_subscribed_status/2
@@ -869,7 +869,7 @@ handle_call(discard, _From, Channel) ->
 %                                                  pendings = Pendings}) ->
 %    ok = emqx_session:takeover(Session),
 %    %% TODO: Should not drain deliver here (side effect)
-%    Delivers = emqx_misc:drain_deliver(),
+%    Delivers = emqx_utils:drain_deliver(),
 %    AllPendings = lists:append(Delivers, Pendings),
 %    shutdown_and_reply(takenover, AllPendings, Channel);
 
@@ -1289,7 +1289,7 @@ ensure_timer(Name, Channel = #channel{timers = Timers}) ->
 
 ensure_timer(Name, Time, Channel = #channel{timers = Timers}) ->
     Msg = maps:get(Name, ?TIMER_TABLE),
-    TRef = emqx_misc:start_timer(Time, Msg),
+    TRef = emqx_utils:start_timer(Time, Msg),
     Channel#channel{timers = Timers#{Name => TRef}}.
 
 reset_timer(Name, Channel) ->
diff --git a/apps/emqx_machine/src/emqx_global_gc.erl b/apps/emqx_machine/src/emqx_global_gc.erl
index f17ab2d16..121855e68 100644
--- a/apps/emqx_machine/src/emqx_global_gc.erl
+++ b/apps/emqx_machine/src/emqx_global_gc.erl
@@ -86,7 +86,7 @@ ensure_timer(State) ->
         disabled ->
             State;
         Interval when is_integer(Interval) ->
-            TRef = emqx_misc:start_timer(Interval, run),
+            TRef = emqx_utils:start_timer(Interval, run),
             State#{timer := TRef}
     end.
 
diff --git a/apps/emqx_management/src/emqx_mgmt_api_clients.erl b/apps/emqx_management/src/emqx_mgmt_api_clients.erl
index cac3edaed..cd4829342 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_clients.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_clients.erl
@@ -644,7 +644,7 @@ list_clients(QString) ->
                     fun ?MODULE:format_channel_info/2
                 );
             Node0 ->
-                case emqx_misc:safe_to_existing_atom(Node0) of
+                case emqx_utils:safe_to_existing_atom(Node0) of
                     {ok, Node1} ->
                         QStringWithoutNode = maps:without([<<"node">>], QString),
                         emqx_mgmt_api:node_query(
diff --git a/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl b/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl
index 409af4d95..1b69835f9 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl
@@ -149,7 +149,7 @@ subscriptions(get, #{query_string := QString}) ->
                     fun ?MODULE:format/2
                 );
             Node0 ->
-                case emqx_misc:safe_to_existing_atom(Node0) of
+                case emqx_utils:safe_to_existing_atom(Node0) of
                     {ok, Node1} ->
                         emqx_mgmt_api:node_query(
                             Node1,
diff --git a/apps/emqx_management/src/emqx_mgmt_api_trace.erl b/apps/emqx_management/src/emqx_mgmt_api_trace.erl
index a69837eb3..5df641add 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_trace.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_trace.erl
@@ -498,7 +498,7 @@ download_trace_log(get, #{bindings := #{name := Name}, query_string := Query}) -
                     %% We generate a session ID so that we name files
                     %% with unique names. Then we won't cause
                     %% overwrites for concurrent requests.
-                    SessionId = emqx_misc:gen_id(),
+                    SessionId = emqx_utils:gen_id(),
                     ZipDir = filename:join([emqx_trace:zip_dir(), SessionId]),
                     ok = file:make_dir(ZipDir),
                     %% Write files to ZipDir and create an in-memory zip file
diff --git a/apps/emqx_management/src/emqx_mgmt_auth.erl b/apps/emqx_management/src/emqx_mgmt_auth.erl
index 6f2a27414..12a7a6641 100644
--- a/apps/emqx_management/src/emqx_mgmt_auth.erl
+++ b/apps/emqx_management/src/emqx_mgmt_auth.erl
@@ -174,7 +174,7 @@ create_app(Name, ApiSecret, Enable, ExpiredAt, Desc) ->
             desc = Desc,
             created_at = erlang:system_time(second),
             api_secret_hash = emqx_dashboard_admin:hash(ApiSecret),
-            api_key = list_to_binary(emqx_misc:gen_id(16))
+            api_key = list_to_binary(emqx_utils:gen_id(16))
         },
     case create_app(App) of
         {ok, Res} ->
@@ -213,7 +213,7 @@ do_force_create_app(App, ApiKey, NamePrefix) ->
     end.
 
 generate_unique_name(NamePrefix) ->
-    New = list_to_binary(NamePrefix ++ emqx_misc:gen_id(16)),
+    New = list_to_binary(NamePrefix ++ emqx_utils:gen_id(16)),
     case mnesia:read(?APP, New) of
         [] -> New;
         _ -> generate_unique_name(NamePrefix)
@@ -246,7 +246,7 @@ init_bootstrap_file(File) ->
             {ok, MP} = re:compile(<<"(\.+):(\.+$)">>, [ungreedy]),
             init_bootstrap_file(File, Dev, MP);
         {error, Reason0} ->
-            Reason = emqx_misc:explain_posix(Reason0),
+            Reason = emqx_utils:explain_posix(Reason0),
             ?SLOG(
                 error,
                 #{
diff --git a/apps/emqx_management/src/emqx_mgmt_cli.erl b/apps/emqx_management/src/emqx_mgmt_cli.erl
index 442d5c7de..253d527ac 100644
--- a/apps/emqx_management/src/emqx_mgmt_cli.erl
+++ b/apps/emqx_management/src/emqx_mgmt_cli.erl
@@ -356,7 +356,7 @@ mnesia(_) ->
 %% @doc Logger Command
 
 log(["set-level", Level]) ->
-    case emqx_misc:safe_to_existing_atom(Level) of
+    case emqx_utils:safe_to_existing_atom(Level) of
         {ok, Level1} ->
             case emqx_logger:set_log_level(Level1) of
                 ok -> emqx_ctl:print("~ts~n", [Level]);
@@ -369,7 +369,7 @@ log(["primary-level"]) ->
     Level = emqx_logger:get_primary_log_level(),
     emqx_ctl:print("~ts~n", [Level]);
 log(["primary-level", Level]) ->
-    case emqx_misc:safe_to_existing_atom(Level) of
+    case emqx_utils:safe_to_existing_atom(Level) of
         {ok, Level1} ->
             _ = emqx_logger:set_primary_log_level(Level1),
             ok;
@@ -392,7 +392,7 @@ log(["handlers", "list"]) ->
     ],
     ok;
 log(["handlers", "start", HandlerId]) ->
-    case emqx_misc:safe_to_existing_atom(HandlerId) of
+    case emqx_utils:safe_to_existing_atom(HandlerId) of
         {ok, HandlerId1} ->
             case emqx_logger:start_log_handler(HandlerId1) of
                 ok ->
@@ -406,7 +406,7 @@ log(["handlers", "start", HandlerId]) ->
             emqx_ctl:print("[error] invalid handler:~ts~n", [HandlerId])
     end;
 log(["handlers", "stop", HandlerId]) ->
-    case emqx_misc:safe_to_existing_atom(HandlerId) of
+    case emqx_utils:safe_to_existing_atom(HandlerId) of
         {ok, HandlerId1} ->
             case emqx_logger:stop_log_handler(HandlerId1) of
                 ok ->
@@ -420,9 +420,9 @@ log(["handlers", "stop", HandlerId]) ->
             emqx_ctl:print("[error] invalid handler:~ts~n", [HandlerId])
     end;
 log(["handlers", "set-level", HandlerId, Level]) ->
-    case emqx_misc:safe_to_existing_atom(HandlerId) of
+    case emqx_utils:safe_to_existing_atom(HandlerId) of
         {ok, HandlerId1} ->
-            case emqx_misc:safe_to_existing_atom(Level) of
+            case emqx_utils:safe_to_existing_atom(Level) of
                 {ok, Level1} ->
                     case emqx_logger:set_log_handler_level(HandlerId1, Level1) of
                         ok ->
@@ -628,7 +628,7 @@ listeners([]) ->
         emqx_listeners:list()
     );
 listeners(["stop", ListenerId]) ->
-    case emqx_misc:safe_to_existing_atom(ListenerId) of
+    case emqx_utils:safe_to_existing_atom(ListenerId) of
         {ok, ListenerId1} ->
             case emqx_listeners:stop_listener(ListenerId1) of
                 ok ->
@@ -640,7 +640,7 @@ listeners(["stop", ListenerId]) ->
             emqx_ctl:print("Invalid listener: ~0p~n", [ListenerId])
     end;
 listeners(["start", ListenerId]) ->
-    case emqx_misc:safe_to_existing_atom(ListenerId) of
+    case emqx_utils:safe_to_existing_atom(ListenerId) of
         {ok, ListenerId1} ->
             case emqx_listeners:start_listener(ListenerId1) of
                 ok ->
@@ -652,7 +652,7 @@ listeners(["start", ListenerId]) ->
             emqx_ctl:print("Invalid listener: ~0p~n", [ListenerId])
     end;
 listeners(["restart", ListenerId]) ->
-    case emqx_misc:safe_to_existing_atom(ListenerId) of
+    case emqx_utils:safe_to_existing_atom(ListenerId) of
         {ok, ListenerId1} ->
             case emqx_listeners:restart_listener(ListenerId1) of
                 ok ->
diff --git a/apps/emqx_modules/src/emqx_delayed.erl b/apps/emqx_modules/src/emqx_delayed.erl
index 91cdbedd3..85313c181 100644
--- a/apps/emqx_modules/src/emqx_delayed.erl
+++ b/apps/emqx_modules/src/emqx_delayed.erl
@@ -328,7 +328,7 @@ handle_info(Info, State) ->
 
 terminate(_Reason, #{stats_timer := StatsTimer} = State) ->
     emqx_conf:remove_handler([delayed]),
-    emqx_misc:cancel_timer(StatsTimer),
+    emqx_utils:cancel_timer(StatsTimer),
     do_load_or_unload(false, State).
 
 code_change(_Vsn, State, _Extra) ->
@@ -370,14 +370,14 @@ ensure_publish_timer({Ts, _Id}, State = #{publish_timer := undefined}) ->
 ensure_publish_timer({Ts, _Id}, State = #{publish_timer := TRef, publish_at := PubAt}) when
     Ts < PubAt
 ->
-    ok = emqx_misc:cancel_timer(TRef),
+    ok = emqx_utils:cancel_timer(TRef),
     ensure_publish_timer(Ts, ?NOW, State);
 ensure_publish_timer(_Key, State) ->
     State.
 
 ensure_publish_timer(Ts, Now, State) ->
     Interval = max(1, Ts - Now),
-    TRef = emqx_misc:start_timer(Interval, do_publish),
+    TRef = emqx_utils:start_timer(Interval, do_publish),
     State#{publish_timer := TRef, publish_at := Now + Interval}.
 
 do_publish(Key, Now) ->
@@ -418,7 +418,7 @@ do_load_or_unload(true, State) ->
     State;
 do_load_or_unload(false, #{publish_timer := PubTimer} = State) ->
     emqx_hooks:del('message.publish', {?MODULE, on_message_publish}),
-    emqx_misc:cancel_timer(PubTimer),
+    emqx_utils:cancel_timer(PubTimer),
     ets:delete_all_objects(?TAB),
     State#{publish_timer := undefined, publish_at := 0};
 do_load_or_unload(_, State) ->
diff --git a/apps/emqx_modules/src/emqx_telemetry.erl b/apps/emqx_modules/src/emqx_telemetry.erl
index 1d49fb3e7..3b27302df 100644
--- a/apps/emqx_modules/src/emqx_telemetry.erl
+++ b/apps/emqx_modules/src/emqx_telemetry.erl
@@ -161,7 +161,7 @@ handle_call(enable, _From, State) ->
     FirstReportTimeoutMS = timer:seconds(10),
     {reply, ok, ensure_report_timer(FirstReportTimeoutMS, State)};
 handle_call(disable, _From, State = #state{timer = Timer}) ->
-    emqx_misc:cancel_timer(Timer),
+    emqx_utils:cancel_timer(Timer),
     {reply, ok, State#state{timer = undefined}};
 handle_call(get_node_uuid, _From, State = #state{node_uuid = UUID}) ->
     {reply, {ok, UUID}, State};
@@ -205,7 +205,7 @@ ensure_report_timer(State = #state{report_interval = ReportInterval}) ->
     ensure_report_timer(ReportInterval, State).
 
 ensure_report_timer(ReportInterval, State) ->
-    State#state{timer = emqx_misc:start_timer(ReportInterval, time_to_report_telemetry_data)}.
+    State#state{timer = emqx_utils:start_timer(ReportInterval, time_to_report_telemetry_data)}.
 
 os_info() ->
     case erlang:system_info(os_type) of
diff --git a/apps/emqx_plugin_libs/src/emqx_plugin_libs_pool.erl b/apps/emqx_plugin_libs/src/emqx_plugin_libs_pool.erl
index 9b286f360..a3048e5dd 100644
--- a/apps/emqx_plugin_libs/src/emqx_plugin_libs_pool.erl
+++ b/apps/emqx_plugin_libs/src/emqx_plugin_libs_pool.erl
@@ -79,7 +79,7 @@ health_check_ecpool_workers(PoolName, CheckFunc, Timeout) ->
                     false
             end
         end,
-    try emqx_misc:pmap(DoPerWorker, Workers, Timeout) of
+    try emqx_utils:pmap(DoPerWorker, Workers, Timeout) of
         [_ | _] = Status ->
             lists:all(fun(St) -> St =:= true end, Status);
         [] ->
diff --git a/apps/emqx_plugin_libs/src/emqx_plugin_libs_rule.erl b/apps/emqx_plugin_libs/src/emqx_plugin_libs_rule.erl
index 40f88a0dc..8844fe586 100644
--- a/apps/emqx_plugin_libs/src/emqx_plugin_libs_rule.erl
+++ b/apps/emqx_plugin_libs/src/emqx_plugin_libs_rule.erl
@@ -225,7 +225,7 @@ tcp_connectivity(Host, Port) ->
 ) ->
     ok | {error, Reason :: term()}.
 tcp_connectivity(Host, Port, Timeout) ->
-    case gen_tcp:connect(Host, Port, emqx_misc:ipv6_probe([]), Timeout) of
+    case gen_tcp:connect(Host, Port, emqx_utils:ipv6_probe([]), Timeout) of
         {ok, Sock} ->
             gen_tcp:close(Sock),
             ok;
diff --git a/apps/emqx_prometheus/src/emqx_prometheus.erl b/apps/emqx_prometheus/src/emqx_prometheus.erl
index 60d52f58b..05d9508b6 100644
--- a/apps/emqx_prometheus/src/emqx_prometheus.erl
+++ b/apps/emqx_prometheus/src/emqx_prometheus.erl
@@ -144,7 +144,7 @@ terminate(_Reason, _State) ->
     ok.
 
 ensure_timer(Interval) ->
-    emqx_misc:start_timer(Interval, ?TIMER_MSG).
+    emqx_utils:start_timer(Interval, ?TIMER_MSG).
 
 %%--------------------------------------------------------------------
 %% prometheus callbacks
diff --git a/apps/emqx_resource/src/emqx_resource_buffer_worker.erl b/apps/emqx_resource/src/emqx_resource_buffer_worker.erl
index 0fa4c0bd8..331480064 100644
--- a/apps/emqx_resource/src/emqx_resource_buffer_worker.erl
+++ b/apps/emqx_resource/src/emqx_resource_buffer_worker.erl
@@ -1535,7 +1535,7 @@ queue_count(Q) ->
 disk_queue_dir(Id, Index) ->
     QDir0 = binary_to_list(Id) ++ ":" ++ integer_to_list(Index),
     QDir = filename:join([emqx:data_dir(), "bufs", node(), QDir0]),
-    emqx_misc:safe_filename(QDir).
+    emqx_utils:safe_filename(QDir).
 
 clear_disk_queue_dir(Id, Index) ->
     ReplayQDir = disk_queue_dir(Id, Index),
diff --git a/apps/emqx_resource/src/emqx_resource_manager.erl b/apps/emqx_resource/src/emqx_resource_manager.erl
index 9fe0fbdf2..7ecf56c18 100644
--- a/apps/emqx_resource/src/emqx_resource_manager.erl
+++ b/apps/emqx_resource/src/emqx_resource_manager.erl
@@ -539,7 +539,7 @@ stop_resource(#data{state = ResState, id = ResId} = Data) ->
     Data#data{status = stopped}.
 
 make_test_id() ->
-    RandId = iolist_to_binary(emqx_misc:gen_id(16)),
+    RandId = iolist_to_binary(emqx_utils:gen_id(16)),
     <<?TEST_ID_PREFIX, RandId/binary>>.
 
 handle_manually_health_check(From, Data) ->
@@ -613,7 +613,7 @@ maybe_alarm(_Status, ResId, Error) ->
     HrError =
         case Error of
             undefined -> <<"Unknown reason">>;
-            _Else -> emqx_misc:readable_error_msg(Error)
+            _Else -> emqx_utils:readable_error_msg(Error)
         end,
     emqx_alarm:activate(
         ResId,
diff --git a/apps/emqx_retainer/src/emqx_retainer.app.src b/apps/emqx_retainer/src/emqx_retainer.app.src
index 11013cdd3..7bfc8ee4e 100644
--- a/apps/emqx_retainer/src/emqx_retainer.app.src
+++ b/apps/emqx_retainer/src/emqx_retainer.app.src
@@ -2,7 +2,7 @@
 {application, emqx_retainer, [
     {description, "EMQX Retainer"},
     % strict semver, bump manually!
-    {vsn, "5.0.11"},
+    {vsn, "5.0.12"},
     {modules, []},
     {registered, [emqx_retainer_sup]},
     {applications, [kernel, stdlib, emqx, emqx_ctl]},
diff --git a/apps/emqx_retainer/src/emqx_retainer_dispatcher.erl b/apps/emqx_retainer/src/emqx_retainer_dispatcher.erl
index 454a65eb3..32cbba084 100644
--- a/apps/emqx_retainer/src/emqx_retainer_dispatcher.erl
+++ b/apps/emqx_retainer/src/emqx_retainer_dispatcher.erl
@@ -91,7 +91,7 @@ worker() ->
     | ignore.
 start_link(Pool, Id) ->
     gen_server:start_link(
-        {local, emqx_misc:proc_name(?MODULE, Id)},
+        {local, emqx_utils:proc_name(?MODULE, Id)},
         ?MODULE,
         [Pool, Id],
         [{hibernate_after, 1000}]
diff --git a/apps/emqx_rule_engine/src/emqx_rule_actions.erl b/apps/emqx_rule_engine/src/emqx_rule_actions.erl
index 40158d342..a9f24ddcd 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_actions.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_actions.erl
@@ -175,7 +175,7 @@ safe_publish(RuleId, Topic, QoS, Flags, Payload, PubProps) ->
         flags = Flags,
         headers = #{
             republish_by => RuleId,
-            properties => emqx_misc:pub_props_to_packet(PubProps)
+            properties => emqx_utils:pub_props_to_packet(PubProps)
         },
         topic = Topic,
         payload = Payload,
diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl b/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl
index c63d6275f..d66f2c1c9 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl
@@ -343,7 +343,7 @@ param_path_id() ->
             {200, Result}
     end;
 '/rules'(post, #{body := Params0}) ->
-    case maps:get(<<"id">>, Params0, list_to_binary(emqx_misc:gen_id(8))) of
+    case maps:get(<<"id">>, Params0, list_to_binary(emqx_utils:gen_id(8))) of
         <<>> ->
             {400, #{code => 'BAD_REQUEST', message => <<"empty rule id is not allowed">>}};
         Id ->
@@ -459,11 +459,11 @@ param_path_id() ->
 %%------------------------------------------------------------------------------
 
 err_msg({RuleError, {_E, Reason, _S}}) ->
-    emqx_misc:readable_error_msg(encode_nested_error(RuleError, Reason));
+    emqx_utils:readable_error_msg(encode_nested_error(RuleError, Reason));
 err_msg({Reason, _Details}) ->
-    emqx_misc:readable_error_msg(Reason);
+    emqx_utils:readable_error_msg(Reason);
 err_msg(Msg) ->
-    emqx_misc:readable_error_msg(Msg).
+    emqx_utils:readable_error_msg(Msg).
 
 encode_nested_error(RuleError, Reason) when is_tuple(Reason) ->
     encode_nested_error(RuleError, element(1, Reason));
diff --git a/apps/emqx_rule_engine/src/emqx_rule_funcs.erl b/apps/emqx_rule_engine/src/emqx_rule_funcs.erl
index 944aa02f8..81435d9ac 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_funcs.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_funcs.erl
@@ -643,10 +643,10 @@ map(Data) ->
     emqx_plugin_libs_rule:map(Data).
 
 bin2hexstr(Bin) when is_binary(Bin) ->
-    emqx_misc:bin_to_hexstr(Bin, upper).
+    emqx_utils:bin_to_hexstr(Bin, upper).
 
 hexstr2bin(Str) when is_binary(Str) ->
-    emqx_misc:hexstr_to_bin(Str).
+    emqx_utils:hexstr_to_bin(Str).
 
 %%------------------------------------------------------------------------------
 %% NULL Funcs
@@ -944,7 +944,7 @@ sha256(S) when is_binary(S) ->
     hash(sha256, S).
 
 hash(Type, Data) ->
-    emqx_misc:bin_to_hexstr(crypto:hash(Type, Data), lower).
+    emqx_utils:bin_to_hexstr(crypto:hash(Type, Data), lower).
 
 %%------------------------------------------------------------------------------
 %% gzip Funcs
diff --git a/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl b/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl
index e97c45b35..455efe389 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl
@@ -48,7 +48,7 @@ test(#{sql := Sql, context := Context}) ->
     end.
 
 test_rule(Sql, Select, Context, EventTopics) ->
-    RuleId = iolist_to_binary(["sql_tester:", emqx_misc:gen_id(16)]),
+    RuleId = iolist_to_binary(["sql_tester:", emqx_utils:gen_id(16)]),
     ok = emqx_rule_engine:maybe_add_metrics_for_rule(RuleId),
     Rule = #{
         id => RuleId,
diff --git a/apps/emqx_statsd/src/emqx_statsd.app.src b/apps/emqx_statsd/src/emqx_statsd.app.src
index 9d40c6857..412e0b685 100644
--- a/apps/emqx_statsd/src/emqx_statsd.app.src
+++ b/apps/emqx_statsd/src/emqx_statsd.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_statsd, [
     {description, "EMQX Statsd"},
-    {vsn, "5.0.7"},
+    {vsn, "5.0.8"},
     {registered, []},
     {mod, {emqx_statsd_app, []}},
     {applications, [
diff --git a/apps/emqx_statsd/src/emqx_statsd.erl b/apps/emqx_statsd/src/emqx_statsd.erl
index c2e1819ac..c5a7fc1c8 100644
--- a/apps/emqx_statsd/src/emqx_statsd.erl
+++ b/apps/emqx_statsd/src/emqx_statsd.erl
@@ -144,7 +144,7 @@ flush_interval(_FlushInterval, SampleInterval) ->
     SampleInterval.
 
 ensure_timer(State = #{sample_time_interval := SampleTimeInterval}) ->
-    State#{timer => emqx_misc:start_timer(SampleTimeInterval, ?SAMPLE_TIMEOUT)}.
+    State#{timer => emqx_utils:start_timer(SampleTimeInterval, ?SAMPLE_TIMEOUT)}.
 
 check_multicall_result({Results, []}) ->
     case
diff --git a/apps/emqx/src/emqx_misc.erl b/apps/emqx_utils/src/emqx_utils.erl
similarity index 99%
rename from apps/emqx/src/emqx_misc.erl
rename to apps/emqx_utils/src/emqx_utils.erl
index d0c7397c8..21dbd339d 100644
--- a/apps/emqx/src/emqx_misc.erl
+++ b/apps/emqx_utils/src/emqx_utils.erl
@@ -14,14 +14,12 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
--module(emqx_misc).
+-module(emqx_utils).
 
 -compile(inline).
+%% [TODO] Cleanup so the instruction below is not necessary.
 -elvis([{elvis_style, god_modules, disable}]).
 
--include("types.hrl").
--include("logger.hrl").
-
 -export([
     merge_opts/2,
     maybe_apply/2,
@@ -71,6 +69,8 @@
 
 -export([clamp/3, redact/1, redact/2, is_redacted/2, is_redacted/3]).
 
+-type maybe(T) :: undefined | T.
+
 -dialyzer({nowarn_function, [nolink_apply/2]}).
 
 -define(SHORT, 8).
@@ -221,6 +221,7 @@ drain_down(Cnt, Acc) ->
 %% `ok': There is nothing out of the ordinary.
 %% `shutdown': Some numbers (message queue length hit the limit),
 %%             hence shutdown for greater good (system stability).
+%% [FIXME] cross-dependency on `emqx_types`.
 -spec check_oom(emqx_types:oom_policy()) -> ok | {shutdown, term()}.
 check_oom(Policy) ->
     check_oom(self(), Policy).
@@ -279,6 +280,7 @@ proc_name(Mod, Id) ->
     list_to_atom(lists:concat([Mod, "_", Id])).
 
 %% Get Proc's Stats.
+%% [FIXME] cross-dependency on `emqx_types`.
 -spec proc_stats() -> emqx_types:stats().
 proc_stats() -> proc_stats(self()).
 
diff --git a/apps/emqx_utils/test/emqx_utils_SUITE.erl b/apps/emqx_utils/test/emqx_utils_SUITE.erl
index 09a8d085c..598f05a21 100644
--- a/apps/emqx_utils/test/emqx_utils_SUITE.erl
+++ b/apps/emqx_utils/test/emqx_utils_SUITE.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2020-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
+%% Copyright (c) 2018-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -20,29 +20,188 @@
 -compile(nowarn_export_all).
 
 -include_lib("eunit/include/eunit.hrl").
--include_lib("common_test/include/ct.hrl").
 
-all() ->
-    emqx_common_test_helpers:all(?MODULE).
+-define(SOCKOPTS, [
+    binary,
+    {packet, raw},
+    {reuseaddr, true},
+    {backlog, 512},
+    {nodelay, true}
+]).
 
-init_per_suite(Config) ->
-    emqx_common_test_helpers:start_apps([emqx_conf, emqx_utils]),
-    Config.
+all() -> emqx_common_test_helpers:all(?MODULE).
 
-end_per_suite(_Config) ->
-    emqx_common_test_helpers:stop_apps([emqx_conf, emqx_utils]),
-    ok.
+t_merge_opts(_) ->
+    Opts = emqx_utils:merge_opts(?SOCKOPTS, [
+        raw,
+        binary,
+        {backlog, 1024},
+        {nodelay, false},
+        {max_clients, 1024},
+        {acceptors, 16}
+    ]),
+    ?assertEqual(1024, proplists:get_value(backlog, Opts)),
+    ?assertEqual(1024, proplists:get_value(max_clients, Opts)),
+    ?assertEqual(
+        [
+            binary,
+            raw,
+            {acceptors, 16},
+            {backlog, 1024},
+            {max_clients, 1024},
+            {nodelay, false},
+            {packet, raw},
+            {reuseaddr, true}
+        ],
+        lists:sort(Opts)
+    ).
 
-init_per_testcase(TestCase, Config) ->
-    emqx_common_test_helpers:init_per_testcase(?MODULE, TestCase, Config).
+t_maybe_apply(_) ->
+    ?assertEqual(undefined, emqx_utils:maybe_apply(fun(A) -> A end, undefined)),
+    ?assertEqual(a, emqx_utils:maybe_apply(fun(A) -> A end, a)).
 
-end_per_testcase(TestCase, Config) ->
-    emqx_common_test_helpers:end_per_testcase(?MODULE, TestCase, Config).
+t_run_fold(_) ->
+    ?assertEqual(1, emqx_utils:run_fold([], 1, state)),
+    Add = fun(I, St) -> I + St end,
+    Mul = fun(I, St) -> I * St end,
+    ?assertEqual(6, emqx_utils:run_fold([Add, Mul], 1, 2)).
 
-t_fail(init, Config) ->
-    Config;
-t_fail('end', _Config) ->
-    ok.
+t_pipeline(_) ->
+    ?assertEqual({ok, input, state}, emqx_utils:pipeline([], input, state)),
+    Funs = [
+        fun(_I, _St) -> ok end,
+        fun(_I, St) -> {ok, St + 1} end,
+        fun(I, St) -> {ok, I + 1, St + 1} end,
+        fun(I, St) -> {ok, I * 2, St * 2} end
+    ],
+    ?assertEqual({ok, 4, 6}, emqx_utils:pipeline(Funs, 1, 1)),
+    ?assertEqual(
+        {error, undefined, 1}, emqx_utils:pipeline([fun(_I) -> {error, undefined} end], 1, 1)
+    ),
+    ?assertEqual(
+        {error, undefined, 2},
+        emqx_utils:pipeline([fun(_I, _St) -> {error, undefined, 2} end], 1, 1)
+    ).
 
-t_fail(_Config) ->
-    ?assert(false).
+t_start_timer(_) ->
+    TRef = emqx_utils:start_timer(1, tmsg),
+    timer:sleep(2),
+    ?assertEqual([{timeout, TRef, tmsg}], drain()),
+    ok = emqx_utils:cancel_timer(TRef).
+
+t_cancel_timer(_) ->
+    Timer = emqx_utils:start_timer(0, foo),
+    ok = emqx_utils:cancel_timer(Timer),
+    ?assertEqual([], drain()),
+    ok = emqx_utils:cancel_timer(undefined).
+
+t_proc_name(_) ->
+    ?assertEqual(emqx_pool_1, emqx_utils:proc_name(emqx_pool, 1)).
+
+t_proc_stats(_) ->
+    Pid1 = spawn(fun() -> exit(normal) end),
+    timer:sleep(10),
+    ?assertEqual([], emqx_utils:proc_stats(Pid1)),
+    Pid2 = spawn(fun() ->
+        ?assertMatch([{mailbox_len, 0} | _], emqx_utils:proc_stats()),
+        timer:sleep(200)
+    end),
+    timer:sleep(10),
+    Pid2 ! msg,
+    timer:sleep(10),
+    ?assertMatch([{mailbox_len, 1} | _], emqx_utils:proc_stats(Pid2)).
+
+t_drain_deliver(_) ->
+    self() ! {deliver, t1, m1},
+    self() ! {deliver, t2, m2},
+    ?assertEqual(
+        [
+            {deliver, t1, m1},
+            {deliver, t2, m2}
+        ],
+        emqx_utils:drain_deliver(2)
+    ).
+
+t_drain_down(_) ->
+    {Pid1, _Ref1} = erlang:spawn_monitor(fun() -> ok end),
+    {Pid2, _Ref2} = erlang:spawn_monitor(fun() -> ok end),
+    timer:sleep(100),
+    ?assertEqual([Pid1, Pid2], lists:sort(emqx_utils:drain_down(2))),
+    ?assertEqual([], emqx_utils:drain_down(1)).
+
+t_index_of(_) ->
+    try emqx_utils:index_of(a, []) of
+        _ -> ct:fail(should_throw_error)
+    catch
+        error:Reason ->
+            ?assertEqual(badarg, Reason)
+    end,
+    ?assertEqual(3, emqx_utils:index_of(a, [b, c, a, e, f])).
+
+t_check(_) ->
+    Policy = #{
+        max_message_queue_len => 10,
+        max_heap_size => 1024 * 1024 * 8,
+        enable => true
+    },
+    [self() ! {msg, I} || I <- lists:seq(1, 5)],
+    ?assertEqual(ok, emqx_utils:check_oom(Policy)),
+    [self() ! {msg, I} || I <- lists:seq(1, 6)],
+    ?assertEqual({shutdown, message_queue_too_long}, emqx_utils:check_oom(Policy)).
+
+drain() ->
+    drain([]).
+
+drain(Acc) ->
+    receive
+        Msg -> drain([Msg | Acc])
+    after 0 ->
+        lists:reverse(Acc)
+    end.
+
+t_rand_seed(_) ->
+    ?assert(is_tuple(emqx_utils:rand_seed())).
+
+t_now_to_secs(_) ->
+    ?assert(is_integer(emqx_utils:now_to_secs(os:timestamp()))).
+
+t_now_to_ms(_) ->
+    ?assert(is_integer(emqx_utils:now_to_ms(os:timestamp()))).
+
+t_gen_id(_) ->
+    ?assertEqual(10, length(emqx_utils:gen_id(10))),
+    ?assertEqual(20, length(emqx_utils:gen_id(20))).
+
+t_pmap_normal(_) ->
+    ?assertEqual(
+        [5, 7, 9],
+        emqx_utils:pmap(
+            fun({A, B}) -> A + B end,
+            [{2, 3}, {3, 4}, {4, 5}]
+        )
+    ).
+
+t_pmap_timeout(_) ->
+    ?assertExit(
+        timeout,
+        emqx_utils:pmap(
+            fun
+                (timeout) -> ct:sleep(1000);
+                ({A, B}) -> A + B
+            end,
+            [{2, 3}, {3, 4}, timeout],
+            100
+        )
+    ).
+
+t_pmap_exception(_) ->
+    ?assertError(
+        foobar,
+        emqx_utils:pmap(
+            fun
+                (error) -> error(foobar);
+                ({A, B}) -> A + B
+            end,
+            [{2, 3}, {3, 4}, error]
+        )
+    ).
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_dynamo_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_dynamo_SUITE.erl
index e899b0fcd..133ef0430 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_dynamo_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_dynamo_SUITE.erl
@@ -272,7 +272,7 @@ t_setup_via_config_and_publish(Config) ->
         {ok, _},
         create_bridge(Config)
     ),
-    MsgId = emqx_misc:gen_id(),
+    MsgId = emqx_utils:gen_id(),
     SentData = #{id => MsgId, payload => ?PAYLOAD},
     ?check_trace(
         begin
@@ -309,7 +309,7 @@ t_setup_via_http_api_and_publish(Config) ->
         {ok, _},
         create_bridge_http(PgsqlConfig)
     ),
-    MsgId = emqx_misc:gen_id(),
+    MsgId = emqx_utils:gen_id(),
     SentData = #{id => MsgId, payload => ?PAYLOAD},
     ?check_trace(
         begin
@@ -375,7 +375,7 @@ t_write_failure(Config) ->
             #{?snk_kind := resource_connected_enter},
             20_000
         ),
-    SentData = #{id => emqx_misc:gen_id(), payload => ?PAYLOAD},
+    SentData = #{id => emqx_utils:gen_id(), payload => ?PAYLOAD},
     emqx_common_test_helpers:with_failure(down, ProxyName, ProxyHost, ProxyPort, fun() ->
         ?assertMatch(
             {error, {resource_error, #{reason := timeout}}}, send_message(Config, SentData)
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_gcp_pubsub_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_gcp_pubsub_SUITE.erl
index 3cc4c75e4..49bc444c6 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_gcp_pubsub_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_gcp_pubsub_SUITE.erl
@@ -809,7 +809,7 @@ test_publish_success_batch(Config) ->
     %% making 1-sized batches.  also important to note that the pool
     %% size for the resource (replayq buffering) must be set to 1 to
     %% avoid further segmentation of batches.
-    emqx_misc:pmap(fun emqx:publish/1, Messages),
+    emqx_utils:pmap(fun emqx:publish/1, Messages),
     DecodedMessages0 = assert_http_request(ServiceAccountJSON),
     ?assertEqual(BatchSize, length(DecodedMessages0)),
     DecodedMessages1 = assert_http_request(ServiceAccountJSON),
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_mysql_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_mysql_SUITE.erl
index 69b1e26ce..be07a2bb7 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_mysql_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_mysql_SUITE.erl
@@ -615,7 +615,7 @@ t_workload_fits_prepared_statement_limit(Config) ->
         create_bridge(Config)
     ),
     Results = lists:append(
-        emqx_misc:pmap(
+        emqx_utils:pmap(
             fun(_) ->
                 [
                     begin
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_cassa.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_cassa.erl
index ce964dd17..86b908038 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_cassa.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_cassa.erl
@@ -102,7 +102,7 @@ on_start(
     ?SLOG(info, #{
         msg => "starting_cassandra_connector",
         connector => InstId,
-        config => emqx_misc:redact(Config)
+        config => emqx_utils:redact(Config)
     }),
 
     Options = [
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_clickhouse.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_clickhouse.erl
index 3749ecc6e..2872e8cf0 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_clickhouse.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_clickhouse.erl
@@ -139,7 +139,7 @@ on_start(
     ?SLOG(info, #{
         msg => "starting_clickhouse_connector",
         connector => InstanceID,
-        config => emqx_misc:redact(Config)
+        config => emqx_utils:redact(Config)
     }),
     PoolName = emqx_plugin_libs_pool:pool_name(InstanceID),
     Options = [
@@ -181,7 +181,7 @@ log_start_error(Config, Reason, Stacktrace) ->
         #{
             msg => "clickhouse_connector_start_failed",
             error_reason => Reason,
-            config => emqx_misc:redact(Config)
+            config => emqx_utils:redact(Config)
         },
     ?SLOG(info, maps:merge(LogMessage, StacktraceMap)),
     ?tp(
@@ -318,7 +318,7 @@ do_get_status(PoolName, Timeout) ->
                     Error
             end
         end,
-    try emqx_misc:pmap(DoPerWorker, Workers, Timeout) of
+    try emqx_utils:pmap(DoPerWorker, Workers, Timeout) of
         Results ->
             case [E || {error, _} = E <- Results] of
                 [] ->
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_dynamo.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_dynamo.erl
index ee56e0c5f..85daefbb7 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_dynamo.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_dynamo.erl
@@ -95,7 +95,7 @@ on_start(
     ?SLOG(info, #{
         msg => "starting_dynamo_connector",
         connector => InstanceId,
-        config => emqx_misc:redact(Config)
+        config => emqx_utils:redact(Config)
     }),
 
     {Schema, Server} = get_host_schema(to_str(Url)),
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_gcp_pubsub.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_gcp_pubsub.erl
index a2045b8c5..2295f63ab 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_gcp_pubsub.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_gcp_pubsub.erl
@@ -86,7 +86,7 @@ on_start(
     PoolType = random,
     Transport = tls,
     TransportOpts = emqx_tls_lib:to_client_opts(#{enable => true, verify => verify_none}),
-    NTransportOpts = emqx_misc:ipv6_probe(TransportOpts),
+    NTransportOpts = emqx_utils:ipv6_probe(TransportOpts),
     PoolOpts = [
         {host, Host},
         {port, Port},
@@ -587,7 +587,7 @@ do_get_status(InstanceId, PoolName, Timeout) ->
                     false
             end
         end,
-    try emqx_misc:pmap(DoPerWorker, Workers, Timeout) of
+    try emqx_utils:pmap(DoPerWorker, Workers, Timeout) of
         [_ | _] = Status ->
             lists:all(fun(St) -> St =:= true end, Status);
         [] ->
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl
index afe17cae6..700eb2a81 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl
@@ -216,8 +216,8 @@ start_client(InstId, Config) ->
     ?SLOG(info, #{
         msg => "starting influxdb connector",
         connector => InstId,
-        config => emqx_misc:redact(Config),
-        client_config => emqx_misc:redact(ClientConfig)
+        config => emqx_utils:redact(Config),
+        client_config => emqx_utils:redact(ClientConfig)
     }),
     try
         do_start_client(InstId, ClientConfig, Config)
@@ -353,7 +353,7 @@ password(_) ->
     [].
 
 redact_auth(Term) ->
-    emqx_misc:redact(Term, fun is_auth_key/1).
+    emqx_utils:redact(Term, fun is_auth_key/1).
 
 is_auth_key(Key) when is_binary(Key) ->
     string:equal("authorization", Key, true);
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_rocketmq.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_rocketmq.erl
index d296b0b4f..205359bb8 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_rocketmq.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_rocketmq.erl
@@ -265,7 +265,7 @@ client_id(InstanceId) ->
     erlang:binary_to_atom(Name, utf8).
 
 redact(Msg) ->
-    emqx_misc:redact(Msg, fun is_sensitive_key/1).
+    emqx_utils:redact(Msg, fun is_sensitive_key/1).
 
 is_sensitive_key(security_token) ->
     true;
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_tdengine.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_tdengine.erl
index 746ab5485..9b6718882 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_tdengine.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_tdengine.erl
@@ -93,7 +93,7 @@ on_start(
     ?SLOG(info, #{
         msg => "starting_tdengine_connector",
         connector => InstanceId,
-        config => emqx_misc:redact(Config)
+        config => emqx_utils:redact(Config)
     }),
 
     {Host, Port} = emqx_schema:parse_server(Server, ?TD_HOST_OPTIONS),
diff --git a/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_SUITE.erl b/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_SUITE.erl
index 3c26d1966..43ccd9fc1 100644
--- a/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_SUITE.erl
+++ b/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_SUITE.erl
@@ -218,7 +218,7 @@ start_cluster(Cluster) ->
      || {Name, Opts} <- Cluster
     ],
     on_exit(fun() ->
-        emqx_misc:pmap(
+        emqx_utils:pmap(
             fun(N) ->
                 ct:pal("stopping ~p", [N]),
                 ok = emqx_common_test_helpers:stop_slave(N)
diff --git a/lib-ee/emqx_license/src/emqx_license_http_api.erl b/lib-ee/emqx_license/src/emqx_license_http_api.erl
index 0133cd637..ef0e1ee52 100644
--- a/lib-ee/emqx_license/src/emqx_license_http_api.erl
+++ b/lib-ee/emqx_license/src/emqx_license_http_api.erl
@@ -95,7 +95,7 @@ sample_license_info_response() ->
     }.
 
 error_msg(Code, Msg) ->
-    #{code => Code, message => emqx_misc:readable_error_msg(Msg)}.
+    #{code => Code, message => emqx_utils:readable_error_msg(Msg)}.
 
 %% read license info
 '/license'(get, _Params) ->

From d0df086c80bce1c9aa9c3d2ad4de0e98f947cd09 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Thu, 13 Apr 2023 14:50:30 +0200
Subject: [PATCH 060/110] refactor: rename emqx_api_lib to emqx_utils_api

---
 apps/emqx_bridge/src/emqx_bridge_api.erl               |  2 +-
 apps/emqx_dashboard/src/emqx_dashboard_monitor_api.erl |  6 +++---
 apps/emqx_management/src/emqx_mgmt_api_nodes.erl       |  6 +++---
 .../include/emqx_utils_api.hrl}                        |  0
 apps/emqx_utils/src/emqx_utils.app.src                 |  1 +
 .../src/emqx_utils_api.erl}                            |  4 ++--
 .../test/emqx_utils_api_SUITE.erl}                     | 10 +++++-----
 .../src/emqx_ee_schema_registry_http_api.erl           |  2 +-
 8 files changed, 16 insertions(+), 15 deletions(-)
 rename apps/{emqx/include/emqx_api_lib.hrl => emqx_utils/include/emqx_utils_api.hrl} (100%)
 rename apps/{emqx/src/emqx_api_lib.erl => emqx_utils/src/emqx_utils_api.erl} (97%)
 rename apps/{emqx/test/emqx_api_lib_SUITE.erl => emqx_utils/test/emqx_utils_api_SUITE.erl} (92%)

diff --git a/apps/emqx_bridge/src/emqx_bridge_api.erl b/apps/emqx_bridge/src/emqx_bridge_api.erl
index 814fcdeb7..a1841b705 100644
--- a/apps/emqx_bridge/src/emqx_bridge_api.erl
+++ b/apps/emqx_bridge/src/emqx_bridge_api.erl
@@ -20,7 +20,7 @@
 -include_lib("typerefl/include/types.hrl").
 -include_lib("hocon/include/hoconsc.hrl").
 -include_lib("emqx/include/logger.hrl").
--include_lib("emqx/include/emqx_api_lib.hrl").
+-include_lib("emqx_utils/include/emqx_utils_api.hrl").
 -include_lib("emqx_bridge/include/emqx_bridge.hrl").
 
 -import(hoconsc, [mk/2, array/1, enum/1]).
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_monitor_api.erl b/apps/emqx_dashboard/src/emqx_dashboard_monitor_api.erl
index c2dd4a9dd..c0e162b62 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_monitor_api.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_monitor_api.erl
@@ -122,7 +122,7 @@ fields(sampler_current) ->
 monitor(get, #{query_string := QS, bindings := Bindings}) ->
     Latest = maps:get(<<"latest">>, QS, infinity),
     RawNode = maps:get(node, Bindings, <<"all">>),
-    emqx_api_lib:with_node_or_cluster(RawNode, dashboard_samplers_fun(Latest)).
+    emqx_utils_api:with_node_or_cluster(RawNode, dashboard_samplers_fun(Latest)).
 
 dashboard_samplers_fun(Latest) ->
     fun(NodeOrCluster) ->
@@ -133,10 +133,10 @@ dashboard_samplers_fun(Latest) ->
     end.
 
 monitor_current(get, #{bindings := []}) ->
-    emqx_api_lib:with_node_or_cluster(erlang:node(), fun emqx_dashboard_monitor:current_rate/1);
+    emqx_utils_api:with_node_or_cluster(erlang:node(), fun emqx_dashboard_monitor:current_rate/1);
 monitor_current(get, #{bindings := Bindings}) ->
     RawNode = maps:get(node, Bindings, <<"all">>),
-    emqx_api_lib:with_node_or_cluster(RawNode, fun current_rate/1).
+    emqx_utils_api:with_node_or_cluster(RawNode, fun current_rate/1).
 
 current_rate(Node) ->
     case emqx_dashboard_monitor:current_rate(Node) of
diff --git a/apps/emqx_management/src/emqx_mgmt_api_nodes.erl b/apps/emqx_management/src/emqx_mgmt_api_nodes.erl
index a4173f5b0..ecf465f43 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_nodes.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_nodes.erl
@@ -247,13 +247,13 @@ nodes(get, _Params) ->
     list_nodes(#{}).
 
 node(get, #{bindings := #{node := NodeName}}) ->
-    emqx_api_lib:with_node(NodeName, to_ok_result_fun(fun get_node/1)).
+    emqx_utils_api:with_node(NodeName, to_ok_result_fun(fun get_node/1)).
 
 node_metrics(get, #{bindings := #{node := NodeName}}) ->
-    emqx_api_lib:with_node(NodeName, to_ok_result_fun(fun emqx_mgmt:get_metrics/1)).
+    emqx_utils_api:with_node(NodeName, to_ok_result_fun(fun emqx_mgmt:get_metrics/1)).
 
 node_stats(get, #{bindings := #{node := NodeName}}) ->
-    emqx_api_lib:with_node(NodeName, to_ok_result_fun(fun emqx_mgmt:get_stats/1)).
+    emqx_utils_api:with_node(NodeName, to_ok_result_fun(fun emqx_mgmt:get_stats/1)).
 
 %%--------------------------------------------------------------------
 %% api apply
diff --git a/apps/emqx/include/emqx_api_lib.hrl b/apps/emqx_utils/include/emqx_utils_api.hrl
similarity index 100%
rename from apps/emqx/include/emqx_api_lib.hrl
rename to apps/emqx_utils/include/emqx_utils_api.hrl
diff --git a/apps/emqx_utils/src/emqx_utils.app.src b/apps/emqx_utils/src/emqx_utils.app.src
index e1f10c139..08a802d1b 100644
--- a/apps/emqx_utils/src/emqx_utils.app.src
+++ b/apps/emqx_utils/src/emqx_utils.app.src
@@ -5,6 +5,7 @@
     {vsn, "5.0.0"},
     {modules, [
         emqx_utils,
+        emqx_utils_api,
         emqx_utils_binary,
         emqx_utils_ets,
         emqx_utils_json,
diff --git a/apps/emqx/src/emqx_api_lib.erl b/apps/emqx_utils/src/emqx_utils_api.erl
similarity index 97%
rename from apps/emqx/src/emqx_api_lib.erl
rename to apps/emqx_utils/src/emqx_utils_api.erl
index 5eddf6188..e6bd07272 100644
--- a/apps/emqx/src/emqx_api_lib.erl
+++ b/apps/emqx_utils/src/emqx_utils_api.erl
@@ -14,14 +14,14 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
--module(emqx_api_lib).
+-module(emqx_utils_api).
 
 -export([
     with_node/2,
     with_node_or_cluster/2
 ]).
 
--include("emqx_api_lib.hrl").
+-include("emqx_utils_api.hrl").
 
 -define(NODE_NOT_FOUND(NODE), ?NOT_FOUND(<<"Node not found: ", NODE/binary>>)).
 
diff --git a/apps/emqx/test/emqx_api_lib_SUITE.erl b/apps/emqx_utils/test/emqx_utils_api_SUITE.erl
similarity index 92%
rename from apps/emqx/test/emqx_api_lib_SUITE.erl
rename to apps/emqx_utils/test/emqx_utils_api_SUITE.erl
index 29f5c6095..3ed3cd250 100644
--- a/apps/emqx/test/emqx_api_lib_SUITE.erl
+++ b/apps/emqx_utils/test/emqx_utils_api_SUITE.erl
@@ -14,12 +14,12 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
--module(emqx_api_lib_SUITE).
+-module(emqx_utils_api_SUITE).
 
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include("emqx_api_lib.hrl").
+-include("emqx_utils_api.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 -define(DUMMY, dummy_module).
@@ -45,14 +45,14 @@ end_per_testcase(_Case, _Config) ->
     meck:unload(?DUMMY).
 
 t_with_node(_) ->
-    test_with(fun emqx_api_lib:with_node/2, [<<"all">>]).
+    test_with(fun emqx_utils_api:with_node/2, [<<"all">>]).
 
 t_with_node_or_cluster(_) ->
-    test_with(fun emqx_api_lib:with_node_or_cluster/2, []),
+    test_with(fun emqx_utils_api:with_node_or_cluster/2, []),
     meck:reset(?DUMMY),
     ?assertEqual(
         ?OK(success),
-        emqx_api_lib:with_node_or_cluster(
+        emqx_utils_api:with_node_or_cluster(
             <<"all">>,
             fun ?DUMMY:expect_success/1
         )
diff --git a/lib-ee/emqx_ee_schema_registry/src/emqx_ee_schema_registry_http_api.erl b/lib-ee/emqx_ee_schema_registry/src/emqx_ee_schema_registry_http_api.erl
index 897d29e07..c7cc6c99a 100644
--- a/lib-ee/emqx_ee_schema_registry/src/emqx_ee_schema_registry_http_api.erl
+++ b/lib-ee/emqx_ee_schema_registry/src/emqx_ee_schema_registry_http_api.erl
@@ -8,7 +8,7 @@
 -include("emqx_ee_schema_registry.hrl").
 -include_lib("hocon/include/hoconsc.hrl").
 -include_lib("emqx/include/logger.hrl").
--include_lib("emqx/include/emqx_api_lib.hrl").
+-include_lib("emqx_utils/include/emqx_utils_api.hrl").
 
 -export([
     namespace/0,

From 6e8665365baa952dff6161bd66290dd53c1bbaa8 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Thu, 13 Apr 2023 14:57:45 +0200
Subject: [PATCH 061/110] refactor: rename emqx_tables to emqx_utils_ets

---
 apps/emqx/src/emqx_broker.erl                  |  8 ++++----
 apps/emqx/src/emqx_broker_helper.erl           | 10 +++++-----
 apps/emqx/src/emqx_cm.erl                      |  8 ++++----
 apps/emqx/src/emqx_flapping.erl                |  2 +-
 apps/emqx/src/emqx_hooks.erl                   |  2 +-
 apps/emqx/src/emqx_metrics.erl                 |  2 +-
 apps/emqx/src/emqx_ocsp_cache.erl              |  2 +-
 apps/emqx/src/emqx_sequence.erl                |  2 +-
 apps/emqx/src/emqx_session_router.erl          | 10 +++++-----
 apps/emqx/src/emqx_shared_sub.erl              |  8 +++++---
 apps/emqx/src/emqx_stats.erl                   |  2 +-
 apps/emqx_gateway/src/emqx_gateway_cm.erl      |  6 +++---
 apps/emqx_gateway/src/emqx_gateway_metrics.erl |  2 +-
 apps/emqx_modules/src/emqx_topic_metrics.erl   |  2 +-
 .../src/emqx_utils_ets.erl}                    |  2 +-
 .../test/emqx_utils_ets_SUITE.erl}             | 18 +++++++++---------
 .../test/emqx_ee_schema_registry_SUITE.erl     |  2 +-
 17 files changed, 45 insertions(+), 43 deletions(-)
 rename apps/{emqx/src/emqx_tables.erl => emqx_utils/src/emqx_utils_ets.erl} (98%)
 rename apps/{emqx/test/emqx_tables_SUITE.erl => emqx_utils/test/emqx_utils_ets_SUITE.erl} (73%)

diff --git a/apps/emqx/src/emqx_broker.erl b/apps/emqx/src/emqx_broker.erl
index 7e00c050e..5f7c4aaf5 100644
--- a/apps/emqx/src/emqx_broker.erl
+++ b/apps/emqx/src/emqx_broker.erl
@@ -71,7 +71,7 @@
     code_change/3
 ]).
 
--import(emqx_tables, [lookup_value/2, lookup_value/3]).
+-import(emqx_utils_ets, [lookup_value/2, lookup_value/3]).
 
 -ifdef(TEST).
 -compile(export_all).
@@ -107,15 +107,15 @@ create_tabs() ->
     TabOpts = [public, {read_concurrency, true}, {write_concurrency, true}],
 
     %% SubOption: {Topic, SubPid} -> SubOption
-    ok = emqx_tables:new(?SUBOPTION, [ordered_set | TabOpts]),
+    ok = emqx_utils_ets:new(?SUBOPTION, [ordered_set | TabOpts]),
 
     %% Subscription: SubPid -> Topic1, Topic2, Topic3, ...
     %% duplicate_bag: o(1) insert
-    ok = emqx_tables:new(?SUBSCRIPTION, [duplicate_bag | TabOpts]),
+    ok = emqx_utils_ets:new(?SUBSCRIPTION, [duplicate_bag | TabOpts]),
 
     %% Subscriber: Topic -> SubPid1, SubPid2, SubPid3, ...
     %% bag: o(n) insert:(
-    ok = emqx_tables:new(?SUBSCRIBER, [bag | TabOpts]).
+    ok = emqx_utils_ets:new(?SUBSCRIBER, [bag | TabOpts]).
 
 %%------------------------------------------------------------------------------
 %% Subscribe API
diff --git a/apps/emqx/src/emqx_broker_helper.erl b/apps/emqx/src/emqx_broker_helper.erl
index 87b291361..06f249678 100644
--- a/apps/emqx/src/emqx_broker_helper.erl
+++ b/apps/emqx/src/emqx_broker_helper.erl
@@ -73,11 +73,11 @@ register_sub(SubPid, SubId) when is_pid(SubPid) ->
 
 -spec lookup_subid(pid()) -> maybe(emqx_types:subid()).
 lookup_subid(SubPid) when is_pid(SubPid) ->
-    emqx_tables:lookup_value(?SUBMON, SubPid).
+    emqx_utils_ets:lookup_value(?SUBMON, SubPid).
 
 -spec lookup_subpid(emqx_types:subid()) -> maybe(pid()).
 lookup_subpid(SubId) ->
-    emqx_tables:lookup_value(?SUBID, SubId).
+    emqx_utils_ets:lookup_value(?SUBID, SubId).
 
 -spec get_sub_shard(pid(), emqx_types:topic()) -> non_neg_integer().
 get_sub_shard(SubPid, Topic) ->
@@ -105,15 +105,15 @@ reclaim_seq(Topic) ->
 
 init([]) ->
     %% Helper table
-    ok = emqx_tables:new(?HELPER, [{read_concurrency, true}]),
+    ok = emqx_utils_ets:new(?HELPER, [{read_concurrency, true}]),
     %% Shards: CPU * 32
     true = ets:insert(?HELPER, {shards, emqx_vm:schedulers() * 32}),
     %% SubSeq: Topic -> SeqId
     ok = emqx_sequence:create(?SUBSEQ),
     %% SubId: SubId -> SubPid
-    ok = emqx_tables:new(?SUBID, [public, {read_concurrency, true}, {write_concurrency, true}]),
+    ok = emqx_utils_ets:new(?SUBID, [public, {read_concurrency, true}, {write_concurrency, true}]),
     %% SubMon: SubPid -> SubId
-    ok = emqx_tables:new(?SUBMON, [public, {read_concurrency, true}, {write_concurrency, true}]),
+    ok = emqx_utils_ets:new(?SUBMON, [public, {read_concurrency, true}, {write_concurrency, true}]),
     %% Stats timer
     ok = emqx_stats:update_interval(broker_stats, fun emqx_broker:stats_fun/0),
     {ok, #{pmon => emqx_pmon:new()}}.
diff --git a/apps/emqx/src/emqx_cm.erl b/apps/emqx/src/emqx_cm.erl
index 346e8dcb5..0290b57d3 100644
--- a/apps/emqx/src/emqx_cm.erl
+++ b/apps/emqx/src/emqx_cm.erl
@@ -651,10 +651,10 @@ cast(Msg) -> gen_server:cast(?CM, Msg).
 
 init([]) ->
     TabOpts = [public, {write_concurrency, true}],
-    ok = emqx_tables:new(?CHAN_TAB, [bag, {read_concurrency, true} | TabOpts]),
-    ok = emqx_tables:new(?CHAN_CONN_TAB, [bag | TabOpts]),
-    ok = emqx_tables:new(?CHAN_INFO_TAB, [ordered_set, compressed | TabOpts]),
-    ok = emqx_tables:new(?CHAN_LIVE_TAB, [ordered_set, {write_concurrency, true} | TabOpts]),
+    ok = emqx_utils_ets:new(?CHAN_TAB, [bag, {read_concurrency, true} | TabOpts]),
+    ok = emqx_utils_ets:new(?CHAN_CONN_TAB, [bag | TabOpts]),
+    ok = emqx_utils_ets:new(?CHAN_INFO_TAB, [ordered_set, compressed | TabOpts]),
+    ok = emqx_utils_ets:new(?CHAN_LIVE_TAB, [ordered_set, {write_concurrency, true} | TabOpts]),
     ok = emqx_stats:update_interval(chan_stats, fun ?MODULE:stats_fun/0),
     State = #{chan_pmon => emqx_pmon:new()},
     {ok, State}.
diff --git a/apps/emqx/src/emqx_flapping.erl b/apps/emqx/src/emqx_flapping.erl
index 2cfed0a8e..46193fb16 100644
--- a/apps/emqx/src/emqx_flapping.erl
+++ b/apps/emqx/src/emqx_flapping.erl
@@ -99,7 +99,7 @@ now_diff(TS) -> erlang:system_time(millisecond) - TS.
 %%--------------------------------------------------------------------
 
 init([]) ->
-    ok = emqx_tables:new(?FLAPPING_TAB, [
+    ok = emqx_utils_ets:new(?FLAPPING_TAB, [
         public,
         set,
         {keypos, #flapping.clientid},
diff --git a/apps/emqx/src/emqx_hooks.erl b/apps/emqx/src/emqx_hooks.erl
index 1784d8ea3..0b8dc0941 100644
--- a/apps/emqx/src/emqx_hooks.erl
+++ b/apps/emqx/src/emqx_hooks.erl
@@ -229,7 +229,7 @@ lookup(HookPoint) ->
 %%--------------------------------------------------------------------
 
 init([]) ->
-    ok = emqx_tables:new(?TAB, [{keypos, #hook.name}, {read_concurrency, true}]),
+    ok = emqx_utils_ets:new(?TAB, [{keypos, #hook.name}, {read_concurrency, true}]),
     {ok, #{}}.
 
 handle_call({add, HookPoint, Callback = #callback{action = {M, F, _}}}, _From, State) ->
diff --git a/apps/emqx/src/emqx_metrics.erl b/apps/emqx/src/emqx_metrics.erl
index c2e297623..21a114c0f 100644
--- a/apps/emqx/src/emqx_metrics.erl
+++ b/apps/emqx/src/emqx_metrics.erl
@@ -541,7 +541,7 @@ init([]) ->
     CRef = counters:new(?MAX_SIZE, [write_concurrency]),
     ok = persistent_term:put(?MODULE, CRef),
     % Create index mapping table
-    ok = emqx_tables:new(?TAB, [{keypos, 2}, {read_concurrency, true}]),
+    ok = emqx_utils_ets:new(?TAB, [{keypos, 2}, {read_concurrency, true}]),
     Metrics = lists:append([
         ?BYTES_METRICS,
         ?PACKET_METRICS,
diff --git a/apps/emqx/src/emqx_ocsp_cache.erl b/apps/emqx/src/emqx_ocsp_cache.erl
index 7044d992e..ccf3e0c40 100644
--- a/apps/emqx/src/emqx_ocsp_cache.erl
+++ b/apps/emqx/src/emqx_ocsp_cache.erl
@@ -120,7 +120,7 @@ inject_sni_fun(ListenerID, Conf0) ->
 
 init(_Args) ->
     logger:set_process_metadata(#{domain => [emqx, ocsp, cache]}),
-    emqx_tables:new(?CACHE_TAB, [
+    emqx_utils_ets:new(?CACHE_TAB, [
         named_table,
         public,
         {heir, whereis(emqx_kernel_sup), none},
diff --git a/apps/emqx/src/emqx_sequence.erl b/apps/emqx/src/emqx_sequence.erl
index 60596324a..7acc87256 100644
--- a/apps/emqx/src/emqx_sequence.erl
+++ b/apps/emqx/src/emqx_sequence.erl
@@ -39,7 +39,7 @@
 %% @doc Create a sequence.
 -spec create(name()) -> ok.
 create(Name) ->
-    emqx_tables:new(Name, [public, set, {write_concurrency, true}]).
+    emqx_utils_ets:new(Name, [public, set, {write_concurrency, true}]).
 
 %% @doc Next value of the sequence.
 -spec nextval(name(), key()) -> seqid().
diff --git a/apps/emqx/src/emqx_session_router.erl b/apps/emqx/src/emqx_session_router.erl
index 8a21d4d03..0435ddca3 100644
--- a/apps/emqx/src/emqx_session_router.erl
+++ b/apps/emqx/src/emqx_session_router.erl
@@ -95,7 +95,7 @@ create_table(Tab, Storage) ->
 %%--------------------------------------------------------------------
 
 create_init_tab() ->
-    emqx_tables:new(?SESSION_INIT_TAB, [
+    emqx_utils_ets:new(?SESSION_INIT_TAB, [
         public,
         {read_concurrency, true},
         {write_concurrency, true}
@@ -182,7 +182,7 @@ pending(SessionID, MarkerIDs) ->
     call(pick(SessionID), {pending, SessionID, MarkerIDs}).
 
 buffer(SessionID, STopic, Msg) ->
-    case emqx_tables:lookup_value(?SESSION_INIT_TAB, SessionID) of
+    case emqx_utils_ets:lookup_value(?SESSION_INIT_TAB, SessionID) of
         undefined -> ok;
         Worker -> emqx_session_router_worker:buffer(Worker, STopic, Msg)
     end.
@@ -194,7 +194,7 @@ resume_begin(From, SessionID) when is_pid(From), is_binary(SessionID) ->
 -spec resume_end(pid(), binary()) ->
     {'ok', [emqx_types:message()]} | {'error', term()}.
 resume_end(From, SessionID) when is_pid(From), is_binary(SessionID) ->
-    case emqx_tables:lookup_value(?SESSION_INIT_TAB, SessionID) of
+    case emqx_utils_ets:lookup_value(?SESSION_INIT_TAB, SessionID) of
         undefined ->
             ?tp(ps_session_not_found, #{sid => SessionID}),
             {error, not_found};
@@ -249,7 +249,7 @@ handle_cast({delete_routes, SessionID, Subscriptions}, State) ->
     ok = lists:foreach(Fun, maps:to_list(Subscriptions)),
     {noreply, State};
 handle_cast({resume_end, SessionID, Pid}, State) ->
-    case emqx_tables:lookup_value(?SESSION_INIT_TAB, SessionID) of
+    case emqx_utils_ets:lookup_value(?SESSION_INIT_TAB, SessionID) of
         undefined -> skip;
         P when P =:= Pid -> ets:delete(?SESSION_INIT_TAB, SessionID);
         P when is_pid(P) -> skip
@@ -283,7 +283,7 @@ init_resume_worker(RemotePid, SessionID, #{pmon := Pmon} = State) ->
             error;
         {ok, Pid} ->
             Pmon1 = emqx_pmon:monitor(Pid, Pmon),
-            case emqx_tables:lookup_value(?SESSION_INIT_TAB, SessionID) of
+            case emqx_utils_ets:lookup_value(?SESSION_INIT_TAB, SessionID) of
                 undefined ->
                     {ok, Pid, State#{pmon => Pmon1}};
                 {_, OldPid} ->
diff --git a/apps/emqx/src/emqx_shared_sub.erl b/apps/emqx/src/emqx_shared_sub.erl
index 061f2a42f..d7dc8c5a6 100644
--- a/apps/emqx/src/emqx_shared_sub.erl
+++ b/apps/emqx/src/emqx_shared_sub.erl
@@ -399,9 +399,11 @@ init([]) ->
     ok = mria:wait_for_tables([?TAB]),
     {ok, _} = mnesia:subscribe({table, ?TAB, simple}),
     {atomic, PMon} = mria:transaction(?SHARED_SUB_SHARD, fun ?MODULE:init_monitors/0),
-    ok = emqx_tables:new(?SHARED_SUBS, [protected, bag]),
-    ok = emqx_tables:new(?ALIVE_SUBS, [protected, set, {read_concurrency, true}]),
-    ok = emqx_tables:new(?SHARED_SUBS_ROUND_ROBIN_COUNTER, [public, set, {write_concurrency, true}]),
+    ok = emqx_utils_ets:new(?SHARED_SUBS, [protected, bag]),
+    ok = emqx_utils_ets:new(?ALIVE_SUBS, [protected, set, {read_concurrency, true}]),
+    ok = emqx_utils_ets:new(?SHARED_SUBS_ROUND_ROBIN_COUNTER, [
+        public, set, {write_concurrency, true}
+    ]),
     {ok, update_stats(#state{pmon = PMon})}.
 
 init_monitors() ->
diff --git a/apps/emqx/src/emqx_stats.erl b/apps/emqx/src/emqx_stats.erl
index 017b83116..ef9109e33 100644
--- a/apps/emqx/src/emqx_stats.erl
+++ b/apps/emqx/src/emqx_stats.erl
@@ -201,7 +201,7 @@ cast(Msg) -> gen_server:cast(?SERVER, Msg).
 %%--------------------------------------------------------------------
 
 init(#{tick_ms := TickMs}) ->
-    ok = emqx_tables:new(?TAB, [public, set, {write_concurrency, true}]),
+    ok = emqx_utils_ets:new(?TAB, [public, set, {write_concurrency, true}]),
     Stats = lists:append([
         ?CONNECTION_STATS,
         ?CHANNEL_STATS,
diff --git a/apps/emqx_gateway/src/emqx_gateway_cm.erl b/apps/emqx_gateway/src/emqx_gateway_cm.erl
index 5de6da63f..837600811 100644
--- a/apps/emqx_gateway/src/emqx_gateway_cm.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_cm.erl
@@ -766,9 +766,9 @@ init(Options) ->
     TabOpts = [public, {write_concurrency, true}],
 
     {ChanTab, ConnTab, InfoTab} = cmtabs(GwName),
-    ok = emqx_tables:new(ChanTab, [bag, {read_concurrency, true} | TabOpts]),
-    ok = emqx_tables:new(ConnTab, [bag | TabOpts]),
-    ok = emqx_tables:new(InfoTab, [ordered_set, compressed | TabOpts]),
+    ok = emqx_utils_ets:new(ChanTab, [bag, {read_concurrency, true} | TabOpts]),
+    ok = emqx_utils_ets:new(ConnTab, [bag | TabOpts]),
+    ok = emqx_utils_ets:new(InfoTab, [ordered_set, compressed | TabOpts]),
 
     %% Start link cm-registry process
     %% XXX: Should I hang it under a higher level supervisor?
diff --git a/apps/emqx_gateway/src/emqx_gateway_metrics.erl b/apps/emqx_gateway/src/emqx_gateway_metrics.erl
index e94510387..0aa2ff210 100644
--- a/apps/emqx_gateway/src/emqx_gateway_metrics.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_metrics.erl
@@ -89,7 +89,7 @@ tabname(GwName) ->
 
 init([GwName]) ->
     TabOpts = [public, {write_concurrency, true}],
-    ok = emqx_tables:new(tabname(GwName), [set | TabOpts]),
+    ok = emqx_utils_ets:new(tabname(GwName), [set | TabOpts]),
     {ok, #state{}}.
 
 handle_call(_Request, _From, State) ->
diff --git a/apps/emqx_modules/src/emqx_topic_metrics.erl b/apps/emqx_modules/src/emqx_topic_metrics.erl
index dfc6b07ab..de09e568f 100644
--- a/apps/emqx_modules/src/emqx_topic_metrics.erl
+++ b/apps/emqx_modules/src/emqx_topic_metrics.erl
@@ -201,7 +201,7 @@ reset() ->
 
 init([Opts]) ->
     erlang:process_flag(trap_exit, true),
-    ok = emqx_tables:new(?TAB, [{read_concurrency, true}]),
+    ok = emqx_utils_ets:new(?TAB, [{read_concurrency, true}]),
     erlang:send_after(timer:seconds(?TICKING_INTERVAL), self(), ticking),
     Fun =
         fun(#{topic := Topic}, CurrentSpeeds) ->
diff --git a/apps/emqx/src/emqx_tables.erl b/apps/emqx_utils/src/emqx_utils_ets.erl
similarity index 98%
rename from apps/emqx/src/emqx_tables.erl
rename to apps/emqx_utils/src/emqx_utils_ets.erl
index ffdf7d891..099152675 100644
--- a/apps/emqx/src/emqx_tables.erl
+++ b/apps/emqx_utils/src/emqx_utils_ets.erl
@@ -14,7 +14,7 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
--module(emqx_tables).
+-module(emqx_utils_ets).
 
 -export([
     new/1,
diff --git a/apps/emqx/test/emqx_tables_SUITE.erl b/apps/emqx_utils/test/emqx_utils_ets_SUITE.erl
similarity index 73%
rename from apps/emqx/test/emqx_tables_SUITE.erl
rename to apps/emqx_utils/test/emqx_utils_ets_SUITE.erl
index ad53e7139..13bf427fd 100644
--- a/apps/emqx/test/emqx_tables_SUITE.erl
+++ b/apps/emqx_utils/test/emqx_utils_ets_SUITE.erl
@@ -14,7 +14,7 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
--module(emqx_tables_SUITE).
+-module(emqx_utils_ets_SUITE).
 
 -compile(export_all).
 -compile(nowarn_export_all).
@@ -26,19 +26,19 @@
 all() -> emqx_common_test_helpers:all(?MODULE).
 
 t_new(_) ->
-    ok = emqx_tables:new(?TAB),
-    ok = emqx_tables:new(?TAB, [{read_concurrency, true}]),
+    ok = emqx_utils_ets:new(?TAB),
+    ok = emqx_utils_ets:new(?TAB, [{read_concurrency, true}]),
     ?assertEqual(?TAB, ets:info(?TAB, name)).
 
 t_lookup_value(_) ->
-    ok = emqx_tables:new(?TAB, []),
+    ok = emqx_utils_ets:new(?TAB, []),
     true = ets:insert(?TAB, {key, val}),
-    ?assertEqual(val, emqx_tables:lookup_value(?TAB, key)),
-    ?assertEqual(undefined, emqx_tables:lookup_value(?TAB, badkey)).
+    ?assertEqual(val, emqx_utils_ets:lookup_value(?TAB, key)),
+    ?assertEqual(undefined, emqx_utils_ets:lookup_value(?TAB, badkey)).
 
 t_delete(_) ->
-    ok = emqx_tables:new(?TAB, []),
+    ok = emqx_utils_ets:new(?TAB, []),
     ?assertEqual(?TAB, ets:info(?TAB, name)),
-    ok = emqx_tables:delete(?TAB),
-    ok = emqx_tables:delete(?TAB),
+    ok = emqx_utils_ets:delete(?TAB),
+    ok = emqx_utils_ets:delete(?TAB),
     ?assertEqual(undefined, ets:info(?TAB, name)).
diff --git a/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_SUITE.erl b/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_SUITE.erl
index 43ccd9fc1..325d3d499 100644
--- a/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_SUITE.erl
+++ b/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_SUITE.erl
@@ -68,7 +68,7 @@ trace_rule(Data, Envs, _Args) ->
 make_trace_fn_action() ->
     persistent_term:put({?MODULE, test_pid}, self()),
     Fn = <<(atom_to_binary(?MODULE))/binary, ":trace_rule">>,
-    emqx_tables:new(recorded_actions, [named_table, public, ordered_set]),
+    emqx_utils_ets:new(recorded_actions, [named_table, public, ordered_set]),
     #{function => Fn, args => #{}}.
 
 create_rule_http(RuleParams) ->

From 062ce5f81991cbd0103a081815bd67c64ceed452 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Thu, 13 Apr 2023 15:02:41 +0200
Subject: [PATCH 062/110] refactor: rename emqx_map_lib to emqx_utils_maps

---
 apps/emqx/src/emqx.erl                        | 18 +++---
 apps/emqx/src/emqx_config.erl                 | 64 +++++++++----------
 apps/emqx/src/emqx_config_handler.erl         | 18 +++---
 .../emqx_limiter/src/emqx_limiter_server.erl  |  2 +-
 apps/emqx/src/emqx_listeners.erl              |  6 +-
 apps/emqx/src/emqx_ocsp_cache.erl             |  4 +-
 apps/emqx/src/emqx_schema.erl                 |  2 +-
 apps/emqx/src/emqx_tls_lib.erl                | 20 +++---
 apps/emqx/test/emqx_crl_cache_SUITE.erl       |  4 +-
 apps/emqx/test/emqx_ocsp_cache_SUITE.erl      | 22 ++++---
 apps/emqx/test/emqx_tls_lib_tests.erl         |  6 +-
 apps/emqx_authn/src/emqx_authn_api.erl        |  4 +-
 .../emqx_authz/src/emqx_authz_api_sources.erl |  2 +-
 apps/emqx_authz/src/emqx_authz_schema.erl     |  2 +-
 apps/emqx_bridge/src/emqx_bridge.erl          |  4 +-
 apps/emqx_bridge/src/emqx_bridge_api.erl      |  2 +-
 apps/emqx_bridge/src/emqx_bridge_resource.erl |  4 +-
 .../src/schema/emqx_bridge_schema.erl         |  2 +-
 .../test/emqx_bridge_api_SUITE.erl            |  2 +-
 .../test/emqx_bridge_mqtt_SUITE.erl           |  2 +-
 .../emqx_bridge_kafka_impl_consumer_SUITE.erl |  6 +-
 .../test/emqx_bridge_kafka_tests.erl          |  4 +-
 apps/emqx_conf/src/emqx_conf.erl              | 28 ++++----
 .../src/proto/emqx_conf_proto_v1.erl          |  8 +--
 .../src/proto/emqx_conf_proto_v2.erl          |  8 +--
 .../emqx_connector/src/emqx_connector_ssl.erl |  2 +-
 .../src/mqtt/emqx_connector_mqtt_worker.erl   |  2 +-
 .../src/emqx_dashboard_listener.erl           | 11 ++--
 .../src/emqx_dashboard_swagger.erl            |  2 +-
 apps/emqx_exhook/src/emqx_exhook_mgr.erl      |  8 +--
 .../test/emqx_exhook_api_SUITE.erl            |  2 +-
 .../src/emqx_gateway_api_listeners.erl        |  2 +-
 apps/emqx_gateway/src/emqx_gateway_conf.erl   | 60 ++++++++---------
 apps/emqx_gateway/src/emqx_gateway_http.erl   |  4 +-
 .../test/emqx_gateway_api_SUITE.erl           | 12 ++--
 .../test/emqx_gateway_authn_SUITE.erl         |  2 +-
 .../test/emqx_gateway_conf_SUITE.erl          |  6 +-
 .../test/emqx_gateway_test_utils.erl          |  2 +-
 .../src/emqx_gateway_exproto.erl              |  4 +-
 .../src/emqx_mgmt_api_clients.erl             |  6 +-
 .../src/emqx_mgmt_api_configs.erl             |  4 +-
 .../src/emqx_mgmt_api_listeners.erl           |  2 +-
 .../test/emqx_mgmt_api_configs_SUITE.erl      | 38 ++++++-----
 .../test/emqx_mgmt_api_listeners_SUITE.erl    |  6 +-
 .../test/emqx_mgmt_api_nodes_SUITE.erl        |  6 +-
 .../test/emqx_delayed_api_SUITE.erl           |  2 +-
 .../src/emqx_retainer_dispatcher.erl          |  2 +-
 .../test/emqx_retainer_api_SUITE.erl          |  4 +-
 .../emqx_rule_engine/src/emqx_rule_engine.erl |  2 +-
 .../test/emqx_slow_subs_api_SUITE.erl         |  2 +-
 .../src/emqx_utils_maps.erl}                  |  4 +-
 .../test/emqx_utils_maps_tests.erl}           | 32 +++++-----
 .../test/emqx_ee_bridge_cassa_SUITE.erl       |  2 +-
 .../test/emqx_ee_bridge_dynamo_SUITE.erl      |  2 +-
 .../test/emqx_ee_bridge_gcp_pubsub_SUITE.erl  |  4 +-
 .../test/emqx_ee_bridge_influxdb_SUITE.erl    |  4 +-
 .../test/emqx_ee_bridge_mongodb_SUITE.erl     |  2 +-
 .../test/emqx_ee_bridge_pgsql_SUITE.erl       |  2 +-
 .../test/emqx_ee_bridge_tdengine_SUITE.erl    |  2 +-
 .../src/emqx_ee_schema_registry.erl           |  4 +-
 .../test/emqx_ee_schema_registry_SUITE.erl    |  2 +-
 61 files changed, 256 insertions(+), 241 deletions(-)
 rename apps/{emqx/src/emqx_map_lib.erl => emqx_utils/src/emqx_utils_maps.erl} (99%)
 rename apps/{emqx/test/emqx_map_lib_tests.erl => emqx_utils/test/emqx_utils_maps_tests.erl} (76%)

diff --git a/apps/emqx/src/emqx.erl b/apps/emqx/src/emqx.erl
index 6e4aa9922..ef870685a 100644
--- a/apps/emqx/src/emqx.erl
+++ b/apps/emqx/src/emqx.erl
@@ -164,29 +164,29 @@ run_hook(HookPoint, Args) ->
 run_fold_hook(HookPoint, Args, Acc) ->
     emqx_hooks:run_fold(HookPoint, Args, Acc).
 
--spec get_config(emqx_map_lib:config_key_path()) -> term().
+-spec get_config(emqx_utils_maps:config_key_path()) -> term().
 get_config(KeyPath) ->
     emqx_config:get(KeyPath).
 
--spec get_config(emqx_map_lib:config_key_path(), term()) -> term().
+-spec get_config(emqx_utils_maps:config_key_path(), term()) -> term().
 get_config(KeyPath, Default) ->
     emqx_config:get(KeyPath, Default).
 
--spec get_raw_config(emqx_map_lib:config_key_path()) -> term().
+-spec get_raw_config(emqx_utils_maps:config_key_path()) -> term().
 get_raw_config(KeyPath) ->
     emqx_config:get_raw(KeyPath).
 
--spec get_raw_config(emqx_map_lib:config_key_path(), term()) -> term().
+-spec get_raw_config(emqx_utils_maps:config_key_path(), term()) -> term().
 get_raw_config(KeyPath, Default) ->
     emqx_config:get_raw(KeyPath, Default).
 
--spec update_config(emqx_map_lib:config_key_path(), emqx_config:update_request()) ->
+-spec update_config(emqx_utils_maps:config_key_path(), emqx_config:update_request()) ->
     {ok, emqx_config:update_result()} | {error, emqx_config:update_error()}.
 update_config(KeyPath, UpdateReq) ->
     update_config(KeyPath, UpdateReq, #{}).
 
 -spec update_config(
-    emqx_map_lib:config_key_path(),
+    emqx_utils_maps:config_key_path(),
     emqx_config:update_request(),
     emqx_config:update_opts()
 ) ->
@@ -198,12 +198,12 @@ update_config([RootName | _] = KeyPath, UpdateReq, Opts) ->
         {{update, UpdateReq}, Opts}
     ).
 
--spec remove_config(emqx_map_lib:config_key_path()) ->
+-spec remove_config(emqx_utils_maps:config_key_path()) ->
     {ok, emqx_config:update_result()} | {error, emqx_config:update_error()}.
 remove_config(KeyPath) ->
     remove_config(KeyPath, #{}).
 
--spec remove_config(emqx_map_lib:config_key_path(), emqx_config:update_opts()) ->
+-spec remove_config(emqx_utils_maps:config_key_path(), emqx_config:update_opts()) ->
     {ok, emqx_config:update_result()} | {error, emqx_config:update_error()}.
 remove_config([RootName | _] = KeyPath, Opts) ->
     emqx_config_handler:update_config(
@@ -212,7 +212,7 @@ remove_config([RootName | _] = KeyPath, Opts) ->
         {remove, Opts}
     ).
 
--spec reset_config(emqx_map_lib:config_key_path(), emqx_config:update_opts()) ->
+-spec reset_config(emqx_utils_maps:config_key_path(), emqx_config:update_opts()) ->
     {ok, emqx_config:update_result()} | {error, emqx_config:update_error()}.
 reset_config([RootName | _] = KeyPath, Opts) ->
     case emqx_config:get_default_value(KeyPath) of
diff --git a/apps/emqx/src/emqx_config.erl b/apps/emqx/src/emqx_config.erl
index bf3134568..b7effa240 100644
--- a/apps/emqx/src/emqx_config.erl
+++ b/apps/emqx/src/emqx_config.erl
@@ -142,7 +142,7 @@
 -type app_envs() :: [proplists:property()].
 
 %% @doc For the given path, get root value enclosed in a single-key map.
--spec get_root(emqx_map_lib:config_key_path()) -> map().
+-spec get_root(emqx_utils_maps:config_key_path()) -> map().
 get_root([RootName | _]) ->
     #{RootName => do_get(?CONF, [RootName], #{})}.
 
@@ -153,14 +153,14 @@ get_root_raw([RootName | _]) ->
 
 %% @doc Get a config value for the given path.
 %% The path should at least include root config name.
--spec get(emqx_map_lib:config_key_path()) -> term().
+-spec get(emqx_utils_maps:config_key_path()) -> term().
 get(KeyPath) -> do_get(?CONF, KeyPath).
 
--spec get(emqx_map_lib:config_key_path(), term()) -> term().
+-spec get(emqx_utils_maps:config_key_path(), term()) -> term().
 get(KeyPath, Default) -> do_get(?CONF, KeyPath, Default).
 
--spec find(emqx_map_lib:config_key_path()) ->
-    {ok, term()} | {not_found, emqx_map_lib:config_key_path(), term()}.
+-spec find(emqx_utils_maps:config_key_path()) ->
+    {ok, term()} | {not_found, emqx_utils_maps:config_key_path(), term()}.
 find([]) ->
     Ref = make_ref(),
     case do_get(?CONF, [], Ref) of
@@ -170,12 +170,12 @@ find([]) ->
 find(KeyPath) ->
     atom_conf_path(
         KeyPath,
-        fun(AtomKeyPath) -> emqx_map_lib:deep_find(AtomKeyPath, get_root(KeyPath)) end,
+        fun(AtomKeyPath) -> emqx_utils_maps:deep_find(AtomKeyPath, get_root(KeyPath)) end,
         {return, {not_found, KeyPath}}
     ).
 
--spec find_raw(emqx_map_lib:config_key_path()) ->
-    {ok, term()} | {not_found, emqx_map_lib:config_key_path(), term()}.
+-spec find_raw(emqx_utils_maps:config_key_path()) ->
+    {ok, term()} | {not_found, emqx_utils_maps:config_key_path(), term()}.
 find_raw([]) ->
     Ref = make_ref(),
     case do_get_raw([], Ref) of
@@ -183,9 +183,9 @@ find_raw([]) ->
         Res -> {ok, Res}
     end;
 find_raw(KeyPath) ->
-    emqx_map_lib:deep_find([bin(Key) || Key <- KeyPath], get_root_raw(KeyPath)).
+    emqx_utils_maps:deep_find([bin(Key) || Key <- KeyPath], get_root_raw(KeyPath)).
 
--spec get_zone_conf(atom(), emqx_map_lib:config_key_path()) -> term().
+-spec get_zone_conf(atom(), emqx_utils_maps:config_key_path()) -> term().
 get_zone_conf(Zone, KeyPath) ->
     case find(?ZONE_CONF_PATH(Zone, KeyPath)) of
         %% not found in zones, try to find the global config
@@ -195,7 +195,7 @@ get_zone_conf(Zone, KeyPath) ->
             Value
     end.
 
--spec get_zone_conf(atom(), emqx_map_lib:config_key_path(), term()) -> term().
+-spec get_zone_conf(atom(), emqx_utils_maps:config_key_path(), term()) -> term().
 get_zone_conf(Zone, KeyPath, Default) ->
     case find(?ZONE_CONF_PATH(Zone, KeyPath)) of
         %% not found in zones, try to find the global config
@@ -205,24 +205,24 @@ get_zone_conf(Zone, KeyPath, Default) ->
             Value
     end.
 
--spec put_zone_conf(atom(), emqx_map_lib:config_key_path(), term()) -> ok.
+-spec put_zone_conf(atom(), emqx_utils_maps:config_key_path(), term()) -> ok.
 put_zone_conf(Zone, KeyPath, Conf) ->
     ?MODULE:put(?ZONE_CONF_PATH(Zone, KeyPath), Conf).
 
--spec get_listener_conf(atom(), atom(), emqx_map_lib:config_key_path()) -> term().
+-spec get_listener_conf(atom(), atom(), emqx_utils_maps:config_key_path()) -> term().
 get_listener_conf(Type, Listener, KeyPath) ->
     ?MODULE:get(?LISTENER_CONF_PATH(Type, Listener, KeyPath)).
 
--spec get_listener_conf(atom(), atom(), emqx_map_lib:config_key_path(), term()) -> term().
+-spec get_listener_conf(atom(), atom(), emqx_utils_maps:config_key_path(), term()) -> term().
 get_listener_conf(Type, Listener, KeyPath, Default) ->
     ?MODULE:get(?LISTENER_CONF_PATH(Type, Listener, KeyPath), Default).
 
--spec put_listener_conf(atom(), atom(), emqx_map_lib:config_key_path(), term()) -> ok.
+-spec put_listener_conf(atom(), atom(), emqx_utils_maps:config_key_path(), term()) -> ok.
 put_listener_conf(Type, Listener, KeyPath, Conf) ->
     ?MODULE:put(?LISTENER_CONF_PATH(Type, Listener, KeyPath), Conf).
 
--spec find_listener_conf(atom(), atom(), emqx_map_lib:config_key_path()) ->
-    {ok, term()} | {not_found, emqx_map_lib:config_key_path(), term()}.
+-spec find_listener_conf(atom(), atom(), emqx_utils_maps:config_key_path()) ->
+    {ok, term()} | {not_found, emqx_utils_maps:config_key_path(), term()}.
 find_listener_conf(Type, Listener, KeyPath) ->
     find(?LISTENER_CONF_PATH(Type, Listener, KeyPath)).
 
@@ -241,20 +241,20 @@ erase(RootName) ->
     persistent_term:erase(?PERSIS_KEY(?RAW_CONF, bin(RootName))),
     ok.
 
--spec put(emqx_map_lib:config_key_path(), term()) -> ok.
+-spec put(emqx_utils_maps:config_key_path(), term()) -> ok.
 put(KeyPath, Config) ->
     Putter = fun(Path, Map, Value) ->
-        emqx_map_lib:deep_put(Path, Map, Value)
+        emqx_utils_maps:deep_put(Path, Map, Value)
     end,
     do_put(?CONF, Putter, KeyPath, Config).
 
 %% Puts value into configuration even if path doesn't exist
 %% For paths of non-existing atoms use force_put(KeyPath, Config, unsafe)
--spec force_put(emqx_map_lib:config_key_path(), term()) -> ok.
+-spec force_put(emqx_utils_maps:config_key_path(), term()) -> ok.
 force_put(KeyPath, Config) ->
     force_put(KeyPath, Config, safe).
 
--spec force_put(emqx_map_lib:config_key_path(), term(), safe | unsafe) -> ok.
+-spec force_put(emqx_utils_maps:config_key_path(), term(), safe | unsafe) -> ok.
 force_put(KeyPath0, Config, Safety) ->
     KeyPath =
         case Safety of
@@ -262,19 +262,19 @@ force_put(KeyPath0, Config, Safety) ->
             unsafe -> [unsafe_atom(Key) || Key <- KeyPath0]
         end,
     Putter = fun(Path, Map, Value) ->
-        emqx_map_lib:deep_force_put(Path, Map, Value)
+        emqx_utils_maps:deep_force_put(Path, Map, Value)
     end,
     do_put(?CONF, Putter, KeyPath, Config).
 
--spec get_default_value(emqx_map_lib:config_key_path()) -> {ok, term()} | {error, term()}.
+-spec get_default_value(emqx_utils_maps:config_key_path()) -> {ok, term()} | {error, term()}.
 get_default_value([RootName | _] = KeyPath) ->
     BinKeyPath = [bin(Key) || Key <- KeyPath],
     case find_raw([RootName]) of
         {ok, RawConf} ->
-            RawConf1 = emqx_map_lib:deep_remove(BinKeyPath, #{bin(RootName) => RawConf}),
+            RawConf1 = emqx_utils_maps:deep_remove(BinKeyPath, #{bin(RootName) => RawConf}),
             try fill_defaults(get_schema_mod(RootName), RawConf1, #{}) of
                 FullConf ->
-                    case emqx_map_lib:deep_find(BinKeyPath, FullConf) of
+                    case emqx_utils_maps:deep_find(BinKeyPath, FullConf) of
                         {not_found, _, _} -> {error, no_default_value};
                         {ok, Val} -> {ok, Val}
                     end
@@ -285,10 +285,10 @@ get_default_value([RootName | _] = KeyPath) ->
             {error, {rootname_not_found, RootName}}
     end.
 
--spec get_raw(emqx_map_lib:config_key_path()) -> term().
+-spec get_raw(emqx_utils_maps:config_key_path()) -> term().
 get_raw(KeyPath) -> do_get_raw(KeyPath).
 
--spec get_raw(emqx_map_lib:config_key_path(), term()) -> term().
+-spec get_raw(emqx_utils_maps:config_key_path(), term()) -> term().
 get_raw(KeyPath, Default) -> do_get_raw(KeyPath, Default).
 
 -spec put_raw(map()) -> ok.
@@ -301,10 +301,10 @@ put_raw(Config) ->
         hocon_maps:ensure_plain(Config)
     ).
 
--spec put_raw(emqx_map_lib:config_key_path(), term()) -> ok.
+-spec put_raw(emqx_utils_maps:config_key_path(), term()) -> ok.
 put_raw(KeyPath, Config) ->
     Putter = fun(Path, Map, Value) ->
-        emqx_map_lib:deep_force_put(Path, Map, Value)
+        emqx_utils_maps:deep_force_put(Path, Map, Value)
     end,
     do_put(?RAW_CONF, Putter, KeyPath, Config).
 
@@ -430,7 +430,7 @@ do_check_config(SchemaMod, RawConf, Opts0) ->
     Opts = maps:merge(Opts0, Opts1),
     {AppEnvs, CheckedConf} =
         hocon_tconf:map_translate(SchemaMod, RawConf, Opts),
-    {AppEnvs, emqx_map_lib:unsafe_atom_key_map(CheckedConf)}.
+    {AppEnvs, emqx_utils_maps:unsafe_atom_key_map(CheckedConf)}.
 
 fill_defaults(RawConf) ->
     fill_defaults(RawConf, #{}).
@@ -645,11 +645,11 @@ do_put(Type, Putter, [RootName | KeyPath], DeepValue) ->
 do_deep_get(?CONF, KeyPath, Map, Default) ->
     atom_conf_path(
         KeyPath,
-        fun(AtomKeyPath) -> emqx_map_lib:deep_get(AtomKeyPath, Map, Default) end,
+        fun(AtomKeyPath) -> emqx_utils_maps:deep_get(AtomKeyPath, Map, Default) end,
         {return, Default}
     );
 do_deep_get(?RAW_CONF, KeyPath, Map, Default) ->
-    emqx_map_lib:deep_get([bin(Key) || Key <- KeyPath], Map, Default).
+    emqx_utils_maps:deep_get([bin(Key) || Key <- KeyPath], Map, Default).
 
 do_deep_put(?CONF, Putter, KeyPath, Map, Value) ->
     atom_conf_path(
diff --git a/apps/emqx/src/emqx_config_handler.erl b/apps/emqx/src/emqx_config_handler.erl
index a0a99b62e..b440d2af7 100644
--- a/apps/emqx/src/emqx_config_handler.erl
+++ b/apps/emqx/src/emqx_config_handler.erl
@@ -232,7 +232,7 @@ process_update_request(ConfKeyPath, _Handlers, {remove, Opts}) ->
     BinKeyPath = bin_path(ConfKeyPath),
     case check_permissions(remove, BinKeyPath, OldRawConf, Opts) of
         allow ->
-            NewRawConf = emqx_map_lib:deep_remove(BinKeyPath, OldRawConf),
+            NewRawConf = emqx_utils_maps:deep_remove(BinKeyPath, OldRawConf),
             OverrideConf = remove_from_override_config(BinKeyPath, Opts),
             {ok, NewRawConf, OverrideConf, Opts};
         {deny, Reason} ->
@@ -445,7 +445,7 @@ remove_from_override_config(_BinKeyPath, #{persistent := false}) ->
     undefined;
 remove_from_override_config(BinKeyPath, Opts) ->
     OldConf = emqx_config:read_override_conf(Opts),
-    emqx_map_lib:deep_remove(BinKeyPath, OldConf).
+    emqx_utils_maps:deep_remove(BinKeyPath, OldConf).
 
 %% apply new config on top of override config
 merge_to_override_config(_RawConf, #{persistent := false}) ->
@@ -467,7 +467,7 @@ return_change_result(_ConfKeyPath, {remove, _Opts}) ->
 
 return_rawconf(ConfKeyPath, #{rawconf_with_defaults := true}) ->
     FullRawConf = emqx_config:fill_defaults(emqx_config:get_raw([])),
-    emqx_map_lib:deep_get(bin_path(ConfKeyPath), FullRawConf);
+    emqx_utils_maps:deep_get(bin_path(ConfKeyPath), FullRawConf);
 return_rawconf(ConfKeyPath, _) ->
     emqx_config:get_raw(ConfKeyPath).
 
@@ -485,16 +485,16 @@ atom(Atom) when is_atom(Atom) ->
 
 -dialyzer({nowarn_function, do_remove_handler/2}).
 do_remove_handler(ConfKeyPath, Handlers) ->
-    NewHandlers = emqx_map_lib:deep_remove(ConfKeyPath ++ [?MOD], Handlers),
+    NewHandlers = emqx_utils_maps:deep_remove(ConfKeyPath ++ [?MOD], Handlers),
     remove_empty_leaf(ConfKeyPath, NewHandlers).
 
 remove_empty_leaf([], Handlers) ->
     Handlers;
 remove_empty_leaf(KeyPath, Handlers) ->
-    case emqx_map_lib:deep_find(KeyPath, Handlers) =:= {ok, #{}} of
+    case emqx_utils_maps:deep_find(KeyPath, Handlers) =:= {ok, #{}} of
         %% empty leaf
         true ->
-            Handlers1 = emqx_map_lib:deep_remove(KeyPath, Handlers),
+            Handlers1 = emqx_utils_maps:deep_remove(KeyPath, Handlers),
             SubKeyPath = lists:sublist(KeyPath, length(KeyPath) - 1),
             remove_empty_leaf(SubKeyPath, Handlers1);
         false ->
@@ -511,7 +511,7 @@ assert_callback_function(Mod) ->
     end,
     ok.
 
--spec schema(module(), emqx_map_lib:config_key_path()) -> hocon_schema:schema().
+-spec schema(module(), emqx_utils_maps:config_key_path()) -> hocon_schema:schema().
 schema(SchemaModule, [RootKey | _]) ->
     Roots = hocon_schema:roots(SchemaModule),
     {Field, Translations} =
@@ -550,10 +550,10 @@ save_handlers(Handlers) ->
 check_permissions(_Action, _ConfKeyPath, _NewRawConf, #{override_to := local}) ->
     allow;
 check_permissions(Action, ConfKeyPath, NewRawConf, _Opts) ->
-    case emqx_map_lib:deep_find(ConfKeyPath, NewRawConf) of
+    case emqx_utils_maps:deep_find(ConfKeyPath, NewRawConf) of
         {ok, NewRaw} ->
             LocalOverride = emqx_config:read_override_conf(#{override_to => local}),
-            case emqx_map_lib:deep_find(ConfKeyPath, LocalOverride) of
+            case emqx_utils_maps:deep_find(ConfKeyPath, LocalOverride) of
                 {ok, LocalRaw} ->
                     case is_mutable(Action, NewRaw, LocalRaw) of
                         ok ->
diff --git a/apps/emqx/src/emqx_limiter/src/emqx_limiter_server.erl b/apps/emqx/src/emqx_limiter/src/emqx_limiter_server.erl
index 44663ceeb..f1daeaaeb 100644
--- a/apps/emqx/src/emqx_limiter/src/emqx_limiter_server.erl
+++ b/apps/emqx/src/emqx_limiter/src/emqx_limiter_server.erl
@@ -572,7 +572,7 @@ find_limiter_cfg(Type, #{rate := _} = Cfg) ->
 find_limiter_cfg(Type, Cfg) ->
     {
         maps:get(Type, Cfg, undefined),
-        find_client_cfg(Type, emqx_map_lib:deep_get([client, Type], Cfg, undefined))
+        find_client_cfg(Type, emqx_utils_maps:deep_get([client, Type], Cfg, undefined))
     }.
 
 find_client_cfg(Type, BucketCfg) ->
diff --git a/apps/emqx/src/emqx_listeners.erl b/apps/emqx/src/emqx_listeners.erl
index 96e28b1de..f82aebe7c 100644
--- a/apps/emqx/src/emqx_listeners.erl
+++ b/apps/emqx/src/emqx_listeners.erl
@@ -427,12 +427,12 @@ pre_config_update([listeners, _Type, _Name], {create, _NewConf}, _RawConf) ->
 pre_config_update([listeners, _Type, _Name], {update, _Request}, undefined) ->
     {error, not_found};
 pre_config_update([listeners, Type, Name], {update, Request}, RawConf) ->
-    NewConfT = emqx_map_lib:deep_merge(RawConf, Request),
+    NewConfT = emqx_utils_maps:deep_merge(RawConf, Request),
     NewConf = ensure_override_limiter_conf(NewConfT, Request),
     CertsDir = certs_dir(Type, Name),
     {ok, convert_certs(CertsDir, NewConf)};
 pre_config_update([listeners, _Type, _Name], {action, _Action, Updated}, RawConf) ->
-    NewConf = emqx_map_lib:deep_merge(RawConf, Updated),
+    NewConf = emqx_utils_maps:deep_merge(RawConf, Updated),
     {ok, NewConf};
 pre_config_update(_Path, _Request, RawConf) ->
     {ok, RawConf}.
@@ -500,7 +500,7 @@ esockd_opts(ListenerId, Type, Opts0) ->
 
 ws_opts(Type, ListenerName, Opts) ->
     WsPaths = [
-        {emqx_map_lib:deep_get([websocket, mqtt_path], Opts, "/mqtt"), emqx_ws_connection, #{
+        {emqx_utils_maps:deep_get([websocket, mqtt_path], Opts, "/mqtt"), emqx_ws_connection, #{
             zone => zone(Opts),
             listener => {Type, ListenerName},
             limiter => limiter(Opts),
diff --git a/apps/emqx/src/emqx_ocsp_cache.erl b/apps/emqx/src/emqx_ocsp_cache.erl
index ccf3e0c40..3bb10ee5c 100644
--- a/apps/emqx/src/emqx_ocsp_cache.erl
+++ b/apps/emqx/src/emqx_ocsp_cache.erl
@@ -110,7 +110,7 @@ register_listener(ListenerID, Opts) ->
 -spec inject_sni_fun(emqx_listeners:listener_id(), map()) -> map().
 inject_sni_fun(ListenerID, Conf0) ->
     SNIFun = emqx_const_v1:make_sni_fun(ListenerID),
-    Conf = emqx_map_lib:deep_merge(Conf0, #{ssl_options => #{sni_fun => SNIFun}}),
+    Conf = emqx_utils_maps:deep_merge(Conf0, #{ssl_options => #{sni_fun => SNIFun}}),
     ok = ?MODULE:register_listener(ListenerID, Conf),
     Conf.
 
@@ -149,7 +149,7 @@ handle_call({register_listener, ListenerID, Conf}, _From, State0) ->
         msg => "registering_ocsp_cache",
         listener_id => ListenerID
     }),
-    RefreshInterval0 = emqx_map_lib:deep_get([ssl_options, ocsp, refresh_interval], Conf),
+    RefreshInterval0 = emqx_utils_maps:deep_get([ssl_options, ocsp, refresh_interval], Conf),
     RefreshInterval = max(RefreshInterval0, ?MIN_REFRESH_INTERVAL),
     State = State0#{{refresh_interval, ListenerID} => RefreshInterval},
     %% we need to pass the config along because this might be called
diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 96d9aea34..9934e09c9 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -2348,7 +2348,7 @@ ocsp_outer_validator(_Conf) ->
     ok.
 
 ocsp_inner_validator(#{enable_ocsp_stapling := _} = Conf) ->
-    ocsp_inner_validator(emqx_map_lib:binary_key_map(Conf));
+    ocsp_inner_validator(emqx_utils_maps:binary_key_map(Conf));
 ocsp_inner_validator(#{<<"enable_ocsp_stapling">> := false} = _Conf) ->
     ok;
 ocsp_inner_validator(#{<<"enable_ocsp_stapling">> := true} = Conf) ->
diff --git a/apps/emqx/src/emqx_tls_lib.erl b/apps/emqx/src/emqx_tls_lib.erl
index 47797b326..d1c57bf0d 100644
--- a/apps/emqx/src/emqx_tls_lib.erl
+++ b/apps/emqx/src/emqx_tls_lib.erl
@@ -317,7 +317,9 @@ ensure_ssl_files(Dir, SSL, Opts) ->
 ensure_ssl_files(_Dir, SSL, [], _Opts) ->
     {ok, SSL};
 ensure_ssl_files(Dir, SSL, [KeyPath | KeyPaths], Opts) ->
-    case ensure_ssl_file(Dir, KeyPath, SSL, emqx_map_lib:deep_get(KeyPath, SSL, undefined), Opts) of
+    case
+        ensure_ssl_file(Dir, KeyPath, SSL, emqx_utils_maps:deep_get(KeyPath, SSL, undefined), Opts)
+    of
         {ok, NewSSL} ->
             ensure_ssl_files(Dir, NewSSL, KeyPaths, Opts);
         {error, Reason} ->
@@ -332,7 +334,7 @@ delete_ssl_files(Dir, NewOpts0, OldOpts0) ->
     {ok, OldOpts} = ensure_ssl_files(Dir, OldOpts0, #{dry_run => DryRun}),
     Get = fun
         (_KP, undefined) -> undefined;
-        (KP, Opts) -> emqx_map_lib:deep_get(KP, Opts, undefined)
+        (KP, Opts) -> emqx_utils_maps:deep_get(KP, Opts, undefined)
     end,
     lists:foreach(
         fun(KeyPath) -> delete_old_file(Get(KeyPath, NewOpts), Get(KeyPath, OldOpts)) end,
@@ -372,7 +374,7 @@ do_ensure_ssl_file(Dir, KeyPath, SSL, MaybePem, DryRun) ->
         true ->
             case save_pem_file(Dir, KeyPath, MaybePem, DryRun) of
                 {ok, Path} ->
-                    NewSSL = emqx_map_lib:deep_put(KeyPath, SSL, Path),
+                    NewSSL = emqx_utils_maps:deep_put(KeyPath, SSL, Path),
                     {ok, NewSSL};
                 {error, Reason} ->
                     {error, Reason}
@@ -482,9 +484,9 @@ is_valid_pem_file(Path) ->
 %% so they are forced to upload a cert file, or use an existing file path.
 -spec drop_invalid_certs(map()) -> map().
 drop_invalid_certs(#{enable := False} = SSL) when ?IS_FALSE(False) ->
-    lists:foldl(fun emqx_map_lib:deep_remove/2, SSL, ?SSL_FILE_OPT_PATHS_A);
+    lists:foldl(fun emqx_utils_maps:deep_remove/2, SSL, ?SSL_FILE_OPT_PATHS_A);
 drop_invalid_certs(#{<<"enable">> := False} = SSL) when ?IS_FALSE(False) ->
-    lists:foldl(fun emqx_map_lib:deep_remove/2, SSL, ?SSL_FILE_OPT_PATHS);
+    lists:foldl(fun emqx_utils_maps:deep_remove/2, SSL, ?SSL_FILE_OPT_PATHS);
 drop_invalid_certs(#{enable := True} = SSL) when ?IS_TRUE(True) ->
     do_drop_invalid_certs(?SSL_FILE_OPT_PATHS_A, SSL);
 drop_invalid_certs(#{<<"enable">> := True} = SSL) when ?IS_TRUE(True) ->
@@ -493,7 +495,7 @@ drop_invalid_certs(#{<<"enable">> := True} = SSL) when ?IS_TRUE(True) ->
 do_drop_invalid_certs([], SSL) ->
     SSL;
 do_drop_invalid_certs([KeyPath | KeyPaths], SSL) ->
-    case emqx_map_lib:deep_get(KeyPath, SSL, undefined) of
+    case emqx_utils_maps:deep_get(KeyPath, SSL, undefined) of
         undefined ->
             do_drop_invalid_certs(KeyPaths, SSL);
         PemOrPath ->
@@ -501,7 +503,7 @@ do_drop_invalid_certs([KeyPath | KeyPaths], SSL) ->
                 true ->
                     do_drop_invalid_certs(KeyPaths, SSL);
                 {error, _} ->
-                    do_drop_invalid_certs(KeyPaths, emqx_map_lib:deep_remove(KeyPath, SSL))
+                    do_drop_invalid_certs(KeyPaths, emqx_utils_maps:deep_remove(KeyPath, SSL))
             end
     end.
 
@@ -586,7 +588,9 @@ ensure_ssl_file_key(_SSL, []) ->
     ok;
 ensure_ssl_file_key(SSL, RequiredKeyPaths) ->
     NotFoundRef = make_ref(),
-    Filter = fun(KeyPath) -> NotFoundRef =:= emqx_map_lib:deep_get(KeyPath, SSL, NotFoundRef) end,
+    Filter = fun(KeyPath) ->
+        NotFoundRef =:= emqx_utils_maps:deep_get(KeyPath, SSL, NotFoundRef)
+    end,
     case lists:filter(Filter, RequiredKeyPaths) of
         [] -> ok;
         Miss -> {error, #{reason => ssl_file_option_not_found, which_options => Miss}}
diff --git a/apps/emqx/test/emqx_crl_cache_SUITE.erl b/apps/emqx/test/emqx_crl_cache_SUITE.erl
index 21bfc39df..dd3eb29e7 100644
--- a/apps/emqx/test/emqx_crl_cache_SUITE.erl
+++ b/apps/emqx/test/emqx_crl_cache_SUITE.erl
@@ -997,7 +997,7 @@ do_t_update_listener(Config) ->
                     <<"enable_crl_check">> => true
                 }
         },
-    ListenerData1 = emqx_map_lib:deep_merge(ListenerData0, CRLConfig),
+    ListenerData1 = emqx_utils_maps:deep_merge(ListenerData0, CRLConfig),
     {ok, {_, _, ListenerData2}} = update_listener_via_api(ListenerId, ListenerData1),
     ?assertMatch(
         #{
@@ -1040,7 +1040,7 @@ do_t_validations(_Config) ->
     {ok, {{_, 200, _}, _, ListenerData0}} = get_listener_via_api(ListenerId),
 
     ListenerData1 =
-        emqx_map_lib:deep_merge(
+        emqx_utils_maps:deep_merge(
             ListenerData0,
             #{
                 <<"ssl_options">> =>
diff --git a/apps/emqx/test/emqx_ocsp_cache_SUITE.erl b/apps/emqx/test/emqx_ocsp_cache_SUITE.erl
index a9b80c276..dff8ce5a7 100644
--- a/apps/emqx/test/emqx_ocsp_cache_SUITE.erl
+++ b/apps/emqx/test/emqx_ocsp_cache_SUITE.erl
@@ -143,7 +143,7 @@ init_per_testcase(t_ocsp_responder_error_responses, Config) ->
             }
     },
     Conf = #{listeners => #{Type => #{Name => ListenerOpts}}},
-    ConfBin = emqx_map_lib:binary_key_map(Conf),
+    ConfBin = emqx_utils_maps:binary_key_map(Conf),
     hocon_tconf:check_plain(emqx_schema, ConfBin, #{required => false, atom_keys => false}),
     emqx_config:put_listener_conf(Type, Name, [], ListenerOpts),
     snabbkaffe:start_trace(),
@@ -184,7 +184,7 @@ init_per_testcase(_TestCase, Config) ->
             }
     },
     Conf = #{listeners => #{Type => #{Name => ListenerOpts}}},
-    ConfBin = emqx_map_lib:binary_key_map(Conf),
+    ConfBin = emqx_utils_maps:binary_key_map(Conf),
     hocon_tconf:check_plain(emqx_schema, ConfBin, #{required => false, atom_keys => false}),
     emqx_config:put_listener_conf(Type, Name, [], ListenerOpts),
     snabbkaffe:start_trace(),
@@ -679,7 +679,7 @@ do_t_update_listener(Config) ->
     {ok, {{_, 200, _}, _, ListenerData0}} = get_listener_via_api(ListenerId),
     ?assertEqual(
         undefined,
-        emqx_map_lib:deep_get([<<"ssl_options">>, <<"ocsp">>], ListenerData0, undefined)
+        emqx_utils_maps:deep_get([<<"ssl_options">>, <<"ocsp">>], ListenerData0, undefined)
     ),
     assert_no_http_get(),
 
@@ -702,7 +702,7 @@ do_t_update_listener(Config) ->
                         }
                 }
         },
-    ListenerData1 = emqx_map_lib:deep_merge(ListenerData0, OCSPConfig),
+    ListenerData1 = emqx_utils_maps:deep_merge(ListenerData0, OCSPConfig),
     {ok, {_, _, ListenerData2}} = update_listener_via_api(ListenerId, ListenerData1),
     ?assertMatch(
         #{
@@ -722,14 +722,14 @@ do_t_update_listener(Config) ->
     %% location
     ?assertNotEqual(
         IssuerPemPath,
-        emqx_map_lib:deep_get(
+        emqx_utils_maps:deep_get(
             [<<"ssl_options">>, <<"ocsp">>, <<"issuer_pem">>],
             ListenerData2
         )
     ),
     ?assertNotEqual(
         IssuerPem,
-        emqx_map_lib:deep_get(
+        emqx_utils_maps:deep_get(
             [<<"ssl_options">>, <<"ocsp">>, <<"issuer_pem">>],
             ListenerData2
         )
@@ -818,7 +818,7 @@ do_t_validations(_Config) ->
     {ok, {{_, 200, _}, _, ListenerData0}} = get_listener_via_api(ListenerId),
 
     ListenerData1 =
-        emqx_map_lib:deep_merge(
+        emqx_utils_maps:deep_merge(
             ListenerData0,
             #{
                 <<"ssl_options">> =>
@@ -843,7 +843,7 @@ do_t_validations(_Config) ->
     ),
 
     ListenerData2 =
-        emqx_map_lib:deep_merge(
+        emqx_utils_maps:deep_merge(
             ListenerData0,
             #{
                 <<"ssl_options">> =>
@@ -873,7 +873,7 @@ do_t_validations(_Config) ->
     ),
 
     ListenerData3a =
-        emqx_map_lib:deep_merge(
+        emqx_utils_maps:deep_merge(
             ListenerData0,
             #{
                 <<"ssl_options">> =>
@@ -886,7 +886,9 @@ do_t_validations(_Config) ->
                     }
             }
         ),
-    ListenerData3 = emqx_map_lib:deep_remove([<<"ssl_options">>, <<"certfile">>], ListenerData3a),
+    ListenerData3 = emqx_utils_maps:deep_remove(
+        [<<"ssl_options">>, <<"certfile">>], ListenerData3a
+    ),
     {error, {_, _, ResRaw3}} = update_listener_via_api(ListenerId, ListenerData3),
     #{<<"code">> := <<"BAD_REQUEST">>, <<"message">> := MsgRaw3} =
         emqx_utils_json:decode(ResRaw3, [return_maps]),
diff --git a/apps/emqx/test/emqx_tls_lib_tests.erl b/apps/emqx/test/emqx_tls_lib_tests.erl
index 5510e4027..ad9598107 100644
--- a/apps/emqx/test/emqx_tls_lib_tests.erl
+++ b/apps/emqx/test/emqx_tls_lib_tests.erl
@@ -191,7 +191,7 @@ ssl_files_save_delete_test() ->
     FileKey = maps:get(<<"keyfile">>, SSL),
     ?assertMatch(<<"/tmp/ssl-test-dir/key-", _:16/binary>>, FileKey),
     ?assertEqual({ok, bin(test_key())}, file:read_file(FileKey)),
-    FileIssuerPem = emqx_map_lib:deep_get([<<"ocsp">>, <<"issuer_pem">>], SSL),
+    FileIssuerPem = emqx_utils_maps:deep_get([<<"ocsp">>, <<"issuer_pem">>], SSL),
     ?assertMatch(<<"/tmp/ssl-test-dir/ocsp_issuer_pem-", _:16/binary>>, FileIssuerPem),
     ?assertEqual({ok, bin(test_key())}, file:read_file(FileIssuerPem)),
     %% no old file to delete
@@ -251,8 +251,8 @@ ssl_file_replace_test() ->
     {ok, SSL3} = emqx_tls_lib:ensure_ssl_files(Dir, SSL1),
     File1 = maps:get(<<"keyfile">>, SSL2),
     File2 = maps:get(<<"keyfile">>, SSL3),
-    IssuerPem1 = emqx_map_lib:deep_get([<<"ocsp">>, <<"issuer_pem">>], SSL2),
-    IssuerPem2 = emqx_map_lib:deep_get([<<"ocsp">>, <<"issuer_pem">>], SSL3),
+    IssuerPem1 = emqx_utils_maps:deep_get([<<"ocsp">>, <<"issuer_pem">>], SSL2),
+    IssuerPem2 = emqx_utils_maps:deep_get([<<"ocsp">>, <<"issuer_pem">>], SSL3),
     ?assert(filelib:is_regular(File1)),
     ?assert(filelib:is_regular(File2)),
     ?assert(filelib:is_regular(IssuerPem1)),
diff --git a/apps/emqx_authn/src/emqx_authn_api.erl b/apps/emqx_authn/src/emqx_authn_api.erl
index fc026a671..de856f163 100644
--- a/apps/emqx_authn/src/emqx_authn_api.erl
+++ b/apps/emqx_authn/src/emqx_authn_api.erl
@@ -929,7 +929,7 @@ aggregate_metrics([]) ->
 aggregate_metrics([HeadMetrics | AllMetrics]) ->
     ErrorLogger = fun(Reason) -> ?SLOG(info, #{msg => "bad_metrics_value", error => Reason}) end,
     Fun = fun(ElemMap, AccMap) ->
-        emqx_map_lib:best_effort_recursive_sum(AccMap, ElemMap, ErrorLogger)
+        emqx_utils_maps:best_effort_recursive_sum(AccMap, ElemMap, ErrorLogger)
     end,
     lists:foldl(Fun, HeadMetrics, AllMetrics).
 
@@ -1069,7 +1069,7 @@ update_user(ChainName, AuthenticatorID, UserID, UserInfo0) ->
         true ->
             serialize_error({missing_parameter, password});
         false ->
-            UserInfo = emqx_map_lib:safe_atom_key_map(UserInfo0),
+            UserInfo = emqx_utils_maps:safe_atom_key_map(UserInfo0),
             case emqx_authentication:update_user(ChainName, AuthenticatorID, UserID, UserInfo) of
                 {ok, User} ->
                     {200, User};
diff --git a/apps/emqx_authz/src/emqx_authz_api_sources.erl b/apps/emqx_authz/src/emqx_authz_api_sources.erl
index 0c2dee340..2220e8f6e 100644
--- a/apps/emqx_authz/src/emqx_authz_api_sources.erl
+++ b/apps/emqx_authz/src/emqx_authz_api_sources.erl
@@ -403,7 +403,7 @@ aggregate_metrics([]) ->
 aggregate_metrics([HeadMetrics | AllMetrics]) ->
     ErrorLogger = fun(Reason) -> ?SLOG(info, #{msg => "bad_metrics_value", error => Reason}) end,
     Fun = fun(ElemMap, AccMap) ->
-        emqx_map_lib:best_effort_recursive_sum(AccMap, ElemMap, ErrorLogger)
+        emqx_utils_maps:best_effort_recursive_sum(AccMap, ElemMap, ErrorLogger)
     end,
     lists:foldl(Fun, HeadMetrics, AllMetrics).
 
diff --git a/apps/emqx_authz/src/emqx_authz_schema.erl b/apps/emqx_authz/src/emqx_authz_schema.erl
index 6630ed526..f03ae52a8 100644
--- a/apps/emqx_authz/src/emqx_authz_schema.erl
+++ b/apps/emqx_authz/src/emqx_authz_schema.erl
@@ -337,7 +337,7 @@ check_ssl_opts(Conf) ->
             (#{<<"url">> := Url} = Source) ->
                 case emqx_authz_http:parse_url(Url) of
                     {<<"https", _/binary>>, _, _} ->
-                        case emqx_map_lib:deep_find([<<"ssl">>, <<"enable">>], Source) of
+                        case emqx_utils_maps:deep_find([<<"ssl">>, <<"enable">>], Source) of
                             {ok, true} -> true;
                             {ok, false} -> throw({ssl_not_enable, Url});
                             _ -> throw({ssl_enable_not_found, Url})
diff --git a/apps/emqx_bridge/src/emqx_bridge.erl b/apps/emqx_bridge/src/emqx_bridge.erl
index 087bc6a3f..08b8222f2 100644
--- a/apps/emqx_bridge/src/emqx_bridge.erl
+++ b/apps/emqx_bridge/src/emqx_bridge.erl
@@ -207,7 +207,7 @@ send_message(BridgeId, Message) ->
     end.
 
 query_opts(Config) ->
-    case emqx_map_lib:deep_get([resource_opts, request_timeout], Config, false) of
+    case emqx_utils_maps:deep_get([resource_opts, request_timeout], Config, false) of
         Timeout when is_integer(Timeout) ->
             %% request_timeout is configured
             #{timeout => Timeout};
@@ -367,7 +367,7 @@ perform_bridge_changes([{Action, MapConfs} | Tasks], Result0) ->
     perform_bridge_changes(Tasks, Result).
 
 diff_confs(NewConfs, OldConfs) ->
-    emqx_map_lib:diff_maps(
+    emqx_utils_maps:diff_maps(
         flatten_confs(NewConfs),
         flatten_confs(OldConfs)
     ).
diff --git a/apps/emqx_bridge/src/emqx_bridge_api.erl b/apps/emqx_bridge/src/emqx_bridge_api.erl
index a1841b705..205fcfcf9 100644
--- a/apps/emqx_bridge/src/emqx_bridge_api.erl
+++ b/apps/emqx_bridge/src/emqx_bridge_api.erl
@@ -1029,5 +1029,5 @@ deobfuscate(NewConf, OldConf) ->
 
 map_to_json(M) ->
     emqx_utils_json:encode(
-        emqx_map_lib:jsonable_map(M, fun(K, V) -> {K, emqx_map_lib:binary_string(V)} end)
+        emqx_utils_maps:jsonable_map(M, fun(K, V) -> {K, emqx_utils_maps:binary_string(V)} end)
     ).
diff --git a/apps/emqx_bridge/src/emqx_bridge_resource.erl b/apps/emqx_bridge/src/emqx_bridge_resource.erl
index 903e86443..347f9d973 100644
--- a/apps/emqx_bridge/src/emqx_bridge_resource.erl
+++ b/apps/emqx_bridge/src/emqx_bridge_resource.erl
@@ -186,7 +186,7 @@ update(Type, Name, {OldConf, Conf}, Opts0) ->
     %% without restarting the bridge.
     %%
     Opts = override_start_after_created(Conf, Opts0),
-    case emqx_map_lib:if_only_to_toggle_enable(OldConf, Conf) of
+    case emqx_utils_maps:if_only_to_toggle_enable(OldConf, Conf) of
         false ->
             ?SLOG(info, #{
                 msg => "update bridge",
@@ -238,7 +238,7 @@ recreate(Type, Name, Conf, Opts) ->
 create_dry_run(Type, Conf0) ->
     TmpPath0 = iolist_to_binary([?TEST_ID_PREFIX, emqx_utils:gen_id(8)]),
     TmpPath = emqx_utils:safe_filename(TmpPath0),
-    Conf = emqx_map_lib:safe_atom_key_map(Conf0),
+    Conf = emqx_utils_maps:safe_atom_key_map(Conf0),
     case emqx_connector_ssl:convert_certs(TmpPath, Conf) of
         {error, Reason} ->
             {error, Reason};
diff --git a/apps/emqx_bridge/src/schema/emqx_bridge_schema.erl b/apps/emqx_bridge/src/schema/emqx_bridge_schema.erl
index 52000ba7f..e5def2d64 100644
--- a/apps/emqx_bridge/src/schema/emqx_bridge_schema.erl
+++ b/apps/emqx_bridge/src/schema/emqx_bridge_schema.erl
@@ -251,7 +251,7 @@ do_convert_webhook_config(
     case {MReqTRoot, MReqTResource} of
         {{ok, ReqTRoot}, {ok, ReqTResource}} ->
             {_Parsed, ReqTRaw} = max({ReqTRoot, ReqTRootRaw}, {ReqTResource, ReqTResourceRaw}),
-            Conf1 = emqx_map_lib:deep_merge(
+            Conf1 = emqx_utils_maps:deep_merge(
                 Conf0,
                 #{
                     <<"request_timeout">> => ReqTRaw,
diff --git a/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl b/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl
index ef997f7e3..3afe17080 100644
--- a/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl
+++ b/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl
@@ -1221,7 +1221,7 @@ t_inconsistent_webhook_request_timeouts(Config) ->
     URL1 = ?URL(Port, "path1"),
     Name = ?BRIDGE_NAME,
     BadBridgeParams =
-        emqx_map_lib:deep_merge(
+        emqx_utils_maps:deep_merge(
             ?HTTP_BRIDGE(URL1, Name),
             #{
                 <<"request_timeout">> => <<"1s">>,
diff --git a/apps/emqx_bridge/test/emqx_bridge_mqtt_SUITE.erl b/apps/emqx_bridge/test/emqx_bridge_mqtt_SUITE.erl
index bd6af9323..ab58ce383 100644
--- a/apps/emqx_bridge/test/emqx_bridge_mqtt_SUITE.erl
+++ b/apps/emqx_bridge/test/emqx_bridge_mqtt_SUITE.erl
@@ -270,7 +270,7 @@ t_mqtt_conn_bridge_ingress_downgrades_qos_2(_) ->
         ?SERVER_CONF(<<"user1">>)#{
             <<"type">> => ?TYPE_MQTT,
             <<"name">> => BridgeName,
-            <<"ingress">> => emqx_map_lib:deep_merge(
+            <<"ingress">> => emqx_utils_maps:deep_merge(
                 ?INGRESS_CONF,
                 #{<<"remote">> => #{<<"qos">> => 2}}
             )
diff --git a/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl
index 254284b75..08fbf5e15 100644
--- a/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl
+++ b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl
@@ -673,7 +673,7 @@ create_bridge(Config, Overrides) ->
     Type = ?BRIDGE_TYPE_BIN,
     Name = ?config(kafka_name, Config),
     KafkaConfig0 = ?config(kafka_config, Config),
-    KafkaConfig = emqx_map_lib:deep_merge(KafkaConfig0, Overrides),
+    KafkaConfig = emqx_utils_maps:deep_merge(KafkaConfig0, Overrides),
     emqx_bridge:create(Type, Name, KafkaConfig).
 
 delete_bridge(Config) ->
@@ -696,7 +696,7 @@ create_bridge_api(Config, Overrides) ->
     TypeBin = ?BRIDGE_TYPE_BIN,
     Name = ?config(kafka_name, Config),
     KafkaConfig0 = ?config(kafka_config, Config),
-    KafkaConfig = emqx_map_lib:deep_merge(KafkaConfig0, Overrides),
+    KafkaConfig = emqx_utils_maps:deep_merge(KafkaConfig0, Overrides),
     Params = KafkaConfig#{<<"type">> => TypeBin, <<"name">> => Name},
     Path = emqx_mgmt_api_test_util:api_path(["bridges"]),
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
@@ -719,7 +719,7 @@ update_bridge_api(Config, Overrides) ->
     TypeBin = ?BRIDGE_TYPE_BIN,
     Name = ?config(kafka_name, Config),
     KafkaConfig0 = ?config(kafka_config, Config),
-    KafkaConfig = emqx_map_lib:deep_merge(KafkaConfig0, Overrides),
+    KafkaConfig = emqx_utils_maps:deep_merge(KafkaConfig0, Overrides),
     BridgeId = emqx_bridge_resource:bridge_id(TypeBin, Name),
     Params = KafkaConfig#{<<"type">> => TypeBin, <<"name">> => Name},
     Path = emqx_mgmt_api_test_util:api_path(["bridges", BridgeId]),
diff --git a/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_tests.erl b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_tests.erl
index fa352ce89..b16df854f 100644
--- a/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_tests.erl
+++ b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_tests.erl
@@ -92,7 +92,7 @@ kafka_consumer_test() ->
     ),
 
     %% Bad: can't repeat kafka topics.
-    BadConf1 = emqx_map_lib:deep_put(
+    BadConf1 = emqx_utils_maps:deep_put(
         [<<"bridges">>, <<"kafka_consumer">>, <<"my_consumer">>, <<"topic_mapping">>],
         Conf1,
         [
@@ -121,7 +121,7 @@ kafka_consumer_test() ->
     ),
 
     %% Bad: there must be at least 1 mapping.
-    BadConf2 = emqx_map_lib:deep_put(
+    BadConf2 = emqx_utils_maps:deep_put(
         [<<"bridges">>, <<"kafka_consumer">>, <<"my_consumer">>, <<"topic_mapping">>],
         Conf1,
         []
diff --git a/apps/emqx_conf/src/emqx_conf.erl b/apps/emqx_conf/src/emqx_conf.erl
index d03cf9c27..246875ab6 100644
--- a/apps/emqx_conf/src/emqx_conf.erl
+++ b/apps/emqx_conf/src/emqx_conf.erl
@@ -43,50 +43,50 @@ add_handler(ConfKeyPath, HandlerName) ->
 remove_handler(ConfKeyPath) ->
     emqx_config_handler:remove_handler(ConfKeyPath).
 
--spec get(emqx_map_lib:config_key_path()) -> term().
+-spec get(emqx_utils_maps:config_key_path()) -> term().
 get(KeyPath) ->
     emqx:get_config(KeyPath).
 
--spec get(emqx_map_lib:config_key_path(), term()) -> term().
+-spec get(emqx_utils_maps:config_key_path(), term()) -> term().
 get(KeyPath, Default) ->
     emqx:get_config(KeyPath, Default).
 
--spec get_raw(emqx_map_lib:config_key_path(), term()) -> term().
+-spec get_raw(emqx_utils_maps:config_key_path(), term()) -> term().
 get_raw(KeyPath, Default) ->
     emqx_config:get_raw(KeyPath, Default).
 
--spec get_raw(emqx_map_lib:config_key_path()) -> term().
+-spec get_raw(emqx_utils_maps:config_key_path()) -> term().
 get_raw(KeyPath) ->
     emqx_config:get_raw(KeyPath).
 
 %% @doc Returns all values in the cluster.
--spec get_all(emqx_map_lib:config_key_path()) -> #{node() => term()}.
+-spec get_all(emqx_utils_maps:config_key_path()) -> #{node() => term()}.
 get_all(KeyPath) ->
     {ResL, []} = emqx_conf_proto_v2:get_all(KeyPath),
     maps:from_list(ResL).
 
 %% @doc Returns the specified node's KeyPath, or exception if not found
--spec get_by_node(node(), emqx_map_lib:config_key_path()) -> term().
+-spec get_by_node(node(), emqx_utils_maps:config_key_path()) -> term().
 get_by_node(Node, KeyPath) when Node =:= node() ->
     emqx:get_config(KeyPath);
 get_by_node(Node, KeyPath) ->
     emqx_conf_proto_v2:get_config(Node, KeyPath).
 
 %% @doc Returns the specified node's KeyPath, or the default value if not found
--spec get_by_node(node(), emqx_map_lib:config_key_path(), term()) -> term().
+-spec get_by_node(node(), emqx_utils_maps:config_key_path(), term()) -> term().
 get_by_node(Node, KeyPath, Default) when Node =:= node() ->
     emqx:get_config(KeyPath, Default);
 get_by_node(Node, KeyPath, Default) ->
     emqx_conf_proto_v2:get_config(Node, KeyPath, Default).
 
 %% @doc Returns the specified node's KeyPath, or config_not_found if key path not found
--spec get_node_and_config(emqx_map_lib:config_key_path()) -> term().
+-spec get_node_and_config(emqx_utils_maps:config_key_path()) -> term().
 get_node_and_config(KeyPath) ->
     {node(), emqx:get_config(KeyPath, config_not_found)}.
 
 %% @doc Update all value of key path in cluster-override.conf or local-override.conf.
 -spec update(
-    emqx_map_lib:config_key_path(),
+    emqx_utils_maps:config_key_path(),
     emqx_config:update_request(),
     emqx_config:update_opts()
 ) ->
@@ -97,7 +97,7 @@ update(KeyPath, UpdateReq, Opts) ->
 %% @doc Update the specified node's key path in local-override.conf.
 -spec update(
     node(),
-    emqx_map_lib:config_key_path(),
+    emqx_utils_maps:config_key_path(),
     emqx_config:update_request(),
     emqx_config:update_opts()
 ) ->
@@ -108,13 +108,13 @@ update(Node, KeyPath, UpdateReq, Opts) ->
     emqx_conf_proto_v2:update(Node, KeyPath, UpdateReq, Opts).
 
 %% @doc remove all value of key path in cluster-override.conf or local-override.conf.
--spec remove(emqx_map_lib:config_key_path(), emqx_config:update_opts()) ->
+-spec remove(emqx_utils_maps:config_key_path(), emqx_config:update_opts()) ->
     {ok, emqx_config:update_result()} | {error, emqx_config:update_error()}.
 remove(KeyPath, Opts) ->
     emqx_conf_proto_v2:remove_config(KeyPath, Opts).
 
 %% @doc remove the specified node's key path in local-override.conf.
--spec remove(node(), emqx_map_lib:config_key_path(), emqx_config:update_opts()) ->
+-spec remove(node(), emqx_utils_maps:config_key_path(), emqx_config:update_opts()) ->
     {ok, emqx_config:update_result()} | {error, emqx_config:update_error()}.
 remove(Node, KeyPath, Opts) when Node =:= node() ->
     emqx:remove_config(KeyPath, Opts#{override_to => local});
@@ -122,13 +122,13 @@ remove(Node, KeyPath, Opts) ->
     emqx_conf_proto_v2:remove_config(Node, KeyPath, Opts).
 
 %% @doc reset all value of key path in cluster-override.conf or local-override.conf.
--spec reset(emqx_map_lib:config_key_path(), emqx_config:update_opts()) ->
+-spec reset(emqx_utils_maps:config_key_path(), emqx_config:update_opts()) ->
     {ok, emqx_config:update_result()} | {error, emqx_config:update_error()}.
 reset(KeyPath, Opts) ->
     emqx_conf_proto_v2:reset(KeyPath, Opts).
 
 %% @doc reset the specified node's key path in local-override.conf.
--spec reset(node(), emqx_map_lib:config_key_path(), emqx_config:update_opts()) ->
+-spec reset(node(), emqx_utils_maps:config_key_path(), emqx_config:update_opts()) ->
     {ok, emqx_config:update_result()} | {error, emqx_config:update_error()}.
 reset(Node, KeyPath, Opts) when Node =:= node() ->
     emqx:reset_config(KeyPath, Opts#{override_to => local});
diff --git a/apps/emqx_conf/src/proto/emqx_conf_proto_v1.erl b/apps/emqx_conf/src/proto/emqx_conf_proto_v1.erl
index 84687e314..b66307a1b 100644
--- a/apps/emqx_conf/src/proto/emqx_conf_proto_v1.erl
+++ b/apps/emqx_conf/src/proto/emqx_conf_proto_v1.erl
@@ -38,22 +38,22 @@
 
 -include_lib("emqx/include/bpapi.hrl").
 
--type update_config_key_path() :: [emqx_map_lib:config_key(), ...].
+-type update_config_key_path() :: [emqx_utils_maps:config_key(), ...].
 
 introduced_in() ->
     "5.0.0".
 
--spec get_config(node(), emqx_map_lib:config_key_path()) ->
+-spec get_config(node(), emqx_utils_maps:config_key_path()) ->
     term() | emqx_rpc:badrpc().
 get_config(Node, KeyPath) ->
     rpc:call(Node, emqx, get_config, [KeyPath]).
 
--spec get_config(node(), emqx_map_lib:config_key_path(), _Default) ->
+-spec get_config(node(), emqx_utils_maps:config_key_path(), _Default) ->
     term() | emqx_rpc:badrpc().
 get_config(Node, KeyPath, Default) ->
     rpc:call(Node, emqx, get_config, [KeyPath, Default]).
 
--spec get_all(emqx_map_lib:config_key_path()) -> emqx_rpc:multicall_result().
+-spec get_all(emqx_utils_maps:config_key_path()) -> emqx_rpc:multicall_result().
 get_all(KeyPath) ->
     rpc:multicall(emqx_conf, get_node_and_config, [KeyPath], 5000).
 
diff --git a/apps/emqx_conf/src/proto/emqx_conf_proto_v2.erl b/apps/emqx_conf/src/proto/emqx_conf_proto_v2.erl
index dd8d2fedd..97446ee9f 100644
--- a/apps/emqx_conf/src/proto/emqx_conf_proto_v2.erl
+++ b/apps/emqx_conf/src/proto/emqx_conf_proto_v2.erl
@@ -44,19 +44,19 @@ introduced_in() ->
 -spec sync_data_from_node(node()) -> {ok, binary()} | emqx_rpc:badrpc().
 sync_data_from_node(Node) ->
     rpc:call(Node, emqx_conf_app, sync_data_from_node, [], 20000).
--type update_config_key_path() :: [emqx_map_lib:config_key(), ...].
+-type update_config_key_path() :: [emqx_utils_maps:config_key(), ...].
 
--spec get_config(node(), emqx_map_lib:config_key_path()) ->
+-spec get_config(node(), emqx_utils_maps:config_key_path()) ->
     term() | emqx_rpc:badrpc().
 get_config(Node, KeyPath) ->
     rpc:call(Node, emqx, get_config, [KeyPath]).
 
--spec get_config(node(), emqx_map_lib:config_key_path(), _Default) ->
+-spec get_config(node(), emqx_utils_maps:config_key_path(), _Default) ->
     term() | emqx_rpc:badrpc().
 get_config(Node, KeyPath, Default) ->
     rpc:call(Node, emqx, get_config, [KeyPath, Default]).
 
--spec get_all(emqx_map_lib:config_key_path()) -> emqx_rpc:multicall_result().
+-spec get_all(emqx_utils_maps:config_key_path()) -> emqx_rpc:multicall_result().
 get_all(KeyPath) ->
     rpc:multicall(emqx_conf, get_node_and_config, [KeyPath], 5000).
 
diff --git a/apps/emqx_connector/src/emqx_connector_ssl.erl b/apps/emqx_connector/src/emqx_connector_ssl.erl
index 54dc0e022..e07d95d51 100644
--- a/apps/emqx_connector/src/emqx_connector_ssl.erl
+++ b/apps/emqx_connector/src/emqx_connector_ssl.erl
@@ -74,7 +74,7 @@ new_ssl_config(Config, _NewSSL) ->
 normalize_key_to_bin(undefined) ->
     undefined;
 normalize_key_to_bin(Map) when is_map(Map) ->
-    emqx_map_lib:binary_key_map(Map).
+    emqx_utils_maps:binary_key_map(Map).
 
 try_map_get(Key, Map, Default) when is_map(Map) ->
     maps:get(Key, Map, Default);
diff --git a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_worker.erl b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_worker.erl
index 5197a35df..880a99313 100644
--- a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_worker.erl
+++ b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_worker.erl
@@ -410,7 +410,7 @@ handle_disconnect(_Reason) ->
     ok.
 
 maybe_publish_local(Msg, Vars, Props) ->
-    case emqx_map_lib:deep_get([local, topic], Vars, undefined) of
+    case emqx_utils_maps:deep_get([local, topic], Vars, undefined) of
         %% local topic is not set, discard it
         undefined ->
             ok;
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_listener.erl b/apps/emqx_dashboard/src/emqx_dashboard_listener.erl
index eac4f845f..01d96bdf0 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_listener.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_listener.erl
@@ -119,7 +119,7 @@ remove_handler() ->
 
 pre_config_update(_Path, UpdateConf0, RawConf) ->
     UpdateConf = remove_sensitive_data(UpdateConf0),
-    NewConf = emqx_map_lib:deep_merge(RawConf, UpdateConf),
+    NewConf = emqx_utils_maps:deep_merge(RawConf, UpdateConf),
     ensure_ssl_cert(NewConf).
 
 -define(SENSITIVE_PASSWORD, <<"******">>).
@@ -134,7 +134,7 @@ remove_sensitive_data(Conf0) ->
         end,
     case Conf1 of
         #{<<"listeners">> := #{<<"https">> := #{<<"password">> := ?SENSITIVE_PASSWORD}}} ->
-            emqx_map_lib:deep_remove([<<"listeners">>, <<"https">>, <<"password">>], Conf1);
+            emqx_utils_maps:deep_remove([<<"listeners">>, <<"https">>, <<"password">>], Conf1);
         _ ->
             Conf1
     end.
@@ -152,7 +152,7 @@ post_config_update(_, _Req, NewConf, OldConf, _AppEnvs) ->
     ok.
 
 get_listener(Type, Conf) ->
-    emqx_map_lib:deep_get([listeners, Type], Conf, undefined).
+    emqx_utils_maps:deep_get([listeners, Type], Conf, undefined).
 
 diff_listeners(_, Listener, Listener) -> {#{}, #{}};
 diff_listeners(Type, undefined, Start) -> {#{}, #{Type => Start}};
@@ -162,13 +162,14 @@ diff_listeners(Type, Stop, Start) -> {#{Type => Stop}, #{Type => Start}}.
 -define(DIR, <<"dashboard">>).
 
 ensure_ssl_cert(#{<<"listeners">> := #{<<"https">> := #{<<"enable">> := true}}} = Conf) ->
-    Https = emqx_map_lib:deep_get([<<"listeners">>, <<"https">>], Conf, undefined),
+    Https = emqx_utils_maps:deep_get([<<"listeners">>, <<"https">>], Conf, undefined),
     Opts = #{required_keys => [[<<"keyfile">>], [<<"certfile">>], [<<"cacertfile">>]]},
     case emqx_tls_lib:ensure_ssl_files(?DIR, Https, Opts) of
         {ok, undefined} ->
             {error, <<"ssl_cert_not_found">>};
         {ok, NewHttps} ->
-            {ok, emqx_map_lib:deep_merge(Conf, #{<<"listeners">> => #{<<"https">> => NewHttps}})};
+            {ok,
+                emqx_utils_maps:deep_merge(Conf, #{<<"listeners">> => #{<<"https">> => NewHttps}})};
         {error, Reason} ->
             ?SLOG(error, Reason#{msg => "bad_ssl_config"}),
             {error, Reason}
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_swagger.erl b/apps/emqx_dashboard/src/emqx_dashboard_swagger.erl
index 22cf484ff..b2ad69997 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_swagger.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_swagger.erl
@@ -474,7 +474,7 @@ maybe_add_summary_from_label(Spec, Hocon) ->
 get_i18n(Key, Struct, Default) ->
     {ok, #{cache := Cache, lang := Lang}} = emqx_dashboard:get_i18n(),
     Desc = hocon_schema:resolve_schema(Struct, Cache),
-    emqx_map_lib:deep_get([Key, Lang], Desc, Default).
+    emqx_utils_maps:deep_get([Key, Lang], Desc, Default).
 
 trans_label(Spec, Hocon, Default) ->
     Label =
diff --git a/apps/emqx_exhook/src/emqx_exhook_mgr.erl b/apps/emqx_exhook/src/emqx_exhook_mgr.erl
index 77937a835..0647c80ea 100644
--- a/apps/emqx_exhook/src/emqx_exhook_mgr.erl
+++ b/apps/emqx_exhook/src/emqx_exhook_mgr.erl
@@ -507,11 +507,11 @@ sort_name_by_order(Names, Orders) ->
     lists:sort(
         fun
             (A, B) when is_binary(A) ->
-                emqx_map_lib:deep_get([A, order], Orders) <
-                    emqx_map_lib:deep_get([B, order], Orders);
+                emqx_utils_maps:deep_get([A, order], Orders) <
+                    emqx_utils_maps:deep_get([B, order], Orders);
             (#{name := A}, #{name := B}) ->
-                emqx_map_lib:deep_get([A, order], Orders) <
-                    emqx_map_lib:deep_get([B, order], Orders)
+                emqx_utils_maps:deep_get([A, order], Orders) <
+                    emqx_utils_maps:deep_get([B, order], Orders)
         end,
         Names
     ).
diff --git a/apps/emqx_exhook/test/emqx_exhook_api_SUITE.erl b/apps/emqx_exhook/test/emqx_exhook_api_SUITE.erl
index 58f2f29b4..c03b3f231 100644
--- a/apps/emqx_exhook/test/emqx_exhook_api_SUITE.erl
+++ b/apps/emqx_exhook/test/emqx_exhook_api_SUITE.erl
@@ -311,7 +311,7 @@ t_update(Cfg) ->
 
 decode_json(Data) ->
     BinJosn = emqx_utils_json:decode(Data, [return_maps]),
-    emqx_map_lib:unsafe_atom_key_map(BinJosn).
+    emqx_utils_maps:unsafe_atom_key_map(BinJosn).
 
 request_api(Method, Url, Auth) ->
     request_api(Method, Url, [], Auth, []).
diff --git a/apps/emqx_gateway/src/emqx_gateway_api_listeners.erl b/apps/emqx_gateway/src/emqx_gateway_api_listeners.erl
index 14b80a500..d90bf3689 100644
--- a/apps/emqx_gateway/src/emqx_gateway_api_listeners.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_api_listeners.erl
@@ -96,7 +96,7 @@ listeners(post, #{bindings := #{name := Name0}, body := LConf}) ->
         LName = binary_to_atom(maps:get(<<"name">>, LConf)),
 
         Path = [listeners, Type, LName],
-        case emqx_map_lib:deep_get(Path, RunningConf, undefined) of
+        case emqx_utils_maps:deep_get(Path, RunningConf, undefined) of
             undefined ->
                 ListenerId = emqx_gateway_utils:listener_id(
                     GwName, Type, LName
diff --git a/apps/emqx_gateway/src/emqx_gateway_conf.erl b/apps/emqx_gateway/src/emqx_gateway_conf.erl
index 07a4c1e2c..56a3e2068 100644
--- a/apps/emqx_gateway/src/emqx_gateway_conf.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_conf.erl
@@ -106,7 +106,7 @@ unconvert_listeners(Ls) when is_list(Ls) ->
             {[Type, Name], Lis1} = maps_key_take([<<"type">>, <<"name">>], Lis),
             _ = vaildate_listener_name(Name),
             NLis1 = maps:without([<<"id">>, <<"running">>], Lis1),
-            emqx_map_lib:deep_merge(Acc, #{Type => #{Name => NLis1}})
+            emqx_utils_maps:deep_merge(Acc, #{Type => #{Name => NLis1}})
         end,
         #{},
         Ls
@@ -160,8 +160,8 @@ gateway(GwName0) ->
     RawConf = emqx_config:fill_defaults(
         emqx_config:get_root_raw(Path)
     ),
-    Confs = emqx_map_lib:jsonable_map(
-        emqx_map_lib:deep_get(Path, RawConf)
+    Confs = emqx_utils_maps:jsonable_map(
+        emqx_utils_maps:deep_get(Path, RawConf)
     ),
     LsConf = maps:get(<<"listeners">>, Confs, #{}),
     Confs#{<<"listeners">> => convert_listeners(GwName, LsConf)}.
@@ -198,8 +198,8 @@ listeners(GwName0) ->
     RawConf = emqx_config:fill_defaults(
         emqx_config:get_root_raw([<<"gateway">>])
     ),
-    Listeners = emqx_map_lib:jsonable_map(
-        emqx_map_lib:deep_get(
+    Listeners = emqx_utils_maps:jsonable_map(
+        emqx_utils_maps:deep_get(
             [<<"gateway">>, GwName, <<"listeners">>], RawConf
         )
     ),
@@ -213,12 +213,12 @@ listener(ListenerId) ->
     ),
     try
         Path = [<<"gateway">>, GwName, <<"listeners">>, Type, LName],
-        LConf = emqx_map_lib:deep_get(Path, RootConf),
+        LConf = emqx_utils_maps:deep_get(Path, RootConf),
         Running = emqx_gateway_utils:is_running(
             binary_to_existing_atom(ListenerId), LConf
         ),
         {ok,
-            emqx_map_lib:jsonable_map(
+            emqx_utils_maps:jsonable_map(
                 LConf#{
                     id => ListenerId,
                     type => Type,
@@ -305,8 +305,8 @@ ret_ok_err({ok, _}) -> ok;
 ret_ok_err(Err) -> Err.
 
 ret_gw(GwName, {ok, #{raw_config := GwConf}}) ->
-    GwConf1 = emqx_map_lib:deep_get([bin(GwName)], GwConf),
-    LsConf = emqx_map_lib:deep_get(
+    GwConf1 = emqx_utils_maps:deep_get([bin(GwName)], GwConf),
+    LsConf = emqx_utils_maps:deep_get(
         [bin(GwName), <<"listeners">>],
         GwConf,
         #{}
@@ -331,7 +331,7 @@ ret_gw(_GwName, Err) ->
     Err.
 
 ret_authn(GwName, {ok, #{raw_config := GwConf}}) ->
-    Authn = emqx_map_lib:deep_get(
+    Authn = emqx_utils_maps:deep_get(
         [bin(GwName), <<"authentication">>],
         GwConf
     ),
@@ -340,7 +340,7 @@ ret_authn(_GwName, Err) ->
     Err.
 
 ret_authn(GwName, {LType, LName}, {ok, #{raw_config := GwConf}}) ->
-    Authn = emqx_map_lib:deep_get(
+    Authn = emqx_utils_maps:deep_get(
         [
             bin(GwName),
             <<"listeners">>,
@@ -355,7 +355,7 @@ ret_authn(_, _, Err) ->
     Err.
 
 ret_listener_or_err(GwName, {LType, LName}, {ok, #{raw_config := GwConf}}) ->
-    LConf = emqx_map_lib:deep_get(
+    LConf = emqx_utils_maps:deep_get(
         [bin(GwName), <<"listeners">>, bin(LType), bin(LName)],
         GwConf
     ),
@@ -377,7 +377,7 @@ pre_config_update(_, {load_gateway, GwName, Conf}, RawConf) ->
     case maps:get(GwName, RawConf, undefined) of
         undefined ->
             NConf = tune_gw_certs(fun convert_certs/2, GwName, Conf),
-            {ok, emqx_map_lib:deep_put([GwName], RawConf, NConf)};
+            {ok, emqx_utils_maps:deep_put([GwName], RawConf, NConf)};
         _ ->
             badres_gateway(already_exist, GwName)
     end;
@@ -389,7 +389,7 @@ pre_config_update(_, {update_gateway, GwName, Conf}, RawConf) ->
             Conf1 = maps:without([<<"listeners">>, ?AUTHN_BIN], Conf),
             NConf = tune_gw_certs(fun convert_certs/2, GwName, Conf1),
             NConf1 = maps:merge(GwRawConf, NConf),
-            {ok, emqx_map_lib:deep_put([GwName], RawConf, NConf1)}
+            {ok, emqx_utils_maps:deep_put([GwName], RawConf, NConf1)}
     end;
 pre_config_update(_, {unload_gateway, GwName}, RawConf) ->
     _ = tune_gw_certs(
@@ -400,7 +400,7 @@ pre_config_update(_, {unload_gateway, GwName}, RawConf) ->
     {ok, maps:remove(GwName, RawConf)};
 pre_config_update(_, {add_listener, GwName, {LType, LName}, Conf}, RawConf) ->
     case
-        emqx_map_lib:deep_get(
+        emqx_utils_maps:deep_get(
             [GwName, <<"listeners">>, LType, LName], RawConf, undefined
         )
     of
@@ -408,7 +408,7 @@ pre_config_update(_, {add_listener, GwName, {LType, LName}, Conf}, RawConf) ->
             NConf = convert_certs(certs_dir(GwName), Conf),
             NListener = #{LType => #{LName => NConf}},
             {ok,
-                emqx_map_lib:deep_merge(
+                emqx_utils_maps:deep_merge(
                     RawConf,
                     #{GwName => #{<<"listeners">> => NListener}}
                 )};
@@ -417,7 +417,7 @@ pre_config_update(_, {add_listener, GwName, {LType, LName}, Conf}, RawConf) ->
     end;
 pre_config_update(_, {update_listener, GwName, {LType, LName}, Conf}, RawConf) ->
     case
-        emqx_map_lib:deep_get(
+        emqx_utils_maps:deep_get(
             [GwName, <<"listeners">>, LType, LName], RawConf, undefined
         )
     of
@@ -425,7 +425,7 @@ pre_config_update(_, {update_listener, GwName, {LType, LName}, Conf}, RawConf) -
             badres_listener(not_found, GwName, LType, LName);
         OldConf ->
             NConf = convert_certs(certs_dir(GwName), Conf, OldConf),
-            NRawConf = emqx_map_lib:deep_put(
+            NRawConf = emqx_utils_maps:deep_put(
                 [GwName, <<"listeners">>, LType, LName],
                 RawConf,
                 NConf
@@ -434,22 +434,22 @@ pre_config_update(_, {update_listener, GwName, {LType, LName}, Conf}, RawConf) -
     end;
 pre_config_update(_, {remove_listener, GwName, {LType, LName}}, RawConf) ->
     Path = [GwName, <<"listeners">>, LType, LName],
-    case emqx_map_lib:deep_get(Path, RawConf, undefined) of
+    case emqx_utils_maps:deep_get(Path, RawConf, undefined) of
         undefined ->
             {ok, RawConf};
         OldConf ->
             clear_certs(certs_dir(GwName), OldConf),
-            {ok, emqx_map_lib:deep_remove(Path, RawConf)}
+            {ok, emqx_utils_maps:deep_remove(Path, RawConf)}
     end;
 pre_config_update(_, {add_authn, GwName, Conf}, RawConf) ->
     case
-        emqx_map_lib:deep_get(
+        emqx_utils_maps:deep_get(
             [GwName, ?AUTHN_BIN], RawConf, undefined
         )
     of
         undefined ->
             {ok,
-                emqx_map_lib:deep_merge(
+                emqx_utils_maps:deep_merge(
                     RawConf,
                     #{GwName => #{?AUTHN_BIN => Conf}}
                 )};
@@ -458,7 +458,7 @@ pre_config_update(_, {add_authn, GwName, Conf}, RawConf) ->
     end;
 pre_config_update(_, {add_authn, GwName, {LType, LName}, Conf}, RawConf) ->
     case
-        emqx_map_lib:deep_get(
+        emqx_utils_maps:deep_get(
             [GwName, <<"listeners">>, LType, LName],
             RawConf,
             undefined
@@ -477,25 +477,25 @@ pre_config_update(_, {add_authn, GwName, {LType, LName}, Conf}, RawConf) ->
                                     #{LType => #{LName => NListener}}
                             }
                     },
-                    {ok, emqx_map_lib:deep_merge(RawConf, NGateway)};
+                    {ok, emqx_utils_maps:deep_merge(RawConf, NGateway)};
                 _ ->
                     badres_listener_authn(already_exist, GwName, LType, LName)
             end
     end;
 pre_config_update(_, {update_authn, GwName, Conf}, RawConf) ->
     case
-        emqx_map_lib:deep_get(
+        emqx_utils_maps:deep_get(
             [GwName, ?AUTHN_BIN], RawConf, undefined
         )
     of
         undefined ->
             badres_authn(not_found, GwName);
         _Authn ->
-            {ok, emqx_map_lib:deep_put([GwName, ?AUTHN_BIN], RawConf, Conf)}
+            {ok, emqx_utils_maps:deep_put([GwName, ?AUTHN_BIN], RawConf, Conf)}
     end;
 pre_config_update(_, {update_authn, GwName, {LType, LName}, Conf}, RawConf) ->
     case
-        emqx_map_lib:deep_get(
+        emqx_utils_maps:deep_get(
             [GwName, <<"listeners">>, LType, LName],
             RawConf,
             undefined
@@ -514,7 +514,7 @@ pre_config_update(_, {update_authn, GwName, {LType, LName}, Conf}, RawConf) ->
                         Listener
                     ),
                     {ok,
-                        emqx_map_lib:deep_put(
+                        emqx_utils_maps:deep_put(
                             [GwName, <<"listeners">>, LType, LName],
                             RawConf,
                             NListener
@@ -523,12 +523,12 @@ pre_config_update(_, {update_authn, GwName, {LType, LName}, Conf}, RawConf) ->
     end;
 pre_config_update(_, {remove_authn, GwName}, RawConf) ->
     {ok,
-        emqx_map_lib:deep_remove(
+        emqx_utils_maps:deep_remove(
             [GwName, ?AUTHN_BIN], RawConf
         )};
 pre_config_update(_, {remove_authn, GwName, {LType, LName}}, RawConf) ->
     Path = [GwName, <<"listeners">>, LType, LName, ?AUTHN_BIN],
-    {ok, emqx_map_lib:deep_remove(Path, RawConf)};
+    {ok, emqx_utils_maps:deep_remove(Path, RawConf)};
 pre_config_update(_, UnknownReq, _RawConf) ->
     logger:error("Unknown configuration update request: ~0p", [UnknownReq]),
     {error, badreq}.
diff --git a/apps/emqx_gateway/src/emqx_gateway_http.erl b/apps/emqx_gateway/src/emqx_gateway_http.erl
index 9bb5821f5..7aaaee9cb 100644
--- a/apps/emqx_gateway/src/emqx_gateway_http.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_http.erl
@@ -240,7 +240,7 @@ authn(GwName) ->
     ChainName = emqx_gateway_utils:global_chain(GwName),
     wrap_chain_name(
         ChainName,
-        emqx_map_lib:jsonable_map(emqx:get_raw_config(Path))
+        emqx_utils_maps:jsonable_map(emqx:get_raw_config(Path))
     ).
 
 -spec authn(gateway_name(), binary()) -> map().
@@ -250,7 +250,7 @@ authn(GwName, ListenerId) ->
     ChainName = emqx_gateway_utils:listener_chain(GwName, Type, Name),
     wrap_chain_name(
         ChainName,
-        emqx_map_lib:jsonable_map(emqx:get_raw_config(Path))
+        emqx_utils_maps:jsonable_map(emqx:get_raw_config(Path))
     ).
 
 wrap_chain_name(ChainName, Conf) ->
diff --git a/apps/emqx_gateway/test/emqx_gateway_api_SUITE.erl b/apps/emqx_gateway/test/emqx_gateway_api_SUITE.erl
index 10adcc428..fb648062a 100644
--- a/apps/emqx_gateway/test/emqx_gateway_api_SUITE.erl
+++ b/apps/emqx_gateway/test/emqx_gateway_api_SUITE.erl
@@ -164,7 +164,7 @@ t_gateway_stomp(_) ->
     {204, _} = request(put, "/gateways/stomp", GwConf),
     {200, ConfResp} = request(get, "/gateways/stomp"),
     assert_confs(GwConf, ConfResp),
-    GwConf2 = emqx_map_lib:deep_merge(GwConf, #{frame => #{max_headers => 10}}),
+    GwConf2 = emqx_utils_maps:deep_merge(GwConf, #{frame => #{max_headers => 10}}),
     {204, _} = request(put, "/gateways/stomp", maps:without([name, listeners], GwConf2)),
     {200, ConfResp2} = request(get, "/gateways/stomp"),
     assert_confs(GwConf2, ConfResp2),
@@ -186,7 +186,7 @@ t_gateway_mqttsn(_) ->
     {204, _} = request(put, "/gateways/mqttsn", GwConf),
     {200, ConfResp} = request(get, "/gateways/mqttsn"),
     assert_confs(GwConf, ConfResp),
-    GwConf2 = emqx_map_lib:deep_merge(GwConf, #{predefined => []}),
+    GwConf2 = emqx_utils_maps:deep_merge(GwConf, #{predefined => []}),
     {204, _} = request(put, "/gateways/mqttsn", maps:without([name, listeners], GwConf2)),
     {200, ConfResp2} = request(get, "/gateways/mqttsn"),
     assert_confs(GwConf2, ConfResp2),
@@ -206,7 +206,7 @@ t_gateway_coap(_) ->
     {204, _} = request(put, "/gateways/coap", GwConf),
     {200, ConfResp} = request(get, "/gateways/coap"),
     assert_confs(GwConf, ConfResp),
-    GwConf2 = emqx_map_lib:deep_merge(GwConf, #{heartbeat => <<"10s">>}),
+    GwConf2 = emqx_utils_maps:deep_merge(GwConf, #{heartbeat => <<"10s">>}),
     {204, _} = request(put, "/gateways/coap", maps:without([name, listeners], GwConf2)),
     {200, ConfResp2} = request(get, "/gateways/coap"),
     assert_confs(GwConf2, ConfResp2),
@@ -244,7 +244,7 @@ t_gateway_lwm2m(_) ->
     {204, _} = request(put, "/gateways/lwm2m", GwConf),
     {200, ConfResp} = request(get, "/gateways/lwm2m"),
     assert_confs(GwConf, ConfResp),
-    GwConf2 = emqx_map_lib:deep_merge(GwConf, #{qmode_time_window => <<"10s">>}),
+    GwConf2 = emqx_utils_maps:deep_merge(GwConf, #{qmode_time_window => <<"10s">>}),
     {204, _} = request(put, "/gateways/lwm2m", maps:without([name, listeners], GwConf2)),
     {200, ConfResp2} = request(get, "/gateways/lwm2m"),
     assert_confs(GwConf2, ConfResp2),
@@ -264,7 +264,7 @@ t_gateway_exproto(_) ->
     {204, _} = request(put, "/gateways/exproto", GwConf),
     {200, ConfResp} = request(get, "/gateways/exproto"),
     assert_confs(GwConf, ConfResp),
-    GwConf2 = emqx_map_lib:deep_merge(GwConf, #{server => #{bind => <<"9200">>}}),
+    GwConf2 = emqx_utils_maps:deep_merge(GwConf, #{server => #{bind => <<"9200">>}}),
     {204, _} = request(put, "/gateways/exproto", maps:without([name, listeners], GwConf2)),
     {200, ConfResp2} = request(get, "/gateways/exproto"),
     assert_confs(GwConf2, ConfResp2),
@@ -293,7 +293,7 @@ t_gateway_exproto_with_ssl(_) ->
     {204, _} = request(put, "/gateways/exproto", GwConf),
     {200, ConfResp} = request(get, "/gateways/exproto"),
     assert_confs(GwConf, ConfResp),
-    GwConf2 = emqx_map_lib:deep_merge(GwConf, #{
+    GwConf2 = emqx_utils_maps:deep_merge(GwConf, #{
         server => #{
             bind => <<"9200">>,
             ssl_options => SslCliOpts
diff --git a/apps/emqx_gateway/test/emqx_gateway_authn_SUITE.erl b/apps/emqx_gateway/test/emqx_gateway_authn_SUITE.erl
index 1ab36f7b8..149e6acd6 100644
--- a/apps/emqx_gateway/test/emqx_gateway_authn_SUITE.erl
+++ b/apps/emqx_gateway/test/emqx_gateway_authn_SUITE.erl
@@ -282,7 +282,7 @@ t_case_exproto(_) ->
 
 disable_authn(GwName, Type, Name) ->
     RawCfg = emqx_conf:get_raw([gateway, GwName], #{}),
-    ListenerCfg = emqx_map_lib:deep_get(
+    ListenerCfg = emqx_utils_maps:deep_get(
         [<<"listeners">>, atom_to_binary(Type), atom_to_binary(Name)], RawCfg
     ),
     {ok, _} = emqx_gateway_conf:update_listener(GwName, {Type, Name}, ListenerCfg#{
diff --git a/apps/emqx_gateway/test/emqx_gateway_conf_SUITE.erl b/apps/emqx_gateway/test/emqx_gateway_conf_SUITE.erl
index 33c307770..1e947e793 100644
--- a/apps/emqx_gateway/test/emqx_gateway_conf_SUITE.erl
+++ b/apps/emqx_gateway/test/emqx_gateway_conf_SUITE.erl
@@ -413,7 +413,7 @@ t_load_gateway_with_certs_content(_) ->
     ),
     {ok, _} = emqx_gateway_conf:load_gateway(<<"stomp">>, StompConf),
     assert_confs(StompConf, emqx:get_raw_config([gateway, stomp])),
-    SslConf = emqx_map_lib:deep_get(
+    SslConf = emqx_utils_maps:deep_get(
         [<<"listeners">>, <<"ssl">>, <<"default">>, <<"ssl_options">>],
         emqx:get_raw_config([gateway, stomp])
     ),
@@ -436,7 +436,7 @@ t_load_gateway_with_certs_content(_) ->
 %                 ),
 %    {ok, _} = emqx_gateway_conf:load_gateway(<<"stomp">>, StompConf),
 %    assert_confs(StompConf, emqx:get_raw_config([gateway, stomp])),
-%    SslConf = emqx_map_lib:deep_get(
+%    SslConf = emqx_utils_maps:deep_get(
 %                [<<"listeners">>, <<"ssl">>, <<"default">>, <<"ssl_options">>],
 %                emqx:get_raw_config([gateway, stomp])
 %               ),
@@ -471,7 +471,7 @@ t_add_listener_with_certs_content(_) ->
         emqx:get_raw_config([gateway, stomp])
     ),
 
-    SslConf = emqx_map_lib:deep_get(
+    SslConf = emqx_utils_maps:deep_get(
         [<<"listeners">>, <<"ssl">>, <<"default">>, <<"ssl_options">>],
         emqx:get_raw_config([gateway, stomp])
     ),
diff --git a/apps/emqx_gateway/test/emqx_gateway_test_utils.erl b/apps/emqx_gateway/test/emqx_gateway_test_utils.erl
index 6d80b63d8..bb378ef10 100644
--- a/apps/emqx_gateway/test/emqx_gateway_test_utils.erl
+++ b/apps/emqx_gateway/test/emqx_gateway_test_utils.erl
@@ -159,7 +159,7 @@ do_request(Mth, Req) ->
                     <<>> ->
                         #{};
                     _ ->
-                        emqx_map_lib:unsafe_atom_key_map(
+                        emqx_utils_maps:unsafe_atom_key_map(
                             emqx_utils_json:decode(Resp, [return_maps])
                         )
                 end,
diff --git a/apps/emqx_gateway_exproto/src/emqx_gateway_exproto.erl b/apps/emqx_gateway_exproto/src/emqx_gateway_exproto.erl
index 7860f1220..ff105b931 100644
--- a/apps/emqx_gateway_exproto/src/emqx_gateway_exproto.erl
+++ b/apps/emqx_gateway_exproto/src/emqx_gateway_exproto.erl
@@ -149,7 +149,7 @@ start_grpc_server(GwName, Options = #{bind := ListenOn}) ->
         }
     },
     SvrOptions =
-        case emqx_map_lib:deep_get([ssl, enable], Options, false) of
+        case emqx_utils_maps:deep_get([ssl, enable], Options, false) of
             false ->
                 [];
             true ->
@@ -201,7 +201,7 @@ start_grpc_client_channel(GwName, Options = #{address := Address}) ->
                     }}
                 )
         end,
-    case emqx_map_lib:deep_get([ssl, enable], Options, false) of
+    case emqx_utils_maps:deep_get([ssl, enable], Options, false) of
         false ->
             SvrAddr = compose_http_uri(http, Host, Port),
             grpc_client_sup:create_channel_pool(GwName, SvrAddr, #{});
diff --git a/apps/emqx_management/src/emqx_mgmt_api_clients.erl b/apps/emqx_management/src/emqx_mgmt_api_clients.erl
index cd4829342..681c851bf 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_clients.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_clients.erl
@@ -860,8 +860,8 @@ format_channel_info(ChannInfo = {_, _ClientInfo, _ClientStats}) ->
 
 format_channel_info(WhichNode, {_, ClientInfo0, ClientStats}) ->
     Node = maps:get(node, ClientInfo0, WhichNode),
-    ClientInfo1 = emqx_map_lib:deep_remove([conninfo, clientid], ClientInfo0),
-    ClientInfo2 = emqx_map_lib:deep_remove([conninfo, username], ClientInfo1),
+    ClientInfo1 = emqx_utils_maps:deep_remove([conninfo, clientid], ClientInfo0),
+    ClientInfo2 = emqx_utils_maps:deep_remove([conninfo, username], ClientInfo1),
     StatsMap = maps:without(
         [memory, next_pkt_id, total_heap_size],
         maps:from_list(ClientStats)
@@ -958,4 +958,4 @@ format_authz_cache({{PubSub, Topic}, {AuthzResult, Timestamp}}) ->
 
 to_topic_info(Data) ->
     M = maps:with([<<"topic">>, <<"qos">>, <<"nl">>, <<"rap">>, <<"rh">>], Data),
-    emqx_map_lib:safe_atom_key_map(M).
+    emqx_utils_maps:safe_atom_key_map(M).
diff --git a/apps/emqx_management/src/emqx_mgmt_api_configs.erl b/apps/emqx_management/src/emqx_mgmt_api_configs.erl
index 55cc50597..b37a47be6 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_configs.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_configs.erl
@@ -215,7 +215,7 @@ fields(Field) ->
 %% HTTP API Callbacks
 config(get, _Params, Req) ->
     Path = conf_path(Req),
-    {ok, Conf} = emqx_map_lib:deep_find(Path, get_full_config()),
+    {ok, Conf} = emqx_utils_maps:deep_find(Path, get_full_config()),
     {200, Conf};
 config(put, #{body := Body}, Req) ->
     Path = conf_path(Req),
@@ -349,7 +349,7 @@ gen_schema(_Conf) ->
     #{type => string}.
 
 with_default_value(Type, Value) ->
-    Type#{example => emqx_map_lib:binary_string(Value)}.
+    Type#{example => emqx_utils_maps:binary_string(Value)}.
 
 global_zone_roots() ->
     lists:map(fun({K, _}) -> K end, global_zone_schema()).
diff --git a/apps/emqx_management/src/emqx_mgmt_api_listeners.erl b/apps/emqx_management/src/emqx_mgmt_api_listeners.erl
index c126cfe19..d7f3ff321 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_listeners.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_listeners.erl
@@ -390,7 +390,7 @@ crud_listeners_by_id(put, #{bindings := #{id := Id}, body := Body0}) ->
                 undefined ->
                     {404, #{code => 'BAD_LISTENER_ID', message => ?LISTENER_NOT_FOUND}};
                 PrevConf ->
-                    MergeConfT = emqx_map_lib:deep_merge(PrevConf, Conf),
+                    MergeConfT = emqx_utils_maps:deep_merge(PrevConf, Conf),
                     MergeConf = emqx_listeners:ensure_override_limiter_conf(MergeConfT, Conf),
                     case update(Path, MergeConf) of
                         {ok, #{raw_config := _RawConf}} ->
diff --git a/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
index cc200a4d5..e5704b817 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
@@ -55,7 +55,7 @@ t_update(_Config) ->
     %% update ok
     {ok, SysMon} = get_config(<<"sysmon">>),
     #{<<"vm">> := #{<<"busy_port">> := BusyPort}} = SysMon,
-    NewSysMon = emqx_map_lib:deep_put([<<"vm">>, <<"busy_port">>], SysMon, not BusyPort),
+    NewSysMon = emqx_utils_maps:deep_put([<<"vm">>, <<"busy_port">>], SysMon, not BusyPort),
     {ok, #{}} = update_config(<<"sysmon">>, NewSysMon),
     {ok, SysMon1} = get_config(<<"sysmon">>),
     #{<<"vm">> := #{<<"busy_port">> := BusyPort1}} = SysMon1,
@@ -63,7 +63,7 @@ t_update(_Config) ->
     assert_busy_port(BusyPort1),
 
     %% update failed
-    ErrorSysMon = emqx_map_lib:deep_put([<<"vm">>, <<"busy_port">>], SysMon, "123"),
+    ErrorSysMon = emqx_utils_maps:deep_put([<<"vm">>, <<"busy_port">>], SysMon, "123"),
     ?assertMatch(
         {error, {"HTTP/1.1", 400, _}},
         update_config(<<"sysmon">>, ErrorSysMon)
@@ -78,7 +78,7 @@ t_update(_Config) ->
     assert_busy_port(true),
 
     %% reset no_default_value config
-    NewSysMon1 = emqx_map_lib:deep_put([<<"vm">>, <<"busy_port">>], SysMon, false),
+    NewSysMon1 = emqx_utils_maps:deep_put([<<"vm">>, <<"busy_port">>], SysMon, false),
     {ok, #{}} = update_config(<<"sysmon">>, NewSysMon1),
     ?assertMatch({error, {"HTTP/1.1", 400, _}}, reset_config(<<"sysmon">>, "")),
     {ok, SysMon4} = get_config(<<"sysmon">>),
@@ -94,27 +94,33 @@ t_log(_Config) ->
     {ok, Log} = get_config("log"),
     File = "log/emqx-test.log",
     %% update handler
-    Log1 = emqx_map_lib:deep_put([<<"file_handlers">>, <<"default">>, <<"enable">>], Log, true),
-    Log2 = emqx_map_lib:deep_put([<<"file_handlers">>, <<"default">>, <<"file">>], Log1, File),
+    Log1 = emqx_utils_maps:deep_put([<<"file_handlers">>, <<"default">>, <<"enable">>], Log, true),
+    Log2 = emqx_utils_maps:deep_put([<<"file_handlers">>, <<"default">>, <<"file">>], Log1, File),
     {ok, #{}} = update_config(<<"log">>, Log2),
     {ok, Log3} = logger:get_handler_config(default),
     ?assertMatch(#{config := #{file := File}}, Log3),
-    ErrLog1 = emqx_map_lib:deep_put([<<"file_handlers">>, <<"default">>, <<"enable">>], Log, 1),
+    ErrLog1 = emqx_utils_maps:deep_put([<<"file_handlers">>, <<"default">>, <<"enable">>], Log, 1),
     ?assertMatch({error, {"HTTP/1.1", 400, _}}, update_config(<<"log">>, ErrLog1)),
-    ErrLog2 = emqx_map_lib:deep_put([<<"file_handlers">>, <<"default">>, <<"enabfe">>], Log, true),
+    ErrLog2 = emqx_utils_maps:deep_put(
+        [<<"file_handlers">>, <<"default">>, <<"enabfe">>], Log, true
+    ),
     ?assertMatch({error, {"HTTP/1.1", 400, _}}, update_config(<<"log">>, ErrLog2)),
 
     %% add new handler
     File1 = "log/emqx-test1.log",
-    Handler = emqx_map_lib:deep_get([<<"file_handlers">>, <<"default">>], Log2),
-    NewLog1 = emqx_map_lib:deep_put([<<"file_handlers">>, <<"new">>], Log2, Handler),
-    NewLog2 = emqx_map_lib:deep_put([<<"file_handlers">>, <<"new">>, <<"file">>], NewLog1, File1),
+    Handler = emqx_utils_maps:deep_get([<<"file_handlers">>, <<"default">>], Log2),
+    NewLog1 = emqx_utils_maps:deep_put([<<"file_handlers">>, <<"new">>], Log2, Handler),
+    NewLog2 = emqx_utils_maps:deep_put(
+        [<<"file_handlers">>, <<"new">>, <<"file">>], NewLog1, File1
+    ),
     {ok, #{}} = update_config(<<"log">>, NewLog2),
     {ok, Log4} = logger:get_handler_config(new),
     ?assertMatch(#{config := #{file := File1}}, Log4),
 
     %% disable new handler
-    Disable = emqx_map_lib:deep_put([<<"file_handlers">>, <<"new">>, <<"enable">>], NewLog2, false),
+    Disable = emqx_utils_maps:deep_put(
+        [<<"file_handlers">>, <<"new">>, <<"enable">>], NewLog2, false
+    ),
     {ok, #{}} = update_config(<<"log">>, Disable),
     ?assertEqual({error, {not_found, new}}, logger:get_handler_config(new)),
     ok.
@@ -125,25 +131,25 @@ t_global_zone(_Config) ->
     ?assertEqual(lists:usort(ZonesKeys), lists:usort(maps:keys(Zones))),
     ?assertEqual(
         emqx_config:get_zone_conf(no_default, [mqtt, max_qos_allowed]),
-        emqx_map_lib:deep_get([<<"mqtt">>, <<"max_qos_allowed">>], Zones)
+        emqx_utils_maps:deep_get([<<"mqtt">>, <<"max_qos_allowed">>], Zones)
     ),
-    NewZones = emqx_map_lib:deep_put([<<"mqtt">>, <<"max_qos_allowed">>], Zones, 1),
+    NewZones = emqx_utils_maps:deep_put([<<"mqtt">>, <<"max_qos_allowed">>], Zones, 1),
     {ok, #{}} = update_global_zone(NewZones),
     ?assertEqual(1, emqx_config:get_zone_conf(no_default, [mqtt, max_qos_allowed])),
 
-    BadZones = emqx_map_lib:deep_put([<<"mqtt">>, <<"max_qos_allowed">>], Zones, 3),
+    BadZones = emqx_utils_maps:deep_put([<<"mqtt">>, <<"max_qos_allowed">>], Zones, 3),
     ?assertMatch({error, {"HTTP/1.1", 400, _}}, update_global_zone(BadZones)),
 
     %% Remove max_qos_allowed from raw config, but we still get default value(2).
     Mqtt0 = emqx_conf:get_raw([<<"mqtt">>]),
-    ?assertEqual(1, emqx_map_lib:deep_get([<<"max_qos_allowed">>], Mqtt0)),
+    ?assertEqual(1, emqx_utils_maps:deep_get([<<"max_qos_allowed">>], Mqtt0)),
     Mqtt1 = maps:remove(<<"max_qos_allowed">>, Mqtt0),
     ok = emqx_config:put_raw([<<"mqtt">>], Mqtt1),
     Mqtt2 = emqx_conf:get_raw([<<"mqtt">>]),
     ?assertNot(maps:is_key(<<"max_qos_allowed">>, Mqtt2), Mqtt2),
     {ok, #{<<"mqtt">> := Mqtt3}} = get_global_zone(),
     %% the default value is 2
-    ?assertEqual(2, emqx_map_lib:deep_get([<<"max_qos_allowed">>], Mqtt3)),
+    ?assertEqual(2, emqx_utils_maps:deep_get([<<"max_qos_allowed">>], Mqtt3)),
     ok = emqx_config:put_raw([<<"mqtt">>], Mqtt0),
     ok.
 
diff --git a/apps/emqx_management/test/emqx_mgmt_api_listeners_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_listeners_SUITE.erl
index 90808d4be..62f689a84 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_listeners_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_listeners_SUITE.erl
@@ -193,10 +193,10 @@ t_clear_certs(Config) when is_list(Config) ->
     },
 
     %% create, make sure the cert files are created
-    NewConf = emqx_map_lib:deep_put(
+    NewConf = emqx_utils_maps:deep_put(
         [<<"ssl_options">>, <<"certfile">>], ConfTemp, cert_file("certfile")
     ),
-    NewConf2 = emqx_map_lib:deep_put(
+    NewConf2 = emqx_utils_maps:deep_put(
         [<<"ssl_options">>, <<"keyfile">>], NewConf, cert_file("keyfile")
     ),
 
@@ -205,7 +205,7 @@ t_clear_certs(Config) when is_list(Config) ->
     ?assertMatch({ok, [_, _]}, ListResult1),
 
     %% update
-    UpdateConf = emqx_map_lib:deep_put(
+    UpdateConf = emqx_utils_maps:deep_put(
         [<<"ssl_options">>, <<"keyfile">>], NewConf2, cert_file("keyfile2")
     ),
     _ = request(put, NewPath, [], UpdateConf),
diff --git a/apps/emqx_management/test/emqx_mgmt_api_nodes_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_nodes_SUITE.erl
index 7e4ccc541..1f14d075e 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_nodes_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_nodes_SUITE.erl
@@ -34,8 +34,8 @@ init_per_testcase(t_log_path, Config) ->
     emqx_config_logger:add_handler(),
     Log = emqx_conf:get_raw([log], #{}),
     File = "log/emqx-test.log",
-    Log1 = emqx_map_lib:deep_put([<<"file_handlers">>, <<"default">>, <<"enable">>], Log, true),
-    Log2 = emqx_map_lib:deep_put([<<"file_handlers">>, <<"default">>, <<"file">>], Log1, File),
+    Log1 = emqx_utils_maps:deep_put([<<"file_handlers">>, <<"default">>, <<"enable">>], Log, true),
+    Log2 = emqx_utils_maps:deep_put([<<"file_handlers">>, <<"default">>, <<"file">>], Log1, File),
     {ok, #{}} = emqx_conf:update([log], Log2, #{rawconf_with_defaults => true}),
     Config;
 init_per_testcase(_, Config) ->
@@ -43,7 +43,7 @@ init_per_testcase(_, Config) ->
 
 end_per_testcase(t_log_path, Config) ->
     Log = emqx_conf:get_raw([log], #{}),
-    Log1 = emqx_map_lib:deep_put([<<"file_handlers">>, <<"default">>, <<"enable">>], Log, false),
+    Log1 = emqx_utils_maps:deep_put([<<"file_handlers">>, <<"default">>, <<"enable">>], Log, false),
     {ok, #{}} = emqx_conf:update([log], Log1, #{rawconf_with_defaults => true}),
     emqx_config_logger:remove_handler(),
     Config;
diff --git a/apps/emqx_modules/test/emqx_delayed_api_SUITE.erl b/apps/emqx_modules/test/emqx_delayed_api_SUITE.erl
index b2d854d22..4ae3dec88 100644
--- a/apps/emqx_modules/test/emqx_delayed_api_SUITE.erl
+++ b/apps/emqx_modules/test/emqx_delayed_api_SUITE.erl
@@ -230,7 +230,7 @@ t_large_payload(_) ->
 
 decode_json(Data) ->
     BinJson = emqx_utils_json:decode(Data, [return_maps]),
-    emqx_map_lib:unsafe_atom_key_map(BinJson).
+    emqx_utils_maps:unsafe_atom_key_map(BinJson).
 
 clear_all_record() ->
     ets:delete_all_objects(emqx_delayed).
diff --git a/apps/emqx_retainer/src/emqx_retainer_dispatcher.erl b/apps/emqx_retainer/src/emqx_retainer_dispatcher.erl
index 32cbba084..7b0a0dc2a 100644
--- a/apps/emqx_retainer/src/emqx_retainer_dispatcher.erl
+++ b/apps/emqx_retainer/src/emqx_retainer_dispatcher.erl
@@ -156,7 +156,7 @@ handle_cast({dispatch, Context, Pid, Topic}, #{limiter := Limiter} = State) ->
     {ok, Limiter2} = dispatch(Context, Pid, Topic, undefined, Limiter),
     {noreply, State#{limiter := Limiter2}};
 handle_cast({refresh_limiter, Conf}, State) ->
-    BucketCfg = emqx_map_lib:deep_get([flow_control, batch_deliver_limiter], Conf, undefined),
+    BucketCfg = emqx_utils_maps:deep_get([flow_control, batch_deliver_limiter], Conf, undefined),
     {ok, Limiter} = emqx_limiter_server:connect(?APP, internal, BucketCfg),
     {noreply, State#{limiter := Limiter}};
 handle_cast(Msg, State) ->
diff --git a/apps/emqx_retainer/test/emqx_retainer_api_SUITE.erl b/apps/emqx_retainer/test/emqx_retainer_api_SUITE.erl
index 2b92b3f59..61eee0510 100644
--- a/apps/emqx_retainer/test/emqx_retainer_api_SUITE.erl
+++ b/apps/emqx_retainer/test/emqx_retainer_api_SUITE.erl
@@ -257,7 +257,7 @@ t_change_storage_type(_Config) ->
     #{data := Msgs0, meta := _} = decode_json(MsgsJson0),
     ?assertEqual(1, length(Msgs0)),
 
-    ChangedConf = emqx_map_lib:deep_merge(
+    ChangedConf = emqx_utils_maps:deep_merge(
         RawConf,
         #{
             <<"backend">> =>
@@ -312,7 +312,7 @@ t_change_storage_type(_Config) ->
 %%--------------------------------------------------------------------
 decode_json(Data) ->
     BinJson = emqx_utils_json:decode(Data, [return_maps]),
-    emqx_map_lib:unsafe_atom_key_map(BinJson).
+    emqx_utils_maps:unsafe_atom_key_map(BinJson).
 
 %%--------------------------------------------------------------------
 %% Internal funcs
diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.erl b/apps/emqx_rule_engine/src/emqx_rule_engine.erl
index 44b49a75b..ada52c5aa 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_engine.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_engine.erl
@@ -115,7 +115,7 @@ start_link() ->
 %%------------------------------------------------------------------------------
 post_config_update(_, _Req, NewRules, OldRules, _AppEnvs) ->
     #{added := Added, removed := Removed, changed := Updated} =
-        emqx_map_lib:diff_maps(NewRules, OldRules),
+        emqx_utils_maps:diff_maps(NewRules, OldRules),
     maps_foreach(
         fun({Id, {_Old, New}}) ->
             {ok, _} = update_rule(New#{id => bin(Id)})
diff --git a/apps/emqx_slow_subs/test/emqx_slow_subs_api_SUITE.erl b/apps/emqx_slow_subs/test/emqx_slow_subs_api_SUITE.erl
index ae74348e0..5196868c7 100644
--- a/apps/emqx_slow_subs/test/emqx_slow_subs_api_SUITE.erl
+++ b/apps/emqx_slow_subs/test/emqx_slow_subs_api_SUITE.erl
@@ -166,7 +166,7 @@ t_settting(_) ->
 
 decode_json(Data) ->
     BinJosn = emqx_utils_json:decode(Data, [return_maps]),
-    emqx_map_lib:unsafe_atom_key_map(BinJosn).
+    emqx_utils_maps:unsafe_atom_key_map(BinJosn).
 
 request_api(Method, Url, Auth) ->
     request_api(Method, Url, [], Auth, []).
diff --git a/apps/emqx/src/emqx_map_lib.erl b/apps/emqx_utils/src/emqx_utils_maps.erl
similarity index 99%
rename from apps/emqx/src/emqx_map_lib.erl
rename to apps/emqx_utils/src/emqx_utils_maps.erl
index 631c3914d..d64075511 100644
--- a/apps/emqx/src/emqx_map_lib.erl
+++ b/apps/emqx_utils/src/emqx_utils_maps.erl
@@ -13,7 +13,7 @@
 %% See the License for the specific language governing permissions and
 %% limitations under the License.
 %%--------------------------------------------------------------------
--module(emqx_map_lib).
+-module(emqx_utils_maps).
 
 -export([
     deep_get/2,
@@ -332,7 +332,7 @@ deep_filter(M, F) when is_map(M) ->
 
 if_only_to_toggle_enable(OldConf, Conf) ->
     #{added := Added, removed := Removed, changed := Updated} =
-        emqx_map_lib:diff_maps(OldConf, Conf),
+        emqx_utils_maps:diff_maps(OldConf, Conf),
     case {Added, Removed, Updated} of
         {Added, Removed, #{enable := _} = Updated} when
             map_size(Added) =:= 0,
diff --git a/apps/emqx/test/emqx_map_lib_tests.erl b/apps/emqx_utils/test/emqx_utils_maps_tests.erl
similarity index 76%
rename from apps/emqx/test/emqx_map_lib_tests.erl
rename to apps/emqx_utils/test/emqx_utils_maps_tests.erl
index 894811d7c..506851f0a 100644
--- a/apps/emqx/test/emqx_map_lib_tests.erl
+++ b/apps/emqx_utils/test/emqx_utils_maps_tests.erl
@@ -14,7 +14,7 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
--module(emqx_map_lib_tests).
+-module(emqx_utils_maps_tests).
 -include_lib("eunit/include/eunit.hrl").
 
 best_effort_recursive_sum_test_() ->
@@ -22,21 +22,21 @@ best_effort_recursive_sum_test_() ->
     [
         ?_assertEqual(
             #{foo => 3},
-            emqx_map_lib:best_effort_recursive_sum(#{foo => 1}, #{foo => 2}, DummyLogger)
+            emqx_utils_maps:best_effort_recursive_sum(#{foo => 1}, #{foo => 2}, DummyLogger)
         ),
         ?_assertEqual(
             #{foo => 3, bar => 6.0},
-            emqx_map_lib:best_effort_recursive_sum(
+            emqx_utils_maps:best_effort_recursive_sum(
                 #{foo => 1, bar => 2.0}, #{foo => 2, bar => 4.0}, DummyLogger
             )
         ),
         ?_assertEqual(
             #{foo => 1, bar => 2},
-            emqx_map_lib:best_effort_recursive_sum(#{foo => 1}, #{bar => 2}, DummyLogger)
+            emqx_utils_maps:best_effort_recursive_sum(#{foo => 1}, #{bar => 2}, DummyLogger)
         ),
         ?_assertEqual(
             #{foo => #{bar => 42}},
-            emqx_map_lib:best_effort_recursive_sum(
+            emqx_utils_maps:best_effort_recursive_sum(
                 #{foo => #{bar => 2}}, #{foo => #{bar => 40}}, DummyLogger
             )
         ),
@@ -45,7 +45,9 @@ best_effort_recursive_sum_test_() ->
             Logger = fun(What) -> Self ! {log, What} end,
             ?assertEqual(
                 #{foo => 1, bar => 2},
-                emqx_map_lib:best_effort_recursive_sum(#{foo => 1, bar => 2}, #{bar => bar}, Logger)
+                emqx_utils_maps:best_effort_recursive_sum(
+                    #{foo => 1, bar => 2}, #{bar => bar}, Logger
+                )
             ),
             receive
                 {log, Log} ->
@@ -55,55 +57,55 @@ best_effort_recursive_sum_test_() ->
         end,
         ?_assertEqual(
             #{},
-            emqx_map_lib:best_effort_recursive_sum(
+            emqx_utils_maps:best_effort_recursive_sum(
                 #{foo => foo}, #{foo => bar}, DummyLogger
             )
         ),
         ?_assertEqual(
             #{foo => 1},
-            emqx_map_lib:best_effort_recursive_sum(
+            emqx_utils_maps:best_effort_recursive_sum(
                 #{foo => 1}, #{foo => bar}, DummyLogger
             )
         ),
         ?_assertEqual(
             #{foo => 1},
-            emqx_map_lib:best_effort_recursive_sum(
+            emqx_utils_maps:best_effort_recursive_sum(
                 #{foo => bar}, #{foo => 1}, DummyLogger
             )
         ),
         ?_assertEqual(
             #{foo => #{bar => 1}},
-            emqx_map_lib:best_effort_recursive_sum(
+            emqx_utils_maps:best_effort_recursive_sum(
                 #{foo => #{bar => 1}}, #{foo => 1}, DummyLogger
             )
         ),
         ?_assertEqual(
             #{foo => #{bar => 1}},
-            emqx_map_lib:best_effort_recursive_sum(
+            emqx_utils_maps:best_effort_recursive_sum(
                 #{foo => 1}, #{foo => #{bar => 1}}, DummyLogger
             )
         ),
         ?_assertEqual(
             #{foo => #{bar => 1}},
-            emqx_map_lib:best_effort_recursive_sum(
+            emqx_utils_maps:best_effort_recursive_sum(
                 #{foo => 1, bar => ignored}, #{foo => #{bar => 1}}, DummyLogger
             )
         ),
         ?_assertEqual(
             #{foo => #{bar => 2}, bar => #{foo => 1}},
-            emqx_map_lib:best_effort_recursive_sum(
+            emqx_utils_maps:best_effort_recursive_sum(
                 #{foo => 1, bar => #{foo => 1}}, #{foo => #{bar => 2}, bar => 2}, DummyLogger
             )
         ),
         ?_assertEqual(
             #{foo => #{bar => 2}, bar => #{foo => 1}},
-            emqx_map_lib:best_effort_recursive_sum(
+            emqx_utils_maps:best_effort_recursive_sum(
                 #{foo => #{bar => 2}, bar => 2}, #{foo => 1, bar => #{foo => 1}}, DummyLogger
             )
         ),
         ?_assertEqual(
             #{foo => #{bar => #{}}},
-            emqx_map_lib:best_effort_recursive_sum(
+            emqx_utils_maps:best_effort_recursive_sum(
                 #{foo => #{bar => #{foo => []}}}, #{foo => 1}, DummyLogger
             )
         )
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_cassa_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_cassa_SUITE.erl
index f37d7fb6a..3e442a926 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_cassa_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_cassa_SUITE.erl
@@ -261,7 +261,7 @@ create_bridge(Config, Overrides) ->
     BridgeType = ?config(cassa_bridge_type, Config),
     Name = ?config(cassa_name, Config),
     BridgeConfig0 = ?config(cassa_config, Config),
-    BridgeConfig = emqx_map_lib:deep_merge(BridgeConfig0, Overrides),
+    BridgeConfig = emqx_utils_maps:deep_merge(BridgeConfig0, Overrides),
     emqx_bridge:create(BridgeType, Name, BridgeConfig).
 
 delete_bridge(Config) ->
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_dynamo_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_dynamo_SUITE.erl
index 133ef0430..5ebd9a89d 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_dynamo_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_dynamo_SUITE.erl
@@ -193,7 +193,7 @@ create_bridge(Config, Overrides) ->
     BridgeType = ?config(dynamo_bridge_type, Config),
     Name = ?config(dynamo_name, Config),
     DynamoConfig0 = ?config(dynamo_config, Config),
-    DynamoConfig = emqx_map_lib:deep_merge(DynamoConfig0, Overrides),
+    DynamoConfig = emqx_utils_maps:deep_merge(DynamoConfig0, Overrides),
     emqx_bridge:create(BridgeType, Name, DynamoConfig).
 
 delete_all_bridges() ->
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_gcp_pubsub_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_gcp_pubsub_SUITE.erl
index 49bc444c6..a785924d4 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_gcp_pubsub_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_gcp_pubsub_SUITE.erl
@@ -181,7 +181,7 @@ create_bridge(Config, GCPPubSubConfigOverrides) ->
     TypeBin = ?BRIDGE_TYPE_BIN,
     Name = ?config(gcp_pubsub_name, Config),
     GCPPubSubConfig0 = ?config(gcp_pubsub_config, Config),
-    GCPPubSubConfig = emqx_map_lib:deep_merge(GCPPubSubConfig0, GCPPubSubConfigOverrides),
+    GCPPubSubConfig = emqx_utils_maps:deep_merge(GCPPubSubConfig0, GCPPubSubConfigOverrides),
     ct:pal("creating bridge: ~p", [GCPPubSubConfig]),
     Res = emqx_bridge:create(TypeBin, Name, GCPPubSubConfig),
     ct:pal("bridge creation result: ~p", [Res]),
@@ -194,7 +194,7 @@ create_bridge_http(Config, GCPPubSubConfigOverrides) ->
     TypeBin = ?BRIDGE_TYPE_BIN,
     Name = ?config(gcp_pubsub_name, Config),
     GCPPubSubConfig0 = ?config(gcp_pubsub_config, Config),
-    GCPPubSubConfig = emqx_map_lib:deep_merge(GCPPubSubConfig0, GCPPubSubConfigOverrides),
+    GCPPubSubConfig = emqx_utils_maps:deep_merge(GCPPubSubConfig0, GCPPubSubConfigOverrides),
     Params = GCPPubSubConfig#{<<"type">> => TypeBin, <<"name">> => Name},
     Path = emqx_mgmt_api_test_util:api_path(["bridges"]),
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_influxdb_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_influxdb_SUITE.erl
index 4891d5d9b..3def35920 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_influxdb_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_influxdb_SUITE.erl
@@ -354,7 +354,7 @@ create_bridge(Config, Overrides) ->
     Type = influxdb_type_bin(?config(influxdb_type, Config)),
     Name = ?config(influxdb_name, Config),
     InfluxDBConfig0 = ?config(influxdb_config, Config),
-    InfluxDBConfig = emqx_map_lib:deep_merge(InfluxDBConfig0, Overrides),
+    InfluxDBConfig = emqx_utils_maps:deep_merge(InfluxDBConfig0, Overrides),
     emqx_bridge:create(Type, Name, InfluxDBConfig).
 
 delete_bridge(Config) ->
@@ -390,7 +390,7 @@ create_rule_and_action_http(Config, Overrides) ->
         sql => <<"SELECT * FROM \"t/topic\"">>,
         actions => [BridgeId]
     },
-    Params = emqx_map_lib:deep_merge(Params0, Overrides),
+    Params = emqx_utils_maps:deep_merge(Params0, Overrides),
     Path = emqx_mgmt_api_test_util:api_path(["rules"]),
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
     case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Params) of
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_mongodb_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_mongodb_SUITE.erl
index 2d4ee9222..0959e3c78 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_mongodb_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_mongodb_SUITE.erl
@@ -245,7 +245,7 @@ create_bridge(Config, Overrides) ->
     Type = mongo_type_bin(?config(mongo_type, Config)),
     Name = ?config(mongo_name, Config),
     MongoConfig0 = ?config(mongo_config, Config),
-    MongoConfig = emqx_map_lib:deep_merge(MongoConfig0, Overrides),
+    MongoConfig = emqx_utils_maps:deep_merge(MongoConfig0, Overrides),
     ct:pal("creating ~p bridge with config:\n ~p", [Type, MongoConfig]),
     emqx_bridge:create(Type, Name, MongoConfig).
 
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_pgsql_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_pgsql_SUITE.erl
index 8f0b9ad9c..d76149b16 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_pgsql_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_pgsql_SUITE.erl
@@ -229,7 +229,7 @@ create_bridge(Config, Overrides) ->
     BridgeType = ?config(pgsql_bridge_type, Config),
     Name = ?config(pgsql_name, Config),
     PGConfig0 = ?config(pgsql_config, Config),
-    PGConfig = emqx_map_lib:deep_merge(PGConfig0, Overrides),
+    PGConfig = emqx_utils_maps:deep_merge(PGConfig0, Overrides),
     emqx_bridge:create(BridgeType, Name, PGConfig).
 
 delete_bridge(Config) ->
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_tdengine_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_tdengine_SUITE.erl
index 8e058f2f1..36ed10f38 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_tdengine_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_tdengine_SUITE.erl
@@ -207,7 +207,7 @@ create_bridge(Config, Overrides) ->
     BridgeType = ?config(tdengine_bridge_type, Config),
     Name = ?config(tdengine_name, Config),
     TDConfig0 = ?config(tdengine_config, Config),
-    TDConfig = emqx_map_lib:deep_merge(TDConfig0, Overrides),
+    TDConfig = emqx_utils_maps:deep_merge(TDConfig0, Overrides),
     emqx_bridge:create(BridgeType, Name, TDConfig).
 
 delete_bridge(Config) ->
diff --git a/lib-ee/emqx_ee_schema_registry/src/emqx_ee_schema_registry.erl b/lib-ee/emqx_ee_schema_registry/src/emqx_ee_schema_registry.erl
index 3569b246e..4c00903d5 100644
--- a/lib-ee/emqx_ee_schema_registry/src/emqx_ee_schema_registry.erl
+++ b/lib-ee/emqx_ee_schema_registry/src/emqx_ee_schema_registry.erl
@@ -67,7 +67,7 @@ get_schema(SchemaName) ->
 
 -spec add_schema(schema_name(), schema()) -> ok | {error, term()}.
 add_schema(Name, Schema) ->
-    RawSchema = emqx_map_lib:binary_key_map(Schema),
+    RawSchema = emqx_utils_maps:binary_key_map(Schema),
     Res = emqx_conf:update(
         [?CONF_KEY_ROOT, schemas, Name],
         RawSchema,
@@ -113,7 +113,7 @@ post_config_update(
         added := Added,
         changed := Changed0,
         removed := Removed
-    } = emqx_map_lib:diff_maps(NewSchemas, OldSchemas),
+    } = emqx_utils_maps:diff_maps(NewSchemas, OldSchemas),
     Changed = maps:map(fun(_N, {_Old, New}) -> New end, Changed0),
     RemovedNames = maps:keys(Removed),
     case RemovedNames of
diff --git a/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_SUITE.erl b/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_SUITE.erl
index 325d3d499..5bfba34b3 100644
--- a/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_SUITE.erl
+++ b/lib-ee/emqx_ee_schema_registry/test/emqx_ee_schema_registry_SUITE.erl
@@ -344,7 +344,7 @@ t_decode(Config) ->
 
 t_fail_rollback(Config) ->
     SerdeType = ?config(serde_type, Config),
-    OkSchema = emqx_map_lib:binary_key_map(schema_params(SerdeType)),
+    OkSchema = emqx_utils_maps:binary_key_map(schema_params(SerdeType)),
     BrokenSchema = OkSchema#{<<"source">> := <<"{}">>},
     %% hopefully, for this small map, the key order is used.
     Serdes = #{

From 19981757aec4a4cdb215786571ece255c22f6673 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Thu, 13 Apr 2023 15:49:12 +0200
Subject: [PATCH 063/110] fix: add is_json

---
 apps/emqx_utils/src/emqx_utils_json.erl          | 16 ++++++++++++----
 apps/emqx_utils/test/emqx_utils_json_SUITE.erl   |  4 ++++
 .../test/props/prop_emqx_utils_json.erl}         |  0
 3 files changed, 16 insertions(+), 4 deletions(-)
 rename apps/{emqx/test/props/prop_emqx_json.erl => emqx_utils/test/props/prop_emqx_utils_json.erl} (100%)

diff --git a/apps/emqx_utils/src/emqx_utils_json.erl b/apps/emqx_utils/src/emqx_utils_json.erl
index 2f0c6f88b..191063d38 100644
--- a/apps/emqx_utils/src/emqx_utils_json.erl
+++ b/apps/emqx_utils/src/emqx_utils_json.erl
@@ -46,11 +46,15 @@
     ]}
 ).
 
--type encode_options() :: emqx_utils_json:encode_options().
--type decode_options() :: emqx_utils_json:decode_options().
+-export([is_json/1]).
+
+-compile({inline, [is_json/1]}).
+
+-type encode_options() :: jiffy:encode_options().
+-type decode_options() :: jiffy:decode_options().
 
 -type json_text() :: iolist() | binary().
--type json_term() :: emqx_utils_json:jiffy_decode_result().
+-type json_term() :: jiffy:jiffy_decode_result().
 
 -export_type([json_text/0, json_term/0]).
 -export_type([decode_options/0, encode_options/0]).
@@ -79,7 +83,7 @@ safe_encode(Term, Opts) ->
     end.
 
 -spec decode(json_text()) -> json_term().
-decode(Json) -> decode(Json, []).
+decode(Json) -> decode(Json, [return_maps]).
 
 -spec decode(json_text(), decode_options()) -> json_term().
 decode(Json, Opts) ->
@@ -100,6 +104,10 @@ safe_decode(Json, Opts) ->
             {error, Reason}
     end.
 
+-spec is_json(json_text()) -> boolean().
+is_json(Json) ->
+    element(1, safe_decode(Json)) =:= ok.
+
 %%--------------------------------------------------------------------
 %% Helpers
 %%--------------------------------------------------------------------
diff --git a/apps/emqx_utils/test/emqx_utils_json_SUITE.erl b/apps/emqx_utils/test/emqx_utils_json_SUITE.erl
index 889cde595..ba7b5226a 100644
--- a/apps/emqx_utils/test/emqx_utils_json_SUITE.erl
+++ b/apps/emqx_utils/test/emqx_utils_json_SUITE.erl
@@ -136,3 +136,7 @@ safe_encode_decode(Term) ->
         {ok, {NTerm}} -> NTerm;
         {ok, NTerm} -> NTerm
     end.
+
+t_is_json(_) ->
+    ?assert(emqx_utils_json:is_json(<<"{}">>)),
+    ?assert(not emqx_utils_json:is_json(<<"foo">>)).
diff --git a/apps/emqx/test/props/prop_emqx_json.erl b/apps/emqx_utils/test/props/prop_emqx_utils_json.erl
similarity index 100%
rename from apps/emqx/test/props/prop_emqx_json.erl
rename to apps/emqx_utils/test/props/prop_emqx_utils_json.erl

From 4f80690162e59f69532ba435e3c1355b3ecc65df Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Thu, 13 Apr 2023 15:50:34 +0200
Subject: [PATCH 064/110] fix: byebye jsx

---
 apps/emqx/src/emqx.app.src                    |  1 -
 apps/emqx/src/emqx_logger_jsonfmt.erl         |  4 ++--
 apps/emqx/test/emqx_common_test_helpers.erl   |  2 +-
 apps/emqx_authz/src/emqx_authz_http.erl       |  2 +-
 .../test/emqx_authz_api_cache_SUITE.erl       |  4 ++--
 .../test/emqx_authz_api_mnesia_SUITE.erl      | 22 ++++++++---------
 .../test/emqx_authz_api_settings_SUITE.erl    |  4 ++--
 .../test/emqx_bridge_mqtt_SUITE.erl           | 24 +++++++++----------
 apps/emqx_conf/src/emqx_conf.erl              |  6 ++---
 .../test/emqx_dashboard_SUITE.erl             |  2 +-
 .../test/emqx_dashboard_api_test_helpers.erl  |  2 +-
 .../src/emqx_lwm2m_message.erl                |  2 +-
 .../test/emqx_mgmt_api_test_util.erl          |  2 +-
 .../test/emqx_telemetry_api_SUITE.erl         |  6 ++---
 .../test/emqx_topic_metrics_api_SUITE.erl     | 10 ++++----
 apps/emqx_utils/src/emqx_utils.app.src        |  3 ++-
 apps/emqx_utils/src/emqx_utils_json.erl       |  6 +++--
 .../emqx_utils/test/emqx_utils_json_SUITE.erl | 23 +++++++++++-------
 18 files changed, 66 insertions(+), 59 deletions(-)

diff --git a/apps/emqx/src/emqx.app.src b/apps/emqx/src/emqx.app.src
index 7014c8381..c4894c933 100644
--- a/apps/emqx/src/emqx.app.src
+++ b/apps/emqx/src/emqx.app.src
@@ -16,7 +16,6 @@
         cowboy,
         sasl,
         os_mon,
-        jiffy,
         lc,
         hocon
     ]},
diff --git a/apps/emqx/src/emqx_logger_jsonfmt.erl b/apps/emqx/src/emqx_logger_jsonfmt.erl
index f60f5a716..e231b76dd 100644
--- a/apps/emqx/src/emqx_logger_jsonfmt.erl
+++ b/apps/emqx/src/emqx_logger_jsonfmt.erl
@@ -62,11 +62,11 @@
 %% The JSON object is pretty-printed.
 %% NOTE: do not use this function for logging.
 best_effort_json(Input) ->
-    best_effort_json(Input, [space, {indent, 4}]).
+    best_effort_json(Input, [pretty]).
 best_effort_json(Input, Opts) ->
     Config = #{depth => unlimited, single_line => true},
     JsonReady = best_effort_json_obj(Input, Config),
-    jsx:encode(JsonReady, Opts).
+    emqx_utils_json:encode(JsonReady, Opts).
 
 -spec format(logger:log_event(), config()) -> iodata().
 format(#{level := Level, msg := Msg, meta := Meta} = Event, Config0) when is_map(Config0) ->
diff --git a/apps/emqx/test/emqx_common_test_helpers.erl b/apps/emqx/test/emqx_common_test_helpers.erl
index 85cb46106..6628401cc 100644
--- a/apps/emqx/test/emqx_common_test_helpers.erl
+++ b/apps/emqx/test/emqx_common_test_helpers.erl
@@ -477,7 +477,7 @@ copy_certs(_, _) ->
 load_config(SchemaModule, Config, Opts) ->
     ConfigBin =
         case is_map(Config) of
-            true -> jsx:encode(Config);
+            true -> emqx_utils_json:encode(Config);
             false -> Config
         end,
     ok = emqx_config:delete_override_conf_files(),
diff --git a/apps/emqx_authz/src/emqx_authz_http.erl b/apps/emqx_authz/src/emqx_authz_http.erl
index 852a667c8..53378d9c2 100644
--- a/apps/emqx_authz/src/emqx_authz_http.erl
+++ b/apps/emqx_authz/src/emqx_authz_http.erl
@@ -227,7 +227,7 @@ encode_path(Path) ->
     lists:flatten(["/" ++ Part || Part <- lists:map(fun uri_encode/1, Parts)]).
 
 serialize_body(<<"application/json">>, Body) ->
-    jsx:encode(Body);
+    emqx_utils_json:encode(Body);
 serialize_body(<<"application/x-www-form-urlencoded">>, Body) ->
     query_string(Body).
 
diff --git a/apps/emqx_authz/test/emqx_authz_api_cache_SUITE.erl b/apps/emqx_authz/test/emqx_authz_api_cache_SUITE.erl
index cfd9f581f..672ddc73c 100644
--- a/apps/emqx_authz/test/emqx_authz_api_cache_SUITE.erl
+++ b/apps/emqx_authz/test/emqx_authz_api_cache_SUITE.erl
@@ -67,12 +67,12 @@ t_clean_cahce(_) ->
     ok = emqtt:publish(C, <<"a/b/c">>, <<"{\"x\":1,\"y\":1}">>, 0),
 
     {ok, 200, Result3} = request(get, uri(["clients", "emqx0", "authorization", "cache"])),
-    ?assertEqual(2, length(emqx_utils_json:decode(Result3))),
+    ?assertEqual(2, maps:size(emqx_utils_json:decode(Result3))),
 
     request(delete, uri(["authorization", "cache"])),
 
     {ok, 200, Result4} = request(get, uri(["clients", "emqx0", "authorization", "cache"])),
-    ?assertEqual(0, length(emqx_utils_json:decode(Result4))),
+    ?assertEqual(0, maps:size(emqx_utils_json:decode(Result4))),
 
     ok.
 
diff --git a/apps/emqx_authz/test/emqx_authz_api_mnesia_SUITE.erl b/apps/emqx_authz/test/emqx_authz_api_mnesia_SUITE.erl
index 2aa2d9545..3775b9a1c 100644
--- a/apps/emqx_authz/test/emqx_authz_api_mnesia_SUITE.erl
+++ b/apps/emqx_authz/test/emqx_authz_api_mnesia_SUITE.erl
@@ -95,7 +95,7 @@ t_api(_) ->
             <<"page">> := 1,
             <<"hasnext">> := false
         }
-    } = jsx:decode(Request1),
+    } = emqx_utils_json:decode(Request1),
     ?assertEqual(3, length(Rules1)),
 
     {ok, 200, Request1_1} =
@@ -119,7 +119,7 @@ t_api(_) ->
                 <<"hasnext">> => false
             }
         },
-        jsx:decode(Request1_1)
+        emqx_utils_json:decode(Request1_1)
     ),
 
     {ok, 200, Request2} =
@@ -128,7 +128,7 @@ t_api(_) ->
             uri(["authorization", "sources", "built_in_database", "rules", "users", "user1"]),
             []
         ),
-    #{<<"username">> := <<"user1">>, <<"rules">> := Rules1} = jsx:decode(Request2),
+    #{<<"username">> := <<"user1">>, <<"rules">> := Rules1} = emqx_utils_json:decode(Request2),
 
     {ok, 204, _} =
         request(
@@ -142,7 +142,7 @@ t_api(_) ->
             uri(["authorization", "sources", "built_in_database", "rules", "users", "user1"]),
             []
         ),
-    #{<<"username">> := <<"user1">>, <<"rules">> := Rules2} = jsx:decode(Request3),
+    #{<<"username">> := <<"user1">>, <<"rules">> := Rules2} = emqx_utils_json:decode(Request3),
     ?assertEqual(0, length(Rules2)),
 
     {ok, 204, _} =
@@ -202,8 +202,8 @@ t_api(_) ->
         <<"data">> := [#{<<"clientid">> := <<"client1">>, <<"rules">> := Rules3}],
         <<"meta">> := #{<<"count">> := 1, <<"limit">> := 100, <<"page">> := 1}
     } =
-        jsx:decode(Request4),
-    #{<<"clientid">> := <<"client1">>, <<"rules">> := Rules3} = jsx:decode(Request5),
+        emqx_utils_json:decode(Request4),
+    #{<<"clientid">> := <<"client1">>, <<"rules">> := Rules3} = emqx_utils_json:decode(Request5),
     ?assertEqual(3, length(Rules3)),
 
     {ok, 204, _} =
@@ -218,7 +218,7 @@ t_api(_) ->
             uri(["authorization", "sources", "built_in_database", "rules", "clients", "client1"]),
             []
         ),
-    #{<<"clientid">> := <<"client1">>, <<"rules">> := Rules4} = jsx:decode(Request6),
+    #{<<"clientid">> := <<"client1">>, <<"rules">> := Rules4} = emqx_utils_json:decode(Request6),
     ?assertEqual(0, length(Rules4)),
 
     {ok, 204, _} =
@@ -252,7 +252,7 @@ t_api(_) ->
             uri(["authorization", "sources", "built_in_database", "rules", "all"]),
             []
         ),
-    #{<<"rules">> := Rules5} = jsx:decode(Request7),
+    #{<<"rules">> := Rules5} = emqx_utils_json:decode(Request7),
     ?assertEqual(3, length(Rules5)),
 
     {ok, 204, _} =
@@ -267,7 +267,7 @@ t_api(_) ->
             uri(["authorization", "sources", "built_in_database", "rules", "all"]),
             []
         ),
-    #{<<"rules">> := Rules6} = jsx:decode(Request8),
+    #{<<"rules">> := Rules6} = emqx_utils_json:decode(Request8),
     ?assertEqual(0, length(Rules6)),
 
     {ok, 204, _} =
@@ -285,7 +285,7 @@ t_api(_) ->
             uri(["authorization", "sources", "built_in_database", "rules", "users?page=2&limit=5"]),
             []
         ),
-    #{<<"data">> := Data1} = jsx:decode(Request9),
+    #{<<"data">> := Data1} = emqx_utils_json:decode(Request9),
     ?assertEqual(5, length(Data1)),
 
     {ok, 204, _} =
@@ -303,7 +303,7 @@ t_api(_) ->
             uri(["authorization", "sources", "built_in_database", "rules", "clients?limit=5"]),
             []
         ),
-    #{<<"data">> := Data2} = jsx:decode(Request10),
+    #{<<"data">> := Data2} = emqx_utils_json:decode(Request10),
     ?assertEqual(5, length(Data2)),
 
     {ok, 400, Msg1} =
diff --git a/apps/emqx_authz/test/emqx_authz_api_settings_SUITE.erl b/apps/emqx_authz/test/emqx_authz_api_settings_SUITE.erl
index 41eba109e..e3412e169 100644
--- a/apps/emqx_authz/test/emqx_authz_api_settings_SUITE.erl
+++ b/apps/emqx_authz/test/emqx_authz_api_settings_SUITE.erl
@@ -76,7 +76,7 @@ t_api(_) ->
 
     {ok, 200, Result1} = request(put, uri(["authorization", "settings"]), Settings1),
     {ok, 200, Result1} = request(get, uri(["authorization", "settings"]), []),
-    ?assertEqual(Settings1, jsx:decode(Result1)),
+    ?assertEqual(Settings1, emqx_utils_json:decode(Result1)),
 
     Settings2 = #{
         <<"no_match">> => <<"allow">>,
@@ -90,7 +90,7 @@ t_api(_) ->
 
     {ok, 200, Result2} = request(put, uri(["authorization", "settings"]), Settings2),
     {ok, 200, Result2} = request(get, uri(["authorization", "settings"]), []),
-    ?assertEqual(Settings2, jsx:decode(Result2)),
+    ?assertEqual(Settings2, emqx_utils_json:decode(Result2)),
 
     ok.
 
diff --git a/apps/emqx_bridge/test/emqx_bridge_mqtt_SUITE.erl b/apps/emqx_bridge/test/emqx_bridge_mqtt_SUITE.erl
index ab58ce383..bd5cda3f0 100644
--- a/apps/emqx_bridge/test/emqx_bridge_mqtt_SUITE.erl
+++ b/apps/emqx_bridge/test/emqx_bridge_mqtt_SUITE.erl
@@ -201,7 +201,7 @@ t_mqtt_conn_bridge_ingress(_) ->
     #{
         <<"type">> := ?TYPE_MQTT,
         <<"name">> := ?BRIDGE_NAME_INGRESS
-    } = jsx:decode(Bridge),
+    } = emqx_utils_json:decode(Bridge),
 
     BridgeIDIngress = emqx_bridge_resource:bridge_id(?TYPE_MQTT, ?BRIDGE_NAME_INGRESS),
 
@@ -313,7 +313,7 @@ t_mqtt_conn_bridge_ingress_no_payload_template(_) ->
     emqx:publish(emqx_message:make(RemoteTopic, Payload)),
     %% we should receive a message on the local broker, with specified topic
     Msg = assert_mqtt_msg_received(LocalTopic),
-    ?assertMatch(#{<<"payload">> := Payload}, jsx:decode(Msg#message.payload)),
+    ?assertMatch(#{<<"payload">> := Payload}, emqx_utils_json:decode(Msg#message.payload)),
 
     %% verify the metrics of the bridge
     ?assertMetrics(
@@ -402,7 +402,7 @@ t_mqtt_conn_bridge_egress_no_payload_template(_) ->
     Msg = assert_mqtt_msg_received(RemoteTopic),
     %% the MapMsg is all fields outputed by Rule-Engine. it's a binary coded json here.
     ?assertMatch(<<ResourceID:(byte_size(ResourceID))/binary, _/binary>>, Msg#message.from),
-    ?assertMatch(#{<<"payload">> := Payload}, jsx:decode(Msg#message.payload)),
+    ?assertMatch(#{<<"payload">> := Payload}, emqx_utils_json:decode(Msg#message.payload)),
 
     %% verify the metrics of the bridge
     ?retry(
@@ -545,7 +545,7 @@ t_ingress_mqtt_bridge_with_rules(_) ->
             <<"sql">> => <<"SELECT * from \"$bridges/", BridgeIDIngress/binary, "\"">>
         }
     ),
-    #{<<"id">> := RuleId} = jsx:decode(Rule),
+    #{<<"id">> := RuleId} = emqx_utils_json:decode(Rule),
 
     %% we now test if the bridge works as expected
 
@@ -562,7 +562,7 @@ t_ingress_mqtt_bridge_with_rules(_) ->
     %% and also the rule should be matched, with matched + 1:
     {ok, 200, Rule1} = request(get, uri(["rules", RuleId]), []),
     {ok, 200, Metrics} = request(get, uri(["rules", RuleId, "metrics"]), []),
-    ?assertMatch(#{<<"id">> := RuleId}, jsx:decode(Rule1)),
+    ?assertMatch(#{<<"id">> := RuleId}, emqx_utils_json:decode(Rule1)),
     ?assertMatch(
         #{
             <<"metrics">> := #{
@@ -581,7 +581,7 @@ t_ingress_mqtt_bridge_with_rules(_) ->
                 <<"actions.failed.unknown">> := 0
             }
         },
-        jsx:decode(Metrics)
+        emqx_utils_json:decode(Metrics)
     ),
 
     %% we also check if the actions of the rule is triggered
@@ -630,7 +630,7 @@ t_egress_mqtt_bridge_with_rules(_) ->
             <<"sql">> => <<"SELECT * from \"t/1\"">>
         }
     ),
-    #{<<"id">> := RuleId} = jsx:decode(Rule),
+    #{<<"id">> := RuleId} = emqx_utils_json:decode(Rule),
 
     %% we now test if the bridge works as expected
     LocalTopic = <<?EGRESS_LOCAL_TOPIC, "/1">>,
@@ -653,7 +653,7 @@ t_egress_mqtt_bridge_with_rules(_) ->
     timer:sleep(100),
     emqx:publish(emqx_message:make(RuleTopic, Payload2)),
     {ok, 200, Rule1} = request(get, uri(["rules", RuleId]), []),
-    ?assertMatch(#{<<"id">> := RuleId, <<"name">> := _}, jsx:decode(Rule1)),
+    ?assertMatch(#{<<"id">> := RuleId, <<"name">> := _}, emqx_utils_json:decode(Rule1)),
     {ok, 200, Metrics} = request(get, uri(["rules", RuleId, "metrics"]), []),
     ?assertMatch(
         #{
@@ -673,7 +673,7 @@ t_egress_mqtt_bridge_with_rules(_) ->
                 <<"actions.failed.unknown">> := 0
             }
         },
-        jsx:decode(Metrics)
+        emqx_utils_json:decode(Metrics)
     ),
 
     %% we should receive a message on the "remote" broker, with specified topic
@@ -911,17 +911,17 @@ create_bridge(Config = #{<<"type">> := Type, <<"name">> := Name}) ->
             <<"type">> := Type,
             <<"name">> := Name
         },
-        jsx:decode(Bridge)
+        emqx_utils_json:decode(Bridge)
     ),
     emqx_bridge_resource:bridge_id(Type, Name).
 
 request_bridge(BridgeID) ->
     {ok, 200, Bridge} = request(get, uri(["bridges", BridgeID]), []),
-    jsx:decode(Bridge).
+    emqx_utils_json:decode(Bridge).
 
 request_bridge_metrics(BridgeID) ->
     {ok, 200, BridgeMetrics} = request(get, uri(["bridges", BridgeID, "metrics"]), []),
-    jsx:decode(BridgeMetrics).
+    emqx_utils_json:decode(BridgeMetrics).
 
 request(Method, Url, Body) ->
     request(<<"connector_admin">>, Method, Url, Body).
diff --git a/apps/emqx_conf/src/emqx_conf.erl b/apps/emqx_conf/src/emqx_conf.erl
index 246875ab6..1ecda913d 100644
--- a/apps/emqx_conf/src/emqx_conf.erl
+++ b/apps/emqx_conf/src/emqx_conf.erl
@@ -166,7 +166,7 @@ gen_schema_json(Dir, I18nFile, SchemaModule, Lang) ->
     io:format(user, "===< Including fields from importance level: ~p~n", [IncludeImportance]),
     Opts = #{desc_file => I18nFile, lang => Lang, include_importance_up_from => IncludeImportance},
     JsonMap = hocon_schema_json:gen(SchemaModule, Opts),
-    IoData = jsx:encode(JsonMap, [space, {indent, 4}]),
+    IoData = emqx_utils_json:encode(JsonMap, [pretty, force_utf8]),
     ok = file:write_file(SchemaJsonFile, IoData).
 
 gen_api_schema_json(Dir, I18nFile, Lang) ->
@@ -268,13 +268,13 @@ do_gen_api_schema_json(File, SchemaMod, SchemaInfo) ->
         ApiSpec0
     ),
     Components = lists:foldl(fun(M, Acc) -> maps:merge(M, Acc) end, #{}, Components0),
-    IoData = jsx:encode(
+    IoData = emqx_utils_json:encode(
         #{
             info => SchemaInfo,
             paths => ApiSpec,
             components => #{schemas => Components}
         },
-        [space, {indent, 4}]
+        [pretty, force_utf8]
     ),
     file:write_file(File, IoData).
 
diff --git a/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl b/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl
index ee850ec17..1f14b02c0 100644
--- a/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl
+++ b/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl
@@ -142,7 +142,7 @@ t_swagger_json(_Config) ->
     %% with auth
     Auth = auth_header_(<<"admin">>, <<"public_www1">>),
     {ok, 200, Body1} = request_api(get, Url, Auth),
-    ?assert(jsx:is_json(Body1)),
+    ?assert(emqx_utils_json:is_json(Body1)),
     %% without auth
     {ok, {{"HTTP/1.1", 200, "OK"}, _Headers, Body2}} =
         httpc:request(get, {Url, []}, [], [{body_format, binary}]),
diff --git a/apps/emqx_dashboard/test/emqx_dashboard_api_test_helpers.erl b/apps/emqx_dashboard/test/emqx_dashboard_api_test_helpers.erl
index 8df130897..91c7729d3 100644
--- a/apps/emqx_dashboard/test/emqx_dashboard_api_test_helpers.erl
+++ b/apps/emqx_dashboard/test/emqx_dashboard_api_test_helpers.erl
@@ -82,7 +82,7 @@ request(Username, Method, Url, Body) ->
             ->
                 {Url, [auth_header(Username)]};
             _ ->
-                {Url, [auth_header(Username)], "application/json", jsx:encode(Body)}
+                {Url, [auth_header(Username)], "application/json", emqx_utils_json:encode(Body)}
         end,
     ct:pal("Method: ~p, Request: ~p", [Method, Request]),
     case httpc:request(Method, Request, [], [{body_format, binary}]) of
diff --git a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl
index c65fff441..8b9ba2491 100644
--- a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl
@@ -152,7 +152,7 @@ object_resource_id(BaseName) ->
 value(Value, ResourceId, ObjDefinition) ->
     case emqx_lwm2m_xml_object:get_resource_type(ResourceId, ObjDefinition) of
         "String" ->
-            % keep binary type since it is same as a string for jsx
+            % keep binary type since it is same as a string for emqx_utils_json
             Value;
         "Integer" ->
             Size = byte_size(Value) * 8,
diff --git a/apps/emqx_management/test/emqx_mgmt_api_test_util.erl b/apps/emqx_management/test/emqx_mgmt_api_test_util.erl
index 5fe4ca937..985b95d5b 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_test_util.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_test_util.erl
@@ -157,7 +157,7 @@ api_path_without_base_path(Parts) ->
 %%
 %% Usage with RequestData:
 %% Payload = [{upload_type, <<"user_picture">>}],
-%% PayloadContent = jsx:encode(Payload),
+%% PayloadContent = emqx_utils_json:encode(Payload),
 %% RequestData = [
 %%     {<<"payload">>, PayloadContent}
 %% ]
diff --git a/apps/emqx_modules/test/emqx_telemetry_api_SUITE.erl b/apps/emqx_modules/test/emqx_telemetry_api_SUITE.erl
index 16f942bc0..ac6d12039 100644
--- a/apps/emqx_modules/test/emqx_telemetry_api_SUITE.erl
+++ b/apps/emqx_modules/test/emqx_telemetry_api_SUITE.erl
@@ -113,7 +113,7 @@ t_status(_) ->
 
     ?assertEqual(
         #{<<"enable">> => false},
-        jsx:decode(Result0)
+        emqx_utils_json:decode(Result0)
     ),
 
     ?assertMatch(
@@ -139,7 +139,7 @@ t_status(_) ->
 
     ?assertEqual(
         #{<<"enable">> => true},
-        jsx:decode(Result1)
+        emqx_utils_json:decode(Result1)
     ),
 
     ?assertMatch(
@@ -180,7 +180,7 @@ t_data(_) ->
             <<"uuid">> := _,
             <<"vm_specs">> := _
         },
-        jsx:decode(Result)
+        emqx_utils_json:decode(Result)
     ),
 
     {ok, 200, _} =
diff --git a/apps/emqx_modules/test/emqx_topic_metrics_api_SUITE.erl b/apps/emqx_modules/test/emqx_topic_metrics_api_SUITE.erl
index ea85d1fe9..5d64f123d 100644
--- a/apps/emqx_modules/test/emqx_topic_metrics_api_SUITE.erl
+++ b/apps/emqx_modules/test/emqx_topic_metrics_api_SUITE.erl
@@ -74,7 +74,7 @@ t_mqtt_topic_metrics_collection(_) ->
 
     ?assertEqual(
         [],
-        jsx:decode(Result0)
+        emqx_utils_json:decode(Result0)
     ),
 
     {ok, 200, _} = request(
@@ -95,7 +95,7 @@ t_mqtt_topic_metrics_collection(_) ->
                 <<"metrics">> := #{}
             }
         ],
-        jsx:decode(Result1)
+        emqx_utils_json:decode(Result1)
     ),
 
     ?assertMatch(
@@ -150,7 +150,7 @@ t_mqtt_topic_metrics(_) ->
         uri(["mqtt", "topic_metrics"])
     ),
 
-    ?assertMatch([_], jsx:decode(Result0)),
+    ?assertMatch([_], emqx_utils_json:decode(Result0)),
 
     {ok, 200, Result1} = request(
         get,
@@ -162,7 +162,7 @@ t_mqtt_topic_metrics(_) ->
             <<"topic">> := <<"topic/1/2">>,
             <<"metrics">> := #{}
         },
-        jsx:decode(Result1)
+        emqx_utils_json:decode(Result1)
     ),
 
     ?assertMatch(
@@ -288,7 +288,7 @@ t_node_aggregation(_) ->
             <<"topic">> := <<"topic/1/2">>,
             <<"metrics">> := #{<<"messages.dropped.count">> := 3}
         },
-        jsx:decode(Result)
+        emqx_utils_json:decode(Result)
     ),
 
     meck:unload(emqx_topic_metrics_proto_v1).
diff --git a/apps/emqx_utils/src/emqx_utils.app.src b/apps/emqx_utils/src/emqx_utils.app.src
index 08a802d1b..b0dedbd72 100644
--- a/apps/emqx_utils/src/emqx_utils.app.src
+++ b/apps/emqx_utils/src/emqx_utils.app.src
@@ -14,7 +14,8 @@
     {registered, []},
     {applications, [
         kernel,
-        stdlib
+        stdlib,
+        jiffy
     ]},
     {env, []},
     {licenses, ["Apache-2.0"]},
diff --git a/apps/emqx_utils/src/emqx_utils_json.erl b/apps/emqx_utils/src/emqx_utils_json.erl
index 191063d38..df7388c94 100644
--- a/apps/emqx_utils/src/emqx_utils_json.erl
+++ b/apps/emqx_utils/src/emqx_utils_json.erl
@@ -65,7 +65,7 @@ encode(Term) ->
 
 -spec encode(json_term(), encode_options()) -> json_text().
 encode(Term, Opts) ->
-    to_binary(emqx_utils_json:encode(to_ejson(Term), Opts)).
+    to_binary(jiffy:encode(to_ejson(Term), Opts)).
 
 -spec safe_encode(json_term()) ->
     {ok, json_text()} | {error, Reason :: term()}.
@@ -87,7 +87,7 @@ decode(Json) -> decode(Json, [return_maps]).
 
 -spec decode(json_text(), decode_options()) -> json_term().
 decode(Json, Opts) ->
-    from_ejson(emqx_utils_json:decode(Json, Opts)).
+    from_ejson(jiffy:decode(Json, Opts)).
 
 -spec safe_decode(json_text()) ->
     {ok, json_term()} | {error, Reason :: term()}.
@@ -125,6 +125,8 @@ to_ejson([{_, _} | _] = L) ->
     {[{K, to_ejson(V)} || {K, V} <- L]};
 to_ejson(L) when is_list(L) ->
     [to_ejson(E) || E <- L];
+to_ejson(M) when is_map(M) ->
+    maps:map(fun(_K, V) -> to_ejson(V) end, M);
 to_ejson(T) ->
     T.
 
diff --git a/apps/emqx_utils/test/emqx_utils_json_SUITE.erl b/apps/emqx_utils/test/emqx_utils_json_SUITE.erl
index ba7b5226a..daf31b440 100644
--- a/apps/emqx_utils/test/emqx_utils_json_SUITE.erl
+++ b/apps/emqx_utils/test/emqx_utils_json_SUITE.erl
@@ -84,10 +84,10 @@ t_decode_encode(_) ->
     1.25 = decode(encode(1.25)),
     [] = decode(encode([])),
     [true, 1] = decode(encode([true, 1])),
-    [{}] = decode(encode([{}])),
-    [{<<"foo">>, <<"bar">>}] = decode(encode([{foo, bar}])),
-    [{<<"foo">>, <<"bar">>}] = decode(encode([{<<"foo">>, <<"bar">>}])),
-    [[{<<"foo">>, <<"bar">>}]] = decode(encode([[{<<"foo">>, <<"bar">>}]])),
+    [{}] = decode(encode([{}]), []),
+    [{<<"foo">>, <<"bar">>}] = decode(encode([{foo, bar}]), []),
+    [{<<"foo">>, <<"bar">>}] = decode(encode([{<<"foo">>, <<"bar">>}]), []),
+    [[{<<"foo">>, <<"bar">>}]] = decode(encode([[{<<"foo">>, <<"bar">>}]]), []),
     [
         [
             {<<"foo">>, <<"bar">>},
@@ -101,7 +101,8 @@ t_decode_encode(_) ->
                 {<<"a">>, <<"b">>}
             ],
             [{<<"x">>, <<"y">>}]
-        ])
+        ]),
+        []
     ),
     #{<<"foo">> := <<"bar">>} = decode(encode(#{<<"foo">> => <<"bar">>}), [return_maps]),
     JsonText = <<"{\"bool\":true,\"int\":10,\"foo\":\"bar\"}">>,
@@ -110,8 +111,12 @@ t_decode_encode(_) ->
         <<"int">> => 10,
         <<"foo">> => <<"bar">>
     },
-    ?assertEqual(JsonText, encode({decode(JsonText)})),
-    ?assertEqual(JsonMaps, decode(JsonText, [return_maps])).
+    ?assertEqual(JsonText, encode({decode(JsonText, [])})),
+    ?assertEqual(JsonMaps, decode(JsonText, [return_maps])),
+    ?assertEqual(
+        #{<<"foo">> => #{<<"bar">> => <<"baz">>}},
+        decode(encode(#{<<"foo">> => [{<<"bar">>, <<"baz">>}]}))
+    ).
 
 t_safe_decode_encode(_) ->
     safe_encode_decode(null),
@@ -123,7 +128,7 @@ t_safe_decode_encode(_) ->
     1.25 = safe_encode_decode(1.25),
     [] = safe_encode_decode([]),
     [true, 1] = safe_encode_decode([true, 1]),
-    [{}] = decode(encode([{}])),
+    [{}] = decode(encode([{}]), []),
     [{<<"foo">>, <<"bar">>}] = safe_encode_decode([{foo, bar}]),
     [{<<"foo">>, <<"bar">>}] = safe_encode_decode([{<<"foo">>, <<"bar">>}]),
     [[{<<"foo">>, <<"bar">>}]] = safe_encode_decode([[{<<"foo">>, <<"bar">>}]]),
@@ -132,7 +137,7 @@ t_safe_decode_encode(_) ->
 
 safe_encode_decode(Term) ->
     {ok, Json} = emqx_utils_json:safe_encode(Term),
-    case emqx_utils_json:safe_decode(Json) of
+    case emqx_utils_json:safe_decode(Json, []) of
         {ok, {NTerm}} -> NTerm;
         {ok, NTerm} -> NTerm
     end.

From 90520a5382a3b871e97de066ff469135b2af9322 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 11:43:53 +0200
Subject: [PATCH 065/110] docs: add an actual README

---
 apps/emqx_utils/README.md | 55 +++++++++++++--------------------------
 1 file changed, 18 insertions(+), 37 deletions(-)

diff --git a/apps/emqx_utils/README.md b/apps/emqx_utils/README.md
index 482b7a947..046b66321 100644
--- a/apps/emqx_utils/README.md
+++ b/apps/emqx_utils/README.md
@@ -1,43 +1,24 @@
-# [Application Name] - [Mandatory]
-> 0. App overview introduction
-> 1. let people know what your project can do specifically. Is it a base
-> library dependency, or what kind of functionality is provided to the user?
-> 2. Provide context and add a link to any reference visitors might be
-> unfamiliar with.
-> 3. Design details, implementation technology architecture, Roadmap, etc.
+# emqx_utils - Erlang utility library for EMQ X
 
-# [Features] - [Optional]
-> A List of features your application provided. If the feature is quite simple, just
-> list in the previous section.
+## Overview
 
-# [Limitation] - [Optional]
-> Explain the limitations of the implementation used in your application.
+`emqx_utils` is a collection of utility functions for EMQ X, organized into
+several modules. It provides various functionalities to make it easier to work
+with EMQ X, such as binary manipulations, maps, JSON en- and decoding, ets table
+handling, data conversions, and more.
 
-# [Documention links] - [Mandatory]
-> You can use the official docs link to provide a detailed explanation of
-> the concept and functions of this application.
+## Features
 
-# [Installation] - [Optional]
-> How users can obtain this application. In most cases, this section is unnecessary.
-> Most of the applications are released with the EMQX distribution package.
-> Otherwise, it is necessary to provide step-by-step instructions on how
-> to install this application.
+- `emqx_utils`: unsorted helper functions, formerly known as `emqx_misc` - NEEDS WORK
+- `emqx_utils_api`: collection of helper functions for API responses
+- `emqx_utils_binary`: binary reverse, join, trim etc
+- `emqx_utils_ets`: convenience functions for creating and looking up data in ets tables.
+- `emqx_utils_json`: JSON encoding and decoding
+- `emqx_utils_maps`: convenience functions for map lookup and manipulation like
+  deep_get etc.
 
-# [Usage] - [Optional]
-> This section explains how users can use the features provided by the application.
+## Contributing
 
-# [Basic Usage Guide] - [Optional]
-> Simple and reproducible introduction on how to use/start it.
-
-# [Configurations] - [Mandatory]
-> Most important configurations that this application depends on.
-> It would be best to attach official documentation if it's available.
-
-# [HTTP APIs] - [Optional]
-> Same as configuration.
-
-# [Other] - [Optional]
-> Other topics that users may need to know can be placed here.
-
-# Contributing - [Mandatory]
-Please see our [contributing.md](../../CONTRIBUTING.md).
+Please see our [contributing guidelines](../../CONTRIBUTING.md) for information
+on how to contribute to `emqx_utils`. We welcome bug reports, feature requests,
+and pull requests.

From d98f7222ff2ccdba5f6830a720961f1ea649015c Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 11:52:21 +0200
Subject: [PATCH 066/110] style: add comment to binary_string/1

---
 apps/emqx_utils/src/emqx_utils_maps.erl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/emqx_utils/src/emqx_utils_maps.erl b/apps/emqx_utils/src/emqx_utils_maps.erl
index d64075511..6bec32ae3 100644
--- a/apps/emqx_utils/src/emqx_utils_maps.erl
+++ b/apps/emqx_utils/src/emqx_utils_maps.erl
@@ -210,6 +210,7 @@ binary_string_kv(K, V, JsonableFun) ->
         {K1, V1} -> {binary_string(K1), V1}
     end.
 
+%% [FIXME] this doesn't belong here
 binary_string([]) ->
     [];
 binary_string(Val) when is_list(Val) ->

From badf96280019f1b89482cdb9de96cbca418fcd01 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 11:53:05 +0200
Subject: [PATCH 067/110] fix: stale call to emqx_misc

---
 apps/emqx_utils/include/emqx_utils_api.hrl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/emqx_utils/include/emqx_utils_api.hrl b/apps/emqx_utils/include/emqx_utils_api.hrl
index 549b0f94c..bfc8e0a53 100644
--- a/apps/emqx_utils/include/emqx_utils_api.hrl
+++ b/apps/emqx_utils/include/emqx_utils_api.hrl
@@ -17,7 +17,7 @@
 -ifndef(EMQX_API_LIB_HRL).
 -define(EMQX_API_LIB_HRL, true).
 
--define(ERROR_MSG(CODE, REASON), #{code => CODE, message => emqx_misc:readable_error_msg(REASON)}).
+-define(ERROR_MSG(CODE, REASON), #{code => CODE, message => emqx_utils:readable_error_msg(REASON)}).
 
 -define(OK(CONTENT), {200, CONTENT}).
 

From 0f162fb50a4cc38a8a599785ca9dde95c8f7aa0b Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 11:54:02 +0200
Subject: [PATCH 068/110] test: add tests for emqx_utils_binary from original
 site

---
 .../test/emqx_utils_binary_tests.erl          | 212 ++++++++++++++++++
 1 file changed, 212 insertions(+)
 create mode 100644 apps/emqx_utils/test/emqx_utils_binary_tests.erl

diff --git a/apps/emqx_utils/test/emqx_utils_binary_tests.erl b/apps/emqx_utils/test/emqx_utils_binary_tests.erl
new file mode 100644
index 000000000..514e0874a
--- /dev/null
+++ b/apps/emqx_utils/test/emqx_utils_binary_tests.erl
@@ -0,0 +1,212 @@
+-module(emqx_utils_binary_tests).
+
+-import(emqx_utils_binary, [
+    trim/1,
+    ltrim/1,
+    rtrim/1,
+    trim/2,
+    ltrim/2,
+    rtrim/2,
+    reverse/1,
+    inverse/1,
+    join/2,
+    suffix/2,
+    prefix/2,
+    duplicate/2,
+    union/2,
+    intersection/2,
+    subtract/2,
+    optimize_patterns/1
+]).
+
+-include_lib("eunit/include/eunit.hrl").
+
+-ifdef(TEST).
+
+trim1_test_() ->
+    [
+        ?_assertEqual(trim(<<>>), <<>>),
+        ?_assertEqual(trim(<<0, 0, 0>>), <<>>),
+        ?_assertEqual(trim(<<1, 2, 3>>), <<1, 2, 3>>),
+        ?_assertEqual(trim(<<0, 1, 2>>), <<1, 2>>),
+        ?_assertEqual(trim(<<0, 0, 1, 2>>), <<1, 2>>),
+        ?_assertEqual(trim(<<1, 2, 0, 0>>), <<1, 2>>),
+        ?_assertEqual(trim(<<0, 1, 2, 0>>), <<1, 2>>),
+        ?_assertEqual(trim(<<0, 0, 0, 1, 2, 0, 0, 0>>), <<1, 2>>)
+    ].
+
+ltrim1_test_() ->
+    [
+        ?_assertEqual(ltrim(<<>>), <<>>),
+        ?_assertEqual(ltrim(<<0, 0, 0>>), <<>>),
+        ?_assertEqual(ltrim(<<1, 2, 3>>), <<1, 2, 3>>),
+        ?_assertEqual(ltrim(<<0, 1, 2>>), <<1, 2>>),
+        ?_assertEqual(ltrim(<<0, 0, 1, 2>>), <<1, 2>>),
+        ?_assertEqual(ltrim(<<1, 2, 0, 0>>), <<1, 2, 0, 0>>),
+        ?_assertEqual(ltrim(<<0, 1, 2, 0>>), <<1, 2, 0>>),
+        ?_assertEqual(ltrim(<<0, 0, 0, 1, 2, 0, 0, 0>>), <<1, 2, 0, 0, 0>>)
+    ].
+
+rtrim1_test_() ->
+    [
+        ?_assertEqual(rtrim(<<>>), <<>>),
+        ?_assertEqual(rtrim(<<1, 2, 3>>), <<1, 2, 3>>),
+        ?_assertEqual(rtrim(<<0, 0, 0>>), <<>>),
+        ?_assertEqual(rtrim(<<0, 1, 2>>), <<0, 1, 2>>),
+        ?_assertEqual(rtrim(<<0, 0, 1, 2>>), <<0, 0, 1, 2>>),
+        ?_assertEqual(rtrim(<<1, 2, 0, 0>>), <<1, 2>>),
+        ?_assertEqual(rtrim(<<0, 1, 2, 0>>), <<0, 1, 2>>),
+        ?_assertEqual(rtrim(<<0, 0, 0, 1, 2, 0, 0, 0>>), <<0, 0, 0, 1, 2>>)
+    ].
+
+trim2_test_() ->
+    [
+        ?_assertEqual(trim(<<5>>, 5), <<>>),
+        ?_assertEqual(trim(<<5, 1, 2, 5>>, 5), <<1, 2>>),
+        ?_assertEqual(trim(<<5, 5, 5, 1, 2, 0, 0, 0>>, 5), <<1, 2, 0, 0, 0>>)
+    ].
+
+ltrim2_test_() ->
+    [
+        ?_assertEqual(ltrim(<<5>>, 5), <<>>),
+        ?_assertEqual(ltrim(<<5, 1, 2, 5>>, 5), <<1, 2, 5>>),
+        ?_assertEqual(ltrim(<<5, 5, 5, 1, 2, 0, 0, 0>>, 5), <<1, 2, 0, 0, 0>>)
+    ].
+
+rtrim2_test_() ->
+    [
+        ?_assertEqual(rtrim(<<5>>, 5), <<>>),
+        ?_assertEqual(rtrim(<<5, 1, 2, 5>>, 5), <<5, 1, 2>>),
+        ?_assertEqual(rtrim(<<5, 5, 5, 1, 2, 0, 0, 0>>, 5), <<5, 5, 5, 1, 2, 0, 0, 0>>)
+    ].
+
+mtrim2_test_() ->
+    [
+        ?_assertEqual(trim(<<5>>, [1, 5]), <<>>),
+        ?_assertEqual(trim(<<5, 1, 2, 5>>, [1, 5]), <<2>>),
+        ?_assertEqual(trim(<<5, 1, 2, 5>>, [1, 2, 5]), <<>>),
+        ?_assertEqual(trim(<<5, 5, 5, 1, 2, 0, 0, 0>>, [1, 5]), <<2, 0, 0, 0>>)
+    ].
+
+mltrim2_test_() ->
+    [
+        ?_assertEqual(ltrim(<<5>>, [1, 5]), <<>>),
+        ?_assertEqual(ltrim(<<5, 1, 2, 5>>, [1, 5]), <<2, 5>>),
+        ?_assertEqual(ltrim(<<5, 1, 2, 5>>, [2, 5]), <<1, 2, 5>>),
+        ?_assertEqual(ltrim(<<5, 5, 5, 1, 2, 0, 0, 0>>, [1, 5]), <<2, 0, 0, 0>>)
+    ].
+
+mrtrim2_test_() ->
+    [
+        ?_assertEqual(rtrim(<<5>>, [1, 5]), <<>>),
+        ?_assertEqual(rtrim(<<5, 1, 2, 5>>, [1, 5]), <<5, 1, 2>>),
+        ?_assertEqual(rtrim(<<5, 1, 2, 5>>, [2, 5]), <<5, 1>>),
+        ?_assertEqual(rtrim(<<5, 5, 5, 1, 2, 0, 0, 0>>, [1, 5]), <<5, 5, 5, 1, 2, 0, 0, 0>>),
+        ?_assertEqual(rtrim(<<5, 5, 5, 1, 2, 0, 0, 0>>, [0, 5]), <<5, 5, 5, 1, 2>>)
+    ].
+
+reverse_test_() ->
+    [?_assertEqual(reverse(<<0, 1, 2>>), <<2, 1, 0>>)].
+
+join_test_() ->
+    [
+        ?_assertEqual(join([<<1, 2>>, <<3, 4>>, <<5, 6>>], <<0>>), <<1, 2, 0, 3, 4, 0, 5, 6>>),
+        ?_assertEqual(
+            join([<<"abc">>, <<"def">>, <<"xyz">>], <<"|">>),
+            <<"abc|def|xyz">>
+        ),
+        ?_assertEqual(
+            join([<<>>, <<"|">>, <<"x|z">>], <<"|">>),
+            <<"|||x|z">>
+        ),
+        ?_assertEqual(
+            join([<<"abc">>, <<"def">>, <<"xyz">>], <<>>),
+            <<"abcdefxyz">>
+        ),
+        ?_assertEqual(join([], <<"|">>), <<>>)
+    ].
+
+duplicate_test_() ->
+    [
+        ?_assertEqual(duplicate(5, <<1, 2>>), <<1, 2, 1, 2, 1, 2, 1, 2, 1, 2>>),
+        ?_assertEqual(duplicate(50, <<0>>), <<0:400>>)
+    ].
+
+suffix_test_() ->
+    [
+        ?_assertEqual(suffix(<<1, 2, 3, 4, 5>>, 2), <<4, 5>>),
+        ?_assertError(badarg, prefix(<<1, 2, 3, 4, 5>>, 25))
+    ].
+
+prefix_test_() ->
+    [
+        ?_assertEqual(prefix(<<1, 2, 3, 4, 5>>, 2), <<1, 2>>),
+        ?_assertError(badarg, prefix(<<1, 2, 3, 4, 5>>, 25))
+    ].
+
+union_test_() ->
+    [
+        ?_assertEqual(
+            union(
+                <<2#0011011:7>>,
+                <<2#1011110:7>>
+            ),
+            <<2#1011111:7>>
+        )
+    ].
+
+inverse_test_() ->
+    [
+        ?_assertEqual(inverse(inverse(<<0, 1, 2>>)), <<0, 1, 2>>),
+        ?_assertEqual(inverse(<<0>>), <<255>>),
+        ?_assertEqual(inverse(<<2#1:1>>), <<2#0:1>>),
+        ?_assertEqual(inverse(<<2#0:1>>), <<2#1:1>>),
+        ?_assertEqual(
+            inverse(<<2#01:2>>),
+            <<2#10:2>>
+        ),
+        ?_assertEqual(
+            inverse(<<2#0011011:7>>),
+            <<2#1100100:7>>
+        )
+    ].
+
+intersection_test_() ->
+    [
+        ?_assertEqual(
+            intersection(
+                <<2#0011011>>,
+                <<2#1011110>>
+            ),
+            <<2#0011010>>
+        )
+    ].
+
+subtract_test_() ->
+    [
+        ?_assertEqual(
+            subtract(
+                <<2#0011011>>,
+                <<2#1011110>>
+            ),
+            <<2#0000001>>
+        )
+    ].
+
+optimize_patterns_test_() ->
+    [
+        ?_assertEqual(
+            [<<"t">>],
+            optimize_patterns([<<"t">>, <<"test">>])
+        ),
+        ?_assertEqual(
+            [<<"t">>],
+            optimize_patterns([<<"t">>, <<"t">>, <<"test">>])
+        ),
+        ?_assertEqual(
+            [<<"t">>],
+            optimize_patterns([<<"test">>, <<"t">>, <<"t">>])
+        )
+    ].
+
+-endif.

From 92ca2f66f5a648799a29838a2db7fcab2a94f252 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 12:06:52 +0200
Subject: [PATCH 069/110] style: add original copyright header

---
 apps/emqx_utils/src/emqx_utils_binary.erl        | 4 ++--
 apps/emqx_utils/test/emqx_utils_binary_tests.erl | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/emqx_utils/src/emqx_utils_binary.erl b/apps/emqx_utils/src/emqx_utils_binary.erl
index d9e504f46..26976496d 100644
--- a/apps/emqx_utils/src/emqx_utils_binary.erl
+++ b/apps/emqx_utils/src/emqx_utils_binary.erl
@@ -1,4 +1,6 @@
 %%--------------------------------------------------------------------
+%% Original file taken from https://github.com/arcusfelis/binary2
+%% Copyright (c) 2016 Michael Uvarov
 %% Copyright (c) 2020-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +18,6 @@
 
 -module(emqx_utils_binary).
 
-%% copied from https://github.com/arcusfelis/binary2
-
 %% Bytes
 -export([
     reverse/1,
diff --git a/apps/emqx_utils/test/emqx_utils_binary_tests.erl b/apps/emqx_utils/test/emqx_utils_binary_tests.erl
index 514e0874a..3709fb014 100644
--- a/apps/emqx_utils/test/emqx_utils_binary_tests.erl
+++ b/apps/emqx_utils/test/emqx_utils_binary_tests.erl
@@ -1,3 +1,8 @@
+%%--------------------------------------------------------------------
+%% Original file taken from https://github.com/arcusfelis/binary2
+%% Copyright (c) 2016 Michael Uvarov
+%% Copyright (c) 2023 EMQ Technologies Co., Ltd. All Rights Reserved.
+%%
 -module(emqx_utils_binary_tests).
 
 -import(emqx_utils_binary, [

From 1bad6ca67db338c939193b539aced8ac6f41cce6 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 12:13:29 +0200
Subject: [PATCH 070/110] fix: jiffy pretty print is a bit different from jsx

---
 apps/emqx/src/emqx_logger_jsonfmt.erl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/emqx/src/emqx_logger_jsonfmt.erl b/apps/emqx/src/emqx_logger_jsonfmt.erl
index e231b76dd..0e72fd2b5 100644
--- a/apps/emqx/src/emqx_logger_jsonfmt.erl
+++ b/apps/emqx/src/emqx_logger_jsonfmt.erl
@@ -62,7 +62,7 @@
 %% The JSON object is pretty-printed.
 %% NOTE: do not use this function for logging.
 best_effort_json(Input) ->
-    best_effort_json(Input, [pretty]).
+    best_effort_json(Input, [pretty, force_utf8]).
 best_effort_json(Input, Opts) ->
     Config = #{depth => unlimited, single_line => true},
     JsonReady = best_effort_json_obj(Input, Config),
@@ -378,15 +378,15 @@ p_config() ->
 
 best_effort_json_test() ->
     ?assertEqual(
-        <<"{}">>,
+        <<"{\n  \n}">>,
         emqx_logger_jsonfmt:best_effort_json([])
     ),
     ?assertEqual(
-        <<"{\n    \"key\": []\n}">>,
+        <<"{\n  \"key\" : [\n    \n  ]\n}">>,
         emqx_logger_jsonfmt:best_effort_json(#{key => []})
     ),
     ?assertEqual(
-        <<"[\n    {\n        \"key\": []\n    }\n]">>,
+        <<"[\n  {\n    \"key\" : [\n      \n    ]\n  }\n]">>,
         emqx_logger_jsonfmt:best_effort_json([#{key => []}])
     ),
     ok.

From b5a496aacdc4b81619f74e16f73efbc65b3b1cd4 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 14:02:56 +0200
Subject: [PATCH 071/110] fix: include emqx_utils in distribution

---
 rebar.config.erl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rebar.config.erl b/rebar.config.erl
index 2ae6ffad4..b6b6a7c18 100644
--- a/rebar.config.erl
+++ b/rebar.config.erl
@@ -391,6 +391,7 @@ relx_apps(ReleaseType, Edition) ->
             {covertool, load},
             % started by emqx_machine
             {system_monitor, load},
+            emqx_utils,
             emqx_http_lib,
             emqx_resource,
             emqx_connector,

From a295d0f1341e17fe73fbddb44ce29894f18f308e Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 14:29:25 +0200
Subject: [PATCH 072/110] fix: add rebar3_path_deps plugin

---
 apps/emqx/rebar.config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config
index a3eff6c16..bf509f059 100644
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@@ -18,7 +18,7 @@
 ]}.
 
 %% Deps here may duplicate with emqx.git root level rebar.config
-%% but there not be any descrpancy.
+%% but there may not be any discrepancy.
 %% This rebar.config is necessary because the app may be used as a
 %% `git_subdir` dependency in other projects.
 {deps, [
@@ -36,7 +36,7 @@
     {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "1.0.7"}}}
 ]}.
 
-{plugins, [{rebar3_proper, "0.12.1"}]}.
+{plugins, [{rebar3_proper, "0.12.1"}, rebar3_path_deps]}.
 {extra_src_dirs, [{"etc", [recursive]}]}.
 {profiles, [
     {test, [

From 4de13d280079725d3822883b55f5eaff83ea6a1f Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Fri, 14 Apr 2023 09:31:33 -0300
Subject: [PATCH 073/110] feat(buffer_worker): change default max queue bytes
 to 256 MB

---
 apps/emqx_resource/include/emqx_resource.hrl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/emqx_resource/include/emqx_resource.hrl b/apps/emqx_resource/include/emqx_resource.hrl
index 7f88e1440..904eeffa5 100644
--- a/apps/emqx_resource/include/emqx_resource.hrl
+++ b/apps/emqx_resource/include/emqx_resource.hrl
@@ -88,8 +88,8 @@
 -define(DEFAULT_QUEUE_SEG_SIZE, 10 * 1024 * 1024).
 -define(DEFAULT_QUEUE_SEG_SIZE_RAW, <<"10MB">>).
 
--define(DEFAULT_QUEUE_SIZE, 100 * 1024 * 1024).
--define(DEFAULT_QUEUE_SIZE_RAW, <<"100MB">>).
+-define(DEFAULT_QUEUE_SIZE, 256 * 1024 * 1024).
+-define(DEFAULT_QUEUE_SIZE_RAW, <<"256MB">>).
 
 -define(DEFAULT_REQUEST_TIMEOUT, timer:seconds(15)).
 

From 55661faac66a2787e29db0156fd2ad8cabf571dc Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 14:44:54 +0200
Subject: [PATCH 074/110] fix: make elixir happy:

---
 mix.exs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mix.exs b/mix.exs
index 582860039..299f23ce6 100644
--- a/mix.exs
+++ b/mix.exs
@@ -303,6 +303,7 @@ defmodule EMQXUmbrella.MixProject do
         tools: :load,
         covertool: :load,
         system_monitor: :load,
+        emqx_utils: :permanent,
         emqx_http_lib: :permanent,
         emqx_resource: :permanent,
         emqx_connector: :permanent,

From 180f5717659228a46617fa31f6f7666ce58ccd5f Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Mon, 3 Apr 2023 09:12:23 +0800
Subject: [PATCH 075/110] feat: configuration priority ENV > emqx.conf > API

---
 apps/emqx/src/config/emqx_config_logger.erl   |  23 +--
 apps/emqx/src/emqx_config.erl                 | 189 ++++++++++++++++--
 apps/emqx/src/emqx_config_handler.erl         |  14 +-
 apps/emqx/test/emqx_config_handler_SUITE.erl  |  15 +-
 apps/emqx_conf/src/emqx_conf_schema.erl       |   4 +-
 apps/emqx_conf/test/emqx_conf_app_SUITE.erl   |   8 +-
 .../src/emqx_mgmt_api_configs.erl             | 138 +++++--------
 .../test/emqx_mgmt_api_configs_SUITE.erl      |  53 +++--
 8 files changed, 289 insertions(+), 155 deletions(-)

diff --git a/apps/emqx/src/config/emqx_config_logger.erl b/apps/emqx/src/config/emqx_config_logger.erl
index 15e4d3959..b0fc1ca67 100644
--- a/apps/emqx/src/config/emqx_config_logger.erl
+++ b/apps/emqx/src/config/emqx_config_logger.erl
@@ -32,25 +32,15 @@ remove_handler() ->
     ok = emqx_config_handler:remove_handler(?LOG),
     ok.
 
-%% refresh logger config when booting, the override config may have changed after node start.
+%% refresh logger config when booting, the cluster config may have changed after node start.
 %% Kernel's app env is confirmed before the node starts,
-%% but we only copy cluster-override.conf from other node after this node starts,
+%% but we only copy cluster.conf from other node after this node starts,
 %% so we need to refresh the logger config after this node starts.
-%% It will not affect the logger config when cluster-override.conf is unchanged.
+%% It will not affect the logger config when cluster.conf is unchanged.
 refresh_config() ->
-    Overrides = emqx_config:read_override_confs(),
-    refresh_config(Overrides).
-
-refresh_config(#{<<"log">> := _}) ->
     %% read the checked config
     LogConfig = emqx:get_config(?LOG, undefined),
-    Conf = #{log => LogConfig},
-    ok = do_refresh_config(Conf);
-refresh_config(_) ->
-    %% No config override found for 'log', do nothing
-    %% because the 'kernel' app should already be configured
-    %% from the base configs. i.e. emqx.conf + env vars
-    ok.
+    do_refresh_config(#{log => LogConfig}).
 
 %% this call is shared between initial config refresh at boot
 %% and dynamic config update from HTTP API
@@ -61,10 +51,9 @@ do_refresh_config(Conf) ->
     ok = maybe_update_log_level(Level),
     ok.
 
+%% always refresh config when the override config is changed
 post_config_update(?LOG, _Req, NewConf, _OldConf, _AppEnvs) ->
-    ok = do_refresh_config(#{log => NewConf});
-post_config_update(_ConfPath, _Req, _NewConf, _OldConf, _AppEnvs) ->
-    ok.
+    do_refresh_config(#{log => NewConf}).
 
 maybe_update_log_level(NewLevel) ->
     OldLevel = emqx_logger:get_primary_log_level(),
diff --git a/apps/emqx/src/emqx_config.erl b/apps/emqx/src/emqx_config.erl
index bf3134568..41e38f184 100644
--- a/apps/emqx/src/emqx_config.erl
+++ b/apps/emqx/src/emqx_config.erl
@@ -24,17 +24,19 @@
     init_load/2,
     init_load/3,
     read_override_conf/1,
-    read_override_confs/0,
     delete_override_conf_files/0,
     check_config/2,
     fill_defaults/1,
     fill_defaults/2,
     fill_defaults/3,
-    save_configs/5,
+    save_configs/6,
     save_to_app_env/1,
     save_to_config_map/2,
     save_to_override_conf/2
 ]).
+-export([raw_conf_with_default/4]).
+-export([remove_default_conf/2]).
+-export([merge_envs/2]).
 
 -export([
     get_root/1,
@@ -329,23 +331,15 @@ init_load(SchemaMod, Conf, Opts) when is_list(Conf) orelse is_binary(Conf) ->
     init_load(SchemaMod, parse_hocon(Conf), Opts);
 init_load(SchemaMod, RawConf, Opts) when is_map(RawConf) ->
     ok = save_schema_mod_and_names(SchemaMod),
+    RootNames = get_root_names(),
     %% Merge environment variable overrides on top
     RawConfWithEnvs = merge_envs(SchemaMod, RawConf),
-    Overrides = read_override_confs(),
-    RawConfWithOverrides = hocon:deep_merge(RawConfWithEnvs, Overrides),
-    RootNames = get_root_names(),
-    RawConfAll = raw_conf_with_default(SchemaMod, RootNames, RawConfWithOverrides, Opts),
+    RawConfAll = raw_conf_with_default(SchemaMod, RootNames, RawConfWithEnvs, Opts),
     %% check configs against the schema
     {AppEnvs, CheckedConf} = check_config(SchemaMod, RawConfAll, #{}),
     save_to_app_env(AppEnvs),
     ok = save_to_config_map(CheckedConf, RawConfAll).
 
-%% @doc Read merged cluster + local overrides.
-read_override_confs() ->
-    ClusterOverrides = read_override_conf(#{override_to => cluster}),
-    LocalOverrides = read_override_conf(#{override_to => local}),
-    hocon:deep_merge(ClusterOverrides, LocalOverrides).
-
 %% keep the raw and non-raw conf has the same keys to make update raw conf easier.
 raw_conf_with_default(SchemaMod, RootNames, RawConf, #{raw_with_default := true}) ->
     Fun = fun(Name, Acc) ->
@@ -375,6 +369,9 @@ schema_default(Schema) ->
     end.
 
 parse_hocon(Conf) ->
+    %% merge cluster-override.conf to local-override.conf
+    %% cluster-override.conf is deprecated, now is cluster.conf
+    merge_deprecated_cluster_override_to_local_override(),
     IncDirs = include_dirs(),
     case do_parse_hocon(Conf, IncDirs) of
         {ok, HoconMap} ->
@@ -393,8 +390,12 @@ parse_hocon(Conf) ->
 do_parse_hocon(Conf, IncDirs) ->
     Opts = #{format => map, include_dirs => IncDirs},
     case is_binary(Conf) of
-        true -> hocon:binary(Conf, Opts);
-        false -> hocon:files(Conf, Opts)
+        true ->
+            hocon:binary(Conf, Opts);
+        false ->
+            LocalFile = override_conf_file(#{override_to => local}),
+            ClusterFile = override_conf_file(#{override_to => cluster}),
+            hocon:files([ClusterFile] ++ Conf ++ [LocalFile], Opts)
     end.
 
 include_dirs() ->
@@ -483,6 +484,13 @@ read_override_conf(#{} = Opts) ->
     File = override_conf_file(Opts),
     load_hocon_file(File, map).
 
+read_deprecated_override_conf() ->
+    ClusterFile = override_conf_file(#{override_to => cluster}),
+    DeprecatedFile = filename:join(filename:dirname(ClusterFile), "cluster-override.conf"),
+    Conf = load_hocon_file(DeprecatedFile, map),
+    _ = file:delete(DeprecatedFile),
+    Conf.
+
 override_conf_file(Opts) when is_map(Opts) ->
     Key =
         case maps:get(override_to, Opts, cluster) of
@@ -522,14 +530,54 @@ get_schema_mod(RootName) ->
 get_root_names() ->
     maps:get(names, persistent_term:get(?PERSIS_SCHEMA_MODS, #{names => []})).
 
--spec save_configs(app_envs(), config(), raw_config(), raw_config(), update_opts()) -> ok.
-save_configs(AppEnvs, Conf, RawConf, OverrideConf, Opts) ->
-    %% We first try to save to override.conf, because saving to files is more error prone
+-spec save_configs(
+    emqx_map_lib:config_key_path(), app_envs(), config(), raw_config(), raw_config(), update_opts()
+) -> ok.
+
+save_configs(Paths0, AppEnvs, Conf, RawConf, OverrideConf, Opts) ->
+    Default = init_default(Paths0),
+    OverrideConf1 = remove_default_conf(OverrideConf, Default),
+    %% We first try to save to files, because saving to files is more error prone
     %% than saving into memory.
-    ok = save_to_override_conf(OverrideConf, Opts),
+    ok = save_to_override_conf(OverrideConf1, Opts),
     save_to_app_env(AppEnvs),
     save_to_config_map(Conf, RawConf).
 
+init_default(Paths0) ->
+    [Root | _] = [bin(Key) || Key <- Paths0],
+    SchemaMod = get_schema_mod(Root),
+    {_, {_, Schema}} = lists:keyfind(Root, 1, hocon_schema:roots(SchemaMod)),
+    fill_defaults(#{Root => schema_default(Schema)}).
+
+remove_default_conf(undefined, _) ->
+    undefined;
+remove_default_conf(Conf, DefaultConf) when is_map(Conf) andalso is_map(DefaultConf) ->
+    maps:fold(
+        fun(Key, Value, Acc) ->
+            case maps:find(Key, DefaultConf) of
+                {ok, DefaultValue} ->
+                    remove_default_conf(Value, DefaultValue, Key, Acc);
+                error ->
+                    Acc
+            end
+        end,
+        Conf,
+        Conf
+    ).
+
+remove_default_conf(Value, Value, Key, Conf) ->
+    maps:remove(Key, Conf);
+remove_default_conf(Value = #{}, DefaultValue = #{}, Key, Conf) ->
+    case remove_default_conf(Value, DefaultValue) of
+        SubValue when SubValue =:= #{} -> maps:remove(Key, Conf);
+        SubValue -> maps:put(Key, SubValue, Conf)
+    end;
+remove_default_conf(Value, DefaultValue, Key, Conf) ->
+    case try_bin(DefaultValue) =:= try_bin(Value) of
+        true -> maps:remove(Key, Conf);
+        false -> Conf
+    end.
+
 %% we ignore kernel app env,
 %% because the old app env will be used in emqx_config_logger:post_config_update/5
 -define(IGNORE_APPS, [kernel]).
@@ -678,6 +726,16 @@ atom(Str) when is_list(Str) ->
 atom(Atom) when is_atom(Atom) ->
     Atom.
 
+try_bin(Bin) when is_binary(Bin) -> Bin;
+try_bin([Bin | _] = List) when is_binary(Bin) -> List;
+try_bin([Atom | _] = List) when is_atom(Atom) -> [atom_to_binary(A) || A <- List];
+try_bin([Map | _] = Maps) when is_map(Map) -> Maps;
+try_bin(Str) when is_list(Str) -> list_to_binary(Str);
+try_bin(Atom) when is_atom(Atom) -> atom_to_binary(Atom, utf8);
+try_bin(Int) when is_integer(Int) -> integer_to_binary(Int);
+try_bin(Float) when is_float(Float) -> float_to_binary(Float);
+try_bin(Term) -> Term.
+
 bin(Bin) when is_binary(Bin) -> Bin;
 bin(Str) when is_list(Str) -> list_to_binary(Str);
 bin(Atom) when is_atom(Atom) -> atom_to_binary(Atom, utf8).
@@ -699,3 +757,98 @@ atom_conf_path(Path, ExpFun, OnFail) ->
                     error(Err)
             end
     end.
+
+merge_deprecated_cluster_override_to_local_override() ->
+    case read_deprecated_override_conf() of
+        DeprecatedConf when DeprecatedConf =/= #{} ->
+            LocalOverrides = read_override_conf(#{override_to => local}),
+            MergedConf = hocon:deep_merge(LocalOverrides, DeprecatedConf),
+            _ = save_to_override_conf(MergedConf, #{override_to => local}),
+            ok;
+        _ ->
+            ok
+    end.
+
+-ifdef(TEST).
+-include_lib("eunit/include/eunit.hrl").
+
+remove_default_conf_test() ->
+    ?assertEqual(
+        #{},
+        remove_default_conf(#{<<"def">> => 100}, #{<<"def">> => 100})
+    ),
+    ?assertEqual(
+        #{},
+        remove_default_conf(#{<<"def">> => 100}, #{<<"def">> => <<"100">>})
+    ),
+    ?assertEqual(
+        #{<<"def">> => 100},
+        remove_default_conf(#{<<"def">> => 100}, #{<<"def">> => #{<<"bar">> => 100}})
+    ),
+    ?assertEqual(
+        #{<<"def">> => #{<<"edf">> => 321}},
+        remove_default_conf(#{<<"def">> => #{<<"abc">> => 100, <<"edf">> => 321}}, #{
+            <<"def">> => #{<<"abc">> => 100, <<"edf">> => 123}
+        })
+    ),
+    ?assertEqual(
+        #{},
+        remove_default_conf(#{<<"def">> => #{<<"abc">> => 100, <<"edf">> => 321}}, #{
+            <<"def">> => #{<<"abc">> => <<"100">>, <<"edf">> => 321}
+        })
+    ),
+    ?assertEqual(
+        #{},
+        remove_default_conf(#{<<"def">> => #{<<"abc">> => 100, <<"edf">> => <<"true">>}}, #{
+            <<"def">> => #{<<"abc">> => <<"100">>, <<"edf">> => true}
+        })
+    ),
+    ?assertEqual(
+        #{},
+        remove_default_conf(
+            #{
+                <<"bytes_in">> =>
+                    #{
+                        <<"capacity">> => infinity,
+                        <<"initial">> => 0,
+                        <<"rate">> => infinity
+                    }
+            },
+            #{
+                <<"bytes_in">> =>
+                    #{
+                        <<"capacity">> => <<"infinity">>,
+                        <<"initial">> => <<"0">>,
+                        <<"rate">> => <<"infinity">>
+                    }
+            }
+        )
+    ),
+    ?assertEqual(
+        #{},
+        remove_default_conf(
+            #{
+                <<"limiter">> => #{
+                    <<"connection">> =>
+                        #{
+                            <<"capacity">> => 1000,
+                            <<"initial">> => <<"0">>,
+                            <<"rate">> => <<"1000/s">>
+                        }
+                }
+            },
+            #{
+                <<"limiter">> => #{
+                    <<"connection">> =>
+                        #{
+                            <<"capacity">> => <<"1000">>,
+                            <<"initial">> => <<"0">>,
+                            <<"rate">> => <<"1000/s">>
+                        }
+                }
+            }
+        )
+    ),
+    ok.
+
+-endif.
diff --git a/apps/emqx/src/emqx_config_handler.erl b/apps/emqx/src/emqx_config_handler.erl
index a0a99b62e..ee22c297e 100644
--- a/apps/emqx/src/emqx_config_handler.erl
+++ b/apps/emqx/src/emqx_config_handler.erl
@@ -271,8 +271,10 @@ do_update_config(
     SubOldRawConf = get_sub_config(ConfKeyBin, OldRawConf),
     SubHandlers = get_sub_handlers(ConfKey, Handlers),
     case do_update_config(SubConfKeyPath, SubHandlers, SubOldRawConf, UpdateReq, ConfKeyPath) of
-        {ok, NewUpdateReq} -> merge_to_old_config(#{ConfKeyBin => NewUpdateReq}, OldRawConf);
-        Error -> Error
+        {ok, NewUpdateReq} ->
+            merge_to_old_config(#{ConfKeyBin => NewUpdateReq}, OldRawConf);
+        Error ->
+            Error
     end.
 
 check_and_save_configs(
@@ -289,7 +291,9 @@ check_and_save_configs(
     OldConf = emqx_config:get_root(ConfKeyPath),
     case do_post_config_update(ConfKeyPath, Handlers, OldConf, NewConf, AppEnvs, UpdateArgs, #{}) of
         {ok, Result0} ->
-            ok = emqx_config:save_configs(AppEnvs, NewConf, NewRawConf, OverrideConf, Opts),
+            ok = emqx_config:save_configs(
+                ConfKeyPath, AppEnvs, NewConf, NewRawConf, OverrideConf, Opts
+            ),
             Result1 = return_change_result(ConfKeyPath, UpdateArgs),
             {ok, Result1#{post_config_update => Result0}};
         Error ->
@@ -560,11 +564,11 @@ check_permissions(Action, ConfKeyPath, NewRawConf, _Opts) ->
                             allow;
                         {error, Error} ->
                             ?SLOG(error, #{
-                                msg => "prevent_remove_local_override_conf",
+                                msg => "prevent_remove_local_conf",
                                 config_key_path => ConfKeyPath,
                                 error => Error
                             }),
-                            {deny, "Disable changed from local-override.conf"}
+                            {deny, "Disable changed from local conf"}
                     end;
                 {not_found, _, _} ->
                     allow
diff --git a/apps/emqx/test/emqx_config_handler_SUITE.erl b/apps/emqx/test/emqx_config_handler_SUITE.erl
index 8126b35c6..6e2dbfef1 100644
--- a/apps/emqx/test/emqx_config_handler_SUITE.erl
+++ b/apps/emqx/test/emqx_config_handler_SUITE.erl
@@ -21,8 +21,8 @@
 
 -define(MOD, {mod}).
 -define(WKEY, '?').
--define(LOCAL_CONF, "/tmp/local-override.conf").
--define(CLUSTER_CONF, "/tmp/cluster-override.conf").
+-define(LOCAL_CONF, "/tmp/local.conf").
+-define(CLUSTER_CONF, "/tmp/cluster.conf").
 
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
@@ -221,12 +221,6 @@ t_local_override_update_remove(_Config) ->
     ),
     ?assertMatch(0.7, emqx:get_config(KeyPath)),
 
-    KeyPath2 = [sysmon, os, cpu_low_watermark],
-    ok = emqx_config_handler:add_handler(KeyPath2, ?MODULE),
-    ?assertMatch(
-        {error, {permission_denied, _}}, emqx:update_config(KeyPath2, <<"40%">>, ClusterOpts)
-    ),
-
     %% remove
     ?assertMatch({error, {permission_denied, _}}, emqx:remove_config(KeyPath)),
     ?assertEqual(
@@ -251,7 +245,6 @@ t_local_override_update_remove(_Config) ->
     ?assert(length(OSKey1) > 1),
 
     ok = emqx_config_handler:remove_handler(KeyPath),
-    ok = emqx_config_handler:remove_handler(KeyPath2),
     application:unset_env(emqx, local_override_conf_file),
     application:unset_env(emqx, cluster_override_conf_file),
     ok.
@@ -426,9 +419,9 @@ wait_for_new_pid() ->
 callback_error(FailedPath, Update, Error) ->
     Opts = #{rawconf_with_defaults => true},
     ok = emqx_config_handler:add_handler(FailedPath, ?MODULE),
-    Old = emqx:get_raw_config(FailedPath),
+    Old = emqx:get_raw_config(FailedPath, undefined),
     ?assertEqual(Error, emqx:update_config(FailedPath, Update, Opts)),
-    New = emqx:get_raw_config(FailedPath),
+    New = emqx:get_raw_config(FailedPath, undefined),
     ?assertEqual(Old, New),
     ok = emqx_config_handler:remove_handler(FailedPath),
     ok.
diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl
index f689997c2..ed246b4ae 100644
--- a/apps/emqx_conf/src/emqx_conf_schema.erl
+++ b/apps/emqx_conf/src/emqx_conf_schema.erl
@@ -1076,10 +1076,10 @@ tr_config_files(_Conf) ->
     end.
 
 tr_cluster_override_conf_file(Conf) ->
-    tr_override_conf_file(Conf, "cluster-override.conf").
+    tr_override_conf_file(Conf, "cluster.conf").
 
 tr_local_override_conf_file(Conf) ->
-    tr_override_conf_file(Conf, "local-override.conf").
+    tr_override_conf_file(Conf, "local.conf").
 
 tr_override_conf_file(Conf, Filename) ->
     DataDir = conf_get("node.data_dir", Conf),
diff --git a/apps/emqx_conf/test/emqx_conf_app_SUITE.erl b/apps/emqx_conf/test/emqx_conf_app_SUITE.erl
index c34eb9dc3..eb67490bc 100644
--- a/apps/emqx_conf/test/emqx_conf_app_SUITE.erl
+++ b/apps/emqx_conf/test/emqx_conf_app_SUITE.erl
@@ -85,7 +85,7 @@ create_data_dir() ->
     ok = file:write_file(Node ++ "/certs/fake-cert", list_to_binary(Node)),
     ok = file:write_file(Node ++ "/authz/fake-authz", list_to_binary(Node)),
     Telemetry = <<"telemetry.enable = false">>,
-    ok = file:write_file(Node ++ "/configs/cluster-override.conf", Telemetry).
+    ok = file:write_file(Node ++ "/configs/cluster.hocon", Telemetry).
 
 set_data_dir_env() ->
     Node = atom_to_list(node()),
@@ -100,14 +100,14 @@ set_data_dir_env() ->
     ok = file:write_file(NewConfigFile, DataDir, [append]),
     application:set_env(emqx, config_files, [NewConfigFile]),
     application:set_env(emqx, data_dir, Node),
-    application:set_env(emqx, cluster_override_conf_file, Node ++ "/configs/cluster-override.conf"),
+    application:set_env(emqx, cluster_override_conf_file, Node ++ "/configs/cluster.hocon"),
     ok.
 
 assert_data_copy_done([First0 | Rest]) ->
     First = atom_to_list(First0),
     {ok, FakeCertFile} = file:read_file(First ++ "/certs/fake-cert"),
     {ok, FakeAuthzFile} = file:read_file(First ++ "/authz/fake-authz"),
-    {ok, FakeOverrideFile} = file:read_file(First ++ "/configs/cluster-override.conf"),
+    {ok, FakeOverrideFile} = file:read_file(First ++ "/configs/cluster.hocon"),
     lists:foreach(
         fun(Node0) ->
             Node = atom_to_list(Node0),
@@ -118,7 +118,7 @@ assert_data_copy_done([First0 | Rest]) ->
             ),
             ?assertEqual(
                 {ok, FakeOverrideFile},
-                file:read_file(Node ++ "/configs/cluster-override.conf"),
+                file:read_file(Node ++ "/configs/cluster.hocon"),
                 #{node => Node}
             ),
             ?assertEqual(
diff --git a/apps/emqx_management/src/emqx_mgmt_api_configs.erl b/apps/emqx_management/src/emqx_mgmt_api_configs.erl
index 55cc50597..56572b41e 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_configs.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_configs.erl
@@ -31,41 +31,23 @@
     global_zone_configs/3
 ]).
 
--export([gen_schema/1]).
-
 -define(PREFIX, "/configs/").
 -define(PREFIX_RESET, "/configs_reset/").
 -define(ERR_MSG(MSG), list_to_binary(io_lib:format("~p", [MSG]))).
 -define(OPTS, #{rawconf_with_defaults => true, override_to => cluster}).
 -define(TAGS, ["Configs"]).
 
--define(EXCLUDES,
-    [
-        <<"exhook">>,
-        <<"gateway">>,
-        <<"plugins">>,
-        <<"bridges">>,
-        <<"rule_engine">>,
-        <<"authorization">>,
-        <<"authentication">>,
-        <<"rpc">>,
-        <<"connectors">>,
-        <<"slow_subs">>,
-        <<"psk_authentication">>,
-        <<"topic_metrics">>,
-        <<"rewrite">>,
-        <<"auto_subscribe">>,
-        <<"retainer">>,
-        <<"statsd">>,
-        <<"delayed">>,
-        <<"event_message">>,
-        <<"prometheus">>,
-        <<"telemetry">>,
-        <<"listeners">>,
-        <<"license">>,
-        <<"api_key">>
-    ] ++ global_zone_roots()
-).
+-define(ROOT_KEYS, [
+    <<"dashboard">>,
+    <<"alarm">>,
+    <<"sys_topics">>,
+    <<"sysmon">>,
+    <<"limiter">>,
+    <<"trace">>,
+    <<"log">>,
+    <<"persistent_session_store">>,
+    <<"zones">>
+]).
 
 api_spec() ->
     emqx_dashboard_swagger:spec(?MODULE, #{check_schema => true}).
@@ -119,7 +101,6 @@ schema("/configs_reset/:rootname") ->
                     "- For a config entry that has default value, this resets it to the default value;\n"
                     "- For a config entry that has no default value, an error 400 will be returned"
                 >>,
-            summary => <<"Reset config entry">>,
             %% We only return "200" rather than the new configs that has been changed, as
             %% the schema of the changed configs is depends on the request parameter
             %% `conf_path`, it cannot be defined here.
@@ -214,12 +195,11 @@ fields(Field) ->
 %%%==============================================================================================
 %% HTTP API Callbacks
 config(get, _Params, Req) ->
+    [Path] = conf_path(Req),
+    {200, get_raw_config(Path)};
+config(put, #{body := NewConf}, Req) ->
     Path = conf_path(Req),
-    {ok, Conf} = emqx_map_lib:deep_find(Path, get_full_config()),
-    {200, Conf};
-config(put, #{body := Body}, Req) ->
-    Path = conf_path(Req),
-    case emqx_conf:update(Path, Body, ?OPTS) of
+    case emqx_conf:update(Path, NewConf, ?OPTS) of
         {ok, #{raw_config := RawConf}} ->
             {200, RawConf};
         {error, {permission_denied, Reason}} ->
@@ -229,28 +209,29 @@ config(put, #{body := Body}, Req) ->
     end.
 
 global_zone_configs(get, _Params, _Req) ->
-    Paths = global_zone_roots(),
-    Zones = lists:foldl(
-        fun(Path, Acc) -> maps:merge(Acc, get_config_with_default(Path)) end,
-        #{},
-        Paths
-    ),
-    {200, Zones};
+    {200, get_zones()};
 global_zone_configs(put, #{body := Body}, _Req) ->
+    PrevZones = get_zones(),
     Res =
         maps:fold(
             fun(Path, Value, Acc) ->
-                case emqx_conf:update([Path], Value, ?OPTS) of
-                    {ok, #{raw_config := RawConf}} ->
-                        Acc#{Path => RawConf};
-                    {error, Reason} ->
-                        ?SLOG(error, #{
-                            msg => "update global zone failed",
-                            reason => Reason,
-                            path => Path,
-                            value => Value
-                        }),
-                        Acc
+                PrevValue = maps:get(Path, PrevZones),
+                case Value =/= PrevValue of
+                    true ->
+                        case emqx_conf:update([Path], Value, ?OPTS) of
+                            {ok, #{raw_config := RawConf}} ->
+                                Acc#{Path => RawConf};
+                            {error, Reason} ->
+                                ?SLOG(error, #{
+                                    msg => "update global zone failed",
+                                    reason => Reason,
+                                    path => Path,
+                                    value => Value
+                                }),
+                                Acc
+                        end;
+                    false ->
+                        Acc#{Path => Value}
                 end
             end,
             #{},
@@ -298,13 +279,30 @@ conf_path_reset(Req) ->
 
 get_full_config() ->
     emqx_config:fill_defaults(
-        maps:without(
-            ?EXCLUDES,
+        maps:with(
+            ?ROOT_KEYS,
             emqx:get_raw_config([])
         ),
         #{obfuscate_sensitive_values => true}
     ).
 
+get_raw_config(Path) ->
+    #{Path := Conf} =
+        emqx_config:fill_defaults(
+            #{Path => emqx:get_raw_config([Path])},
+            #{obfuscate_sensitive_values => true}
+        ),
+    Conf.
+
+get_zones() ->
+    lists:foldl(
+        fun(Path, Acc) ->
+            maps:merge(Acc, get_config_with_default(Path))
+        end,
+        #{},
+        global_zone_roots()
+    ).
+
 get_config_with_default(Path) ->
     emqx_config:fill_defaults(#{Path => emqx:get_raw_config([Path])}).
 
@@ -317,40 +315,12 @@ conf_path_from_querystr(Req) ->
 config_list() ->
     Mod = emqx_conf:schema_module(),
     Roots = hocon_schema:roots(Mod),
-    lists:foldl(fun(Key, Acc) -> lists:keydelete(Key, 1, Acc) end, Roots, ?EXCLUDES).
+    lists:foldl(fun(Key, Acc) -> [lists:keyfind(Key, 1, Roots) | Acc] end, [], ?ROOT_KEYS).
 
 conf_path(Req) ->
     <<"/api/v5", ?PREFIX, Path/binary>> = cowboy_req:path(Req),
     string:lexemes(Path, "/ ").
 
-%% TODO: generate from hocon schema
-gen_schema(Conf) when is_boolean(Conf) ->
-    with_default_value(#{type => boolean}, Conf);
-gen_schema(Conf) when is_binary(Conf); is_atom(Conf) ->
-    with_default_value(#{type => string}, Conf);
-gen_schema(Conf) when is_number(Conf) ->
-    with_default_value(#{type => number}, Conf);
-gen_schema(Conf) when is_list(Conf) ->
-    case io_lib:printable_unicode_list(Conf) of
-        true ->
-            gen_schema(unicode:characters_to_binary(Conf));
-        false ->
-            #{type => array, items => gen_schema(hd(Conf))}
-    end;
-gen_schema(Conf) when is_map(Conf) ->
-    #{
-        type => object,
-        properties =>
-            maps:map(fun(_K, V) -> gen_schema(V) end, Conf)
-    };
-gen_schema(_Conf) ->
-    %% the conf is not of JSON supported type, it may have been converted
-    %% by the hocon schema
-    #{type => string}.
-
-with_default_value(Type, Value) ->
-    Type#{example => emqx_map_lib:binary_string(Value)}.
-
 global_zone_roots() ->
     lists:map(fun({K, _}) -> K end, global_zone_schema()).
 
diff --git a/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
index 2d24bce99..f5ee4e5be 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
@@ -55,12 +55,17 @@ t_update(_Config) ->
     %% update ok
     {ok, SysMon} = get_config(<<"sysmon">>),
     #{<<"vm">> := #{<<"busy_port">> := BusyPort}} = SysMon,
-    NewSysMon = emqx_map_lib:deep_put([<<"vm">>, <<"busy_port">>], SysMon, not BusyPort),
+    NewSysMon = #{<<"vm">> => #{<<"busy_port">> => not BusyPort}},
     {ok, #{}} = update_config(<<"sysmon">>, NewSysMon),
     {ok, SysMon1} = get_config(<<"sysmon">>),
     #{<<"vm">> := #{<<"busy_port">> := BusyPort1}} = SysMon1,
     ?assertEqual(BusyPort, not BusyPort1),
     assert_busy_port(BusyPort1),
+    %% Make sure the override config is updated, and remove the default value.
+    ?assertEqual(
+        #{<<"vm">> => #{<<"busy_port">> => BusyPort1}},
+        maps:get(<<"sysmon">>, emqx_config:read_override_conf(#{override_to => cluster}))
+    ),
 
     %% update failed
     ErrorSysMon = emqx_map_lib:deep_put([<<"vm">>, <<"busy_port">>], SysMon, "123"),
@@ -130,6 +135,8 @@ t_global_zone(_Config) ->
     NewZones = emqx_map_lib:deep_put([<<"mqtt">>, <<"max_qos_allowed">>], Zones, 1),
     {ok, #{}} = update_global_zone(NewZones),
     ?assertEqual(1, emqx_config:get_zone_conf(no_default, [mqtt, max_qos_allowed])),
+    %% Make sure the override config is updated, and remove the default value.
+    ?assertEqual(#{<<"max_qos_allowed">> => 1}, read_conf(<<"mqtt">>)),
 
     BadZones = emqx_map_lib:deep_put([<<"mqtt">>, <<"max_qos_allowed">>], Zones, 3),
     ?assertMatch({error, {"HTTP/1.1", 400, _}}, update_global_zone(BadZones)),
@@ -145,6 +152,10 @@ t_global_zone(_Config) ->
     %% the default value is 2
     ?assertEqual(2, emqx_map_lib:deep_get([<<"max_qos_allowed">>], Mqtt3)),
     ok = emqx_config:put_raw([<<"mqtt">>], Mqtt0),
+
+    DefaultZones = emqx_map_lib:deep_put([<<"mqtt">>, <<"max_qos_allowed">>], Zones, 2),
+    {ok, #{}} = update_global_zone(DefaultZones),
+    ?assertEqual(undefined, read_conf(<<"mqtt">>)),
     ok.
 
 get_global_zone() ->
@@ -169,7 +180,7 @@ t_dashboard(_Config) ->
     Https1 = #{enable => true, bind => 18084},
     ?assertMatch(
         {error, {"HTTP/1.1", 400, _}},
-        update_config("dashboard", Dashboard#{<<"https">> => Https1})
+        update_config("dashboard", Dashboard#{<<"listeners">> => Listeners#{<<"https">> => Https1}})
     ),
 
     Https2 = #{
@@ -179,35 +190,41 @@ t_dashboard(_Config) ->
         cacertfile => "etc/certs/badcacert.pem",
         certfile => "etc/certs/badcert.pem"
     },
-    Dashboard2 = Dashboard#{listeners => Listeners#{https => Https2}},
+    Dashboard2 = Dashboard#{<<"listeners">> => Listeners#{<<"https">> => Https2}},
     ?assertMatch(
         {error, {"HTTP/1.1", 400, _}},
         update_config("dashboard", Dashboard2)
     ),
 
-    Keyfile = emqx_common_test_helpers:app_path(emqx, filename:join(["etc", "certs", "key.pem"])),
-    Certfile = emqx_common_test_helpers:app_path(emqx, filename:join(["etc", "certs", "cert.pem"])),
-    Cacertfile = emqx_common_test_helpers:app_path(
+    KeyFile = emqx_common_test_helpers:app_path(emqx, filename:join(["etc", "certs", "key.pem"])),
+    CertFile = emqx_common_test_helpers:app_path(emqx, filename:join(["etc", "certs", "cert.pem"])),
+    CacertFile = emqx_common_test_helpers:app_path(
         emqx, filename:join(["etc", "certs", "cacert.pem"])
     ),
     Https3 = #{
-        enable => true,
-        bind => 18084,
-        keyfile => Keyfile,
-        cacertfile => Cacertfile,
-        certfile => Certfile
+        <<"enable">> => true,
+        <<"bind">> => 18084,
+        <<"keyfile">> => list_to_binary(KeyFile),
+        <<"cacertfile">> => list_to_binary(CacertFile),
+        <<"certfile">> => list_to_binary(CertFile)
     },
-    Dashboard3 = Dashboard#{listeners => Listeners#{https => Https3}},
+    Dashboard3 = Dashboard#{<<"listeners">> => Listeners#{<<"https">> => Https3}},
     ?assertMatch({ok, _}, update_config("dashboard", Dashboard3)),
 
-    Dashboard4 = Dashboard#{listeners => Listeners#{https => #{enable => false}}},
+    Dashboard4 = Dashboard#{<<"listeners">> => Listeners#{<<"https">> => #{<<"enable">> => false}}},
     ?assertMatch({ok, _}, update_config("dashboard", Dashboard4)),
+    {ok, Dashboard41} = get_config("dashboard"),
+    ?assertEqual(
+        Https3#{<<"enable">> => false},
+        read_conf([<<"dashboard">>, <<"listeners">>, <<"https">>]),
+        Dashboard41
+    ),
 
     ?assertMatch({ok, _}, update_config("dashboard", Dashboard)),
 
     {ok, Dashboard1} = get_config("dashboard"),
     ?assertNotEqual(Dashboard, Dashboard1),
-    timer:sleep(1000),
+    timer:sleep(1500),
     ok.
 
 t_configs_node({'init', Config}) ->
@@ -288,3 +305,11 @@ reset_config(Name, Key) ->
         {ok, []} -> ok;
         Error -> Error
     end.
+
+read_conf(RootKeys) when is_list(RootKeys) ->
+    case emqx_config:read_override_conf(#{override_to => cluster}) of
+        undefined -> undefined;
+        Conf -> emqx_map_lib:deep_get(RootKeys, Conf, undefined)
+    end;
+read_conf(RootKey) ->
+    read_conf([RootKey]).

From 5f4ea3b6d8621ac667b7af121fac452617cea6c7 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Fri, 7 Apr 2023 09:17:54 +0800
Subject: [PATCH 076/110] feat: deprecated cluster-override.conf

---
 apps/emqx/src/emqx_config.erl           | 142 ++++++++++++++++--------
 apps/emqx_conf/src/emqx_conf_app.erl    |  29 +++--
 apps/emqx_conf/src/emqx_conf_schema.erl |  16 ++-
 3 files changed, 127 insertions(+), 60 deletions(-)

diff --git a/apps/emqx/src/emqx_config.erl b/apps/emqx/src/emqx_config.erl
index 41e38f184..68a8563d8 100644
--- a/apps/emqx/src/emqx_config.erl
+++ b/apps/emqx/src/emqx_config.erl
@@ -24,6 +24,7 @@
     init_load/2,
     init_load/3,
     read_override_conf/1,
+    has_deprecated_conf/0,
     delete_override_conf_files/0,
     check_config/2,
     fill_defaults/1,
@@ -32,7 +33,7 @@
     save_configs/6,
     save_to_app_env/1,
     save_to_config_map/2,
-    save_to_override_conf/2
+    save_to_override_conf/3
 ]).
 -export([raw_conf_with_default/4]).
 -export([remove_default_conf/2]).
@@ -331,14 +332,35 @@ init_load(SchemaMod, Conf, Opts) when is_list(Conf) orelse is_binary(Conf) ->
     init_load(SchemaMod, parse_hocon(Conf), Opts);
 init_load(SchemaMod, RawConf, Opts) when is_map(RawConf) ->
     ok = save_schema_mod_and_names(SchemaMod),
-    RootNames = get_root_names(),
-    %% Merge environment variable overrides on top
-    RawConfWithEnvs = merge_envs(SchemaMod, RawConf),
-    RawConfAll = raw_conf_with_default(SchemaMod, RootNames, RawConfWithEnvs, Opts),
-    %% check configs against the schema
-    {AppEnvs, CheckedConf} = check_config(SchemaMod, RawConfAll, #{}),
-    save_to_app_env(AppEnvs),
-    ok = save_to_config_map(CheckedConf, RawConfAll).
+    case has_deprecated_conf() of
+        false ->
+            RootNames = get_root_names(),
+            %% Merge environment variable overrides on top
+            RawConfWithEnvs = merge_envs(SchemaMod, RawConf),
+            RawConfAll = raw_conf_with_default(SchemaMod, RootNames, RawConfWithEnvs, Opts),
+            %% check configs against the schema
+            {AppEnvs, CheckedConf} = check_config(SchemaMod, RawConfAll, #{}),
+            save_to_app_env(AppEnvs),
+            ok = save_to_config_map(CheckedConf, RawConfAll);
+        true ->
+            %% deprecated conf will be removed in 5.1
+            %% Merge environment variable overrides on top
+            RawConfWithEnvs = merge_envs(SchemaMod, RawConf),
+            Overrides = read_override_confs(),
+            RawConfWithOverrides = hocon:deep_merge(RawConfWithEnvs, Overrides),
+            RootNames = get_root_names(),
+            RawConfAll = raw_conf_with_default(SchemaMod, RootNames, RawConfWithOverrides, Opts),
+            %% check configs against the schema
+            {AppEnvs, CheckedConf} = check_config(SchemaMod, RawConfAll, #{}),
+            save_to_app_env(AppEnvs),
+            ok = save_to_config_map(CheckedConf, RawConfAll)
+    end.
+
+%% @doc Read merged cluster + local overrides.
+read_override_confs() ->
+    ClusterOverrides = read_override_conf(#{override_to => cluster}),
+    LocalOverrides = read_override_conf(#{override_to => local}),
+    hocon:deep_merge(ClusterOverrides, LocalOverrides).
 
 %% keep the raw and non-raw conf has the same keys to make update raw conf easier.
 raw_conf_with_default(SchemaMod, RootNames, RawConf, #{raw_with_default := true}) ->
@@ -369,11 +391,9 @@ schema_default(Schema) ->
     end.
 
 parse_hocon(Conf) ->
-    %% merge cluster-override.conf to local-override.conf
-    %% cluster-override.conf is deprecated, now is cluster.conf
-    merge_deprecated_cluster_override_to_local_override(),
+    HasDeprecatedConf = has_deprecated_conf(),
     IncDirs = include_dirs(),
-    case do_parse_hocon(Conf, IncDirs) of
+    case do_parse_hocon(HasDeprecatedConf, Conf, IncDirs) of
         {ok, HoconMap} ->
             HoconMap;
         {error, Reason} ->
@@ -387,14 +407,20 @@ parse_hocon(Conf) ->
             error(failed_to_load_hocon_conf)
     end.
 
-do_parse_hocon(Conf, IncDirs) ->
+do_parse_hocon(true, Conf, IncDirs) ->
+    Opts = #{format => map, include_dirs => IncDirs},
+    case is_binary(Conf) of
+        true -> hocon:binary(Conf, Opts);
+        false -> hocon:files(Conf, Opts)
+    end;
+do_parse_hocon(false, Conf, IncDirs) ->
     Opts = #{format => map, include_dirs => IncDirs},
     case is_binary(Conf) of
         true ->
             hocon:binary(Conf, Opts);
         false ->
-            LocalFile = override_conf_file(#{override_to => local}),
-            ClusterFile = override_conf_file(#{override_to => cluster}),
+            LocalFile = deprecated_override_conf_file(#{override_to => local}),
+            ClusterFile = deprecated_override_conf_file(#{override_to => cluster}),
             hocon:files([ClusterFile] ++ Conf ++ [LocalFile], Opts)
     end.
 
@@ -467,10 +493,14 @@ fill_defaults(SchemaMod, RawConf, Opts0) ->
 %% Delete override config files.
 -spec delete_override_conf_files() -> ok.
 delete_override_conf_files() ->
-    F1 = override_conf_file(#{override_to => local}),
-    F2 = override_conf_file(#{override_to => cluster}),
+    F1 = deprecated_override_conf_file(#{override_to => local}),
+    F2 = deprecated_override_conf_file(#{override_to => cluster}),
+    F3 = conf_file(#{override_to => local}),
+    F4 = conf_file(#{override_to => cluster}),
     ok = ensure_file_deleted(F1),
-    ok = ensure_file_deleted(F2).
+    ok = ensure_file_deleted(F2),
+    ok = ensure_file_deleted(F3),
+    ok = ensure_file_deleted(F4).
 
 ensure_file_deleted(F) ->
     case file:delete(F) of
@@ -481,24 +511,39 @@ ensure_file_deleted(F) ->
 
 -spec read_override_conf(map()) -> raw_config().
 read_override_conf(#{} = Opts) ->
-    File = override_conf_file(Opts),
+    File =
+        case has_deprecated_conf() of
+            true -> deprecated_override_conf_file(Opts);
+            false -> conf_file(Opts)
+        end,
     load_hocon_file(File, map).
 
-read_deprecated_override_conf() ->
-    ClusterFile = override_conf_file(#{override_to => cluster}),
-    DeprecatedFile = filename:join(filename:dirname(ClusterFile), "cluster-override.conf"),
-    Conf = load_hocon_file(DeprecatedFile, map),
-    _ = file:delete(DeprecatedFile),
-    Conf.
+has_deprecated_conf() ->
+    DeprecatedFile = deprecated_cluster_conf_file(),
+    filelib:is_regular(DeprecatedFile).
 
-override_conf_file(Opts) when is_map(Opts) ->
+deprecated_cluster_conf_file() ->
+    ClusterFile = deprecated_override_conf_file(#{override_to => cluster}),
+    filename:join(filename:dirname(ClusterFile), "cluster-override.conf").
+
+deprecated_override_conf_file(Opts) when is_map(Opts) ->
     Key =
         case maps:get(override_to, Opts, cluster) of
             local -> local_override_conf_file;
             cluster -> cluster_override_conf_file
         end,
     application:get_env(emqx, Key, undefined);
-override_conf_file(Which) when is_atom(Which) ->
+deprecated_override_conf_file(Which) when is_atom(Which) ->
+    application:get_env(emqx, Which, undefined).
+
+conf_file(Opts) when is_map(Opts) ->
+    Key =
+        case maps:get(override_to, Opts, cluster) of
+            local -> local_conf_file;
+            cluster -> cluster_conf_file
+        end,
+    application:get_env(emqx, Key, undefined);
+conf_file(Which) when is_atom(Which) ->
     application:get_env(emqx, Which, undefined).
 
 -spec save_schema_mod_and_names(module()) -> ok.
@@ -539,7 +584,8 @@ save_configs(Paths0, AppEnvs, Conf, RawConf, OverrideConf, Opts) ->
     OverrideConf1 = remove_default_conf(OverrideConf, Default),
     %% We first try to save to files, because saving to files is more error prone
     %% than saving into memory.
-    ok = save_to_override_conf(OverrideConf1, Opts),
+    HasDeprecated = has_deprecated_conf(),
+    ok = save_to_override_conf(HasDeprecated, OverrideConf1, Opts),
     save_to_app_env(AppEnvs),
     save_to_config_map(Conf, RawConf).
 
@@ -592,11 +638,12 @@ save_to_config_map(Conf, RawConf) ->
     ?MODULE:put(Conf),
     ?MODULE:put_raw(RawConf).
 
--spec save_to_override_conf(raw_config(), update_opts()) -> ok | {error, term()}.
-save_to_override_conf(undefined, _) ->
+-spec save_to_override_conf(boolean(), raw_config(), update_opts()) -> ok | {error, term()}.
+save_to_override_conf(_, undefined, _) ->
     ok;
-save_to_override_conf(RawConf, Opts) ->
-    case override_conf_file(Opts) of
+%% TODO: Remove deprecated override conf file when 5.1
+save_to_override_conf(true, RawConf, Opts) ->
+    case deprecated_override_conf_file(Opts) of
         undefined ->
             ok;
         FileName ->
@@ -612,6 +659,24 @@ save_to_override_conf(RawConf, Opts) ->
                     }),
                     {error, Reason}
             end
+    end;
+save_to_override_conf(false, RawConf, Opts) ->
+    case conf_file(Opts) of
+        undefined ->
+            ok;
+        FileName ->
+            ok = filelib:ensure_dir(FileName),
+            case file:write_file(FileName, hocon_pp:do(RawConf, #{})) of
+                ok ->
+                    ok;
+                {error, Reason} ->
+                    ?SLOG(error, #{
+                        msg => "failed_to_save_conf_file",
+                        filename => FileName,
+                        reason => Reason
+                    }),
+                    {error, Reason}
+            end
     end.
 
 add_handlers() ->
@@ -758,17 +823,6 @@ atom_conf_path(Path, ExpFun, OnFail) ->
             end
     end.
 
-merge_deprecated_cluster_override_to_local_override() ->
-    case read_deprecated_override_conf() of
-        DeprecatedConf when DeprecatedConf =/= #{} ->
-            LocalOverrides = read_override_conf(#{override_to => local}),
-            MergedConf = hocon:deep_merge(LocalOverrides, DeprecatedConf),
-            _ = save_to_override_conf(MergedConf, #{override_to => local}),
-            ok;
-        _ ->
-            ok
-    end.
-
 -ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
 
diff --git a/apps/emqx_conf/src/emqx_conf_app.erl b/apps/emqx_conf/src/emqx_conf_app.erl
index 51fc5c2e2..45631619b 100644
--- a/apps/emqx_conf/src/emqx_conf_app.erl
+++ b/apps/emqx_conf/src/emqx_conf_app.erl
@@ -60,7 +60,14 @@ get_override_config_file() ->
                         TnxId = emqx_cluster_rpc:get_node_tnx_id(Node),
                         WallClock = erlang:statistics(wall_clock),
                         Conf = emqx_config_handler:get_raw_cluster_override_conf(),
-                        #{wall_clock => WallClock, conf => Conf, tnx_id => TnxId, node => Node}
+                        HasDeprecateConf = emqx_config:has_deprecated_conf(),
+                        #{
+                            wall_clock => WallClock,
+                            conf => Conf,
+                            tnx_id => TnxId,
+                            node => Node,
+                            has_deprecated_conf => HasDeprecateConf
+                        }
                     end,
                     case mria:ro_transaction(?CLUSTER_RPC_SHARD, Fun) of
                         {atomic, Res} -> {ok, Res};
@@ -153,10 +160,10 @@ copy_override_conf_from_core_node() ->
                             {ok, ?DEFAULT_INIT_TXN_ID};
                         false ->
                             %% retry in some time
-                            Jitter = rand:uniform(2_000),
-                            Timeout = 10_000 + Jitter,
+                            Jitter = rand:uniform(2000),
+                            Timeout = 10000 + Jitter,
                             ?SLOG(info, #{
-                                msg => "copy_override_conf_from_core_node_retry",
+                                msg => "copy_cluster_conf_from_core_node_retry",
                                 timeout => Timeout,
                                 nodes => Nodes,
                                 failed => Failed,
@@ -168,18 +175,16 @@ copy_override_conf_from_core_node() ->
                 _ ->
                     [{ok, Info} | _] = lists:sort(fun conf_sort/2, Ready),
                     #{node := Node, conf := RawOverrideConf, tnx_id := TnxId} = Info,
+                    HasDeprecatedConf = maps:get(has_deprecated_conf, Info, false),
                     ?SLOG(debug, #{
-                        msg => "copy_override_conf_from_core_node_success",
+                        msg => "copy_cluster_conf_from_core_node_success",
                         node => Node,
-                        cluster_override_conf_file => application:get_env(
-                            emqx, cluster_override_conf_file
-                        ),
-                        local_override_conf_file => application:get_env(
-                            emqx, local_override_conf_file
-                        ),
-                        data_dir => emqx:data_dir()
+                        has_deprecated_conf => HasDeprecatedConf,
+                        data_dir => emqx:data_dir(),
+                        tnx_id => TnxId
                     }),
                     ok = emqx_config:save_to_override_conf(
+                        HasDeprecatedConf,
                         RawOverrideConf,
                         #{override_to => cluster}
                     ),
diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl
index ed246b4ae..a67d2a100 100644
--- a/apps/emqx_conf/src/emqx_conf_schema.erl
+++ b/apps/emqx_conf/src/emqx_conf_schema.erl
@@ -1028,7 +1028,9 @@ translation("emqx") ->
     [
         {"config_files", fun tr_config_files/1},
         {"cluster_override_conf_file", fun tr_cluster_override_conf_file/1},
-        {"local_override_conf_file", fun tr_local_override_conf_file/1}
+        {"local_override_conf_file", fun tr_local_override_conf_file/1},
+        {"cluster_conf_file", fun tr_cluster_conf_file/1},
+        {"local_conf_file", fun tr_local_conf_file/1}
     ];
 translation("gen_rpc") ->
     [{"default_client_driver", fun tr_default_config_driver/1}];
@@ -1076,12 +1078,18 @@ tr_config_files(_Conf) ->
     end.
 
 tr_cluster_override_conf_file(Conf) ->
-    tr_override_conf_file(Conf, "cluster.conf").
+    tr_conf_file(Conf, "cluster-override.conf").
 
 tr_local_override_conf_file(Conf) ->
-    tr_override_conf_file(Conf, "local.conf").
+    tr_conf_file(Conf, "local-overide.conf").
 
-tr_override_conf_file(Conf, Filename) ->
+tr_cluster_conf_file(Conf) ->
+    tr_conf_file(Conf, "cluster.hocon").
+
+tr_local_conf_file(Conf) ->
+    tr_conf_file(Conf, "local.hocon").
+
+tr_conf_file(Conf, Filename) ->
     DataDir = conf_get("node.data_dir", Conf),
     %% assert, this config is not nullable
     [_ | _] = DataDir,

From a271ba5ff9ec53741a9f3ac85dd46fe6bc9e4bae Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Mon, 10 Apr 2023 14:52:49 +0800
Subject: [PATCH 077/110] feat: don't check_permission on local.conf

---
 apps/emqx/src/emqx_config_handler.erl        | 117 +------------------
 apps/emqx/test/emqx_config_handler_SUITE.erl |  49 --------
 2 files changed, 5 insertions(+), 161 deletions(-)

diff --git a/apps/emqx/src/emqx_config_handler.erl b/apps/emqx/src/emqx_config_handler.erl
index ee22c297e..3e18a172e 100644
--- a/apps/emqx/src/emqx_config_handler.erl
+++ b/apps/emqx/src/emqx_config_handler.erl
@@ -43,7 +43,6 @@
     terminate/2,
     code_change/3
 ]).
--export([is_mutable/3]).
 
 -define(MOD, {mod}).
 -define(WKEY, '?').
@@ -230,26 +229,15 @@ process_update_request([_], _Handlers, {remove, _Opts}) ->
 process_update_request(ConfKeyPath, _Handlers, {remove, Opts}) ->
     OldRawConf = emqx_config:get_root_raw(ConfKeyPath),
     BinKeyPath = bin_path(ConfKeyPath),
-    case check_permissions(remove, BinKeyPath, OldRawConf, Opts) of
-        allow ->
-            NewRawConf = emqx_map_lib:deep_remove(BinKeyPath, OldRawConf),
-            OverrideConf = remove_from_override_config(BinKeyPath, Opts),
-            {ok, NewRawConf, OverrideConf, Opts};
-        {deny, Reason} ->
-            {error, {permission_denied, Reason}}
-    end;
+    NewRawConf = emqx_map_lib:deep_remove(BinKeyPath, OldRawConf),
+    OverrideConf = remove_from_override_config(BinKeyPath, Opts),
+    {ok, NewRawConf, OverrideConf, Opts};
 process_update_request(ConfKeyPath, Handlers, {{update, UpdateReq}, Opts}) ->
     OldRawConf = emqx_config:get_root_raw(ConfKeyPath),
     case do_update_config(ConfKeyPath, Handlers, OldRawConf, UpdateReq) of
         {ok, NewRawConf} ->
-            BinKeyPath = bin_path(ConfKeyPath),
-            case check_permissions(update, BinKeyPath, NewRawConf, Opts) of
-                allow ->
-                    OverrideConf = merge_to_override_config(NewRawConf, Opts),
-                    {ok, NewRawConf, OverrideConf, Opts};
-                {deny, Reason} ->
-                    {error, {permission_denied, Reason}}
-            end;
+            OverrideConf = merge_to_override_config(NewRawConf, Opts),
+            {ok, NewRawConf, OverrideConf, Opts};
         Error ->
             Error
     end.
@@ -550,98 +538,3 @@ load_prev_handlers() ->
 
 save_handlers(Handlers) ->
     application:set_env(emqx, ?MODULE, Handlers).
-
-check_permissions(_Action, _ConfKeyPath, _NewRawConf, #{override_to := local}) ->
-    allow;
-check_permissions(Action, ConfKeyPath, NewRawConf, _Opts) ->
-    case emqx_map_lib:deep_find(ConfKeyPath, NewRawConf) of
-        {ok, NewRaw} ->
-            LocalOverride = emqx_config:read_override_conf(#{override_to => local}),
-            case emqx_map_lib:deep_find(ConfKeyPath, LocalOverride) of
-                {ok, LocalRaw} ->
-                    case is_mutable(Action, NewRaw, LocalRaw) of
-                        ok ->
-                            allow;
-                        {error, Error} ->
-                            ?SLOG(error, #{
-                                msg => "prevent_remove_local_conf",
-                                config_key_path => ConfKeyPath,
-                                error => Error
-                            }),
-                            {deny, "Disable changed from local conf"}
-                    end;
-                {not_found, _, _} ->
-                    allow
-            end;
-        {not_found, _, _} ->
-            allow
-    end.
-
-is_mutable(Action, NewRaw, LocalRaw) ->
-    try
-        KeyPath = [],
-        is_mutable(KeyPath, Action, NewRaw, LocalRaw)
-    catch
-        throw:Error -> Error
-    end.
-
--define(REMOVE_FAILED, "remove_failed").
--define(UPDATE_FAILED, "update_failed").
-
-is_mutable(KeyPath, Action, New = #{}, Local = #{}) ->
-    maps:foreach(
-        fun(Key, SubLocal) ->
-            case maps:find(Key, New) of
-                error -> ok;
-                {ok, SubNew} -> is_mutable(KeyPath ++ [Key], Action, SubNew, SubLocal)
-            end
-        end,
-        Local
-    );
-is_mutable(KeyPath, remove, Update, Origin) ->
-    throw({error, {?REMOVE_FAILED, KeyPath, Update, Origin}});
-is_mutable(_KeyPath, update, Val, Val) ->
-    ok;
-is_mutable(KeyPath, update, Update, Origin) ->
-    throw({error, {?UPDATE_FAILED, KeyPath, Update, Origin}}).
-
--ifdef(TEST).
--include_lib("eunit/include/eunit.hrl").
-
-is_mutable_update_test() ->
-    Action = update,
-    ?assertEqual(ok, is_mutable(Action, #{}, #{})),
-    ?assertEqual(ok, is_mutable(Action, #{a => #{b => #{c => #{}}}}, #{a => #{b => #{c => #{}}}})),
-    ?assertEqual(ok, is_mutable(Action, #{a => #{b => #{c => 1}}}, #{a => #{b => #{c => 1}}})),
-    ?assertEqual(
-        {error, {?UPDATE_FAILED, [a, b, c], 1, 2}},
-        is_mutable(Action, #{a => #{b => #{c => 1}}}, #{a => #{b => #{c => 2}}})
-    ),
-    ?assertEqual(
-        {error, {?UPDATE_FAILED, [a, b, d], 2, 3}},
-        is_mutable(Action, #{a => #{b => #{c => 1, d => 2}}}, #{a => #{b => #{c => 1, d => 3}}})
-    ),
-    ok.
-
-is_mutable_remove_test() ->
-    Action = remove,
-    ?assertEqual(ok, is_mutable(Action, #{}, #{})),
-    ?assertEqual(ok, is_mutable(Action, #{a => #{b => #{c => #{}}}}, #{a1 => #{b => #{c => #{}}}})),
-    ?assertEqual(ok, is_mutable(Action, #{a => #{b => #{c => 1}}}, #{a => #{b1 => #{c => 1}}})),
-    ?assertEqual(ok, is_mutable(Action, #{a => #{b => #{c => 1}}}, #{a => #{b => #{c1 => 1}}})),
-
-    ?assertEqual(
-        {error, {?REMOVE_FAILED, [a, b, c], 1, 1}},
-        is_mutable(Action, #{a => #{b => #{c => 1}}}, #{a => #{b => #{c => 1}}})
-    ),
-    ?assertEqual(
-        {error, {?REMOVE_FAILED, [a, b, c], 1, 2}},
-        is_mutable(Action, #{a => #{b => #{c => 1}}}, #{a => #{b => #{c => 2}}})
-    ),
-    ?assertEqual(
-        {error, {?REMOVE_FAILED, [a, b, c], 1, 1}},
-        is_mutable(Action, #{a => #{b => #{c => 1, d => 2}}}, #{a => #{b => #{c => 1, d => 3}}})
-    ),
-    ok.
-
--endif.
diff --git a/apps/emqx/test/emqx_config_handler_SUITE.erl b/apps/emqx/test/emqx_config_handler_SUITE.erl
index 6e2dbfef1..cea956825 100644
--- a/apps/emqx/test/emqx_config_handler_SUITE.erl
+++ b/apps/emqx/test/emqx_config_handler_SUITE.erl
@@ -200,55 +200,6 @@ t_sub_key_update_remove(_Config) ->
     ok = emqx_config_handler:remove_handler(KeyPath2),
     ok.
 
-t_local_override_update_remove(_Config) ->
-    application:set_env(emqx, local_override_conf_file, ?LOCAL_CONF),
-    application:set_env(emqx, cluster_override_conf_file, ?CLUSTER_CONF),
-    KeyPath = [sysmon, os, cpu_high_watermark],
-    ok = emqx_config_handler:add_handler(KeyPath, ?MODULE),
-    LocalOpts = #{override_to => local},
-    {ok, Res} = emqx:update_config(KeyPath, <<"70%">>, LocalOpts),
-    ?assertMatch(
-        #{
-            config := 0.7,
-            post_config_update := #{},
-            raw_config := <<"70%">>
-        },
-        Res
-    ),
-    ClusterOpts = #{override_to => cluster},
-    ?assertMatch(
-        {error, {permission_denied, _}}, emqx:update_config(KeyPath, <<"71%">>, ClusterOpts)
-    ),
-    ?assertMatch(0.7, emqx:get_config(KeyPath)),
-
-    %% remove
-    ?assertMatch({error, {permission_denied, _}}, emqx:remove_config(KeyPath)),
-    ?assertEqual(
-        {ok, #{post_config_update => #{}}},
-        emqx:remove_config(KeyPath, #{override_to => local})
-    ),
-    ?assertEqual(
-        {ok, #{post_config_update => #{}}},
-        emqx:remove_config(KeyPath)
-    ),
-    ?assertError({config_not_found, KeyPath}, emqx:get_raw_config(KeyPath)),
-    OSKey = maps:keys(emqx:get_raw_config([sysmon, os])),
-    ?assertEqual(false, lists:member(<<"cpu_high_watermark">>, OSKey)),
-    ?assert(length(OSKey) > 0),
-
-    ?assertEqual(
-        {ok, #{config => 0.8, post_config_update => #{}, raw_config => <<"80%">>}},
-        emqx:reset_config(KeyPath, ClusterOpts)
-    ),
-    OSKey1 = maps:keys(emqx:get_raw_config([sysmon, os])),
-    ?assertEqual(true, lists:member(<<"cpu_high_watermark">>, OSKey1)),
-    ?assert(length(OSKey1) > 1),
-
-    ok = emqx_config_handler:remove_handler(KeyPath),
-    application:unset_env(emqx, local_override_conf_file),
-    application:unset_env(emqx, cluster_override_conf_file),
-    ok.
-
 t_check_failed(_Config) ->
     KeyPath = [sysmon, os, cpu_check_interval],
     Opts = #{rawconf_with_defaults => true},

From 7f870257b2e29484e82d0281ebc3ffa9eb9e8fe9 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Mon, 10 Apr 2023 17:26:17 +0800
Subject: [PATCH 078/110] test: fix failed ct

---
 apps/emqx_conf/test/emqx_conf_app_SUITE.erl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/emqx_conf/test/emqx_conf_app_SUITE.erl b/apps/emqx_conf/test/emqx_conf_app_SUITE.erl
index eb67490bc..e6b15ad13 100644
--- a/apps/emqx_conf/test/emqx_conf_app_SUITE.erl
+++ b/apps/emqx_conf/test/emqx_conf_app_SUITE.erl
@@ -100,7 +100,7 @@ set_data_dir_env() ->
     ok = file:write_file(NewConfigFile, DataDir, [append]),
     application:set_env(emqx, config_files, [NewConfigFile]),
     application:set_env(emqx, data_dir, Node),
-    application:set_env(emqx, cluster_override_conf_file, Node ++ "/configs/cluster.hocon"),
+    application:set_env(emqx, cluster_conf_file, Node ++ "/configs/cluster.hocon"),
     ok.
 
 assert_data_copy_done([First0 | Rest]) ->
@@ -108,6 +108,7 @@ assert_data_copy_done([First0 | Rest]) ->
     {ok, FakeCertFile} = file:read_file(First ++ "/certs/fake-cert"),
     {ok, FakeAuthzFile} = file:read_file(First ++ "/authz/fake-authz"),
     {ok, FakeOverrideFile} = file:read_file(First ++ "/configs/cluster.hocon"),
+    {ok, ExpectFake} = hocon:binary(FakeOverrideFile),
     lists:foreach(
         fun(Node0) ->
             Node = atom_to_list(Node0),
@@ -117,8 +118,8 @@ assert_data_copy_done([First0 | Rest]) ->
                 #{node => Node}
             ),
             ?assertEqual(
-                {ok, FakeOverrideFile},
-                file:read_file(Node ++ "/configs/cluster.hocon"),
+                {ok, ExpectFake},
+                hocon:files([Node ++ "/configs/cluster.hocon"]),
                 #{node => Node}
             ),
             ?assertEqual(

From fa753cf333664b04d0a1ed60c68328027a43f477 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Thu, 13 Apr 2023 14:25:44 +0800
Subject: [PATCH 079/110] fix: failed ct test

---
 apps/emqx_conf/test/emqx_conf_app_SUITE.erl | 53 +++++++++++++++++----
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/apps/emqx_conf/test/emqx_conf_app_SUITE.erl b/apps/emqx_conf/test/emqx_conf_app_SUITE.erl
index e6b15ad13..21e22519e 100644
--- a/apps/emqx_conf/test/emqx_conf_app_SUITE.erl
+++ b/apps/emqx_conf/test/emqx_conf_app_SUITE.erl
@@ -27,7 +27,7 @@ all() ->
 t_copy_conf_override_on_restarts(_Config) ->
     ct:timetrap({seconds, 120}),
     snabbkaffe:fix_ct_logging(),
-    Cluster = cluster([core, core, core]),
+    Cluster = cluster([cluster_spec({core, 1}), cluster_spec({core, 2}), cluster_spec({core, 3})]),
 
     %% 1. Start all nodes
     Nodes = start_cluster(Cluster),
@@ -41,7 +41,7 @@ t_copy_conf_override_on_restarts(_Config) ->
         %% crash and eventually all nodes should be ready.
         start_cluster_async(Cluster),
 
-        timer:sleep(15_000),
+        timer:sleep(15000),
 
         assert_config_load_done(Nodes),
 
@@ -50,11 +50,11 @@ t_copy_conf_override_on_restarts(_Config) ->
         stop_cluster(Nodes)
     end.
 
-t_copy_data_dir(_Config) ->
+t_copy_new_data_dir(_Config) ->
     net_kernel:start(['master1@127.0.0.1', longnames]),
     ct:timetrap({seconds, 120}),
     snabbkaffe:fix_ct_logging(),
-    Cluster = cluster([{core, copy1}, {core, copy2}, {core, copy3}]),
+    Cluster = cluster([cluster_spec({core, 4}), cluster_spec({core, 5}), cluster_spec({core, 6})]),
 
     %% 1. Start all nodes
     [First | Rest] = Nodes = start_cluster(Cluster),
@@ -66,7 +66,30 @@ t_copy_data_dir(_Config) ->
         ok = rpc:call(First, application, start, [emqx_conf]),
         {[ok, ok], []} = rpc:multicall(Rest, application, start, [emqx_conf]),
 
-        assert_data_copy_done(Nodes),
+        assert_data_copy_done(Nodes, "/configs/cluster.hocon"),
+        stop_cluster(Nodes),
+        ok
+    after
+        stop_cluster(Nodes)
+    end.
+
+t_copy_deprecated_data_dir(_Config) ->
+    net_kernel:start(['master2@127.0.0.1', longnames]),
+    ct:timetrap({seconds, 120}),
+    snabbkaffe:fix_ct_logging(),
+    Cluster = cluster([cluster_spec({core, 7}), cluster_spec({core, 8}), cluster_spec({core, 9})]),
+
+    %% 1. Start all nodes
+    [First | Rest] = Nodes = start_cluster(Cluster),
+    try
+        assert_config_load_done(Nodes),
+        rpc:call(First, ?MODULE, create_deprecated_data_dir, []),
+        {[ok, ok, ok], []} = rpc:multicall(Nodes, application, stop, [emqx_conf]),
+        {[ok, ok, ok], []} = rpc:multicall(Nodes, ?MODULE, set_data_dir_env, []),
+        ok = rpc:call(First, application, start, [emqx_conf]),
+        {[ok, ok], []} = rpc:multicall(Rest, application, start, [emqx_conf]),
+
+        assert_data_copy_done(Nodes, "/configs/cluster-override.conf"),
         stop_cluster(Nodes),
         ok
     after
@@ -87,6 +110,16 @@ create_data_dir() ->
     Telemetry = <<"telemetry.enable = false">>,
     ok = file:write_file(Node ++ "/configs/cluster.hocon", Telemetry).
 
+create_deprecated_data_dir() ->
+    Node = atom_to_list(node()),
+    ok = filelib:ensure_dir(Node ++ "/certs/"),
+    ok = filelib:ensure_dir(Node ++ "/authz/"),
+    ok = filelib:ensure_dir(Node ++ "/configs/"),
+    ok = file:write_file(Node ++ "/certs/fake-cert", list_to_binary(Node)),
+    ok = file:write_file(Node ++ "/authz/fake-authz", list_to_binary(Node)),
+    Telemetry = <<"telemetry.enable = false">>,
+    ok = file:write_file(Node ++ "/configs/cluster-override.conf", Telemetry).
+
 set_data_dir_env() ->
     Node = atom_to_list(node()),
     %% will create certs and authz dir
@@ -101,13 +134,14 @@ set_data_dir_env() ->
     application:set_env(emqx, config_files, [NewConfigFile]),
     application:set_env(emqx, data_dir, Node),
     application:set_env(emqx, cluster_conf_file, Node ++ "/configs/cluster.hocon"),
+    application:set_env(emqx, cluster_override_conf_file, Node ++ "/configs/cluster-override.conf"),
     ok.
 
-assert_data_copy_done([First0 | Rest]) ->
+assert_data_copy_done([First0 | Rest], File) ->
     First = atom_to_list(First0),
     {ok, FakeCertFile} = file:read_file(First ++ "/certs/fake-cert"),
     {ok, FakeAuthzFile} = file:read_file(First ++ "/authz/fake-authz"),
-    {ok, FakeOverrideFile} = file:read_file(First ++ "/configs/cluster.hocon"),
+    {ok, FakeOverrideFile} = file:read_file(First ++ File),
     {ok, ExpectFake} = hocon:binary(FakeOverrideFile),
     lists:foreach(
         fun(Node0) ->
@@ -119,7 +153,7 @@ assert_data_copy_done([First0 | Rest]) ->
             ),
             ?assertEqual(
                 {ok, ExpectFake},
-                hocon:files([Node ++ "/configs/cluster.hocon"]),
+                hocon:files([Node ++ File]),
                 #{node => Node}
             ),
             ?assertEqual(
@@ -174,3 +208,6 @@ cluster(Specs) ->
                 ok
         end}
     ]).
+
+cluster_spec({Type, Num}) ->
+    {Type, list_to_atom(atom_to_list(?MODULE) ++ integer_to_list(Num))}.

From c21744c2601cd8607b71455bc4441037ae67de9c Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Fri, 14 Apr 2023 17:09:24 +0800
Subject: [PATCH 080/110] fix: hocon_pp crash when atom_key

---
 apps/emqx/rebar.config                       | 2 +-
 apps/emqx/test/emqx_authentication_SUITE.erl | 8 ++++++--
 apps/emqx/test/emqx_common_test_helpers.erl  | 7 +++++++
 mix.exs                                      | 2 +-
 rebar.config                                 | 2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config
index 9079322eb..bb89dfe52 100644
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@@ -29,7 +29,7 @@
     {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.6"}}},
     {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.14.6"}}},
     {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}},
-    {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.38.0"}}},
+    {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.38.1"}}},
     {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}},
     {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}},
     {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}},
diff --git a/apps/emqx/test/emqx_authentication_SUITE.erl b/apps/emqx/test/emqx_authentication_SUITE.erl
index 2c83162ed..0190ab936 100644
--- a/apps/emqx/test/emqx_authentication_SUITE.erl
+++ b/apps/emqx/test/emqx_authentication_SUITE.erl
@@ -95,13 +95,17 @@ all() ->
     emqx_common_test_helpers:all(?MODULE).
 
 init_per_suite(Config) ->
+    LogLevel = emqx_logger:get_primary_log_level(),
+    ok = emqx_logger:set_log_level(debug),
     application:set_env(ekka, strict_mode, true),
     emqx_common_test_helpers:boot_modules(all),
     emqx_common_test_helpers:start_apps([]),
-    Config.
+    [{log_level, LogLevel} | Config].
 
-end_per_suite(_) ->
+end_per_suite(Config) ->
     emqx_common_test_helpers:stop_apps([]),
+    LogLevel = ?config(log_level),
+    emqx_logger:set_log_level(LogLevel),
     ok.
 
 init_per_testcase(Case, Config) ->
diff --git a/apps/emqx/test/emqx_common_test_helpers.erl b/apps/emqx/test/emqx_common_test_helpers.erl
index 406183094..bc9da2a9e 100644
--- a/apps/emqx/test/emqx_common_test_helpers.erl
+++ b/apps/emqx/test/emqx_common_test_helpers.erl
@@ -314,6 +314,8 @@ stop_apps(Apps) ->
     ok = emqx_config:delete_override_conf_files(),
     application:unset_env(emqx, local_override_conf_file),
     application:unset_env(emqx, cluster_override_conf_file),
+    application:unset_env(emqx, local_conf_file),
+    application:unset_env(emqx, cluster_conf_file),
     application:unset_env(gen_rpc, port_discovery),
     ok.
 
@@ -462,6 +464,11 @@ force_set_config_file_paths(emqx_conf, [Path] = Paths) ->
     ok = file:write_file(Path, Bin, [append]),
     application:set_env(emqx, config_files, Paths);
 force_set_config_file_paths(emqx, Paths) ->
+    %% we need init cluster conf, so we can save the cluster conf to the file
+    application:set_env(emqx, local_override_conf_file, "local_override.conf"),
+    application:set_env(emqx, cluster_override_conf_file, "cluster_override.conf"),
+    application:set_env(emqx, local_conf_file, "local.hocon"),
+    application:set_env(emqx, cluster_conf_file, "cluster.hocon"),
     application:set_env(emqx, config_files, Paths);
 force_set_config_file_paths(_, _) ->
     ok.
diff --git a/mix.exs b/mix.exs
index 582860039..55036d498 100644
--- a/mix.exs
+++ b/mix.exs
@@ -72,7 +72,7 @@ defmodule EMQXUmbrella.MixProject do
       # in conflict by emqtt and hocon
       {:getopt, "1.0.2", override: true},
       {:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "1.0.7", override: true},
-      {:hocon, github: "emqx/hocon", tag: "0.38.0", override: true},
+      {:hocon, github: "emqx/hocon", tag: "0.38.1", override: true},
       {:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.5.2", override: true},
       {:esasl, github: "emqx/esasl", tag: "0.2.0"},
       {:jose, github: "potatosalad/erlang-jose", tag: "1.11.2"},
diff --git a/rebar.config b/rebar.config
index 9b67b6cce..7e783b56d 100644
--- a/rebar.config
+++ b/rebar.config
@@ -75,7 +75,7 @@
     , {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}}
     , {getopt, "1.0.2"}
     , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "1.0.7"}}}
-    , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.38.0"}}}
+    , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.38.1"}}}
     , {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}}
     , {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.0"}}}
     , {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}}

From 4f2f0ebb6a25817e468681bcec03357948d6f477 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 14:58:19 +0200
Subject: [PATCH 081/110] fix: bad ref to emqx_misc after rebase

---
 lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
index dc9759341..f11441a3b 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl
@@ -188,7 +188,7 @@ on_start(
     ?SLOG(info, #{
         msg => "starting_sqlserver_connector",
         connector => InstanceId,
-        config => emqx_misc:redact(Config)
+        config => emqx_utils:redact(Config)
     }),
 
     ODBCDir = code:priv_dir(odbc),

From c0e6e79bcddca8eef85dd8a10081f1608789f29f Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Fri, 14 Apr 2023 20:51:40 +0800
Subject: [PATCH 082/110] feat: don't remove default value when save config

---
 apps/emqx/src/emqx_config.erl                | 250 +++++--------------
 apps/emqx/src/emqx_config_handler.erl        |   4 +-
 apps/emqx/test/emqx_common_test_helpers.erl  |   4 +-
 apps/emqx/test/emqx_config_handler_SUITE.erl |   2 -
 apps/emqx_conf/src/emqx_conf_app.erl         |  10 +-
 apps/emqx_conf/src/emqx_conf_schema.erl      |  10 +-
 apps/emqx_conf/test/emqx_conf_app_SUITE.erl  |   1 +
 7 files changed, 67 insertions(+), 214 deletions(-)

diff --git a/apps/emqx/src/emqx_config.erl b/apps/emqx/src/emqx_config.erl
index 68a8563d8..75396d779 100644
--- a/apps/emqx/src/emqx_config.erl
+++ b/apps/emqx/src/emqx_config.erl
@@ -24,19 +24,18 @@
     init_load/2,
     init_load/3,
     read_override_conf/1,
-    has_deprecated_conf/0,
+    has_deprecated_file/0,
     delete_override_conf_files/0,
     check_config/2,
     fill_defaults/1,
     fill_defaults/2,
     fill_defaults/3,
-    save_configs/6,
+    save_configs/5,
     save_to_app_env/1,
     save_to_config_map/2,
     save_to_override_conf/3
 ]).
 -export([raw_conf_with_default/4]).
--export([remove_default_conf/2]).
 -export([merge_envs/2]).
 
 -export([
@@ -329,32 +328,32 @@ init_load(SchemaMod, ConfFiles) ->
 %% in the rear of the list overrides prior values.
 -spec init_load(module(), [string()] | binary() | hocon:config()) -> ok.
 init_load(SchemaMod, Conf, Opts) when is_list(Conf) orelse is_binary(Conf) ->
-    init_load(SchemaMod, parse_hocon(Conf), Opts);
-init_load(SchemaMod, RawConf, Opts) when is_map(RawConf) ->
+    HasDeprecatedFile = has_deprecated_file(),
+    RawConf = parse_hocon(HasDeprecatedFile, Conf),
+    init_load(HasDeprecatedFile, SchemaMod, RawConf, Opts).
+
+init_load(true, SchemaMod, RawConf, Opts) when is_map(RawConf) ->
+    %% deprecated conf will be removed in 5.1
+    %% Merge environment variable overrides on top
+    RawConfWithEnvs = merge_envs(SchemaMod, RawConf),
+    Overrides = read_override_confs(),
+    RawConfWithOverrides = hocon:deep_merge(RawConfWithEnvs, Overrides),
+    RootNames = get_root_names(),
+    RawConfAll = raw_conf_with_default(SchemaMod, RootNames, RawConfWithOverrides, Opts),
+    %% check configs against the schema
+    {AppEnvs, CheckedConf} = check_config(SchemaMod, RawConfAll, #{}),
+    save_to_app_env(AppEnvs),
+    ok = save_to_config_map(CheckedConf, RawConfAll);
+init_load(false, SchemaMod, RawConf, Opts) when is_map(RawConf) ->
     ok = save_schema_mod_and_names(SchemaMod),
-    case has_deprecated_conf() of
-        false ->
-            RootNames = get_root_names(),
-            %% Merge environment variable overrides on top
-            RawConfWithEnvs = merge_envs(SchemaMod, RawConf),
-            RawConfAll = raw_conf_with_default(SchemaMod, RootNames, RawConfWithEnvs, Opts),
-            %% check configs against the schema
-            {AppEnvs, CheckedConf} = check_config(SchemaMod, RawConfAll, #{}),
-            save_to_app_env(AppEnvs),
-            ok = save_to_config_map(CheckedConf, RawConfAll);
-        true ->
-            %% deprecated conf will be removed in 5.1
-            %% Merge environment variable overrides on top
-            RawConfWithEnvs = merge_envs(SchemaMod, RawConf),
-            Overrides = read_override_confs(),
-            RawConfWithOverrides = hocon:deep_merge(RawConfWithEnvs, Overrides),
-            RootNames = get_root_names(),
-            RawConfAll = raw_conf_with_default(SchemaMod, RootNames, RawConfWithOverrides, Opts),
-            %% check configs against the schema
-            {AppEnvs, CheckedConf} = check_config(SchemaMod, RawConfAll, #{}),
-            save_to_app_env(AppEnvs),
-            ok = save_to_config_map(CheckedConf, RawConfAll)
-    end.
+    RootNames = get_root_names(),
+    %% Merge environment variable overrides on top
+    RawConfWithEnvs = merge_envs(SchemaMod, RawConf),
+    RawConfAll = raw_conf_with_default(SchemaMod, RootNames, RawConfWithEnvs, Opts),
+    %% check configs against the schema
+    {AppEnvs, CheckedConf} = check_config(SchemaMod, RawConfAll, #{}),
+    save_to_app_env(AppEnvs),
+    ok = save_to_config_map(CheckedConf, RawConfAll).
 
 %% @doc Read merged cluster + local overrides.
 read_override_confs() ->
@@ -390,21 +389,20 @@ schema_default(Schema) ->
             #{}
     end.
 
-parse_hocon(Conf) ->
-    HasDeprecatedConf = has_deprecated_conf(),
+parse_hocon(HasDeprecatedFile, Conf) ->
     IncDirs = include_dirs(),
-    case do_parse_hocon(HasDeprecatedConf, Conf, IncDirs) of
+    case do_parse_hocon(HasDeprecatedFile, Conf, IncDirs) of
         {ok, HoconMap} ->
             HoconMap;
         {error, Reason} ->
             ?SLOG(error, #{
-                msg => "failed_to_load_hocon_conf",
+                msg => "failed_to_load_hocon_file",
                 reason => Reason,
                 pwd => file:get_cwd(),
                 include_dirs => IncDirs,
                 config_file => Conf
             }),
-            error(failed_to_load_hocon_conf)
+            error(failed_to_load_hocon_file)
     end.
 
 do_parse_hocon(true, Conf, IncDirs) ->
@@ -416,12 +414,12 @@ do_parse_hocon(true, Conf, IncDirs) ->
 do_parse_hocon(false, Conf, IncDirs) ->
     Opts = #{format => map, include_dirs => IncDirs},
     case is_binary(Conf) of
+        %% only use in test
         true ->
             hocon:binary(Conf, Opts);
         false ->
-            LocalFile = deprecated_override_conf_file(#{override_to => local}),
-            ClusterFile = deprecated_override_conf_file(#{override_to => cluster}),
-            hocon:files([ClusterFile] ++ Conf ++ [LocalFile], Opts)
+            ClusterFile = cluster_hocon_file(#{override_to => cluster}),
+            hocon:files([ClusterFile | Conf], Opts)
     end.
 
 include_dirs() ->
@@ -493,14 +491,12 @@ fill_defaults(SchemaMod, RawConf, Opts0) ->
 %% Delete override config files.
 -spec delete_override_conf_files() -> ok.
 delete_override_conf_files() ->
-    F1 = deprecated_override_conf_file(#{override_to => local}),
-    F2 = deprecated_override_conf_file(#{override_to => cluster}),
-    F3 = conf_file(#{override_to => local}),
-    F4 = conf_file(#{override_to => cluster}),
+    F1 = deprecated_conf_file(#{override_to => local}),
+    F2 = deprecated_conf_file(#{override_to => cluster}),
+    F3 = cluster_hocon_file(#{override_to => cluster}),
     ok = ensure_file_deleted(F1),
     ok = ensure_file_deleted(F2),
-    ok = ensure_file_deleted(F3),
-    ok = ensure_file_deleted(F4).
+    ok = ensure_file_deleted(F3).
 
 ensure_file_deleted(F) ->
     case file:delete(F) of
@@ -512,38 +508,35 @@ ensure_file_deleted(F) ->
 -spec read_override_conf(map()) -> raw_config().
 read_override_conf(#{} = Opts) ->
     File =
-        case has_deprecated_conf() of
-            true -> deprecated_override_conf_file(Opts);
-            false -> conf_file(Opts)
+        case has_deprecated_file() of
+            true -> deprecated_conf_file(Opts);
+            false -> cluster_hocon_file(Opts)
         end,
     load_hocon_file(File, map).
 
-has_deprecated_conf() ->
-    DeprecatedFile = deprecated_cluster_conf_file(),
+has_deprecated_file() ->
+    DeprecatedFile = deprecated_conf_file(#{override_to => cluster}),
     filelib:is_regular(DeprecatedFile).
 
-deprecated_cluster_conf_file() ->
-    ClusterFile = deprecated_override_conf_file(#{override_to => cluster}),
-    filename:join(filename:dirname(ClusterFile), "cluster-override.conf").
-
-deprecated_override_conf_file(Opts) when is_map(Opts) ->
+deprecated_conf_file(Opts) when is_map(Opts) ->
     Key =
         case maps:get(override_to, Opts, cluster) of
             local -> local_override_conf_file;
             cluster -> cluster_override_conf_file
         end,
     application:get_env(emqx, Key, undefined);
-deprecated_override_conf_file(Which) when is_atom(Which) ->
+deprecated_conf_file(Which) when is_atom(Which) ->
     application:get_env(emqx, Which, undefined).
 
-conf_file(Opts) when is_map(Opts) ->
+cluster_hocon_file(Opts) when is_map(Opts) ->
     Key =
         case maps:get(override_to, Opts, cluster) of
-            local -> local_conf_file;
-            cluster -> cluster_conf_file
+            %% no local config file support
+            local -> undefined;
+            cluster -> cluster_hocon_file
         end,
     application:get_env(emqx, Key, undefined);
-conf_file(Which) when is_atom(Which) ->
+cluster_hocon_file(Which) when is_atom(Which) ->
     application:get_env(emqx, Which, undefined).
 
 -spec save_schema_mod_and_names(module()) -> ok.
@@ -576,54 +569,17 @@ get_root_names() ->
     maps:get(names, persistent_term:get(?PERSIS_SCHEMA_MODS, #{names => []})).
 
 -spec save_configs(
-    emqx_map_lib:config_key_path(), app_envs(), config(), raw_config(), raw_config(), update_opts()
+    app_envs(), config(), raw_config(), raw_config(), update_opts()
 ) -> ok.
 
-save_configs(Paths0, AppEnvs, Conf, RawConf, OverrideConf, Opts) ->
-    Default = init_default(Paths0),
-    OverrideConf1 = remove_default_conf(OverrideConf, Default),
+save_configs(AppEnvs, Conf, RawConf, OverrideConf, Opts) ->
     %% We first try to save to files, because saving to files is more error prone
     %% than saving into memory.
-    HasDeprecated = has_deprecated_conf(),
-    ok = save_to_override_conf(HasDeprecated, OverrideConf1, Opts),
+    HasDeprecatedFile = has_deprecated_file(),
+    ok = save_to_override_conf(HasDeprecatedFile, OverrideConf, Opts),
     save_to_app_env(AppEnvs),
     save_to_config_map(Conf, RawConf).
 
-init_default(Paths0) ->
-    [Root | _] = [bin(Key) || Key <- Paths0],
-    SchemaMod = get_schema_mod(Root),
-    {_, {_, Schema}} = lists:keyfind(Root, 1, hocon_schema:roots(SchemaMod)),
-    fill_defaults(#{Root => schema_default(Schema)}).
-
-remove_default_conf(undefined, _) ->
-    undefined;
-remove_default_conf(Conf, DefaultConf) when is_map(Conf) andalso is_map(DefaultConf) ->
-    maps:fold(
-        fun(Key, Value, Acc) ->
-            case maps:find(Key, DefaultConf) of
-                {ok, DefaultValue} ->
-                    remove_default_conf(Value, DefaultValue, Key, Acc);
-                error ->
-                    Acc
-            end
-        end,
-        Conf,
-        Conf
-    ).
-
-remove_default_conf(Value, Value, Key, Conf) ->
-    maps:remove(Key, Conf);
-remove_default_conf(Value = #{}, DefaultValue = #{}, Key, Conf) ->
-    case remove_default_conf(Value, DefaultValue) of
-        SubValue when SubValue =:= #{} -> maps:remove(Key, Conf);
-        SubValue -> maps:put(Key, SubValue, Conf)
-    end;
-remove_default_conf(Value, DefaultValue, Key, Conf) ->
-    case try_bin(DefaultValue) =:= try_bin(Value) of
-        true -> maps:remove(Key, Conf);
-        false -> Conf
-    end.
-
 %% we ignore kernel app env,
 %% because the old app env will be used in emqx_config_logger:post_config_update/5
 -define(IGNORE_APPS, [kernel]).
@@ -643,7 +599,7 @@ save_to_override_conf(_, undefined, _) ->
     ok;
 %% TODO: Remove deprecated override conf file when 5.1
 save_to_override_conf(true, RawConf, Opts) ->
-    case deprecated_override_conf_file(Opts) of
+    case deprecated_conf_file(Opts) of
         undefined ->
             ok;
         FileName ->
@@ -661,7 +617,7 @@ save_to_override_conf(true, RawConf, Opts) ->
             end
     end;
 save_to_override_conf(false, RawConf, Opts) ->
-    case conf_file(Opts) of
+    case cluster_hocon_file(Opts) of
         undefined ->
             ok;
         FileName ->
@@ -791,16 +747,6 @@ atom(Str) when is_list(Str) ->
 atom(Atom) when is_atom(Atom) ->
     Atom.
 
-try_bin(Bin) when is_binary(Bin) -> Bin;
-try_bin([Bin | _] = List) when is_binary(Bin) -> List;
-try_bin([Atom | _] = List) when is_atom(Atom) -> [atom_to_binary(A) || A <- List];
-try_bin([Map | _] = Maps) when is_map(Map) -> Maps;
-try_bin(Str) when is_list(Str) -> list_to_binary(Str);
-try_bin(Atom) when is_atom(Atom) -> atom_to_binary(Atom, utf8);
-try_bin(Int) when is_integer(Int) -> integer_to_binary(Int);
-try_bin(Float) when is_float(Float) -> float_to_binary(Float);
-try_bin(Term) -> Term.
-
 bin(Bin) when is_binary(Bin) -> Bin;
 bin(Str) when is_list(Str) -> list_to_binary(Str);
 bin(Atom) when is_atom(Atom) -> atom_to_binary(Atom, utf8).
@@ -822,87 +768,3 @@ atom_conf_path(Path, ExpFun, OnFail) ->
                     error(Err)
             end
     end.
-
--ifdef(TEST).
--include_lib("eunit/include/eunit.hrl").
-
-remove_default_conf_test() ->
-    ?assertEqual(
-        #{},
-        remove_default_conf(#{<<"def">> => 100}, #{<<"def">> => 100})
-    ),
-    ?assertEqual(
-        #{},
-        remove_default_conf(#{<<"def">> => 100}, #{<<"def">> => <<"100">>})
-    ),
-    ?assertEqual(
-        #{<<"def">> => 100},
-        remove_default_conf(#{<<"def">> => 100}, #{<<"def">> => #{<<"bar">> => 100}})
-    ),
-    ?assertEqual(
-        #{<<"def">> => #{<<"edf">> => 321}},
-        remove_default_conf(#{<<"def">> => #{<<"abc">> => 100, <<"edf">> => 321}}, #{
-            <<"def">> => #{<<"abc">> => 100, <<"edf">> => 123}
-        })
-    ),
-    ?assertEqual(
-        #{},
-        remove_default_conf(#{<<"def">> => #{<<"abc">> => 100, <<"edf">> => 321}}, #{
-            <<"def">> => #{<<"abc">> => <<"100">>, <<"edf">> => 321}
-        })
-    ),
-    ?assertEqual(
-        #{},
-        remove_default_conf(#{<<"def">> => #{<<"abc">> => 100, <<"edf">> => <<"true">>}}, #{
-            <<"def">> => #{<<"abc">> => <<"100">>, <<"edf">> => true}
-        })
-    ),
-    ?assertEqual(
-        #{},
-        remove_default_conf(
-            #{
-                <<"bytes_in">> =>
-                    #{
-                        <<"capacity">> => infinity,
-                        <<"initial">> => 0,
-                        <<"rate">> => infinity
-                    }
-            },
-            #{
-                <<"bytes_in">> =>
-                    #{
-                        <<"capacity">> => <<"infinity">>,
-                        <<"initial">> => <<"0">>,
-                        <<"rate">> => <<"infinity">>
-                    }
-            }
-        )
-    ),
-    ?assertEqual(
-        #{},
-        remove_default_conf(
-            #{
-                <<"limiter">> => #{
-                    <<"connection">> =>
-                        #{
-                            <<"capacity">> => 1000,
-                            <<"initial">> => <<"0">>,
-                            <<"rate">> => <<"1000/s">>
-                        }
-                }
-            },
-            #{
-                <<"limiter">> => #{
-                    <<"connection">> =>
-                        #{
-                            <<"capacity">> => <<"1000">>,
-                            <<"initial">> => <<"0">>,
-                            <<"rate">> => <<"1000/s">>
-                        }
-                }
-            }
-        )
-    ),
-    ok.
-
--endif.
diff --git a/apps/emqx/src/emqx_config_handler.erl b/apps/emqx/src/emqx_config_handler.erl
index 3e18a172e..d5dc72acc 100644
--- a/apps/emqx/src/emqx_config_handler.erl
+++ b/apps/emqx/src/emqx_config_handler.erl
@@ -279,9 +279,7 @@ check_and_save_configs(
     OldConf = emqx_config:get_root(ConfKeyPath),
     case do_post_config_update(ConfKeyPath, Handlers, OldConf, NewConf, AppEnvs, UpdateArgs, #{}) of
         {ok, Result0} ->
-            ok = emqx_config:save_configs(
-                ConfKeyPath, AppEnvs, NewConf, NewRawConf, OverrideConf, Opts
-            ),
+            ok = emqx_config:save_configs(AppEnvs, NewConf, NewRawConf, OverrideConf, Opts),
             Result1 = return_change_result(ConfKeyPath, UpdateArgs),
             {ok, Result1#{post_config_update => Result0}};
         Error ->
diff --git a/apps/emqx/test/emqx_common_test_helpers.erl b/apps/emqx/test/emqx_common_test_helpers.erl
index bc9da2a9e..6e56c85ed 100644
--- a/apps/emqx/test/emqx_common_test_helpers.erl
+++ b/apps/emqx/test/emqx_common_test_helpers.erl
@@ -314,8 +314,7 @@ stop_apps(Apps) ->
     ok = emqx_config:delete_override_conf_files(),
     application:unset_env(emqx, local_override_conf_file),
     application:unset_env(emqx, cluster_override_conf_file),
-    application:unset_env(emqx, local_conf_file),
-    application:unset_env(emqx, cluster_conf_file),
+    application:unset_env(emqx, cluster_hocon_file),
     application:unset_env(gen_rpc, port_discovery),
     ok.
 
@@ -467,7 +466,6 @@ force_set_config_file_paths(emqx, Paths) ->
     %% we need init cluster conf, so we can save the cluster conf to the file
     application:set_env(emqx, local_override_conf_file, "local_override.conf"),
     application:set_env(emqx, cluster_override_conf_file, "cluster_override.conf"),
-    application:set_env(emqx, local_conf_file, "local.hocon"),
     application:set_env(emqx, cluster_conf_file, "cluster.hocon"),
     application:set_env(emqx, config_files, Paths);
 force_set_config_file_paths(_, _) ->
diff --git a/apps/emqx/test/emqx_config_handler_SUITE.erl b/apps/emqx/test/emqx_config_handler_SUITE.erl
index cea956825..deeee8d62 100644
--- a/apps/emqx/test/emqx_config_handler_SUITE.erl
+++ b/apps/emqx/test/emqx_config_handler_SUITE.erl
@@ -21,7 +21,6 @@
 
 -define(MOD, {mod}).
 -define(WKEY, '?').
--define(LOCAL_CONF, "/tmp/local.conf").
 -define(CLUSTER_CONF, "/tmp/cluster.conf").
 
 -include_lib("eunit/include/eunit.hrl").
@@ -38,7 +37,6 @@ end_per_suite(_Config) ->
     emqx_common_test_helpers:stop_apps([]).
 
 init_per_testcase(_Case, Config) ->
-    _ = file:delete(?LOCAL_CONF),
     _ = file:delete(?CLUSTER_CONF),
     Config.
 
diff --git a/apps/emqx_conf/src/emqx_conf_app.erl b/apps/emqx_conf/src/emqx_conf_app.erl
index 45631619b..35a79ea6e 100644
--- a/apps/emqx_conf/src/emqx_conf_app.erl
+++ b/apps/emqx_conf/src/emqx_conf_app.erl
@@ -60,13 +60,13 @@ get_override_config_file() ->
                         TnxId = emqx_cluster_rpc:get_node_tnx_id(Node),
                         WallClock = erlang:statistics(wall_clock),
                         Conf = emqx_config_handler:get_raw_cluster_override_conf(),
-                        HasDeprecateConf = emqx_config:has_deprecated_conf(),
+                        HasDeprecateFile = emqx_config:has_deprecated_file(),
                         #{
                             wall_clock => WallClock,
                             conf => Conf,
                             tnx_id => TnxId,
                             node => Node,
-                            has_deprecated_conf => HasDeprecateConf
+                            has_deprecated_file => HasDeprecateFile
                         }
                     end,
                     case mria:ro_transaction(?CLUSTER_RPC_SHARD, Fun) of
@@ -175,16 +175,16 @@ copy_override_conf_from_core_node() ->
                 _ ->
                     [{ok, Info} | _] = lists:sort(fun conf_sort/2, Ready),
                     #{node := Node, conf := RawOverrideConf, tnx_id := TnxId} = Info,
-                    HasDeprecatedConf = maps:get(has_deprecated_conf, Info, false),
+                    HasDeprecatedFile = maps:get(has_deprecated_file, Info, false),
                     ?SLOG(debug, #{
                         msg => "copy_cluster_conf_from_core_node_success",
                         node => Node,
-                        has_deprecated_conf => HasDeprecatedConf,
+                        has_deprecated_file => HasDeprecatedFile,
                         data_dir => emqx:data_dir(),
                         tnx_id => TnxId
                     }),
                     ok = emqx_config:save_to_override_conf(
-                        HasDeprecatedConf,
+                        HasDeprecatedFile,
                         RawOverrideConf,
                         #{override_to => cluster}
                     ),
diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl
index a67d2a100..228462e73 100644
--- a/apps/emqx_conf/src/emqx_conf_schema.erl
+++ b/apps/emqx_conf/src/emqx_conf_schema.erl
@@ -1029,8 +1029,7 @@ translation("emqx") ->
         {"config_files", fun tr_config_files/1},
         {"cluster_override_conf_file", fun tr_cluster_override_conf_file/1},
         {"local_override_conf_file", fun tr_local_override_conf_file/1},
-        {"cluster_conf_file", fun tr_cluster_conf_file/1},
-        {"local_conf_file", fun tr_local_conf_file/1}
+        {"cluster_hocon_file", fun tr_cluster_hocon_file/1}
     ];
 translation("gen_rpc") ->
     [{"default_client_driver", fun tr_default_config_driver/1}];
@@ -1081,14 +1080,11 @@ tr_cluster_override_conf_file(Conf) ->
     tr_conf_file(Conf, "cluster-override.conf").
 
 tr_local_override_conf_file(Conf) ->
-    tr_conf_file(Conf, "local-overide.conf").
+    tr_conf_file(Conf, "local-override.conf").
 
-tr_cluster_conf_file(Conf) ->
+tr_cluster_hocon_file(Conf) ->
     tr_conf_file(Conf, "cluster.hocon").
 
-tr_local_conf_file(Conf) ->
-    tr_conf_file(Conf, "local.hocon").
-
 tr_conf_file(Conf, Filename) ->
     DataDir = conf_get("node.data_dir", Conf),
     %% assert, this config is not nullable
diff --git a/apps/emqx_conf/test/emqx_conf_app_SUITE.erl b/apps/emqx_conf/test/emqx_conf_app_SUITE.erl
index 21e22519e..825f01441 100644
--- a/apps/emqx_conf/test/emqx_conf_app_SUITE.erl
+++ b/apps/emqx_conf/test/emqx_conf_app_SUITE.erl
@@ -133,6 +133,7 @@ set_data_dir_env() ->
     ok = file:write_file(NewConfigFile, DataDir, [append]),
     application:set_env(emqx, config_files, [NewConfigFile]),
     application:set_env(emqx, data_dir, Node),
+    %% We set env both cluster.hocon and cluster-override.conf, but only one will be used
     application:set_env(emqx, cluster_conf_file, Node ++ "/configs/cluster.hocon"),
     application:set_env(emqx, cluster_override_conf_file, Node ++ "/configs/cluster-override.conf"),
     ok.

From e5b85916b62ac274f4f028a52e08d82df48bc3c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=90=E6=96=87?= <zhongwencool@gmail.com>
Date: Mon, 10 Apr 2023 22:00:56 +0800
Subject: [PATCH 083/110] feat: hidden stats config

---
 apps/emqx/src/emqx_schema.erl                 | 13 +++++----
 apps/emqx/src/emqx_zone_schema.erl            | 27 ++++++++++++++++++-
 .../src/emqx_mgmt_api_configs.erl             |  5 ++--
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index ed20848d2..f03ba07c5 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -204,7 +204,9 @@ roots(low) ->
         {"stats",
             sc(
                 ref("stats"),
-                #{}
+                #{
+                    importance => ?IMPORTANCE_HIDDEN
+                }
             )},
         {"sysmon",
             sc(
@@ -339,6 +341,7 @@ fields("stats") ->
                 boolean(),
                 #{
                     default => true,
+                    importance => ?IMPORTANCE_HIDDEN,
                     desc => ?DESC(stats_enable)
                 }
             )}
@@ -609,8 +612,7 @@ fields("mqtt") ->
             )}
     ];
 fields("zone") ->
-    Fields = emqx_zone_schema:roots(),
-    [{F, ref(emqx_zone_schema, F)} || F <- Fields];
+    emqx_zone_schema:zone();
 fields("flapping_detect") ->
     [
         {"enable",
@@ -1971,10 +1973,7 @@ desc("persistent_session_builtin") ->
 desc("persistent_table_mria_opts") ->
     "Tuning options for the mria table.";
 desc("stats") ->
-    "Enable/disable statistic data collection.\n"
-    "Statistic data such as message receive/send count/rate etc. "
-    "It provides insights of system performance and helps to diagnose issues. "
-    "You can find statistic data from the dashboard, or from the '/stats' API.";
+    "deprecated since 5.0.23";
 desc("authorization") ->
     "Settings for client authorization.";
 desc("mqtt") ->
diff --git a/apps/emqx/src/emqx_zone_schema.erl b/apps/emqx/src/emqx_zone_schema.erl
index c2595725b..6ac8cefa3 100644
--- a/apps/emqx/src/emqx_zone_schema.erl
+++ b/apps/emqx/src/emqx_zone_schema.erl
@@ -15,8 +15,10 @@
 %%--------------------------------------------------------------------
 
 -module(emqx_zone_schema).
+-include_lib("typerefl/include/types.hrl").
+-include_lib("hocon/include/hoconsc.hrl").
 
--export([namespace/0, roots/0, fields/1, desc/1]).
+-export([namespace/0, roots/0, fields/1, desc/1, zone/0, zone_without_hidden/0]).
 
 namespace() -> zone.
 
@@ -33,6 +35,29 @@ roots() ->
         "overload_protection"
     ].
 
+zone() ->
+    Fields = roots(),
+    Hidden = hidden(),
+    lists:map(
+        fun(F) ->
+            case lists:member(F, Hidden) of
+                true ->
+                    {F, ?HOCON(?R_REF(F), #{importance => ?IMPORTANCE_HIDDEN})};
+                false ->
+                    {F, ?HOCON(?R_REF(F), #{})}
+            end
+        end,
+        Fields
+    ).
+
+zone_without_hidden() ->
+    lists:map(fun(F) -> {F, ?HOCON(?R_REF(F), #{})} end, roots() -- hidden()).
+
+hidden() ->
+    [
+        "stats"
+    ].
+
 %% zone schemas are clones from the same name from root level
 %% only not allowed to have default values.
 fields(Name) ->
diff --git a/apps/emqx_management/src/emqx_mgmt_api_configs.erl b/apps/emqx_management/src/emqx_mgmt_api_configs.erl
index 55cc50597..13614335e 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_configs.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_configs.erl
@@ -352,8 +352,7 @@ with_default_value(Type, Value) ->
     Type#{example => emqx_map_lib:binary_string(Value)}.
 
 global_zone_roots() ->
-    lists:map(fun({K, _}) -> K end, global_zone_schema()).
+    lists:map(fun({K, _}) -> list_to_binary(K) end, global_zone_schema()).
 
 global_zone_schema() ->
-    Roots = hocon_schema:roots(emqx_zone_schema),
-    lists:map(fun({RootKey, {_Root, Schema}}) -> {RootKey, Schema} end, Roots).
+    emqx_zone_schema:zone_without_hidden().

From 7934a1cea13437ee48067186e853f94e556178ea Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Wed, 12 Apr 2023 14:39:59 +0800
Subject: [PATCH 084/110] feat: hide
 overload_protection,conn_congestion,flapping_detect

---
 apps/emqx/src/emqx_channel.erl                |  2 +-
 apps/emqx/src/emqx_flapping.erl               | 50 ++++++++++++-------
 apps/emqx/src/emqx_schema.erl                 | 48 +++++++++++-------
 apps/emqx/src/emqx_zone_schema.erl            |  5 +-
 apps/emqx/test/emqx_flapping_SUITE.erl        | 18 +++++++
 .../test/emqx_mgmt_api_configs_SUITE.erl      |  4 +-
 6 files changed, 86 insertions(+), 41 deletions(-)

diff --git a/apps/emqx/src/emqx_channel.erl b/apps/emqx/src/emqx_channel.erl
index 29a59e482..1506e296f 100644
--- a/apps/emqx/src/emqx_channel.erl
+++ b/apps/emqx/src/emqx_channel.erl
@@ -1630,7 +1630,7 @@ check_banned(_ConnPkt, #channel{clientinfo = ClientInfo}) ->
 %% Flapping
 
 count_flapping_event(_ConnPkt, Channel = #channel{clientinfo = ClientInfo = #{zone := Zone}}) ->
-    emqx_config:get_zone_conf(Zone, [flapping_detect, enable]) andalso
+    is_integer(emqx_config:get_zone_conf(Zone, [flapping_detect, window_time])) andalso
         emqx_flapping:detect(ClientInfo),
     {ok, Channel}.
 
diff --git a/apps/emqx/src/emqx_flapping.erl b/apps/emqx/src/emqx_flapping.erl
index 64e4ed6c3..cc4af99d2 100644
--- a/apps/emqx/src/emqx_flapping.erl
+++ b/apps/emqx/src/emqx_flapping.erl
@@ -27,6 +27,10 @@
 %% API
 -export([detect/1]).
 
+-ifdef(TEST).
+-export([get_policy/2]).
+-endif.
+
 %% gen_server callbacks
 -export([
     init/1,
@@ -39,15 +43,6 @@
 
 %% Tab
 -define(FLAPPING_TAB, ?MODULE).
-%% Default Policy
--define(FLAPPING_THRESHOLD, 30).
--define(FLAPPING_DURATION, 60000).
--define(FLAPPING_BANNED_INTERVAL, 300000).
--define(DEFAULT_DETECT_POLICY, #{
-    max_count => ?FLAPPING_THRESHOLD,
-    window_time => ?FLAPPING_DURATION,
-    ban_time => ?FLAPPING_BANNED_INTERVAL
-}).
 
 -record(flapping, {
     clientid :: emqx_types:clientid(),
@@ -69,7 +64,7 @@ stop() -> gen_server:stop(?MODULE).
 %% @doc Detect flapping when a MQTT client disconnected.
 -spec detect(emqx_types:clientinfo()) -> boolean().
 detect(#{clientid := ClientId, peerhost := PeerHost, zone := Zone}) ->
-    Policy = #{max_count := Threshold} = get_policy(Zone),
+    Policy = #{max_count := Threshold} = get_policy([max_count, window_time, ban_time], Zone),
     %% The initial flapping record sets the detect_cnt to 0.
     InitVal = #flapping{
         clientid = ClientId,
@@ -89,8 +84,22 @@ detect(#{clientid := ClientId, peerhost := PeerHost, zone := Zone}) ->
             end
     end.
 
-get_policy(Zone) ->
-    emqx_config:get_zone_conf(Zone, [flapping_detect]).
+get_policy(Keys, Zone) when is_list(Keys) ->
+    RootKey = flapping_detect,
+    Conf = emqx_config:get_zone_conf(Zone, [RootKey]),
+    lists:foldl(
+        fun(Key, Acc) ->
+            case maps:find(Key, Conf) of
+                {ok, V} -> Acc#{Key => V};
+                error -> Acc#{Key => emqx_config:get([RootKey, Key])}
+            end
+        end,
+        #{},
+        Keys
+    );
+get_policy(Key, Zone) ->
+    #{Key := Conf} = get_policy([Key], Zone),
+    Conf.
 
 now_diff(TS) -> erlang:system_time(millisecond) - TS.
 
@@ -166,8 +175,7 @@ handle_cast(Msg, State) ->
 
 handle_info({timeout, _TRef, {garbage_collect, Zone}}, State) ->
     Timestamp =
-        erlang:system_time(millisecond) -
-            maps:get(window_time, get_policy(Zone)),
+        erlang:system_time(millisecond) - get_policy(window_time, Zone),
     MatchSpec = [{{'_', '_', '_', '$1', '_'}, [{'<', '$1', Timestamp}], [true]}],
     ets:select_delete(?FLAPPING_TAB, MatchSpec),
     _ = start_timer(Zone),
@@ -183,15 +191,19 @@ code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
 
 start_timer(Zone) ->
-    WindTime = maps:get(window_time, get_policy(Zone)),
-    emqx_misc:start_timer(WindTime, {garbage_collect, Zone}).
+    case get_policy(window_time, Zone) of
+        WindowTime when is_integer(WindowTime) ->
+            emqx_misc:start_timer(WindowTime, {garbage_collect, Zone});
+        disabled ->
+            ok
+    end.
 
 start_timers() ->
-    lists:foreach(
-        fun({Zone, _ZoneConf}) ->
+    maps:foreach(
+        fun(Zone, _ZoneConf) ->
             start_timer(Zone)
         end,
-        maps:to_list(emqx:get_config([zones], #{}))
+        emqx:get_config([zones], #{})
     ).
 
 fmt_host(PeerHost) ->
diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index f03ba07c5..c3d566554 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -145,17 +145,23 @@ roots(high) ->
         {"listeners",
             sc(
                 ref("listeners"),
-                #{}
-            )},
-        {"zones",
-            sc(
-                map("name", ref("zone")),
-                #{desc => ?DESC(zones)}
+                #{importance => ?IMPORTANCE_HIGH}
             )},
         {"mqtt",
             sc(
                 ref("mqtt"),
-                #{desc => ?DESC(mqtt)}
+                #{
+                    desc => ?DESC(mqtt),
+                    importance => ?IMPORTANCE_MEDIUM
+                }
+            )},
+        {"zones",
+            sc(
+                map("name", ref("zone")),
+                #{
+                    desc => ?DESC(zones),
+                    importance => ?IMPORTANCE_LOW
+                }
             )},
         {?EMQX_AUTHENTICATION_CONFIG_ROOT_NAME, authentication(global)},
         %% NOTE: authorization schema here is only to keep emqx app prue
@@ -199,7 +205,9 @@ roots(low) ->
         {"conn_congestion",
             sc(
                 ref("conn_congestion"),
-                #{}
+                #{
+                    importance => ?IMPORTANCE_HIDDEN
+                }
             )},
         {"stats",
             sc(
@@ -221,7 +229,7 @@ roots(low) ->
         {"flapping_detect",
             sc(
                 ref("flapping_detect"),
-                #{}
+                #{importance => ?IMPORTANCE_HIDDEN}
             )},
         {"persistent_session_store",
             sc(
@@ -620,25 +628,27 @@ fields("flapping_detect") ->
                 boolean(),
                 #{
                     default => false,
+                    deprecated => {since, "5.0.22"},
                     desc => ?DESC(flapping_detect_enable)
                 }
             )},
-        {"max_count",
-            sc(
-                integer(),
-                #{
-                    default => 15,
-                    desc => ?DESC(flapping_detect_max_count)
-                }
-            )},
         {"window_time",
             sc(
-                duration(),
+                hoconsc:union([disabled, duration()]),
                 #{
-                    default => <<"1m">>,
+                    default => disabled,
+                    importance => ?IMPORTANCE_HIGH,
                     desc => ?DESC(flapping_detect_window_time)
                 }
             )},
+        {"max_count",
+            sc(
+                non_neg_integer(),
+                #{
+                    default => 15,
+                    desc => ?DESC(flapping_detect_max_count)
+                }
+            )},
         {"ban_time",
             sc(
                 duration(),
diff --git a/apps/emqx/src/emqx_zone_schema.erl b/apps/emqx/src/emqx_zone_schema.erl
index 6ac8cefa3..5d6720986 100644
--- a/apps/emqx/src/emqx_zone_schema.erl
+++ b/apps/emqx/src/emqx_zone_schema.erl
@@ -55,7 +55,10 @@ zone_without_hidden() ->
 
 hidden() ->
     [
-        "stats"
+        "stats",
+        "overload_protection",
+        "conn_congestion",
+        "flapping_detect"
     ].
 
 %% zone schemas are clones from the same name from root level
diff --git a/apps/emqx/test/emqx_flapping_SUITE.erl b/apps/emqx/test/emqx_flapping_SUITE.erl
index e27ff67e0..877f05995 100644
--- a/apps/emqx/test/emqx_flapping_SUITE.erl
+++ b/apps/emqx/test/emqx_flapping_SUITE.erl
@@ -101,3 +101,21 @@ t_expired_detecting(_) ->
             ets:tab2list(emqx_flapping)
         )
     ).
+
+t_conf_without_window_time(_) ->
+    %% enable is deprecated, so we need to make sure it won't be used.
+    Global = emqx_config:get([flapping_detect]),
+    ?assertNot(maps:is_key(enable, Global)),
+    %% zones don't have default value, so we need to make sure fallback to global conf.
+    %% this new_zone will fallback to global conf.
+    emqx_config:put_zone_conf(new_zone, [flapping_detect], #{}),
+    ?assertEqual(Global, get_policy(new_zone)),
+
+    emqx_config:put_zone_conf(new_zone_1, [flapping_detect], #{window_time => 100}),
+    ?assertEqual(100, emqx_flapping:get_policy(window_time, new_zone_1)),
+    ?assertEqual(maps:get(ban_time, Global), emqx_flapping:get_policy(ban_time, new_zone_1)),
+    ?assertEqual(maps:get(max_count, Global), emqx_flapping:get_policy(max_count, new_zone_1)),
+    ok.
+
+get_policy(Zone) ->
+    emqx_flapping:get_policy([window_time, ban_time, max_count], Zone).
diff --git a/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
index 2d24bce99..06aa6f78d 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
@@ -121,7 +121,9 @@ t_log(_Config) ->
 
 t_global_zone(_Config) ->
     {ok, Zones} = get_global_zone(),
-    ZonesKeys = lists:map(fun({K, _}) -> K end, hocon_schema:roots(emqx_zone_schema)),
+    ZonesKeys = lists:map(
+        fun({K, _}) -> list_to_binary(K) end, emqx_zone_schema:zone_without_hidden()
+    ),
     ?assertEqual(lists:usort(ZonesKeys), lists:usort(maps:keys(Zones))),
     ?assertEqual(
         emqx_config:get_zone_conf(no_default, [mqtt, max_qos_allowed]),

From 3789ca2622509d3bfb854648f33a7951508578c6 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Fri, 14 Apr 2023 21:31:34 +0800
Subject: [PATCH 085/110] chore: revert stats desc

---
 apps/emqx/src/emqx_schema.erl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index c3d566554..bbc7b3a4a 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -1983,7 +1983,10 @@ desc("persistent_session_builtin") ->
 desc("persistent_table_mria_opts") ->
     "Tuning options for the mria table.";
 desc("stats") ->
-    "deprecated since 5.0.23";
+    "Enable/disable statistic data collection.\n"
+    "Statistic data such as message receive/send count/rate etc. "
+    "It provides insights of system performance and helps to diagnose issues. "
+    "You can find statistic data from the dashboard, or from the '/stats' API.";
 desc("authorization") ->
     "Settings for client authorization.";
 desc("mqtt") ->

From 99d6c5e179657c8414298007d47b5736d04c568f Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Fri, 14 Apr 2023 21:57:09 +0800
Subject: [PATCH 086/110] feat: hide dashboard's
 default_username/default_password conf

---
 apps/emqx_dashboard/src/emqx_dashboard_schema.erl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/emqx_dashboard/src/emqx_dashboard_schema.erl b/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
index 7df661fb2..0ba970842 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
@@ -42,6 +42,7 @@ fields("dashboard") ->
                 #{
                     default => <<"10s">>,
                     desc => ?DESC(sample_interval),
+                    importance => ?IMPORTANCE_HIDDEN,
                     validator => fun validate_sample_interval/1
                 }
             )},
@@ -61,6 +62,7 @@ fields("dashboard") ->
                 #{
                     desc => ?DESC(bootstrap_users_file),
                     required => false,
+                    importance => ?IMPORTANCE_HIDDEN,
                     default => <<>>
                     %% deprecated => {since, "5.1.0"}
                 }
@@ -97,7 +99,7 @@ fields("https") ->
         bind(18084)
         | common_listener_fields() ++
             exclude_fields(
-                ["fail_if_no_peer_cert"],
+                ["fail_if_no_peer_cert", "password"],
                 emqx_schema:server_ssl_opts_schema(#{}, true)
             )
     ].
@@ -210,6 +212,7 @@ default_username(default) -> <<"admin">>;
 default_username(required) -> true;
 default_username(desc) -> ?DESC(default_username);
 default_username('readOnly') -> true;
+default_username(importance) -> ?IMPORTANCE_HIDDEN;
 default_username(_) -> undefined.
 
 default_password(type) -> binary();
@@ -219,6 +222,7 @@ default_password('readOnly') -> true;
 default_password(sensitive) -> true;
 default_password(converter) -> fun emqx_schema:password_converter/2;
 default_password(desc) -> ?DESC(default_password);
+default_password(importance) -> ?IMPORTANCE_HIDDEN;
 default_password(_) -> undefined.
 
 cors(type) -> boolean();
@@ -231,6 +235,7 @@ i18n_lang(type) -> ?ENUM([en, zh]);
 i18n_lang(default) -> en;
 i18n_lang('readOnly') -> true;
 i18n_lang(desc) -> ?DESC(i18n_lang);
+i18n_lang(importance) -> ?IMPORTANCE_HIDDEN;
 i18n_lang(_) -> undefined.
 
 validate_sample_interval(Second) ->

From a9976287b53e3d759136445eddddff4c6a7e5486 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 16:26:32 +0200
Subject: [PATCH 087/110] fix: force proper calling decode to return proplist

---
 apps/emqx_utils/test/props/prop_emqx_utils_json.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/emqx_utils/test/props/prop_emqx_utils_json.erl b/apps/emqx_utils/test/props/prop_emqx_utils_json.erl
index 86f60b39c..0be1508da 100644
--- a/apps/emqx_utils/test/props/prop_emqx_utils_json.erl
+++ b/apps/emqx_utils/test/props/prop_emqx_utils_json.erl
@@ -66,7 +66,7 @@ prop_object_proplist_to_proplist() ->
         begin
             {ok, J} = safe_encode(T),
             {ok, T} = safe_decode(J),
-            T = decode(encode(T)),
+            T = decode(encode(T), []),
             true
         end
     ).
@@ -108,7 +108,7 @@ prop_object_map_to_proplist() ->
             T = to_list(T0),
             {ok, J} = safe_encode(T0),
             {ok, T} = safe_decode(J),
-            T = decode(encode(T0)),
+            T = decode(encode(T0), []),
             true
         end
     ).

From bcce98990605eb33f93adca3600b8abd8025cbba Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Fri, 14 Apr 2023 22:30:11 +0800
Subject: [PATCH 088/110] chore: update has_deprecated_file doc

Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
---
 apps/emqx/src/emqx_config.erl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/emqx/src/emqx_config.erl b/apps/emqx/src/emqx_config.erl
index 75396d779..c73fdbc72 100644
--- a/apps/emqx/src/emqx_config.erl
+++ b/apps/emqx/src/emqx_config.erl
@@ -514,6 +514,8 @@ read_override_conf(#{} = Opts) ->
         end,
     load_hocon_file(File, map).
 
+%% @doc Return `true' if this node is upgraded from older version which used cluster-override.conf for
+%% cluster-wide config persistence.
 has_deprecated_file() ->
     DeprecatedFile = deprecated_conf_file(#{override_to => cluster}),
     filelib:is_regular(DeprecatedFile).

From 53871e3a2ce8b2e947a89f611ebe502c9a35a5c9 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 16:30:27 +0200
Subject: [PATCH 089/110] fix: stale ref to emqx_json after rebase

---
 .../test/emqx_bridge_kafka_impl_producer_SUITE.erl              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_producer_SUITE.erl b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_producer_SUITE.erl
index 5e2a2a7a8..a2111b1a8 100644
--- a/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_producer_SUITE.erl
+++ b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_producer_SUITE.erl
@@ -320,7 +320,7 @@ kafka_bridge_rest_api_helper(Config) ->
             <<"sql">> => <<"SELECT * from \"kafka_bridge_topic/#\"">>
         }
     ),
-    #{<<"id">> := RuleId} = emqx_json:decode(Rule, [return_maps]),
+    #{<<"id">> := RuleId} = emqx_utils_json:decode(Rule, [return_maps]),
     %% counters should be empty before
     ?assertEqual(0, emqx_resource_metrics:matched_get(ResourceId)),
     ?assertEqual(0, emqx_resource_metrics:success_get(ResourceId)),

From 7c5dead03a4a5b5074b16915469d90a96e424a0e Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Fri, 14 Apr 2023 22:30:35 +0800
Subject: [PATCH 090/110] chore: update cluster_hocon_file doc

Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
---
 apps/emqx/src/emqx_config.erl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/emqx/src/emqx_config.erl b/apps/emqx/src/emqx_config.erl
index c73fdbc72..b676b07e2 100644
--- a/apps/emqx/src/emqx_config.erl
+++ b/apps/emqx/src/emqx_config.erl
@@ -530,6 +530,7 @@ deprecated_conf_file(Opts) when is_map(Opts) ->
 deprecated_conf_file(Which) when is_atom(Which) ->
     application:get_env(emqx, Which, undefined).
 
+%% The newer version cluster-wide config persistence file.
 cluster_hocon_file(Opts) when is_map(Opts) ->
     Key =
         case maps:get(override_to, Opts, cluster) of

From edd1bc579f6eaba4119126dd46a3f71f18f5e898 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 16:32:42 +0200
Subject: [PATCH 091/110] fix: stale ref to emqx_json after rebase

---
 lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
index c1b33c3c9..6e6d7bf03 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
@@ -501,7 +501,7 @@ create_bridge_http(Params) ->
     Path = emqx_mgmt_api_test_util:api_path(["bridges"]),
     AuthHeader = emqx_mgmt_api_test_util:auth_header_(),
     case emqx_mgmt_api_test_util:request_api(post, Path, "", AuthHeader, Params) of
-        {ok, Res} -> {ok, emqx_json:decode(Res, [return_maps])};
+        {ok, Res} -> {ok, emqx_utils_json:decode(Res, [return_maps])};
         Error -> Error
     end.
 

From 14ed4a7adae564497719e1fc3bc66ec504beeb82 Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Fri, 14 Apr 2023 10:05:20 -0300
Subject: [PATCH 092/110] feat(buffer_worker): set default queue mode to
 `memory_only`

Fixes https://emqx.atlassian.net/browse/EMQX-9367

For better user experience and performance for the average bridge, we
should change the default queue mode to `memory_only`, as was the
behavior of most bridges in e4.x.  This leads to better performance
when message rate is high enough and the remote resource is not
keeping up with EMQX.

Also, we set the default segment size to equal max queue bytes.
---
 apps/emqx_resource/include/emqx_resource.hrl  |   3 -
 .../src/emqx_resource_buffer_worker.erl       |  43 ++++---
 .../src/schema/emqx_resource_schema.erl       |  17 ++-
 .../test/emqx_resource_SUITE.erl              | 112 ++++++++++++++++++
 changes/ce/feat-10404.en.md                   |   2 +
 rel/i18n/emqx_resource_schema.hocon           |  38 ++++++
 6 files changed, 196 insertions(+), 19 deletions(-)
 create mode 100644 changes/ce/feat-10404.en.md

diff --git a/apps/emqx_resource/include/emqx_resource.hrl b/apps/emqx_resource/include/emqx_resource.hrl
index 904eeffa5..f8d671b40 100644
--- a/apps/emqx_resource/include/emqx_resource.hrl
+++ b/apps/emqx_resource/include/emqx_resource.hrl
@@ -85,9 +85,6 @@
 
 -define(WORKER_POOL_SIZE, 16).
 
--define(DEFAULT_QUEUE_SEG_SIZE, 10 * 1024 * 1024).
--define(DEFAULT_QUEUE_SEG_SIZE_RAW, <<"10MB">>).
-
 -define(DEFAULT_QUEUE_SIZE, 256 * 1024 * 1024).
 -define(DEFAULT_QUEUE_SIZE_RAW, <<"256MB">>).
 
diff --git a/apps/emqx_resource/src/emqx_resource_buffer_worker.erl b/apps/emqx_resource/src/emqx_resource_buffer_worker.erl
index 0fa4c0bd8..c53627ca4 100644
--- a/apps/emqx_resource/src/emqx_resource_buffer_worker.erl
+++ b/apps/emqx_resource/src/emqx_resource_buffer_worker.erl
@@ -178,20 +178,7 @@ init({Id, Index, Opts}) ->
     process_flag(trap_exit, true),
     true = gproc_pool:connect_worker(Id, {Id, Index}),
     BatchSize = maps:get(batch_size, Opts, ?DEFAULT_BATCH_SIZE),
-    SegBytes0 = maps:get(queue_seg_bytes, Opts, ?DEFAULT_QUEUE_SEG_SIZE),
-    TotalBytes = maps:get(max_queue_bytes, Opts, ?DEFAULT_QUEUE_SIZE),
-    SegBytes = min(SegBytes0, TotalBytes),
-    QueueOpts =
-        #{
-            dir => disk_queue_dir(Id, Index),
-            marshaller => fun ?MODULE:queue_item_marshaller/1,
-            max_total_bytes => TotalBytes,
-            %% we don't want to retain the queue after
-            %% resource restarts.
-            offload => {true, volatile},
-            seg_bytes => SegBytes,
-            sizer => fun ?MODULE:estimate_size/1
-        },
+    QueueOpts = replayq_opts(Id, Index, Opts),
     Queue = replayq:open(QueueOpts),
     emqx_resource_metrics:queuing_set(Id, Index, queue_count(Queue)),
     emqx_resource_metrics:inflight_set(Id, Index, 0),
@@ -214,7 +201,7 @@ init({Id, Index, Opts}) ->
         resume_interval => ResumeInterval,
         tref => undefined
     },
-    ?tp(buffer_worker_init, #{id => Id, index => Index}),
+    ?tp(buffer_worker_init, #{id => Id, index => Index, queue_opts => QueueOpts}),
     {ok, running, Data}.
 
 running(enter, _, #{tref := _Tref} = Data) ->
@@ -1679,6 +1666,32 @@ adjust_batch_time(Id, RequestTimeout, BatchTime0) ->
     end,
     BatchTime.
 
+replayq_opts(Id, Index, Opts) ->
+    QueueMode = maps:get(queue_mode, Opts, memory_only),
+    TotalBytes = maps:get(max_queue_bytes, Opts, ?DEFAULT_QUEUE_SIZE),
+    case QueueMode of
+        memory_only ->
+            #{
+                mem_only => true,
+                marshaller => fun ?MODULE:queue_item_marshaller/1,
+                max_total_bytes => TotalBytes,
+                sizer => fun ?MODULE:estimate_size/1
+            };
+        volatile_offload ->
+            SegBytes0 = maps:get(queue_seg_bytes, Opts, TotalBytes),
+            SegBytes = min(SegBytes0, TotalBytes),
+            #{
+                dir => disk_queue_dir(Id, Index),
+                marshaller => fun ?MODULE:queue_item_marshaller/1,
+                max_total_bytes => TotalBytes,
+                %% we don't want to retain the queue after
+                %% resource restarts.
+                offload => {true, volatile},
+                seg_bytes => SegBytes,
+                sizer => fun ?MODULE:estimate_size/1
+            }
+    end.
+
 %% The request timeout should be greater than the resume interval, as
 %% it defines how often the buffer worker tries to unblock. If request
 %% timeout is <= resume interval and the buffer worker is ever
diff --git a/apps/emqx_resource/src/schema/emqx_resource_schema.erl b/apps/emqx_resource/src/schema/emqx_resource_schema.erl
index 647a40fed..9116927fa 100644
--- a/apps/emqx_resource/src/schema/emqx_resource_schema.erl
+++ b/apps/emqx_resource/src/schema/emqx_resource_schema.erl
@@ -40,6 +40,7 @@ fields("resource_opts") ->
     ];
 fields("creation_opts") ->
     [
+        {queue_mode, fun queue_mode/1},
         {worker_pool_size, fun worker_pool_size/1},
         {health_check_interval, fun health_check_interval/1},
         {resume_interval, fun resume_interval/1},
@@ -53,7 +54,8 @@ fields("creation_opts") ->
         {batch_size, fun batch_size/1},
         {batch_time, fun batch_time/1},
         {enable_queue, fun enable_queue/1},
-        {max_queue_bytes, fun max_queue_bytes/1}
+        {max_queue_bytes, fun max_queue_bytes/1},
+        {queue_seg_bytes, fun queue_seg_bytes/1}
     ].
 
 resource_opts_meta() ->
@@ -149,4 +151,17 @@ max_queue_bytes(default) -> ?DEFAULT_QUEUE_SIZE_RAW;
 max_queue_bytes(required) -> false;
 max_queue_bytes(_) -> undefined.
 
+queue_mode(type) -> enum([memory_only, volatile_offload]);
+queue_mode(desc) -> ?DESC("queue_mode");
+queue_mode(default) -> memory_only;
+queue_mode(required) -> false;
+queue_mode(importance) -> ?IMPORTANCE_HIDDEN;
+queue_mode(_) -> undefined.
+
+queue_seg_bytes(type) -> emqx_schema:bytesize();
+queue_seg_bytes(desc) -> ?DESC("queue_seg_bytes");
+queue_seg_bytes(required) -> false;
+queue_seg_bytes(importance) -> ?IMPORTANCE_HIDDEN;
+queue_seg_bytes(_) -> undefined.
+
 desc("creation_opts") -> ?DESC("creation_opts").
diff --git a/apps/emqx_resource/test/emqx_resource_SUITE.erl b/apps/emqx_resource/test/emqx_resource_SUITE.erl
index 5d8e85697..087a39eee 100644
--- a/apps/emqx_resource/test/emqx_resource_SUITE.erl
+++ b/apps/emqx_resource/test/emqx_resource_SUITE.erl
@@ -1314,6 +1314,7 @@ t_delete_and_re_create_with_same_name(_Config) ->
             query_mode => sync,
             batch_size => 1,
             worker_pool_size => NumBufferWorkers,
+            queue_mode => volatile_offload,
             queue_seg_bytes => 100,
             resume_interval => 1_000
         }
@@ -2639,6 +2640,117 @@ t_call_mode_uncoupled_from_query_mode(_Config) ->
         end
     ).
 
+%% The default mode is currently `memory_only'.
+t_volatile_offload_mode(_Config) ->
+    MaxQueueBytes = 1_000,
+    DefaultOpts = #{
+        max_queue_bytes => MaxQueueBytes,
+        worker_pool_size => 1
+    },
+    ?check_trace(
+        begin
+            emqx_connector_demo:set_callback_mode(async_if_possible),
+            %% Create without any specified segment bytes; should
+            %% default to equal max bytes.
+            ?assertMatch(
+                {ok, _},
+                emqx_resource:create(
+                    ?ID,
+                    ?DEFAULT_RESOURCE_GROUP,
+                    ?TEST_RESOURCE,
+                    #{name => test_resource},
+                    DefaultOpts#{queue_mode => volatile_offload}
+                )
+            ),
+            ?assertEqual(ok, emqx_resource:remove_local(?ID)),
+
+            %% Create with segment bytes < max bytes
+            ?assertMatch(
+                {ok, _},
+                emqx_resource:create(
+                    ?ID,
+                    ?DEFAULT_RESOURCE_GROUP,
+                    ?TEST_RESOURCE,
+                    #{name => test_resource},
+                    DefaultOpts#{
+                        queue_mode => volatile_offload,
+                        queue_seg_bytes => MaxQueueBytes div 2
+                    }
+                )
+            ),
+            ?assertEqual(ok, emqx_resource:remove_local(?ID)),
+            %% Create with segment bytes = max bytes
+            ?assertMatch(
+                {ok, _},
+                emqx_resource:create(
+                    ?ID,
+                    ?DEFAULT_RESOURCE_GROUP,
+                    ?TEST_RESOURCE,
+                    #{name => test_resource},
+                    DefaultOpts#{
+                        queue_mode => volatile_offload,
+                        queue_seg_bytes => MaxQueueBytes
+                    }
+                )
+            ),
+            ?assertEqual(ok, emqx_resource:remove_local(?ID)),
+
+            %% Create with segment bytes > max bytes; should normalize
+            %% to max bytes.
+            ?assertMatch(
+                {ok, _},
+                emqx_resource:create(
+                    ?ID,
+                    ?DEFAULT_RESOURCE_GROUP,
+                    ?TEST_RESOURCE,
+                    #{name => test_resource},
+                    DefaultOpts#{
+                        queue_mode => volatile_offload,
+                        queue_seg_bytes => 2 * MaxQueueBytes
+                    }
+                )
+            ),
+            ?assertEqual(ok, emqx_resource:remove_local(?ID)),
+
+            ok
+        end,
+        fun(Trace) ->
+            HalfMaxQueueBytes = MaxQueueBytes div 2,
+            ?assertMatch(
+                [
+                    #{
+                        dir := _,
+                        max_total_bytes := MaxTotalBytes,
+                        seg_bytes := MaxTotalBytes,
+                        offload := {true, volatile}
+                    },
+                    #{
+                        dir := _,
+                        max_total_bytes := MaxTotalBytes,
+                        %% uses the specified value since it's smaller
+                        %% than max bytes.
+                        seg_bytes := HalfMaxQueueBytes,
+                        offload := {true, volatile}
+                    },
+                    #{
+                        dir := _,
+                        max_total_bytes := MaxTotalBytes,
+                        seg_bytes := MaxTotalBytes,
+                        offload := {true, volatile}
+                    },
+                    #{
+                        dir := _,
+                        max_total_bytes := MaxTotalBytes,
+                        seg_bytes := MaxTotalBytes,
+                        offload := {true, volatile}
+                    }
+                ],
+                ?projection(queue_opts, ?of_kind(buffer_worker_init, Trace))
+            ),
+            ok
+        end
+    ).
+
 %%------------------------------------------------------------------------------
 %% Helpers
 %%------------------------------------------------------------------------------
diff --git a/changes/ce/feat-10404.en.md b/changes/ce/feat-10404.en.md
new file mode 100644
index 000000000..ad216336e
--- /dev/null
+++ b/changes/ce/feat-10404.en.md
@@ -0,0 +1,2 @@
+Change the default queue mode for buffer workers to `memory_only`.
+Before this change, the default queue mode was `volatile_offload`.  When under high message rate pressure and when the resource is not keeping up with such rate, the buffer performance degraded a lot due to the constant disk operations.
diff --git a/rel/i18n/emqx_resource_schema.hocon b/rel/i18n/emqx_resource_schema.hocon
index c73f8b1aa..7b693c256 100644
--- a/rel/i18n/emqx_resource_schema.hocon
+++ b/rel/i18n/emqx_resource_schema.hocon
@@ -179,5 +179,43 @@ When disabled the messages are buffered in RAM only."""
     }
   }
 
+  queue_seg_bytes {
+    desc {
+      en: "Applicable when buffer mode is set to <code>volatile_offload</code>.\n"
+          "This value is to specify the size of each on-disk buffer file."
+      zh: "当缓存模式是 <code>volatile_offload</code> 时适用。"
+          "该配置用于指定缓存到磁盘上的文件的大小。"
+    }
+    label {
+      en: "Segment File Bytes"
+      zh: "缓存文件大小"
+    }
+  }
+
+  queue_mode {
+    desc {
+      en: "Queue operation mode.\n"
+          "\n"
+          "<code>memory_only</mode>: Buffer all messages in memory."
+          " The messages will be lost in case of EMQX node restart.\n"
+          "<code>volatile_offload</code>: Buffer message in memory first, when up to certain limit"
+          " (see <code>queue_seg_bytes</code> config for more information), then start offloading"
+          " messages to disk, Like <code>memory_only</code> mode, the messages will be lost in case of"
+          " EMQX node restart."
+      zh: "队列操作模式。\n"
+          "\n"
+          "<code>memory_only</code>: 所有的消息都缓存在内存里。"
+          " 如果 EMQX 服务重启，缓存的消息会丢失。\n"
+          "<code>hybrid</code>: 先将消息缓存在内存中，当内存中的消息堆积超过一定限制"
+          "（配置项 <code>queue_seg_bytes</code> 描述了该限制）后，"
+          " 后续的消息会缓存到磁盘上。与 <code>memory_only</code> 模式一样，"
+          " 如果 EMQX 服务重启，缓存的消息会丢失。"
+    }
+    label {
+      en: "Queue Mode"
+      zh: "排队模式"
+    }
+  }
+
 
 }

From dd381227972f0965d680bd4d8872f6f15765f70a Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Fri, 14 Apr 2023 11:22:04 -0300
Subject: [PATCH 093/110] docs: improve descriptions

Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
---
 rel/i18n/emqx_resource_schema.hocon | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/rel/i18n/emqx_resource_schema.hocon b/rel/i18n/emqx_resource_schema.hocon
index 7b693c256..885a6c4dd 100644
--- a/rel/i18n/emqx_resource_schema.hocon
+++ b/rel/i18n/emqx_resource_schema.hocon
@@ -195,25 +195,18 @@ When disabled the messages are buffered in RAM only."""
   queue_mode {
     desc {
       en: "Queue operation mode.\n"
-          "\n"
           "<code>memory_only</mode>: Buffer all messages in memory."
-          " The messages will be lost in case of EMQX node restart.\n"
           "<code>volatile_offload</code>: Buffer message in memory first, when up to certain limit"
-          " (see <code>queue_seg_bytes</code> config for more information), then start offloading"
-          " messages to disk, Like <code>memory_only</code> mode, the messages will be lost in case of"
-          " EMQX node restart."
+          " (see <code>buffer_seg_bytes</code> config for more information), then start offloading messages to disk"
       zh: "队列操作模式。\n"
-          "\n"
           "<code>memory_only</code>: 所有的消息都缓存在内存里。"
-          " 如果 EMQX 服务重启，缓存的消息会丢失。\n"
-          "<code>hybrid</code>: 先将消息缓存在内存中，当内存中的消息堆积超过一定限制"
-          "（配置项 <code>queue_seg_bytes</code> 描述了该限制）后，"
-          " 后续的消息会缓存到磁盘上。与 <code>memory_only</code> 模式一样，"
-          " 如果 EMQX 服务重启，缓存的消息会丢失。"
+          "<code>volatile_offload</code>: 先将消息缓存在内存中，当内存中的消息堆积超过一定限制"
+          "（配置项 <code>buffer_seg_bytes</code> 该限制）后，"
+          " 消息会缓存到磁盘上"
     }
     label {
-      en: "Queue Mode"
-      zh: "排队模式"
+      en: "Buffer Mode"
+      zh: "缓存模式"
     }
   }
 

From e073bc90bc76d3bea1387a0f4196a3fe6b23ac9a Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Fri, 14 Apr 2023 11:29:52 -0300
Subject: [PATCH 094/110] refactor(buffer_worker): rename `s/queue/buffer/g`

---
 apps/emqx_bridge/src/emqx_bridge_api.erl      |  4 +-
 .../schema/emqx_bridge_compatible_config.erl  |  2 +-
 .../test/emqx_bridge_webhook_SUITE.erl        |  2 +-
 apps/emqx_resource/include/emqx_resource.hrl  |  6 +--
 .../src/emqx_resource_buffer_worker.erl       |  8 ++--
 .../src/schema/emqx_resource_schema.erl       | 39 ++++++++++---------
 .../test/emqx_resource_SUITE.erl              | 30 +++++++-------
 .../src/emqx_ee_bridge_cassa.erl              |  2 +-
 .../src/emqx_ee_bridge_clickhouse.erl         |  2 +-
 .../src/emqx_ee_bridge_dynamo.erl             |  2 +-
 .../src/emqx_ee_bridge_mysql.erl              |  2 +-
 .../src/emqx_ee_bridge_pgsql.erl              |  2 +-
 .../src/emqx_ee_bridge_rocketmq.erl           |  2 +-
 .../src/emqx_ee_bridge_sqlserver.erl          |  2 +-
 .../src/emqx_ee_bridge_tdengine.erl           |  2 +-
 rel/i18n/emqx_resource_schema.hocon           |  8 ++--
 scripts/test/influx/influx-bridge.conf        |  2 +-
 17 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/apps/emqx_bridge/src/emqx_bridge_api.erl b/apps/emqx_bridge/src/emqx_bridge_api.erl
index b29cefacd..137cd1241 100644
--- a/apps/emqx_bridge/src/emqx_bridge_api.erl
+++ b/apps/emqx_bridge/src/emqx_bridge_api.erl
@@ -220,7 +220,7 @@ info_example_basic(webhook) ->
             auto_restart_interval => 15000,
             query_mode => async,
             inflight_window => 100,
-            max_queue_bytes => 100 * 1024 * 1024
+            max_buffer_bytes => 100 * 1024 * 1024
         }
     };
 info_example_basic(mqtt) ->
@@ -245,7 +245,7 @@ mqtt_main_example() ->
             health_check_interval => <<"15s">>,
             auto_restart_interval => <<"60s">>,
             query_mode => sync,
-            max_queue_bytes => 100 * 1024 * 1024
+            max_buffer_bytes => 100 * 1024 * 1024
         },
         ssl => #{
             enable => false
diff --git a/apps/emqx_bridge/src/schema/emqx_bridge_compatible_config.erl b/apps/emqx_bridge/src/schema/emqx_bridge_compatible_config.erl
index fe173fa89..595b75ecf 100644
--- a/apps/emqx_bridge/src/schema/emqx_bridge_compatible_config.erl
+++ b/apps/emqx_bridge/src/schema/emqx_bridge_compatible_config.erl
@@ -89,7 +89,7 @@ default_resource_opts() ->
         <<"inflight_window">> => 100,
         <<"auto_restart_interval">> => <<"60s">>,
         <<"health_check_interval">> => <<"15s">>,
-        <<"max_queue_bytes">> => <<"1GB">>,
+        <<"max_buffer_bytes">> => <<"1GB">>,
         <<"query_mode">> => <<"sync">>,
         %% there is only one underlying MQTT connection
         %% doesn't make a lot of sense to have a large pool
diff --git a/apps/emqx_bridge/test/emqx_bridge_webhook_SUITE.erl b/apps/emqx_bridge/test/emqx_bridge_webhook_SUITE.erl
index e222190d2..f08c87b6e 100644
--- a/apps/emqx_bridge/test/emqx_bridge_webhook_SUITE.erl
+++ b/apps/emqx_bridge/test/emqx_bridge_webhook_SUITE.erl
@@ -175,7 +175,7 @@ bridge_async_config(#{port := Port} = Config) ->
         "    inflight_window = 100\n"
         "    auto_restart_interval = \"60s\"\n"
         "    health_check_interval = \"15s\"\n"
-        "    max_queue_bytes = \"1GB\"\n"
+        "    max_buffer_bytes = \"1GB\"\n"
         "    query_mode = \"~s\"\n"
         "    request_timeout = \"~s\"\n"
         "    start_after_created = \"true\"\n"
diff --git a/apps/emqx_resource/include/emqx_resource.hrl b/apps/emqx_resource/include/emqx_resource.hrl
index f8d671b40..91572eac3 100644
--- a/apps/emqx_resource/include/emqx_resource.hrl
+++ b/apps/emqx_resource/include/emqx_resource.hrl
@@ -70,7 +70,7 @@
     auto_restart_interval => pos_integer(),
     batch_size => pos_integer(),
     batch_time => pos_integer(),
-    max_queue_bytes => pos_integer(),
+    max_buffer_bytes => pos_integer(),
     query_mode => query_mode(),
     resume_interval => pos_integer(),
     inflight_window => pos_integer()
@@ -85,8 +85,8 @@
 
 -define(WORKER_POOL_SIZE, 16).
 
--define(DEFAULT_QUEUE_SIZE, 256 * 1024 * 1024).
--define(DEFAULT_QUEUE_SIZE_RAW, <<"256MB">>).
+-define(DEFAULT_BUFFER_BYTES, 256 * 1024 * 1024).
+-define(DEFAULT_BUFFER_BYTES_RAW, <<"256MB">>).
 
 -define(DEFAULT_REQUEST_TIMEOUT, timer:seconds(15)).
 
diff --git a/apps/emqx_resource/src/emqx_resource_buffer_worker.erl b/apps/emqx_resource/src/emqx_resource_buffer_worker.erl
index c53627ca4..a77335140 100644
--- a/apps/emqx_resource/src/emqx_resource_buffer_worker.erl
+++ b/apps/emqx_resource/src/emqx_resource_buffer_worker.erl
@@ -1667,9 +1667,9 @@ adjust_batch_time(Id, RequestTimeout, BatchTime0) ->
     BatchTime.
 
 replayq_opts(Id, Index, Opts) ->
-    QueueMode = maps:get(queue_mode, Opts, memory_only),
-    TotalBytes = maps:get(max_queue_bytes, Opts, ?DEFAULT_QUEUE_SIZE),
-    case QueueMode of
+    BufferMode = maps:get(buffer_mode, Opts, memory_only),
+    TotalBytes = maps:get(max_buffer_bytes, Opts, ?DEFAULT_BUFFER_BYTES),
+    case BufferMode of
         memory_only ->
             #{
                 mem_only => true,
@@ -1678,7 +1678,7 @@ replayq_opts(Id, Index, Opts) ->
                 sizer => fun ?MODULE:estimate_size/1
             };
         volatile_offload ->
-            SegBytes0 = maps:get(queue_seg_bytes, Opts, TotalBytes),
+            SegBytes0 = maps:get(buffer_seg_bytes, Opts, TotalBytes),
             SegBytes = min(SegBytes0, TotalBytes),
             #{
                 dir => disk_queue_dir(Id, Index),
diff --git a/apps/emqx_resource/src/schema/emqx_resource_schema.erl b/apps/emqx_resource/src/schema/emqx_resource_schema.erl
index 9116927fa..3b4fb66e5 100644
--- a/apps/emqx_resource/src/schema/emqx_resource_schema.erl
+++ b/apps/emqx_resource/src/schema/emqx_resource_schema.erl
@@ -40,7 +40,7 @@ fields("resource_opts") ->
     ];
 fields("creation_opts") ->
     [
-        {queue_mode, fun queue_mode/1},
+        {buffer_mode, fun buffer_mode/1},
         {worker_pool_size, fun worker_pool_size/1},
         {health_check_interval, fun health_check_interval/1},
         {resume_interval, fun resume_interval/1},
@@ -54,8 +54,8 @@ fields("creation_opts") ->
         {batch_size, fun batch_size/1},
         {batch_time, fun batch_time/1},
         {enable_queue, fun enable_queue/1},
-        {max_queue_bytes, fun max_queue_bytes/1},
-        {queue_seg_bytes, fun queue_seg_bytes/1}
+        {max_buffer_bytes, fun max_buffer_bytes/1},
+        {buffer_seg_bytes, fun buffer_seg_bytes/1}
     ].
 
 resource_opts_meta() ->
@@ -145,23 +145,24 @@ batch_time(default) -> ?DEFAULT_BATCH_TIME_RAW;
 batch_time(required) -> false;
 batch_time(_) -> undefined.
 
-max_queue_bytes(type) -> emqx_schema:bytesize();
-max_queue_bytes(desc) -> ?DESC("max_queue_bytes");
-max_queue_bytes(default) -> ?DEFAULT_QUEUE_SIZE_RAW;
-max_queue_bytes(required) -> false;
-max_queue_bytes(_) -> undefined.
+max_buffer_bytes(type) -> emqx_schema:bytesize();
+max_buffer_bytes(aliases) -> [max_queue_bytes];
+max_buffer_bytes(desc) -> ?DESC("max_buffer_bytes");
+max_buffer_bytes(default) -> ?DEFAULT_BUFFER_BYTES_RAW;
+max_buffer_bytes(required) -> false;
+max_buffer_bytes(_) -> undefined.
 
-queue_mode(type) -> enum([memory_only, volatile_offload]);
-queue_mode(desc) -> ?DESC("queue_mode");
-queue_mode(default) -> memory_only;
-queue_mode(required) -> false;
-queue_mode(importance) -> ?IMPORTANCE_HIDDEN;
-queue_mode(_) -> undefined.
+buffer_mode(type) -> enum([memory_only, volatile_offload]);
+buffer_mode(desc) -> ?DESC("buffer_mode");
+buffer_mode(default) -> memory_only;
+buffer_mode(required) -> false;
+buffer_mode(importance) -> ?IMPORTANCE_HIDDEN;
+buffer_mode(_) -> undefined.
 
-queue_seg_bytes(type) -> emqx_schema:bytesize();
-queue_seg_bytes(desc) -> ?DESC("queue_seg_bytes");
-queue_seg_bytes(required) -> false;
-queue_seg_bytes(importance) -> ?IMPORTANCE_HIDDEN;
-queue_seg_bytes(_) -> undefined.
+buffer_seg_bytes(type) -> emqx_schema:bytesize();
+buffer_seg_bytes(desc) -> ?DESC("buffer_seg_bytes");
+buffer_seg_bytes(required) -> false;
+buffer_seg_bytes(importance) -> ?IMPORTANCE_HIDDEN;
+buffer_seg_bytes(_) -> undefined.
 
 desc("creation_opts") -> ?DESC("creation_opts").
diff --git a/apps/emqx_resource/test/emqx_resource_SUITE.erl b/apps/emqx_resource/test/emqx_resource_SUITE.erl
index 087a39eee..385b4cb91 100644
--- a/apps/emqx_resource/test/emqx_resource_SUITE.erl
+++ b/apps/emqx_resource/test/emqx_resource_SUITE.erl
@@ -1314,8 +1314,8 @@ t_delete_and_re_create_with_same_name(_Config) ->
             query_mode => sync,
             batch_size => 1,
             worker_pool_size => NumBufferWorkers,
-            queue_mode => volatile_offload,
-            queue_seg_bytes => 100,
+            buffer_mode => volatile_offload,
+            buffer_seg_bytes => 100,
             resume_interval => 1_000
         }
     ),
@@ -1374,7 +1374,7 @@ t_delete_and_re_create_with_same_name(_Config) ->
                             query_mode => async,
                             batch_size => 1,
                             worker_pool_size => 2,
-                            queue_seg_bytes => 100,
+                            buffer_seg_bytes => 100,
                             resume_interval => 1_000
                         }
                     ),
@@ -1406,7 +1406,7 @@ t_always_overflow(_Config) ->
             query_mode => sync,
             batch_size => 1,
             worker_pool_size => 1,
-            max_queue_bytes => 1,
+            max_buffer_bytes => 1,
             resume_interval => 1_000
         }
     ),
@@ -2642,9 +2642,9 @@ t_call_mode_uncoupled_from_query_mode(_Config) ->
 
 %% The default mode is currently `memory_only'.
 t_volatile_offload_mode(_Config) ->
-    MaxQueueBytes = 1_000,
+    MaxBufferBytes = 1_000,
     DefaultOpts = #{
-        max_queue_bytes => MaxQueueBytes,
+        max_buffer_bytes => MaxBufferBytes,
         worker_pool_size => 1
     },
     ?check_trace(
@@ -2659,7 +2659,7 @@ t_volatile_offload_mode(_Config) ->
                     ?DEFAULT_RESOURCE_GROUP,
                     ?TEST_RESOURCE,
                     #{name => test_resource},
-                    DefaultOpts#{queue_mode => volatile_offload}
+                    DefaultOpts#{buffer_mode => volatile_offload}
                 )
             ),
             ?assertEqual(ok, emqx_resource:remove_local(?ID)),
@@ -2673,8 +2673,8 @@ t_volatile_offload_mode(_Config) ->
                     ?TEST_RESOURCE,
                     #{name => test_resource},
                     DefaultOpts#{
-                        queue_mode => volatile_offload,
-                        queue_seg_bytes => MaxQueueBytes div 2
+                        buffer_mode => volatile_offload,
+                        buffer_seg_bytes => MaxBufferBytes div 2
                     }
                 )
             ),
@@ -2688,8 +2688,8 @@ t_volatile_offload_mode(_Config) ->
                     ?TEST_RESOURCE,
                     #{name => test_resource},
                     DefaultOpts#{
-                        queue_mode => volatile_offload,
-                        queue_seg_bytes => MaxQueueBytes
+                        buffer_mode => volatile_offload,
+                        buffer_seg_bytes => MaxBufferBytes
                     }
                 )
             ),
@@ -2705,8 +2705,8 @@ t_volatile_offload_mode(_Config) ->
                     ?TEST_RESOURCE,
                     #{name => test_resource},
                     DefaultOpts#{
-                        queue_mode => volatile_offload,
-                        queue_seg_bytes => 2 * MaxQueueBytes
+                        buffer_mode => volatile_offload,
+                        buffer_seg_bytes => 2 * MaxBufferBytes
                     }
                 )
             ),
@@ -2715,7 +2715,7 @@ t_volatile_offload_mode(_Config) ->
             ok
         end,
         fun(Trace) ->
-            HalfMaxQueueBytes = MaxQueueBytes div 2,
+            HalfMaxBufferBytes = MaxBufferBytes div 2,
             ?assertMatch(
                 [
                     #{
@@ -2729,7 +2729,7 @@ t_volatile_offload_mode(_Config) ->
                         max_total_bytes := MaxTotalBytes,
                         %% uses the specified value since it's smaller
                         %% than max bytes.
-                        seg_bytes := HalfMaxQueueBytes,
+                        seg_bytes := HalfMaxBufferBytes,
                         offload := {true, volatile}
                     },
                     #{
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_cassa.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_cassa.erl
index 78db8352a..26c6de04d 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_cassa.erl
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_cassa.erl
@@ -63,7 +63,7 @@ values(_Method, Type) ->
             batch_size => ?DEFAULT_BATCH_SIZE,
             batch_time => ?DEFAULT_BATCH_TIME,
             query_mode => sync,
-            max_queue_bytes => ?DEFAULT_QUEUE_SIZE
+            max_buffer_bytes => ?DEFAULT_BUFFER_BYTES
         }
     }.
 
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_clickhouse.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_clickhouse.erl
index 0b611c142..56671c586 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_clickhouse.erl
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_clickhouse.erl
@@ -61,7 +61,7 @@ values(_Method, Type) ->
             batch_size => ?DEFAULT_BATCH_SIZE,
             batch_time => ?DEFAULT_BATCH_TIME,
             query_mode => async,
-            max_queue_bytes => ?DEFAULT_QUEUE_SIZE
+            max_buffer_bytes => ?DEFAULT_BUFFER_BYTES
         }
     }.
 
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_dynamo.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_dynamo.erl
index e6a3d1a58..ba1fd0c70 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_dynamo.erl
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_dynamo.erl
@@ -56,7 +56,7 @@ values(_Method) ->
             batch_size => ?DEFAULT_BATCH_SIZE,
             batch_time => ?DEFAULT_BATCH_TIME,
             query_mode => sync,
-            max_queue_bytes => ?DEFAULT_QUEUE_SIZE
+            max_buffer_bytes => ?DEFAULT_BUFFER_BYTES
         }
     }.
 
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_mysql.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_mysql.erl
index f3ed44247..7914c77e2 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_mysql.erl
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_mysql.erl
@@ -57,7 +57,7 @@ values(_Method) ->
             batch_size => ?DEFAULT_BATCH_SIZE,
             batch_time => ?DEFAULT_BATCH_TIME,
             query_mode => async,
-            max_queue_bytes => ?DEFAULT_QUEUE_SIZE
+            max_buffer_bytes => ?DEFAULT_BUFFER_BYTES
         }
     }.
 
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_pgsql.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_pgsql.erl
index 958bc3449..a5dcb19e6 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_pgsql.erl
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_pgsql.erl
@@ -59,7 +59,7 @@ values(_Method, Type) ->
             batch_size => ?DEFAULT_BATCH_SIZE,
             batch_time => ?DEFAULT_BATCH_TIME,
             query_mode => async,
-            max_queue_bytes => ?DEFAULT_QUEUE_SIZE
+            max_buffer_bytes => ?DEFAULT_BUFFER_BYTES
         }
     }.
 
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_rocketmq.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_rocketmq.erl
index 78fd527d3..28b94a1a4 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_rocketmq.erl
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_rocketmq.erl
@@ -56,7 +56,7 @@ values(post) ->
             batch_size => ?DEFAULT_BATCH_SIZE,
             batch_time => ?DEFAULT_BATCH_TIME,
             query_mode => sync,
-            max_queue_bytes => ?DEFAULT_QUEUE_SIZE
+            max_buffer_bytes => ?DEFAULT_BUFFER_BYTES
         }
     };
 values(put) ->
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_sqlserver.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_sqlserver.erl
index 49a5ed0ce..e216299c2 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_sqlserver.erl
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_sqlserver.erl
@@ -60,7 +60,7 @@ values(post) ->
             batch_size => ?DEFAULT_BATCH_SIZE,
             batch_time => ?DEFAULT_BATCH_TIME,
             query_mode => async,
-            max_queue_bytes => ?DEFAULT_QUEUE_SIZE
+            max_buffer_bytes => ?DEFAULT_BUFFER_BYTES
         }
     };
 values(put) ->
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_tdengine.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_tdengine.erl
index 7a958d45f..54406541d 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_tdengine.erl
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_tdengine.erl
@@ -58,7 +58,7 @@ values(_Method) ->
             batch_size => ?DEFAULT_BATCH_SIZE,
             batch_time => ?DEFAULT_BATCH_TIME,
             query_mode => sync,
-            max_queue_bytes => ?DEFAULT_QUEUE_SIZE
+            max_buffer_bytes => ?DEFAULT_BUFFER_BYTES
         }
     }.
 
diff --git a/rel/i18n/emqx_resource_schema.hocon b/rel/i18n/emqx_resource_schema.hocon
index 885a6c4dd..031a5b412 100644
--- a/rel/i18n/emqx_resource_schema.hocon
+++ b/rel/i18n/emqx_resource_schema.hocon
@@ -168,7 +168,7 @@ When disabled the messages are buffered in RAM only."""
     }
   }
 
-  max_queue_bytes {
+  max_buffer_bytes {
     desc {
       en: """Maximum number of bytes to buffer for each buffer worker."""
       zh: """每个缓存 worker 允许使用的最大字节数。"""
@@ -179,7 +179,7 @@ When disabled the messages are buffered in RAM only."""
     }
   }
 
-  queue_seg_bytes {
+  buffer_seg_bytes {
     desc {
       en: "Applicable when buffer mode is set to <code>volatile_offload</code>.\n"
           "This value is to specify the size of each on-disk buffer file."
@@ -192,9 +192,9 @@ When disabled the messages are buffered in RAM only."""
     }
   }
 
-  queue_mode {
+  buffer_mode {
     desc {
-      en: "Queue operation mode.\n"
+      en: "Buffer operation mode.\n"
           "<code>memory_only</mode>: Buffer all messages in memory."
           "<code>volatile_offload</code>: Buffer message in memory first, when up to certain limit"
           " (see <code>buffer_seg_bytes</code> config for more information), then start offloading messages to disk"
diff --git a/scripts/test/influx/influx-bridge.conf b/scripts/test/influx/influx-bridge.conf
index 0416e42b6..0574ac38a 100644
--- a/scripts/test/influx/influx-bridge.conf
+++ b/scripts/test/influx/influx-bridge.conf
@@ -11,7 +11,7 @@ bridges {
         batch_size = 100
         batch_time = "10ms"
         health_check_interval = "15s"
-        max_queue_bytes = "1GB"
+        max_buffer_bytes = "1GB"
         query_mode = "sync"
         request_timeout = "15s"
         start_after_created = "true"

From 24df1045dec62fdeb777fe6be8a4de785c974a4d Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 16:40:25 +0200
Subject: [PATCH 095/110] fix: test not updated after rebase

---
 apps/emqx_utils/test/emqx_utils_SUITE.erl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/emqx_utils/test/emqx_utils_SUITE.erl b/apps/emqx_utils/test/emqx_utils_SUITE.erl
index 598f05a21..99516b0eb 100644
--- a/apps/emqx_utils/test/emqx_utils_SUITE.erl
+++ b/apps/emqx_utils/test/emqx_utils_SUITE.erl
@@ -147,7 +147,10 @@ t_check(_) ->
     [self() ! {msg, I} || I <- lists:seq(1, 5)],
     ?assertEqual(ok, emqx_utils:check_oom(Policy)),
     [self() ! {msg, I} || I <- lists:seq(1, 6)],
-    ?assertEqual({shutdown, message_queue_too_long}, emqx_utils:check_oom(Policy)).
+    ?assertEqual(
+        {shutdown, #{reason => message_queue_too_long, value => 11, max => 10}},
+        emqx_utils:check_oom(Policy)
+    ).
 
 drain() ->
     drain([]).

From 8facd130f695464370949945a8a9cbb51d4624a4 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Fri, 14 Apr 2023 22:45:28 +0800
Subject: [PATCH 096/110] chore: update cluster_hocon_file/0 function

---
 apps/emqx/src/emqx_config.erl                 | 22 +++++-----------
 apps/emqx_conf/test/emqx_conf_app_SUITE.erl   | 26 +++++++------------
 .../test/emqx_mgmt_api_configs_SUITE.erl      | 17 +++++++++---
 .../test/emqx_rule_funcs_SUITE.erl            |  2 +-
 changes/ce/feat-10156.en.md                   |  7 +++++
 5 files changed, 37 insertions(+), 37 deletions(-)
 create mode 100644 changes/ce/feat-10156.en.md

diff --git a/apps/emqx/src/emqx_config.erl b/apps/emqx/src/emqx_config.erl
index b676b07e2..ab028cf7f 100644
--- a/apps/emqx/src/emqx_config.erl
+++ b/apps/emqx/src/emqx_config.erl
@@ -418,7 +418,7 @@ do_parse_hocon(false, Conf, IncDirs) ->
         true ->
             hocon:binary(Conf, Opts);
         false ->
-            ClusterFile = cluster_hocon_file(#{override_to => cluster}),
+            ClusterFile = cluster_hocon_file(),
             hocon:files([ClusterFile | Conf], Opts)
     end.
 
@@ -493,7 +493,7 @@ fill_defaults(SchemaMod, RawConf, Opts0) ->
 delete_override_conf_files() ->
     F1 = deprecated_conf_file(#{override_to => local}),
     F2 = deprecated_conf_file(#{override_to => cluster}),
-    F3 = cluster_hocon_file(#{override_to => cluster}),
+    F3 = cluster_hocon_file(),
     ok = ensure_file_deleted(F1),
     ok = ensure_file_deleted(F2),
     ok = ensure_file_deleted(F3).
@@ -510,7 +510,7 @@ read_override_conf(#{} = Opts) ->
     File =
         case has_deprecated_file() of
             true -> deprecated_conf_file(Opts);
-            false -> cluster_hocon_file(Opts)
+            false -> cluster_hocon_file()
         end,
     load_hocon_file(File, map).
 
@@ -531,16 +531,8 @@ deprecated_conf_file(Which) when is_atom(Which) ->
     application:get_env(emqx, Which, undefined).
 
 %% The newer version cluster-wide config persistence file.
-cluster_hocon_file(Opts) when is_map(Opts) ->
-    Key =
-        case maps:get(override_to, Opts, cluster) of
-            %% no local config file support
-            local -> undefined;
-            cluster -> cluster_hocon_file
-        end,
-    application:get_env(emqx, Key, undefined);
-cluster_hocon_file(Which) when is_atom(Which) ->
-    application:get_env(emqx, Which, undefined).
+cluster_hocon_file() ->
+    application:get_env(emqx, cluster_hocon_file, undefined).
 
 -spec save_schema_mod_and_names(module()) -> ok.
 save_schema_mod_and_names(SchemaMod) ->
@@ -619,8 +611,8 @@ save_to_override_conf(true, RawConf, Opts) ->
                     {error, Reason}
             end
     end;
-save_to_override_conf(false, RawConf, Opts) ->
-    case cluster_hocon_file(Opts) of
+save_to_override_conf(false, RawConf, _Opts) ->
+    case cluster_hocon_file() of
         undefined ->
             ok;
         FileName ->
diff --git a/apps/emqx_conf/test/emqx_conf_app_SUITE.erl b/apps/emqx_conf/test/emqx_conf_app_SUITE.erl
index 825f01441..583405158 100644
--- a/apps/emqx_conf/test/emqx_conf_app_SUITE.erl
+++ b/apps/emqx_conf/test/emqx_conf_app_SUITE.erl
@@ -59,14 +59,15 @@ t_copy_new_data_dir(_Config) ->
     %% 1. Start all nodes
     [First | Rest] = Nodes = start_cluster(Cluster),
     try
+        File = "/configs/cluster.hocon",
         assert_config_load_done(Nodes),
-        rpc:call(First, ?MODULE, create_data_dir, []),
+        rpc:call(First, ?MODULE, create_data_dir, [File]),
         {[ok, ok, ok], []} = rpc:multicall(Nodes, application, stop, [emqx_conf]),
         {[ok, ok, ok], []} = rpc:multicall(Nodes, ?MODULE, set_data_dir_env, []),
         ok = rpc:call(First, application, start, [emqx_conf]),
         {[ok, ok], []} = rpc:multicall(Rest, application, start, [emqx_conf]),
 
-        assert_data_copy_done(Nodes, "/configs/cluster.hocon"),
+        assert_data_copy_done(Nodes, File),
         stop_cluster(Nodes),
         ok
     after
@@ -82,14 +83,15 @@ t_copy_deprecated_data_dir(_Config) ->
     %% 1. Start all nodes
     [First | Rest] = Nodes = start_cluster(Cluster),
     try
+        File = "/configs/cluster-override.conf",
         assert_config_load_done(Nodes),
-        rpc:call(First, ?MODULE, create_deprecated_data_dir, []),
+        rpc:call(First, ?MODULE, create_data_dir, [File]),
         {[ok, ok, ok], []} = rpc:multicall(Nodes, application, stop, [emqx_conf]),
         {[ok, ok, ok], []} = rpc:multicall(Nodes, ?MODULE, set_data_dir_env, []),
         ok = rpc:call(First, application, start, [emqx_conf]),
         {[ok, ok], []} = rpc:multicall(Rest, application, start, [emqx_conf]),
 
-        assert_data_copy_done(Nodes, "/configs/cluster-override.conf"),
+        assert_data_copy_done(Nodes, File),
         stop_cluster(Nodes),
         ok
     after
@@ -100,7 +102,7 @@ t_copy_deprecated_data_dir(_Config) ->
 %% Helper functions
 %%------------------------------------------------------------------------------
 
-create_data_dir() ->
+create_data_dir(File) ->
     Node = atom_to_list(node()),
     ok = filelib:ensure_dir(Node ++ "/certs/"),
     ok = filelib:ensure_dir(Node ++ "/authz/"),
@@ -108,17 +110,7 @@ create_data_dir() ->
     ok = file:write_file(Node ++ "/certs/fake-cert", list_to_binary(Node)),
     ok = file:write_file(Node ++ "/authz/fake-authz", list_to_binary(Node)),
     Telemetry = <<"telemetry.enable = false">>,
-    ok = file:write_file(Node ++ "/configs/cluster.hocon", Telemetry).
-
-create_deprecated_data_dir() ->
-    Node = atom_to_list(node()),
-    ok = filelib:ensure_dir(Node ++ "/certs/"),
-    ok = filelib:ensure_dir(Node ++ "/authz/"),
-    ok = filelib:ensure_dir(Node ++ "/configs/"),
-    ok = file:write_file(Node ++ "/certs/fake-cert", list_to_binary(Node)),
-    ok = file:write_file(Node ++ "/authz/fake-authz", list_to_binary(Node)),
-    Telemetry = <<"telemetry.enable = false">>,
-    ok = file:write_file(Node ++ "/configs/cluster-override.conf", Telemetry).
+    ok = file:write_file(Node ++ File, Telemetry).
 
 set_data_dir_env() ->
     Node = atom_to_list(node()),
@@ -134,7 +126,7 @@ set_data_dir_env() ->
     application:set_env(emqx, config_files, [NewConfigFile]),
     application:set_env(emqx, data_dir, Node),
     %% We set env both cluster.hocon and cluster-override.conf, but only one will be used
-    application:set_env(emqx, cluster_conf_file, Node ++ "/configs/cluster.hocon"),
+    application:set_env(emqx, cluster_hocon_file, Node ++ "/configs/cluster.hocon"),
     application:set_env(emqx, cluster_override_conf_file, Node ++ "/configs/cluster-override.conf"),
     ok.
 
diff --git a/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
index f5ee4e5be..fc1620fec 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
@@ -62,8 +62,8 @@ t_update(_Config) ->
     ?assertEqual(BusyPort, not BusyPort1),
     assert_busy_port(BusyPort1),
     %% Make sure the override config is updated, and remove the default value.
-    ?assertEqual(
-        #{<<"vm">> => #{<<"busy_port">> => BusyPort1}},
+    ?assertMatch(
+        #{<<"vm">> := #{<<"busy_port">> := BusyPort1}},
         maps:get(<<"sysmon">>, emqx_config:read_override_conf(#{override_to => cluster}))
     ),
 
@@ -136,7 +136,7 @@ t_global_zone(_Config) ->
     {ok, #{}} = update_global_zone(NewZones),
     ?assertEqual(1, emqx_config:get_zone_conf(no_default, [mqtt, max_qos_allowed])),
     %% Make sure the override config is updated, and remove the default value.
-    ?assertEqual(#{<<"max_qos_allowed">> => 1}, read_conf(<<"mqtt">>)),
+    ?assertMatch(#{<<"max_qos_allowed">> := 1}, read_conf(<<"mqtt">>)),
 
     BadZones = emqx_map_lib:deep_put([<<"mqtt">>, <<"max_qos_allowed">>], Zones, 3),
     ?assertMatch({error, {"HTTP/1.1", 400, _}}, update_global_zone(BadZones)),
@@ -155,7 +155,16 @@ t_global_zone(_Config) ->
 
     DefaultZones = emqx_map_lib:deep_put([<<"mqtt">>, <<"max_qos_allowed">>], Zones, 2),
     {ok, #{}} = update_global_zone(DefaultZones),
-    ?assertEqual(undefined, read_conf(<<"mqtt">>)),
+    #{<<"mqtt">> := Mqtt} = emqx_config:fill_defaults(emqx_schema, #{<<"mqtt">> => #{}}, #{}),
+    Default = maps:map(
+        fun
+            (_, V) when is_boolean(V) -> V;
+            (_, V) when is_atom(V) -> atom_to_binary(V);
+            (_, V) -> V
+        end,
+        Mqtt
+    ),
+    ?assertEqual(Default, read_conf(<<"mqtt">>)),
     ok.
 
 get_global_zone() ->
diff --git a/apps/emqx_rule_engine/test/emqx_rule_funcs_SUITE.erl b/apps/emqx_rule_engine/test/emqx_rule_funcs_SUITE.erl
index 94adb3506..ee798868e 100644
--- a/apps/emqx_rule_engine/test/emqx_rule_funcs_SUITE.erl
+++ b/apps/emqx_rule_engine/test/emqx_rule_funcs_SUITE.erl
@@ -686,7 +686,7 @@ t_jq(_) ->
                 %% Got timeout as expected
                 got_timeout
         end,
-    ConfigRootKey = emqx_rule_engine_schema:namespace(),
+    _ConfigRootKey = emqx_rule_engine_schema:namespace(),
     ?assertThrow(
         {jq_exception, {timeout, _}},
         apply_func(jq, [TOProgram, <<"-2">>])
diff --git a/changes/ce/feat-10156.en.md b/changes/ce/feat-10156.en.md
new file mode 100644
index 000000000..bc864fcc3
--- /dev/null
+++ b/changes/ce/feat-10156.en.md
@@ -0,0 +1,7 @@
+Change the priority of the configuration:
+1. If it is a new installation of EMQX, the priority of s configuration is `ENV > emqx.conf > HTTP API`.
+2. If it is an upgrade of EMQX, the priority of s configuration is the same as before `HTTP API > ENV > emqx.conf`.
+
+Deprecated data/configs/local-override.conf.
+
+Stabilizing the HTTP API for hot updates.

From 16c49b2cc185f703b15590d443382b642d74e6af Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 17:21:38 +0200
Subject: [PATCH 097/110] fix: undo wrong thinking about returned types from
 decode

---
 apps/emqx_authz/test/emqx_authz_api_cache_SUITE.erl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/emqx_authz/test/emqx_authz_api_cache_SUITE.erl b/apps/emqx_authz/test/emqx_authz_api_cache_SUITE.erl
index 672ddc73c..ab673b225 100644
--- a/apps/emqx_authz/test/emqx_authz_api_cache_SUITE.erl
+++ b/apps/emqx_authz/test/emqx_authz_api_cache_SUITE.erl
@@ -60,19 +60,19 @@ set_special_configs(emqx_authz) ->
 set_special_configs(_App) ->
     ok.
 
-t_clean_cahce(_) ->
+t_clean_cache(_) ->
     {ok, C} = emqtt:start_link([{clientid, <<"emqx0">>}, {username, <<"emqx0">>}]),
     {ok, _} = emqtt:connect(C),
     {ok, _, _} = emqtt:subscribe(C, <<"a/b/c">>, 0),
     ok = emqtt:publish(C, <<"a/b/c">>, <<"{\"x\":1,\"y\":1}">>, 0),
 
     {ok, 200, Result3} = request(get, uri(["clients", "emqx0", "authorization", "cache"])),
-    ?assertEqual(2, maps:size(emqx_utils_json:decode(Result3))),
+    ?assertEqual(2, length(emqx_utils_json:decode(Result3))),
 
     request(delete, uri(["authorization", "cache"])),
 
     {ok, 200, Result4} = request(get, uri(["clients", "emqx0", "authorization", "cache"])),
-    ?assertEqual(0, maps:size(emqx_utils_json:decode(Result4))),
+    ?assertEqual(0, length(emqx_utils_json:decode(Result4))),
 
     ok.
 

From 8948be49e7cbff3e512f346dcd35d63e637cf0c4 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Fri, 14 Apr 2023 23:29:41 +0800
Subject: [PATCH 098/110] feat: hide node advance config

---
 apps/emqx_conf/src/emqx_conf_schema.erl | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl
index f689997c2..140e9c17d 100644
--- a/apps/emqx_conf/src/emqx_conf_schema.erl
+++ b/apps/emqx_conf/src/emqx_conf_schema.erl
@@ -457,7 +457,7 @@ fields("node") ->
                     mapping => "vm_args.+e",
                     desc => ?DESC(max_ets_tables),
                     default => 262144,
-                    importance => ?IMPORTANCE_LOW,
+                    importance => ?IMPORTANCE_HIDDEN,
                     'readOnly' => true
                 }
             )},
@@ -503,7 +503,7 @@ fields("node") ->
                     mapping => "vm_args.-env ERL_CRASH_DUMP",
                     desc => ?DESC(node_crash_dump_file),
                     default => crash_dump_file_default(),
-                    importance => ?IMPORTANCE_LOW,
+                    importance => ?IMPORTANCE_HIDDEN,
                     'readOnly' => true
                 }
             )},
@@ -514,7 +514,7 @@ fields("node") ->
                     mapping => "vm_args.-env ERL_CRASH_DUMP_SECONDS",
                     default => <<"30s">>,
                     desc => ?DESC(node_crash_dump_seconds),
-                    importance => ?IMPORTANCE_LOW,
+                    importance => ?IMPORTANCE_HIDDEN,
                     'readOnly' => true
                 }
             )},
@@ -525,7 +525,7 @@ fields("node") ->
                     mapping => "vm_args.-env ERL_CRASH_DUMP_BYTES",
                     default => <<"100MB">>,
                     desc => ?DESC(node_crash_dump_bytes),
-                    importance => ?IMPORTANCE_LOW,
+                    importance => ?IMPORTANCE_HIDDEN,
                     'readOnly' => true
                 }
             )},
@@ -536,7 +536,7 @@ fields("node") ->
                     mapping => "vm_args.-kernel net_ticktime",
                     default => <<"2m">>,
                     'readOnly' => true,
-                    importance => ?IMPORTANCE_LOW,
+                    importance => ?IMPORTANCE_HIDDEN,
                     desc => ?DESC(node_dist_net_ticktime)
                 }
             )},
@@ -547,7 +547,7 @@ fields("node") ->
                     mapping => "emqx_machine.backtrace_depth",
                     default => 23,
                     'readOnly' => true,
-                    importance => ?IMPORTANCE_LOW,
+                    importance => ?IMPORTANCE_HIDDEN,
                     desc => ?DESC(node_backtrace_depth)
                 }
             )},
@@ -558,7 +558,7 @@ fields("node") ->
                     mapping => "emqx_machine.applications",
                     default => [],
                     'readOnly' => true,
-                    importance => ?IMPORTANCE_LOW,
+                    importance => ?IMPORTANCE_HIDDEN,
                     desc => ?DESC(node_applications)
                 }
             )},
@@ -568,7 +568,7 @@ fields("node") ->
                 #{
                     desc => ?DESC(node_etc_dir),
                     'readOnly' => true,
-                    importance => ?IMPORTANCE_LOW,
+                    importance => ?IMPORTANCE_HIDDEN,
                     deprecated => {since, "5.0.8"}
                 }
             )},
@@ -577,7 +577,7 @@ fields("node") ->
                 ?R_REF("cluster_call"),
                 #{
                     'readOnly' => true,
-                    importance => ?IMPORTANCE_LOW
+                    importance => ?IMPORTANCE_HIDDEN
                 }
             )},
         {"db_backend",
@@ -591,7 +591,7 @@ fields("node") ->
                     desc => ?DESC(db_backend)
                 }
             )},
-        {"db_role",
+        {"role",
             sc(
                 hoconsc:enum([core, replicant]),
                 #{
@@ -599,6 +599,7 @@ fields("node") ->
                     default => core,
                     'readOnly' => true,
                     importance => ?IMPORTANCE_HIGH,
+                    aliases => [db_role],
                     desc => ?DESC(db_role)
                 }
             )},
@@ -620,7 +621,7 @@ fields("node") ->
                     mapping => "mria.tlog_push_mode",
                     default => async,
                     'readOnly' => true,
-                    importance => ?IMPORTANCE_LOW,
+                    importance => ?IMPORTANCE_HIDDEN,
                     desc => ?DESC(db_tlog_push_mode)
                 }
             )},

From 97a936ad4f8e2f7df317c6a7c3284d31f2c0af6a Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Fri, 14 Apr 2023 23:46:05 +0800
Subject: [PATCH 099/110] test: fix failed test

---
 apps/emqx/test/emqx_channel_SUITE.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/emqx/test/emqx_channel_SUITE.erl b/apps/emqx/test/emqx_channel_SUITE.erl
index 6dd389350..29f8b1503 100644
--- a/apps/emqx/test/emqx_channel_SUITE.erl
+++ b/apps/emqx/test/emqx_channel_SUITE.erl
@@ -1137,7 +1137,7 @@ t_ws_cookie_init(_) ->
 %%--------------------------------------------------------------------
 
 t_flapping_detect(_) ->
-    emqx_config:put_zone_conf(default, [flapping_detect, enable], true),
+    emqx_config:put_zone_conf(default, [flapping_detect, window_time], 60000),
     Parent = self(),
     ok = meck:expect(
         emqx_cm,

From 3373a63137a7c0443831985919fef131c2d7d6b4 Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Fri, 14 Apr 2023 13:21:30 -0300
Subject: [PATCH 100/110] docs: improve descriptions

Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
---
 rel/i18n/emqx_resource_schema.hocon | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rel/i18n/emqx_resource_schema.hocon b/rel/i18n/emqx_resource_schema.hocon
index 031a5b412..f4a9982bc 100644
--- a/rel/i18n/emqx_resource_schema.hocon
+++ b/rel/i18n/emqx_resource_schema.hocon
@@ -201,8 +201,8 @@ When disabled the messages are buffered in RAM only."""
       zh: "队列操作模式。\n"
           "<code>memory_only</code>: 所有的消息都缓存在内存里。"
           "<code>volatile_offload</code>: 先将消息缓存在内存中，当内存中的消息堆积超过一定限制"
-          "（配置项 <code>buffer_seg_bytes</code> 该限制）后，"
-          " 消息会缓存到磁盘上"
+          "（配置项 <code>buffer_seg_bytes</code> 指定该限制）后，"
+          " 消息会开始缓存到磁盘上。"
     }
     label {
       en: "Buffer Mode"

From f0c13e01345f367553fddb1874677fbf0e906993 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 18:43:53 +0200
Subject: [PATCH 101/110] fix: stale ref to emqx_map_lib

---
 lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
index 6e6d7bf03..68bf7a057 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
@@ -489,7 +489,7 @@ create_bridge(Config, Overrides) ->
     BridgeType = ?config(sqlserver_bridge_type, Config),
     Name = ?config(sqlserver_name, Config),
     SSConfig0 = ?config(sqlserver_config, Config),
-    SSConfig = emqx_map_lib:deep_merge(SSConfig0, Overrides),
+    SSConfig = emqx_utils_maps:deep_merge(SSConfig0, Overrides),
     emqx_bridge:create(BridgeType, Name, SSConfig).
 
 delete_bridge(Config) ->

From a20797160e11336a765f308fe3b2024fc548373f Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Fri, 14 Apr 2023 18:45:25 +0200
Subject: [PATCH 102/110] style: remove unnecessary ifdef(TEST)

---
 apps/emqx_utils/test/emqx_utils_binary_tests.erl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/emqx_utils/test/emqx_utils_binary_tests.erl b/apps/emqx_utils/test/emqx_utils_binary_tests.erl
index 3709fb014..79851dca5 100644
--- a/apps/emqx_utils/test/emqx_utils_binary_tests.erl
+++ b/apps/emqx_utils/test/emqx_utils_binary_tests.erl
@@ -26,8 +26,6 @@
 
 -include_lib("eunit/include/eunit.hrl").
 
--ifdef(TEST).
-
 trim1_test_() ->
     [
         ?_assertEqual(trim(<<>>), <<>>),
@@ -213,5 +211,3 @@ optimize_patterns_test_() ->
             optimize_patterns([<<"test">>, <<"t">>, <<"t">>])
         )
     ].
-
--endif.

From 9ccfa643cecfb98e826a86a6175f260b0c7efbbc Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan@strigler.de>
Date: Fri, 14 Apr 2023 18:51:51 +0200
Subject: [PATCH 103/110] style: fix wording

Co-authored-by: Thales Macedo Garitezi <thalesmg@gmail.com>
---
 apps/emqx_utils/README.md              | 6 +++---
 apps/emqx_utils/src/emqx_utils.app.src | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/emqx_utils/README.md b/apps/emqx_utils/README.md
index 046b66321..f8c386f3d 100644
--- a/apps/emqx_utils/README.md
+++ b/apps/emqx_utils/README.md
@@ -1,10 +1,10 @@
-# emqx_utils - Erlang utility library for EMQ X
+# Erlang utility library for EMQX
 
 ## Overview
 
-`emqx_utils` is a collection of utility functions for EMQ X, organized into
+`emqx_utils` is a collection of utility functions for EMQX, organized into
 several modules. It provides various functionalities to make it easier to work
-with EMQ X, such as binary manipulations, maps, JSON en- and decoding, ets table
+with EMQX, such as binary manipulations, maps, JSON en- and decoding, ets table
 handling, data conversions, and more.
 
 ## Features
diff --git a/apps/emqx_utils/src/emqx_utils.app.src b/apps/emqx_utils/src/emqx_utils.app.src
index b0dedbd72..eb6371411 100644
--- a/apps/emqx_utils/src/emqx_utils.app.src
+++ b/apps/emqx_utils/src/emqx_utils.app.src
@@ -1,6 +1,6 @@
 %% -*- mode: erlang -*-
 {application, emqx_utils, [
-    {description, "An OTP application"},
+    {description, "Miscellaneous utilities for EMQX apps"},
     % strict semver, bump manually!
     {vsn, "5.0.0"},
     {modules, [

From 89fa07c9be64465c50d6762b9849513d758b2093 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan@strigler.de>
Date: Fri, 14 Apr 2023 18:53:01 +0200
Subject: [PATCH 104/110] fix: emqx_utils is just a library, so 'load' is
 enough

Co-authored-by: Thales Macedo Garitezi <thalesmg@gmail.com>
---
 mix.exs          | 2 +-
 rebar.config.erl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.exs b/mix.exs
index 299f23ce6..454c398a2 100644
--- a/mix.exs
+++ b/mix.exs
@@ -303,7 +303,7 @@ defmodule EMQXUmbrella.MixProject do
         tools: :load,
         covertool: :load,
         system_monitor: :load,
-        emqx_utils: :permanent,
+        emqx_utils: :load,
         emqx_http_lib: :permanent,
         emqx_resource: :permanent,
         emqx_connector: :permanent,
diff --git a/rebar.config.erl b/rebar.config.erl
index b6b6a7c18..7c00622c2 100644
--- a/rebar.config.erl
+++ b/rebar.config.erl
@@ -391,7 +391,7 @@ relx_apps(ReleaseType, Edition) ->
             {covertool, load},
             % started by emqx_machine
             {system_monitor, load},
-            emqx_utils,
+            {emqx_utils, load},
             emqx_http_lib,
             emqx_resource,
             emqx_connector,

From 8461551f51cf5ee56ac315172f06bf8b75306bdb Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Sat, 15 Apr 2023 06:56:33 +0800
Subject: [PATCH 105/110] test: rename module from emqx_map_lib to
 emqx_utils_maps

---
 apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
index 5fe9f881e..db735bb27 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
@@ -159,7 +159,7 @@ t_global_zone(_Config) ->
     ?assertEqual(2, emqx_utils_maps:deep_get([<<"max_qos_allowed">>], Mqtt3)),
     ok = emqx_config:put_raw([<<"mqtt">>], Mqtt0),
 
-    DefaultZones = emqx_map_lib:deep_put([<<"mqtt">>, <<"max_qos_allowed">>], Zones, 2),
+    DefaultZones = emqx_utils_maps:deep_put([<<"mqtt">>, <<"max_qos_allowed">>], Zones, 2),
     {ok, #{}} = update_global_zone(DefaultZones),
     #{<<"mqtt">> := Mqtt} = emqx_config:fill_defaults(emqx_schema, #{<<"mqtt">> => #{}}, #{}),
     Default = maps:map(
@@ -324,7 +324,7 @@ reset_config(Name, Key) ->
 read_conf(RootKeys) when is_list(RootKeys) ->
     case emqx_config:read_override_conf(#{override_to => cluster}) of
         undefined -> undefined;
-        Conf -> emqx_map_lib:deep_get(RootKeys, Conf, undefined)
+        Conf -> emqx_utils_maps:deep_get(RootKeys, Conf, undefined)
     end;
 read_conf(RootKey) ->
     read_conf([RootKey]).

From e1faae451a27801fb4ae23cc916f2ba9774aab20 Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Sat, 15 Apr 2023 18:17:28 +0800
Subject: [PATCH 106/110] chore: Update changes/ce/feat-10156.en.md

Co-authored-by: JianBo He <heeejianbo@163.com>
---
 changes/ce/feat-10156.en.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/ce/feat-10156.en.md b/changes/ce/feat-10156.en.md
index bc864fcc3..c1291a7ce 100644
--- a/changes/ce/feat-10156.en.md
+++ b/changes/ce/feat-10156.en.md
@@ -1,5 +1,5 @@
 Change the priority of the configuration:
-1. If it is a new installation of EMQX, the priority of s configuration is `ENV > emqx.conf > HTTP API`.
+1. If it is a new installation of EMQX, the priority of configuration is `ENV > emqx.conf > HTTP API`.
 2. If it is an upgrade of EMQX, the priority of s configuration is the same as before `HTTP API > ENV > emqx.conf`.
 
 Deprecated data/configs/local-override.conf.

From 454d244535aa7bee1ff2630c43e20874e5c64558 Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Sun, 16 Apr 2023 09:58:22 +0800
Subject: [PATCH 107/110] chore: update changes/ce/feat-10156.en.md

Co-authored-by: JianBo He <heeejianbo@163.com>
---
 changes/ce/feat-10156.en.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/ce/feat-10156.en.md b/changes/ce/feat-10156.en.md
index c1291a7ce..589578f26 100644
--- a/changes/ce/feat-10156.en.md
+++ b/changes/ce/feat-10156.en.md
@@ -1,6 +1,6 @@
 Change the priority of the configuration:
 1. If it is a new installation of EMQX, the priority of configuration is `ENV > emqx.conf > HTTP API`.
-2. If it is an upgrade of EMQX, the priority of s configuration is the same as before `HTTP API > ENV > emqx.conf`.
+2. If EMQX is upgraded from an old version (i.e., the cluster-override.conf file still exists in EMQX's data directory), then the configuration priority remains the same as before. That is, `HTTP API > ENV > emqx.conf`.
 
 Deprecated data/configs/local-override.conf.
 

From ad65fefac2f98baf55a2c80bf7f7266cc81b1aa0 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Sun, 16 Apr 2023 10:26:12 +0800
Subject: [PATCH 108/110] fix: rename emqx_misc to emqx_utils

---
 apps/emqx/src/emqx_flapping.erl | 2 +-
 apps/emqx/src/emqx_schema.erl   | 2 +-
 changes/ce/feat-10358.en.md     | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 changes/ce/feat-10358.en.md

diff --git a/apps/emqx/src/emqx_flapping.erl b/apps/emqx/src/emqx_flapping.erl
index 9a4d56bc6..70b1a3232 100644
--- a/apps/emqx/src/emqx_flapping.erl
+++ b/apps/emqx/src/emqx_flapping.erl
@@ -193,7 +193,7 @@ code_change(_OldVsn, State, _Extra) ->
 start_timer(Zone) ->
     case get_policy(window_time, Zone) of
         WindowTime when is_integer(WindowTime) ->
-            emqx_misc:start_timer(WindowTime, {garbage_collect, Zone});
+            emqx_utils:start_timer(WindowTime, {garbage_collect, Zone});
         disabled ->
             ok
     end.
diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index da856badc..8335d69b8 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -628,7 +628,7 @@ fields("flapping_detect") ->
                 boolean(),
                 #{
                     default => false,
-                    deprecated => {since, "5.0.22"},
+                    deprecated => {since, "5.0.23"},
                     desc => ?DESC(flapping_detect_enable)
                 }
             )},
diff --git a/changes/ce/feat-10358.en.md b/changes/ce/feat-10358.en.md
new file mode 100644
index 000000000..e6d05c84b
--- /dev/null
+++ b/changes/ce/feat-10358.en.md
@@ -0,0 +1,2 @@
+Hide `flapping_detect/conn_congestion/stats` configuration.
+Deprecate `flapping_detect.enable`.

From 98e8287260f3e000eab7715082e8be17a2b06c91 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Sun, 16 Apr 2023 10:11:36 +0800
Subject: [PATCH 109/110] fix: hidden password in dashboard https's shema

---
 apps/emqx_dashboard/src/emqx_dashboard_schema.erl | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/emqx_dashboard/src/emqx_dashboard_schema.erl b/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
index 0ba970842..d3e4233d3 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_schema.erl
@@ -97,13 +97,15 @@ fields("https") ->
     [
         enable(false),
         bind(18084)
-        | common_listener_fields() ++
-            exclude_fields(
-                ["fail_if_no_peer_cert", "password"],
-                emqx_schema:server_ssl_opts_schema(#{}, true)
-            )
+        | common_listener_fields() ++ server_ssl_opts()
     ].
 
+server_ssl_opts() ->
+    Opts0 = emqx_schema:server_ssl_opts_schema(#{}, true),
+    Opts1 = exclude_fields(["fail_if_no_peer_cert"], Opts0),
+    {value, {_, Meta}, Opts2} = lists:keytake("password", 1, Opts1),
+    [{"password", Meta#{importance => ?IMPORTANCE_HIDDEN}} | Opts2].
+
 exclude_fields([], Fields) ->
     Fields;
 exclude_fields([FieldName | Rest], Fields) ->

From 9fc8a498f8e1e4fa1a97ad71901c37bf21caeecb Mon Sep 17 00:00:00 2001
From: Ivan Dyachkov <dev@dyachkov.org>
Date: Mon, 17 Apr 2023 09:01:41 +0200
Subject: [PATCH 110/110] chore: bump apps versions

---
 apps/emqx/src/emqx.app.src                                      | 2 +-
 apps/emqx_authn/src/emqx_authn.app.src                          | 2 +-
 apps/emqx_authz/src/emqx_authz.app.src                          | 2 +-
 apps/emqx_bridge/src/emqx_bridge.app.src                        | 2 +-
 apps/emqx_conf/src/emqx_conf.app.src                            | 2 +-
 apps/emqx_connector/src/emqx_connector.app.src                  | 2 +-
 apps/emqx_dashboard/src/emqx_dashboard.app.src                  | 2 +-
 apps/emqx_gateway/src/emqx_gateway.app.src                      | 2 +-
 apps/emqx_management/src/emqx_management.app.src                | 2 +-
 apps/emqx_modules/src/emqx_modules.app.src                      | 2 +-
 apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src              | 2 +-
 apps/emqx_prometheus/src/emqx_prometheus.app.src                | 2 +-
 apps/emqx_resource/src/emqx_resource.app.src                    | 2 +-
 apps/emqx_rule_engine/src/emqx_rule_engine.app.src              | 2 +-
 lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src                | 2 +-
 lib-ee/emqx_ee_connector/src/emqx_ee_connector.app.src          | 2 +-
 .../emqx_ee_schema_registry/src/emqx_ee_schema_registry.app.src | 2 +-
 lib-ee/emqx_license/src/emqx_license.app.src                    | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/emqx/src/emqx.app.src b/apps/emqx/src/emqx.app.src
index c4894c933..b2dfca9e1 100644
--- a/apps/emqx/src/emqx.app.src
+++ b/apps/emqx/src/emqx.app.src
@@ -3,7 +3,7 @@
     {id, "emqx"},
     {description, "EMQX Core"},
     % strict semver, bump manually!
-    {vsn, "5.0.22"},
+    {vsn, "5.0.23"},
     {modules, []},
     {registered, []},
     {applications, [
diff --git a/apps/emqx_authn/src/emqx_authn.app.src b/apps/emqx_authn/src/emqx_authn.app.src
index caa59e455..063771e24 100644
--- a/apps/emqx_authn/src/emqx_authn.app.src
+++ b/apps/emqx_authn/src/emqx_authn.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_authn, [
     {description, "EMQX Authentication"},
-    {vsn, "0.1.16"},
+    {vsn, "0.1.17"},
     {modules, []},
     {registered, [emqx_authn_sup, emqx_authn_registry]},
     {applications, [kernel, stdlib, emqx_resource, emqx_connector, ehttpc, epgsql, mysql, jose]},
diff --git a/apps/emqx_authz/src/emqx_authz.app.src b/apps/emqx_authz/src/emqx_authz.app.src
index 2f8b26894..a17ce5dea 100644
--- a/apps/emqx_authz/src/emqx_authz.app.src
+++ b/apps/emqx_authz/src/emqx_authz.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_authz, [
     {description, "An OTP application"},
-    {vsn, "0.1.16"},
+    {vsn, "0.1.17"},
     {registered, []},
     {mod, {emqx_authz_app, []}},
     {applications, [
diff --git a/apps/emqx_bridge/src/emqx_bridge.app.src b/apps/emqx_bridge/src/emqx_bridge.app.src
index cd2668ef8..04f2b58a7 100644
--- a/apps/emqx_bridge/src/emqx_bridge.app.src
+++ b/apps/emqx_bridge/src/emqx_bridge.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_bridge, [
     {description, "EMQX bridges"},
-    {vsn, "0.1.15"},
+    {vsn, "0.1.16"},
     {registered, [emqx_bridge_sup]},
     {mod, {emqx_bridge_app, []}},
     {applications, [
diff --git a/apps/emqx_conf/src/emqx_conf.app.src b/apps/emqx_conf/src/emqx_conf.app.src
index c904688ca..234690374 100644
--- a/apps/emqx_conf/src/emqx_conf.app.src
+++ b/apps/emqx_conf/src/emqx_conf.app.src
@@ -1,6 +1,6 @@
 {application, emqx_conf, [
     {description, "EMQX configuration management"},
-    {vsn, "0.1.16"},
+    {vsn, "0.1.17"},
     {registered, []},
     {mod, {emqx_conf_app, []}},
     {applications, [kernel, stdlib, emqx_ctl]},
diff --git a/apps/emqx_connector/src/emqx_connector.app.src b/apps/emqx_connector/src/emqx_connector.app.src
index e3de5aeff..38ca230b2 100644
--- a/apps/emqx_connector/src/emqx_connector.app.src
+++ b/apps/emqx_connector/src/emqx_connector.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_connector, [
     {description, "EMQX Data Integration Connectors"},
-    {vsn, "0.1.19"},
+    {vsn, "0.1.20"},
     {registered, []},
     {mod, {emqx_connector_app, []}},
     {applications, [
diff --git a/apps/emqx_dashboard/src/emqx_dashboard.app.src b/apps/emqx_dashboard/src/emqx_dashboard.app.src
index 15530d679..b810f9c5f 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard.app.src
+++ b/apps/emqx_dashboard/src/emqx_dashboard.app.src
@@ -2,7 +2,7 @@
 {application, emqx_dashboard, [
     {description, "EMQX Web Dashboard"},
     % strict semver, bump manually!
-    {vsn, "5.0.17"},
+    {vsn, "5.0.18"},
     {modules, []},
     {registered, [emqx_dashboard_sup]},
     {applications, [kernel, stdlib, mnesia, minirest, emqx, emqx_ctl]},
diff --git a/apps/emqx_gateway/src/emqx_gateway.app.src b/apps/emqx_gateway/src/emqx_gateway.app.src
index 850d38cdd..0419666b4 100644
--- a/apps/emqx_gateway/src/emqx_gateway.app.src
+++ b/apps/emqx_gateway/src/emqx_gateway.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_gateway, [
     {description, "The Gateway management application"},
-    {vsn, "0.1.14"},
+    {vsn, "0.1.15"},
     {registered, []},
     {mod, {emqx_gateway_app, []}},
     {applications, [kernel, stdlib, emqx, emqx_authn, emqx_ctl]},
diff --git a/apps/emqx_management/src/emqx_management.app.src b/apps/emqx_management/src/emqx_management.app.src
index dac82403a..f423213af 100644
--- a/apps/emqx_management/src/emqx_management.app.src
+++ b/apps/emqx_management/src/emqx_management.app.src
@@ -2,7 +2,7 @@
 {application, emqx_management, [
     {description, "EMQX Management API and CLI"},
     % strict semver, bump manually!
-    {vsn, "5.0.18"},
+    {vsn, "5.0.19"},
     {modules, []},
     {registered, [emqx_management_sup]},
     {applications, [kernel, stdlib, emqx_plugins, minirest, emqx, emqx_ctl]},
diff --git a/apps/emqx_modules/src/emqx_modules.app.src b/apps/emqx_modules/src/emqx_modules.app.src
index fdc13f354..1e38e25d1 100644
--- a/apps/emqx_modules/src/emqx_modules.app.src
+++ b/apps/emqx_modules/src/emqx_modules.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_modules, [
     {description, "EMQX Modules"},
-    {vsn, "5.0.12"},
+    {vsn, "5.0.13"},
     {modules, []},
     {applications, [kernel, stdlib, emqx, emqx_ctl]},
     {mod, {emqx_modules_app, []}},
diff --git a/apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src b/apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src
index dcb330df4..24b5a3240 100644
--- a/apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src
+++ b/apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_plugin_libs, [
     {description, "EMQX Plugin utility libs"},
-    {vsn, "4.3.8"},
+    {vsn, "4.3.9"},
     {modules, []},
     {applications, [kernel, stdlib]},
     {env, []}
diff --git a/apps/emqx_prometheus/src/emqx_prometheus.app.src b/apps/emqx_prometheus/src/emqx_prometheus.app.src
index 1e7e59f7a..ae879da8f 100644
--- a/apps/emqx_prometheus/src/emqx_prometheus.app.src
+++ b/apps/emqx_prometheus/src/emqx_prometheus.app.src
@@ -2,7 +2,7 @@
 {application, emqx_prometheus, [
     {description, "Prometheus for EMQX"},
     % strict semver, bump manually!
-    {vsn, "5.0.8"},
+    {vsn, "5.0.9"},
     {modules, []},
     {registered, [emqx_prometheus_sup]},
     {applications, [kernel, stdlib, prometheus, emqx, emqx_management]},
diff --git a/apps/emqx_resource/src/emqx_resource.app.src b/apps/emqx_resource/src/emqx_resource.app.src
index dfb0047c7..00c315714 100644
--- a/apps/emqx_resource/src/emqx_resource.app.src
+++ b/apps/emqx_resource/src/emqx_resource.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_resource, [
     {description, "Manager for all external resources"},
-    {vsn, "0.1.12"},
+    {vsn, "0.1.13"},
     {registered, []},
     {mod, {emqx_resource_app, []}},
     {applications, [
diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src
index fa33a1ea5..133138252 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src
+++ b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src
@@ -2,7 +2,7 @@
 {application, emqx_rule_engine, [
     {description, "EMQX Rule Engine"},
     % strict semver, bump manually!
-    {vsn, "5.0.13"},
+    {vsn, "5.0.14"},
     {modules, []},
     {registered, [emqx_rule_engine_sup, emqx_rule_engine]},
     {applications, [kernel, stdlib, rulesql, getopt, emqx_ctl]},
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src
index f1793d2e0..d6c59c716 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src
@@ -1,6 +1,6 @@
 {application, emqx_ee_bridge, [
     {description, "EMQX Enterprise data bridges"},
-    {vsn, "0.1.9"},
+    {vsn, "0.1.10"},
     {registered, []},
     {applications, [
         kernel,
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector.app.src b/lib-ee/emqx_ee_connector/src/emqx_ee_connector.app.src
index 2e2ff2a62..7ebc320e5 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector.app.src
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector.app.src
@@ -1,6 +1,6 @@
 {application, emqx_ee_connector, [
     {description, "EMQX Enterprise connectors"},
-    {vsn, "0.1.9"},
+    {vsn, "0.1.10"},
     {registered, []},
     {applications, [
         kernel,
diff --git a/lib-ee/emqx_ee_schema_registry/src/emqx_ee_schema_registry.app.src b/lib-ee/emqx_ee_schema_registry/src/emqx_ee_schema_registry.app.src
index c40fb808a..4d0f4e9c7 100644
--- a/lib-ee/emqx_ee_schema_registry/src/emqx_ee_schema_registry.app.src
+++ b/lib-ee/emqx_ee_schema_registry/src/emqx_ee_schema_registry.app.src
@@ -1,6 +1,6 @@
 {application, emqx_ee_schema_registry, [
     {description, "EMQX Schema Registry"},
-    {vsn, "0.1.0"},
+    {vsn, "0.1.1"},
     {registered, [emqx_ee_schema_registry_sup]},
     {mod, {emqx_ee_schema_registry_app, []}},
     {applications, [
diff --git a/lib-ee/emqx_license/src/emqx_license.app.src b/lib-ee/emqx_license/src/emqx_license.app.src
index 0a97ee83b..fcdcbc05b 100644
--- a/lib-ee/emqx_license/src/emqx_license.app.src
+++ b/lib-ee/emqx_license/src/emqx_license.app.src
@@ -1,6 +1,6 @@
 {application, emqx_license, [
     {description, "EMQX License"},
-    {vsn, "5.0.8"},
+    {vsn, "5.0.9"},
     {modules, []},
     {registered, [emqx_license_sup]},
     {applications, [kernel, stdlib, emqx_ctl]},