From 856d394860b3c4d00e7601e5ae166cbcc12e3fb4 Mon Sep 17 00:00:00 2001
From: Turtle <deng@emqx.io>
Date: Thu, 26 Aug 2021 20:17:17 +0800
Subject: [PATCH] feat(topic_metrics): update topic_metrics conf to array

---
 apps/emqx_modules/src/emqx_topic_metrics.erl      | 15 +++++++--------
 .../test/emqx_topic_metrics_SUITE.erl             |  3 +--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/apps/emqx_modules/src/emqx_topic_metrics.erl b/apps/emqx_modules/src/emqx_topic_metrics.erl
index 3a7e5e3c0..3829deb1a 100644
--- a/apps/emqx_modules/src/emqx_topic_metrics.erl
+++ b/apps/emqx_modules/src/emqx_topic_metrics.erl
@@ -146,7 +146,7 @@ on_message_dropped(#message{topic = Topic}, _, _) ->
     end.
 
 start_link() ->
-    Opts = emqx:get_config([topic_metrics], #{}),
+    Opts = emqx:get_config([topic_metrics], []),
     gen_server:start_link({local, ?MODULE}, ?MODULE, [Opts], []).
 
 stop() ->
@@ -198,7 +198,7 @@ init([Opts]) ->
     ok = emqx_tables:new(?TAB, [{read_concurrency, true}]),
     erlang:send_after(timer:seconds(?TICKING_INTERVAL), self(), ticking),
     Fun =
-        fun(Topic, CurrentSpeeds) ->
+        fun(#{topic := Topic}, CurrentSpeeds) ->
             case do_register(Topic, CurrentSpeeds) of
                 {ok, NSpeeds} ->
                     NSpeeds;
@@ -208,7 +208,7 @@ init([Opts]) ->
                     error("max topic metrics quota exceeded")
             end
         end,
-    {ok, #state{speeds = lists:foldl(Fun, #{}, maps:get(topics, Opts, []))}, hibernate}.
+    {ok, #state{speeds = lists:foldl(Fun, #{}, Opts)}, hibernate}.
 
 handle_call({register, Topic}, _From, State = #state{speeds = Speeds}) ->
     case do_register(Topic, Speeds) of
@@ -348,16 +348,15 @@ format({Topic, Data}) ->
     end.
 
 remove_topic_config(Topic) when is_binary(Topic) ->
-    Topics = emqx_config:get_raw([<<"topic_metrics">>, <<"topics">>], []) -- [Topic],
+    Topics = emqx_config:get_raw([<<"topic_metrics">>], []) -- [#{<<"topic">> => Topic}],
     update_config(Topics).
 
 add_topic_config(Topic) when is_binary(Topic) ->
-    Topics = emqx_config:get_raw([<<"topic_metrics">>, <<"topics">>], []) ++ [Topic],
-    update_config(Topics).
+    Topics = emqx_config:get_raw([<<"topic_metrics">>], []) ++ [#{<<"topic">> => Topic}],
+    update_config(lists:usort(Topics)).
 
 update_config(Topics) when is_list(Topics) ->
-    Opts = emqx_config:get_raw([<<"topic_metrics">>], #{}),
-    {ok, _} = emqx:update_config([topic_metrics], maps:put(<<"topics">>, Topics, Opts)),
+    {ok, _} = emqx:update_config([topic_metrics], Topics),
     ok.
 
 try_inc(Topic, Metric) ->
diff --git a/apps/emqx_modules/test/emqx_topic_metrics_SUITE.erl b/apps/emqx_modules/test/emqx_topic_metrics_SUITE.erl
index 958131716..246eb2ab3 100644
--- a/apps/emqx_modules/test/emqx_topic_metrics_SUITE.erl
+++ b/apps/emqx_modules/test/emqx_topic_metrics_SUITE.erl
@@ -21,8 +21,7 @@
 
 
 -define(TOPIC, <<"""
-topic_metrics: {
-  topics : []}""">>).
+topic_metrics: []""">>).
 
 -include_lib("eunit/include/eunit.hrl").