From e100b0a5e96ae303882dc41fd992ce4ef94f7630 Mon Sep 17 00:00:00 2001 From: zhanghongtong Date: Tue, 10 Nov 2020 21:44:39 +0800 Subject: [PATCH] feat(emqx_metrics): add new functions to count message received --- src/emqx.appup.src | 6 ++++-- src/emqx_metrics.erl | 13 ++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/emqx.appup.src b/src/emqx.appup.src index cdf2ac0c1..23a383d77 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -2,13 +2,15 @@ [ {"4.2.0", [ {load_module, emqx_alarm, brutal_purge, soft_purge, []}, - {load_module, emqx_connection, brutal_purge, soft_purge, []} + {load_module, emqx_connection, brutal_purge, soft_purge, []}, + {load_module, emqx_metrics, brutal_purge, soft_purge, []} ]} ], [ {"4.2.0", [ {load_module, emqx_alarm, brutal_purge, soft_purge, []}, - {load_module, emqx_connection, brutal_purge, soft_purge, []} + {load_module, emqx_connection, brutal_purge, soft_purge, []}, + {load_module, emqx_metrics, brutal_purge, soft_purge, []} ]} ] }. diff --git a/src/emqx_metrics.erl b/src/emqx_metrics.erl index 2a5a82749..4bd529a2e 100644 --- a/src/emqx_metrics.erl +++ b/src/emqx_metrics.erl @@ -21,6 +21,7 @@ -include("logger.hrl"). -include("types.hrl"). -include("emqx_mqtt.hrl"). +-include("emqx.hrl"). -logger_header("[Metrics]"). @@ -49,7 +50,8 @@ ]). %% Inc received/sent metrics --export([ inc_recv/1 +-export([ inc_msg/1 + , inc_recv/1 , inc_sent/1 ]). @@ -313,6 +315,15 @@ update_counter(Name, Value) -> %% Inc received/sent metrics %%-------------------------------------------------------------------- +-spec(inc_msg(emqx_types:massage()) -> ok). +inc_msg(Msg) -> + case Msg#message.qos of + 0 -> inc('messages.qos0.received'); + 1 -> inc('messages.qos1.received'); + 2 -> inc('messages.qos2.received') + end, + inc('messages.received'). + %% @doc Inc packets received. -spec(inc_recv(emqx_types:packet()) -> ok). inc_recv(Packet) ->