From f0cb72dda67205a021722fa3e63e9342a27689ca Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Thu, 12 May 2022 11:17:47 +0800
Subject: [PATCH] fix: telemetry can't get active plugins list

---
 apps/emqx/include/emqx.hrl                 | 13 -------------
 apps/emqx/src/emqx_types.erl               |  2 --
 apps/emqx_management/src/emqx_mgmt_cli.erl |  5 -----
 apps/emqx_modules/src/emqx_telemetry.erl   | 11 ++++++-----
 4 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/apps/emqx/include/emqx.hrl b/apps/emqx/include/emqx.hrl
index 88e61f9b3..b776adab4 100644
--- a/apps/emqx/include/emqx.hrl
+++ b/apps/emqx/include/emqx.hrl
@@ -102,19 +102,6 @@
     dest :: node() | {binary(), node()} | emqx_session:sessionID()
 }).
 
-%%--------------------------------------------------------------------
-%% Plugin
-%%--------------------------------------------------------------------
-
--record(plugin, {
-    name :: atom(),
-    dir :: string() | undefined,
-    descr :: string(),
-    vendor :: string() | undefined,
-    active = false :: boolean(),
-    info = #{} :: map()
-}).
-
 %%--------------------------------------------------------------------
 %% Command
 %%--------------------------------------------------------------------
diff --git a/apps/emqx/src/emqx_types.erl b/apps/emqx/src/emqx_types.erl
index 9373f02a2..14f6ebeed 100644
--- a/apps/emqx/src/emqx_types.erl
+++ b/apps/emqx/src/emqx_types.erl
@@ -88,7 +88,6 @@
 ]).
 
 -export_type([
-    plugin/0,
     banned/0,
     command/0
 ]).
@@ -231,7 +230,6 @@
 -type route() :: #route{}.
 -type group() :: emqx_topic:group().
 -type route_entry() :: {topic(), node()} | {topic, group()}.
--type plugin() :: #plugin{}.
 -type command() :: #command{}.
 
 -type caps() :: emqx_mqtt_caps:caps().
diff --git a/apps/emqx_management/src/emqx_mgmt_cli.erl b/apps/emqx_management/src/emqx_mgmt_cli.erl
index 705fa54f1..8e6b303bb 100644
--- a/apps/emqx_management/src/emqx_mgmt_cli.erl
+++ b/apps/emqx_management/src/emqx_mgmt_cli.erl
@@ -759,11 +759,6 @@ print({emqx_topic, #route{topic = Topic, dest = {_, Node}}}) ->
     emqx_ctl:print("~ts -> ~ts~n", [Topic, Node]);
 print({emqx_topic, #route{topic = Topic, dest = Node}}) ->
     emqx_ctl:print("~ts -> ~ts~n", [Topic, Node]);
-print(#plugin{name = Name, descr = Descr, active = Active}) ->
-    emqx_ctl:print(
-        "Plugin(~ts, description=~ts, active=~ts)~n",
-        [Name, Descr, Active]
-    );
 print({emqx_suboption, {{Pid, Topic}, Options}}) when is_pid(Pid) ->
     emqx_ctl:print("~ts -> ~ts~n", [maps:get(subid, Options), Topic]).
 
diff --git a/apps/emqx_modules/src/emqx_telemetry.erl b/apps/emqx_modules/src/emqx_telemetry.erl
index cb923fb79..dfcbe9929 100644
--- a/apps/emqx_modules/src/emqx_telemetry.erl
+++ b/apps/emqx_modules/src/emqx_telemetry.erl
@@ -278,11 +278,12 @@ nodes_uuid() ->
 
 active_plugins() ->
     lists:foldl(
-        fun(#plugin{name = Name, active = Active}, Acc) ->
-            case Active of
-                true -> [Name | Acc];
-                false -> Acc
-            end
+        fun
+            (#{running_status := running} = Plugin, Acc) ->
+                #{<<"name">> := Name, <<"rel_vsn">> := Vsn} = Plugin,
+                [iolist_to_binary([Name, "-", Vsn]) | Acc];
+            (_, Acc) ->
+                Acc
         end,
         [],
         emqx_plugins:list()