Merge branch 'anders/diameter/rc_counters/OTP-11937' into maint

* anders/diameter/rc_counters/OTP-11937:
  Count encode errors in outgoing messages
  Count decode errors in incoming requests
  Count decode errors independently of result codes

1 files changed, 8 insertions, 5 deletions

diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl
index 079e1c0bc2..dbfe087659 100644
--- a/lib/diameter/src/base/diameter_watchdog.erl
+++ b/lib/diameter/src/base/diameter_watchdog.erl
@@ -562,17 +562,20 @@ recv(Name, Pkt, S) ->
 
 rcv('DWR', Pkt, #watchdog{transport = TPid,
                           dictionary = Dict0}) ->
+    DPkt = diameter_codec:decode(Dict0, Pkt),
+    diameter_traffic:incr_error(recv, DPkt, TPid),
     EPkt = encode(dwa, Dict0, Pkt),
-    diameter_traffic:incr_A(send, EPkt, TPid, Dict0),
+    diameter_traffic:incr_rc(send, EPkt, TPid, Dict0),
+
     send(TPid, {send, EPkt}),
     ?LOG(send, 'DWA');
 
 rcv('DWA', Pkt, #watchdog{transport = TPid,
                           dictionary = Dict0}) ->
-    diameter_traffic:incr_A(recv,
-                            diameter_codec:decode(Dict0, Pkt),
-                            TPid,
-                            Dict0);
+    diameter_traffic:incr_rc(recv,
+                             diameter_codec:decode(Dict0, Pkt),
+                             TPid,
+                             Dict0);
 
 rcv(N, _, _)
   when N == 'CER';