From 5a8f0db0e67b4535363724d2842f65faec5d4f2f Mon Sep 17 00:00:00 2001
From: k32 <10274441+k32@users.noreply.github.com>
Date: Thu, 13 Jan 2022 01:46:34 +0100
Subject: [PATCH] refactor(emqx_prometheus): Decorate remote procedure calls

---
 apps/emqx_prometheus/src/emqx_prometheus.erl  | 33 ++++++----------
 .../src/proto/emqx_prometheus_proto_v1.erl    | 38 +++++++++++++++++++
 .../test/emqx_prometheus_SUITE.erl            | 10 ++++-
 3 files changed, 57 insertions(+), 24 deletions(-)
 create mode 100644 apps/emqx_prometheus/src/proto/emqx_prometheus_proto_v1.erl

diff --git a/apps/emqx_prometheus/src/emqx_prometheus.erl b/apps/emqx_prometheus/src/emqx_prometheus.erl
index 29f66670b..3d4971f69 100644
--- a/apps/emqx_prometheus/src/emqx_prometheus.erl
+++ b/apps/emqx_prometheus/src/emqx_prometheus.erl
@@ -41,7 +41,6 @@
         % for rpc
         , do_start/0
         , do_stop/0
-        , do_restart/0
         ]).
 
 %% APIs
@@ -87,9 +86,17 @@ update(Config) ->
             {error, Reason}
     end.
 
-start()   -> cluster_call(do_start, []).
-stop()    -> cluster_call(do_stop, []).
-restart() -> cluster_call(do_restart, []).
+start() ->
+    {_, []} = emqx_prometheus_proto_v1:start(mria_mnesia:running_nodes()),
+    ok.
+
+stop() ->
+    {_, []} = emqx_prometheus_proto_v1:stop(mria_mnesia:running_nodes()),
+    ok.
+
+restart() ->
+    stop(),
+    stop().
 
 do_start() ->
     emqx_prometheus_sup:start_child(?APP, emqx_conf:get([prometheus])).
@@ -102,24 +109,6 @@ do_stop() ->
             ok
     end.
 
-do_restart() ->
-    ok = do_stop(),
-    ok = do_start(),
-    ok.
-
-cluster_call(F, A) ->
-    [ok = rpc_call(N, F, A) || N <- mria_mnesia:running_nodes()],
-    ok.
-
-rpc_call(N, F, A) ->
-    case rpc:call(N, ?MODULE, F, A, 5000) of
-        {badrpc, R} ->
-            ?LOG(error, "RPC Node: ~p ~p ~p failed, Reason: ~p", [N, ?MODULE, F, R]),
-            {error, {badrpc, R}};
-        Result ->
-            Result
-    end.
-
 %%--------------------------------------------------------------------
 %% APIs
 %%--------------------------------------------------------------------
diff --git a/apps/emqx_prometheus/src/proto/emqx_prometheus_proto_v1.erl b/apps/emqx_prometheus/src/proto/emqx_prometheus_proto_v1.erl
new file mode 100644
index 000000000..992c6e22b
--- /dev/null
+++ b/apps/emqx_prometheus/src/proto/emqx_prometheus_proto_v1.erl
@@ -0,0 +1,38 @@
+%%--------------------------------------------------------------------
+%% Copyright (c) 2022 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_prometheus_proto_v1).
+
+-behaviour(emqx_bpapi).
+
+-export([ introduced_in/0
+
+        , start/1
+        , stop/1
+        ]).
+
+-include_lib("emqx/include/bpapi.hrl").
+
+introduced_in() ->
+    "5.0.0".
+
+-spec start([node()]) -> emqx_rpc:multicall_result().
+start(Nodes) ->
+    rpc:multicall(Nodes, emqx_prometheus, do_start, [], 5000).
+
+-spec stop([node()]) -> emqx_rpc:multicall_result().
+stop(Nodes) ->
+    rpc:multicall(Nodes, emqx_prometheus, do_stop, [], 5000).
diff --git a/apps/emqx_prometheus/test/emqx_prometheus_SUITE.erl b/apps/emqx_prometheus/test/emqx_prometheus_SUITE.erl
index edcebe00a..cdbd5ba2d 100644
--- a/apps/emqx_prometheus/test/emqx_prometheus_SUITE.erl
+++ b/apps/emqx_prometheus/test/emqx_prometheus_SUITE.erl
@@ -16,8 +16,14 @@
 
 -module(emqx_prometheus_SUITE).
 
+-include_lib("stdlib/include/assert.hrl").
+
 -compile(nowarn_export_all).
 -compile(export_all).
 
-all() ->
-    [].
+all() -> emqx_common_test_helpers:all(?MODULE).
+
+t_start_stop(_) ->
+    ?assertMatch(ok, emqx_prometheus:start()),
+    ?assertMatch(ok, emqx_prometheus:stop()),
+    ?assertMatch(ok, emqx_prometheus:restart()).