commit 923b6d2da8ba8d55e0b6b1c9ff9fb13a115f72d6
author vasilvv <vasilvv@google.com> Mon Mar 23 11:17:58 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Mar 23 11:18:43 2020 -0700
tree 0615dfad7038108d7488966d1d41cdee8d3eb9b5
parent 1faf10c21513c7441a3f6dc0553d5990bc384737

Record encryption level for ACK and LOSS events in QUIC traces.

Those are required to disambiguate packet numbers across different packet number spaces.

gfe-relnote: n/a (not used in production)
PiperOrigin-RevId: 302475643
Change-Id: I107555ecba3103cf333c21133c7cdddd9d7a4335

quic/core/quic_sent_packet_manager_test.cc

diff --git a/quic/core/quic_sent_packet_manager_test.cc b/quic/core/quic_sent_packet_manager_test.cc
index 19f5dd1..573a857 100644
--- a/quic/core/quic_sent_packet_manager_test.cc
+++ b/quic/core/quic_sent_packet_manager_test.cc
@@ -46,8 +46,9 @@
   MOCK_METHOD2(OnSpuriousPacketRetransmission,
                void(TransmissionType transmission_type,
                     QuicByteCount byte_size));
-  MOCK_METHOD3(OnPacketLoss,
+  MOCK_METHOD4(OnPacketLoss,
                void(QuicPacketNumber lost_packet_number,
+                    EncryptionLevel encryption_level,
                     TransmissionType transmission_type,
                     QuicTime detection_time));
 };
@@ -599,7 +600,7 @@
   SendDataPacket(5);
   ExpectAckAndLoss(true, 5, 2);
   EXPECT_CALL(debug_delegate,
-              OnPacketLoss(QuicPacketNumber(2), LOSS_RETRANSMISSION, _));
+              OnPacketLoss(QuicPacketNumber(2), _, LOSS_RETRANSMISSION, _));
   // Frames in all packets are acked.
   EXPECT_CALL(notifier_, IsFrameOutstanding(_)).WillRepeatedly(Return(false));
   // Notify session that stream frame in packet 2 gets lost although it is
@@ -1209,7 +1210,7 @@
   // packets lost.
   for (int i = 1; i <= 99; ++i) {
     EXPECT_CALL(debug_delegate,
-                OnPacketLoss(QuicPacketNumber(i), LOSS_RETRANSMISSION, _));
+                OnPacketLoss(QuicPacketNumber(i), _, LOSS_RETRANSMISSION, _));
   }
   EXPECT_CALL(notifier_, IsFrameOutstanding(_)).WillRepeatedly(Return(true));
   // Packets [1, 99] are considered as lost, although stream frame in packet