From 8c814bc8615908f8925c7882253bd3b301f8c6f9 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Fri, 26 May 2023 19:31:13 +0800
Subject: [PATCH] fix: only report enable authn/authz in telemetry

---
 apps/emqx_authn/src/emqx_authn.erl        | 2 +-
 apps/emqx_authz/src/emqx_authz.erl        | 2 +-
 apps/emqx_authz/test/emqx_authz_SUITE.erl | 2 +-
 changes/ce/fix-10833.en.md                | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 changes/ce/fix-10833.en.md

diff --git a/apps/emqx_authn/src/emqx_authn.erl b/apps/emqx_authn/src/emqx_authn.erl
index 15efeb673..515c3bfd6 100644
--- a/apps/emqx_authn/src/emqx_authn.erl
+++ b/apps/emqx_authn/src/emqx_authn.erl
@@ -106,7 +106,7 @@ get_enabled_authns() ->
     AuthnTypes = lists:usort([
         Type
      || #{authenticators := As} <- Chains,
-        #{id := Type} <- As
+        #{id := Type, enable := true} <- As
     ]),
     OverriddenListeners =
         lists:foldl(
diff --git a/apps/emqx_authz/src/emqx_authz.erl b/apps/emqx_authz/src/emqx_authz.erl
index c7db65992..7ceacdb68 100644
--- a/apps/emqx_authz/src/emqx_authz.erl
+++ b/apps/emqx_authz/src/emqx_authz.erl
@@ -417,7 +417,7 @@ do_authorize(
     end.
 
 get_enabled_authzs() ->
-    lists:usort([Type || #{type := Type} <- lookup()]).
+    lists:usort([Type || #{type := Type, enable := true} <- lookup()]).
 
 %%--------------------------------------------------------------------
 %% Internal function
diff --git a/apps/emqx_authz/test/emqx_authz_SUITE.erl b/apps/emqx_authz/test/emqx_authz_SUITE.erl
index 9c1b7fd51..39c414617 100644
--- a/apps/emqx_authz/test/emqx_authz_SUITE.erl
+++ b/apps/emqx_authz/test/emqx_authz_SUITE.erl
@@ -366,7 +366,7 @@ t_get_enabled_authzs_none_enabled(_Config) ->
     ?assertEqual([], emqx_authz:get_enabled_authzs()).
 
 t_get_enabled_authzs_some_enabled(_Config) ->
-    {ok, _} = emqx_authz:update(?CMD_REPLACE, [?SOURCE4]),
+    {ok, _} = emqx_authz:update(?CMD_REPLACE, [?SOURCE4, ?SOURCE5#{<<"enable">> := false}]),
     ?assertEqual([postgresql], emqx_authz:get_enabled_authzs()).
 
 t_subscribe_deny_disconnect_publishes_last_will_testament(_Config) ->
diff --git a/changes/ce/fix-10833.en.md b/changes/ce/fix-10833.en.md
new file mode 100644
index 000000000..fb09e4542
--- /dev/null
+++ b/changes/ce/fix-10833.en.md
@@ -0,0 +1 @@
+Only include enabled authenticators and authorizers in telemetry report, not all of them.