yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(emqx_metrics): add new functions to count message received

This commit is contained in:
zhanghongtong 2020-11-10 22:21:27 +08:00 committed by tigercl
parent bcd98bda1c
commit 253c43e405
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/emqx.appup.src
View File

@ -6,14 +6,19 @@
4 -> % arch_32 4 -> % arch_32
{1000, cuttlefish_bytesize:parse("32MB")} {1000, cuttlefish_bytesize:parse("32MB")}
end, end,
{"4.2.2", {"4.2.3",
[ [
{"4.2.2", [
{load_module, emqx_metrics, brutal_purge, soft_purge, []}
]},
{"4.2.1", [ {"4.2.1", [
{load_module, emqx_metrics, brutal_purge, soft_purge, []},
{load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []},
{load_module, emqx_mod_topic_metrics, brutal_purge, soft_purge, []}, {load_module, emqx_mod_topic_metrics, brutal_purge, soft_purge, []},
{load_module, emqx_json, brutal_purge, soft_purge, []} {load_module, emqx_json, brutal_purge, soft_purge, []}
]}, ]},
{"4.2.0", [ {"4.2.0", [
{load_module, emqx_metrics, brutal_purge, soft_purge, []},
{load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []},
{load_module, emqx_mod_topic_metrics, brutal_purge, soft_purge, []}, {load_module, emqx_mod_topic_metrics, brutal_purge, soft_purge, []},
{load_module, emqx_json, brutal_purge, soft_purge, []}, {load_module, emqx_json, brutal_purge, soft_purge, []},
@ -24,12 +29,17 @@
]} ]}
], ],
[ [
{"4.2.2", [
{load_module, emqx_metrics, brutal_purge, soft_purge, []}
]},
{"4.2.1", [ {"4.2.1", [
{load_module, emqx_metrics, brutal_purge, soft_purge, []}
{load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []},
{load_module, emqx_mod_topic_metrics, brutal_purge, soft_purge, []}, {load_module, emqx_mod_topic_metrics, brutal_purge, soft_purge, []},
{load_module, emqx_json, brutal_purge, soft_purge, []} {load_module, emqx_json, brutal_purge, soft_purge, []}
]}, ]},
{"4.2.0", [ {"4.2.0", [
{load_module, emqx_metrics, brutal_purge, soft_purge, []}
{load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []},
{load_module, emqx_mod_topic_metrics, brutal_purge, soft_purge, []}, {load_module, emqx_mod_topic_metrics, brutal_purge, soft_purge, []},
{load_module, emqx_json, brutal_purge, soft_purge, []} {load_module, emqx_json, brutal_purge, soft_purge, []}

13
src/emqx_metrics.erl
View File

@ -21,6 +21,7 @@
-include("logger.hrl"). -include("logger.hrl").
-include("types.hrl"). -include("types.hrl").
-include("emqx_mqtt.hrl"). -include("emqx_mqtt.hrl").
-include("emqx.hrl").
-logger_header("[Metrics]"). -logger_header("[Metrics]").
@ -49,7 +50,8 @@
]). ]).
%% Inc received/sent metrics %% Inc received/sent metrics
-export([ inc_recv/1 -export([ inc_msg/1
, inc_recv/1
, inc_sent/1 , inc_sent/1
]). ]).
@ -313,6 +315,15 @@ update_counter(Name, Value) ->
%% Inc received/sent metrics %% 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. %% @doc Inc packets received.
-spec(inc_recv(emqx_types:packet()) -> ok). -spec(inc_recv(emqx_types:packet()) -> ok).
inc_recv(Packet) -> inc_recv(Packet) ->