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.cc

diff --git a/quic/core/quic_sent_packet_manager.cc b/quic/core/quic_sent_packet_manager.cc
index 4443bf6..4a041d8 100644
--- a/quic/core/quic_sent_packet_manager.cc
+++ b/quic/core/quic_sent_packet_manager.cc
@@ -369,6 +369,7 @@
 
 void QuicSentPacketManager::PostProcessNewlyAckedPackets(
     QuicPacketNumber ack_packet_number,
+    EncryptionLevel ack_decrypted_level,
     const QuicAckFrame& ack_frame,
     QuicTime ack_receive_time,
     bool rtt_updated,
@@ -413,9 +414,9 @@
   }
 
   if (debug_delegate_ != nullptr) {
-    debug_delegate_->OnIncomingAck(ack_packet_number, ack_frame,
-                                   ack_receive_time, LargestAcked(ack_frame),
-                                   rtt_updated, GetLeastUnacked());
+    debug_delegate_->OnIncomingAck(
+        ack_packet_number, ack_decrypted_level, ack_frame, ack_receive_time,
+        LargestAcked(ack_frame), rtt_updated, GetLeastUnacked());
   }
   // Remove packets below least unacked from all_packets_acked_ and
   // last_ack_frame_.
@@ -946,7 +947,8 @@
           stats_->total_loss_detection_time + (time - info->sent_time);
     }
     if (debug_delegate_ != nullptr) {
-      debug_delegate_->OnPacketLoss(packet.packet_number, LOSS_RETRANSMISSION,
+      debug_delegate_->OnPacketLoss(packet.packet_number,
+                                    info->encryption_level, LOSS_RETRANSMISSION,
                                     time);
     }
     unacked_packets_.RemoveFromInFlight(info);
@@ -1372,8 +1374,8 @@
                       acked_packet.receive_timestamp);
   }
   const bool acked_new_packet = !packets_acked_.empty();
-  PostProcessNewlyAckedPackets(ack_packet_number, last_ack_frame_,
-                               ack_receive_time, rtt_updated_,
+  PostProcessNewlyAckedPackets(ack_packet_number, ack_decrypted_level,
+                               last_ack_frame_, ack_receive_time, rtt_updated_,
                                prior_bytes_in_flight);
 
   return acked_new_packet ? PACKETS_NEWLY_ACKED : NO_PACKETS_NEWLY_ACKED;