From b91ecac16887f617e0fe0cb70cc8616d982b304d Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Thu, 23 May 2024 20:09:14 +0800
Subject: [PATCH] refactor(prom): unify function name to avoid multiple levels
 call

---
 apps/emqx_prometheus/src/emqx_prometheus.erl | 31 ++++++++++----------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/apps/emqx_prometheus/src/emqx_prometheus.erl b/apps/emqx_prometheus/src/emqx_prometheus.erl
index 82e60d4bb..f4d0ff2c0 100644
--- a/apps/emqx_prometheus/src/emqx_prometheus.erl
+++ b/apps/emqx_prometheus/src/emqx_prometheus.erl
@@ -295,18 +295,18 @@ fetch_cluster_consistented_data() ->
 
 aggre_or_zip_init_acc() ->
     (maybe_add_ds_meta())#{
-        stats_data => maps:from_keys(metrics_name(stats_metric_meta()), []),
-        vm_data => maps:from_keys(metrics_name(vm_metric_meta()), []),
-        cluster_data => maps:from_keys(metrics_name(cluster_metric_meta()), []),
-        emqx_packet_data => maps:from_keys(metrics_name(emqx_packet_metric_meta()), []),
-        emqx_message_data => maps:from_keys(metrics_name(message_metric_meta()), []),
-        emqx_delivery_data => maps:from_keys(metrics_name(delivery_metric_meta()), []),
-        emqx_client_data => maps:from_keys(metrics_name(client_metric_meta()), []),
-        emqx_session_data => maps:from_keys(metrics_name(session_metric_meta()), []),
-        emqx_olp_data => maps:from_keys(metrics_name(olp_metric_meta()), []),
-        emqx_acl_data => maps:from_keys(metrics_name(acl_metric_meta()), []),
-        emqx_authn_data => maps:from_keys(metrics_name(authn_metric_meta()), []),
-        mria_data => maps:from_keys(metrics_name(mria_metric_meta()), [])
+        stats_data => meta_to_init_from(stats_metric_meta()),
+        vm_data => meta_to_init_from(vm_metric_meta()),
+        cluster_data => meta_to_init_from(cluster_metric_meta()),
+        emqx_packet_data => meta_to_init_from(emqx_packet_metric_meta()),
+        emqx_message_data => meta_to_init_from(message_metric_meta()),
+        emqx_delivery_data => meta_to_init_from(delivery_metric_meta()),
+        emqx_client_data => meta_to_init_from(client_metric_meta()),
+        emqx_session_data => meta_to_init_from(session_metric_meta()),
+        emqx_olp_data => meta_to_init_from(olp_metric_meta()),
+        emqx_acl_data => meta_to_init_from(acl_metric_meta()),
+        emqx_authn_data => meta_to_init_from(authn_metric_meta()),
+        mria_data => meta_to_init_from(mria_metric_meta())
     }.
 
 logic_sum_metrics() ->
@@ -662,9 +662,7 @@ maybe_add_ds_meta() ->
     case emqx_persistent_message:is_persistence_enabled() of
         true ->
             #{
-                ds_data => maps:from_keys(
-                    metrics_name(emqx_ds_builtin_metrics:prometheus_meta()), []
-                )
+                ds_data => meta_to_init_from(emqx_ds_builtin_metrics:prometheus_meta())
             };
         false ->
             #{}
@@ -1130,6 +1128,9 @@ zip_json_prom_stats_metrics(Key, Points, AllResultedAcc) ->
     ThisKeyResult = lists:foldl(emqx_prometheus_cluster:point_to_map_fun(Key), [], Points),
     lists:zipwith(fun maps:merge/2, AllResultedAcc, ThisKeyResult).
 
+meta_to_init_from(Meta) ->
+    maps:from_keys(metrics_name(Meta), []).
+
 metrics_name(MetricsAll) ->
     [Name || {Name, _, _} <- MetricsAll].