From f95c82e37a6061235988f3bd97f5782f54670140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E5=AD=90=E5=8D=9A?= <349832309@qq.com>
Date: Thu, 6 Sep 2018 18:14:14 +0800
Subject: [PATCH] Add metric for DISCONNECT packet

---
 src/emqx_metrics.erl | 57 +++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/emqx_metrics.erl b/src/emqx_metrics.erl
index e319a425b..8130a307e 100644
--- a/src/emqx_metrics.erl
+++ b/src/emqx_metrics.erl
@@ -34,32 +34,33 @@
 
 %% Packets sent and received of broker
 -define(PACKET_METRICS, [
-    {counter, 'packets/received'},         % All Packets received
-    {counter, 'packets/sent'},             % All Packets sent
-    {counter, 'packets/connect'},          % CONNECT Packets received
-    {counter, 'packets/connack'},          % CONNACK Packets sent
-    {counter, 'packets/publish/received'}, % PUBLISH packets received
-    {counter, 'packets/publish/sent'},     % PUBLISH packets sent
-    {counter, 'packets/puback/received'},  % PUBACK packets received
-    {counter, 'packets/puback/sent'},      % PUBACK packets sent
-    {counter, 'packets/puback/missed'},    % PUBACK packets missed
-    {counter, 'packets/pubrec/received'},  % PUBREC packets received
-    {counter, 'packets/pubrec/sent'},      % PUBREC packets sent
-    {counter, 'packets/pubrec/missed'},    % PUBREC packets missed
-    {counter, 'packets/pubrel/received'},  % PUBREL packets received
-    {counter, 'packets/pubrel/sent'},      % PUBREL packets sent
-    {counter, 'packets/pubrel/missed'},    % PUBREL packets missed
-    {counter, 'packets/pubcomp/received'}, % PUBCOMP packets received
-    {counter, 'packets/pubcomp/sent'},     % PUBCOMP packets sent
-    {counter, 'packets/pubcomp/missed'},   % PUBCOMP packets missed
-    {counter, 'packets/subscribe'},        % SUBSCRIBE Packets received
-    {counter, 'packets/suback'},           % SUBACK packets sent
-    {counter, 'packets/unsubscribe'},      % UNSUBSCRIBE Packets received
-    {counter, 'packets/unsuback'},         % UNSUBACK Packets sent
-    {counter, 'packets/pingreq'},          % PINGREQ packets received
-    {counter, 'packets/pingresp'},         % PINGRESP Packets sent
-    {counter, 'packets/disconnect'},       % DISCONNECT Packets received
-    {counter, 'packets/auth'}              % Auth Packets received
+    {counter, 'packets/received'},              % All Packets received
+    {counter, 'packets/sent'},                  % All Packets sent
+    {counter, 'packets/connect'},               % CONNECT Packets received
+    {counter, 'packets/connack'},               % CONNACK Packets sent
+    {counter, 'packets/publish/received'},      % PUBLISH packets received
+    {counter, 'packets/publish/sent'},          % PUBLISH packets sent
+    {counter, 'packets/puback/received'},       % PUBACK packets received
+    {counter, 'packets/puback/sent'},           % PUBACK packets sent
+    {counter, 'packets/puback/missed'},         % PUBACK packets missed
+    {counter, 'packets/pubrec/received'},       % PUBREC packets received
+    {counter, 'packets/pubrec/sent'},           % PUBREC packets sent
+    {counter, 'packets/pubrec/missed'},         % PUBREC packets missed
+    {counter, 'packets/pubrel/received'},       % PUBREL packets received
+    {counter, 'packets/pubrel/sent'},           % PUBREL packets sent
+    {counter, 'packets/pubrel/missed'},         % PUBREL packets missed
+    {counter, 'packets/pubcomp/received'},      % PUBCOMP packets received
+    {counter, 'packets/pubcomp/sent'},          % PUBCOMP packets sent
+    {counter, 'packets/pubcomp/missed'},        % PUBCOMP packets missed
+    {counter, 'packets/subscribe'},             % SUBSCRIBE Packets received
+    {counter, 'packets/suback'},                % SUBACK packets sent
+    {counter, 'packets/unsubscribe'},           % UNSUBSCRIBE Packets received
+    {counter, 'packets/unsuback'},              % UNSUBACK Packets sent
+    {counter, 'packets/pingreq'},               % PINGREQ packets received
+    {counter, 'packets/pingresp'},              % PINGRESP Packets sent
+    {counter, 'packets/disconnect/received'},   % DISCONNECT Packets received
+    {counter, 'packets/disconnect/sent'},       % DISCONNECT Packets sent
+    {counter, 'packets/auth'}                   % Auth Packets received
 ]).
 
 %% Messages sent and received of broker
@@ -194,7 +195,7 @@ received2(?UNSUBSCRIBE) ->
 received2(?PINGREQ) ->
     inc('packets/pingreq');
 received2(?DISCONNECT) ->
-    inc('packets/disconnect');
+    inc('packets/disconnect/received');
 received2(_) ->
     ignore.
 qos_received(?QOS_0) ->
@@ -233,6 +234,8 @@ sent2(?UNSUBACK) ->
     inc('packets/unsuback');
 sent2(?PINGRESP) ->
     inc('packets/pingresp');
+sent2(?DISCONNECT) ->
+    inc('packets/disconnect/sent');
 sent2(_Type) ->
     ignore.
 qos_sent(?QOS_0) ->