From e7252eee815eda34a311eca88ae6516ba1992e14 Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@163.com>
Date: Tue, 11 May 2021 14:16:21 +0800
Subject: [PATCH] fix(metric): incr the messages.retained counter

---
 apps/emqx_retainer/src/emqx_retainer.appup.src | 15 +++++++++++++++
 apps/emqx_retainer/src/emqx_retainer.erl       |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 apps/emqx_retainer/src/emqx_retainer.appup.src

diff --git a/apps/emqx_retainer/src/emqx_retainer.appup.src b/apps/emqx_retainer/src/emqx_retainer.appup.src
new file mode 100644
index 000000000..a17e6ee2f
--- /dev/null
+++ b/apps/emqx_retainer/src/emqx_retainer.appup.src
@@ -0,0 +1,15 @@
+%% -*-: erlang -*-
+{VSN,
+  [
+    {"4.3.0", [
+      {load_module, emqx_retainer, brutal_purge, soft_purge, []}
+    ]},
+    {<<".*">>, []}
+  ],
+  [
+    {"4.3.0", [
+      {load_module, emqx_retainer, brutal_purge, soft_purge, []}
+    ]},
+    {<<".*">>, []}
+  ]
+}.
diff --git a/apps/emqx_retainer/src/emqx_retainer.erl b/apps/emqx_retainer/src/emqx_retainer.erl
index c1523b7a1..340e6929d 100644
--- a/apps/emqx_retainer/src/emqx_retainer.erl
+++ b/apps/emqx_retainer/src/emqx_retainer.erl
@@ -200,7 +200,7 @@ sort_retained(Msgs)  ->
 store_retained(Msg = #message{topic = Topic, payload = Payload}, Env) ->
     case {is_table_full(Env), is_too_big(size(Payload), Env)} of
         {false, false} ->
-            ok = emqx_metrics:set('messages.retained', retained_count()),
+            ok = emqx_metrics:inc('messages.retained'),
             mnesia:dirty_write(?TAB, #retained{topic = topic2tokens(Topic),
                                                msg = Msg,
                                                expiry_time = get_expiry_time(Msg, Env)});