commit f7c51276ea4ec862cbd471436229579f8a8718dd
author Boris Zbarsky <bzbarsky@apple.com> Wed Sep 22 10:22:31 2021 -0400
committer GitHub <noreply@github.com> Wed Sep 22 10:22:31 2021 -0400
tree 72e7ff71a8db064d98a3633c6ec2760567352d2f
parent e9ec6761db0e8f4a49aba88cb6d6679e34d0b31a

Improve various logging to make it easier to undestand what happened. (#9868)

* Improve various logging to make it easier to undestand what happened.

Specific changes:

1) Consistent formatting for message counters.
2) Consistent formatting for message types.
3) Consistent formatting of protocol ids.
4) Include the exchange context in various logging so we know which
   actual interaction/exchange is involved.
5) Include message counters in more places so we know which message is
   involved.

* Address review comments

src/messaging/ExchangeMgr.cpp

diff --git a/src/messaging/ExchangeMgr.cpp b/src/messaging/ExchangeMgr.cpp
index 2d0fb23..e9d3204 100644
--- a/src/messaging/ExchangeMgr.cpp
+++ b/src/messaging/ExchangeMgr.cpp
@@ -201,11 +201,11 @@
 {
     UnsolicitedMessageHandler * matchingUMH = nullptr;
 
-    ChipLogProgress(
-        ExchangeManager,
-        "Received message of type 0x%02x with vendorId 0x%04x and protocolId 0x%04x on exchange " ChipLogFormatExchangeId,
-        payloadHeader.GetMessageType(), payloadHeader.GetProtocolID().GetVendorId(), payloadHeader.GetProtocolID().GetProtocolId(),
-        ChipLogValueExchangeIdFromHeader(payloadHeader));
+    ChipLogProgress(ExchangeManager,
+                    "Received message of type " ChipLogFormatMessageType " with protocolId " ChipLogFormatProtocolId
+                    " and MessageCounter:" ChipLogFormatMessageCounter " on exchange " ChipLogFormatExchangeId,
+                    payloadHeader.GetMessageType(), ChipLogValueProtocolId(payloadHeader.GetProtocolID()),
+                    packetHeader.GetMessageCounter(), ChipLogValueExchangeIdFromReceivedHeader(payloadHeader));
 
     MessageFlags msgFlags;
     if (isDuplicate == DuplicateMessage::Yes)