Improve server packet drop logging.

Summary: Provide a more detailed reason why we dropped a packet to the stats callback and qlog. Reviewed By: hanidamlaj Differential Revision: D66171930 fbshipit-source-id: 4cf10b149d1184afb7b268ac8f229555d2ffb75d
facebook · Nov 20, 2024 · abb06d9 · abb06d9
1 parent df29c69
commit abb06d9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/quic/server/state/ServerStateMachine.cpp b/quic/server/state/ServerStateMachine.cpp
@@ -886,14 +886,16 @@ void onServerReadDataFromOpen(
         break;
       }
       case CodecResult::Type::NOTHING: {
-        VLOG(10) << "drop cipher unavailable, no data " << conn;
+        VLOG(10) << "drop no data, reason: "
+                 << parsedPacket.nothing()->reason._to_string() << " " << conn;
         if (conn.qLogger) {
-          conn.qLogger->addPacketDrop(packetSize, kCipherUnavailable);
+          conn.qLogger->addPacketDrop(
+              packetSize, parsedPacket.nothing()->reason._to_string());
         }
         QUIC_STATS(
             conn.statsCallback,
             onPacketDropped,
-            PacketDropReason::UNEXPECTED_NOTHING);
+            parsedPacket.nothing()->reason);
         if (firstPacketFromPeer) {
           throw QuicInternalException(
               "Failed to decrypt first packet from peer",
@@ -1455,14 +1457,14 @@ void onServerReadDataFromClosed(
       break;
     }
     case CodecResult::Type::NOTHING: {
-      VLOG(10) << "drop cipher unavailable, no data " << conn;
+      VLOG(10) << "drop no data, reason: "
+               << parsedPacket.nothing()->reason._to_string() << " " << conn;
       if (conn.qLogger) {
-        conn.qLogger->addPacketDrop(packetSize, kCipherUnavailable);
+        conn.qLogger->addPacketDrop(
+            packetSize, parsedPacket.nothing()->reason._to_string());
       }
       QUIC_STATS(
-          conn.statsCallback,
-          onPacketDropped,
-          PacketDropReason::UNEXPECTED_NOTHING);
+          conn.statsCallback, onPacketDropped, parsedPacket.nothing()->reason);
       break;
     }
     case CodecResult::Type::REGULAR_PACKET:

diff --git a/quic/server/test/QuicServerTransportTest.cpp b/quic/server/test/QuicServerTransportTest.cpp
@@ -3570,7 +3570,7 @@ TEST_F(QuicUnencryptedServerTransportTest, TestUnencryptedAck) {
   auto tmp = std::move(qLogger->logs[indices[0]]);
   auto event = dynamic_cast<QLogPacketDropEvent*>(tmp.get());
   EXPECT_EQ(event->packetSize, 45);
-  EXPECT_EQ(event->dropReason, kCipherUnavailable);
+  EXPECT_EQ(event->dropReason, "DECRYPTION_ERROR_INITIAL");
 }
 
 TEST_F(QuicUnencryptedServerTransportTest, TestBadPacketProtectionLevel) {