Add byte counters to the bonnet in addition to the existing packet counters.

gfe-relnote: n/a (QBONE-only change)
PiperOrigin-RevId: 301636544
Change-Id: Ied7868a2045168df0c1b44b5b152cec538251659

quic/qbone/bonnet/mock_packet_exchanger_stats_interface.h

diff --git a/quic/qbone/bonnet/mock_packet_exchanger_stats_interface.h b/quic/qbone/bonnet/mock_packet_exchanger_stats_interface.h
index 7814fb3..a265603 100644
--- a/quic/qbone/bonnet/mock_packet_exchanger_stats_interface.h
+++ b/quic/qbone/bonnet/mock_packet_exchanger_stats_interface.h
@@ -13,8 +13,8 @@
 class MockPacketExchangerStatsInterface
     : public TunDevicePacketExchanger::StatsInterface {
  public:
-  MOCK_METHOD0(OnPacketRead, void());
-  MOCK_METHOD0(OnPacketWritten, void());
+  MOCK_METHOD1(OnPacketRead, void(size_t));
+  MOCK_METHOD1(OnPacketWritten, void(size_t));
   MOCK_METHOD1(OnReadError, void(std::string*));
   MOCK_METHOD1(OnWriteError, void(std::string*));
 

quic/qbone/bonnet/tun_device_packet_exchanger.cc

diff --git a/quic/qbone/bonnet/tun_device_packet_exchanger.cc b/quic/qbone/bonnet/tun_device_packet_exchanger.cc
index a3f3565..4e7c93b 100644
--- a/quic/qbone/bonnet/tun_device_packet_exchanger.cc
+++ b/quic/qbone/bonnet/tun_device_packet_exchanger.cc
@@ -48,7 +48,7 @@
     }
     return false;
   }
-  stats_->OnPacketWritten();
+  stats_->OnPacketWritten(result);
 
   return true;
 }
@@ -78,7 +78,7 @@
     }
     return nullptr;
   }
-  stats_->OnPacketRead();
+  stats_->OnPacketRead(result);
   return std::make_unique<QuicData>(read_buffer.release(), result, true);
 }
 

quic/qbone/bonnet/tun_device_packet_exchanger.h

diff --git a/quic/qbone/bonnet/tun_device_packet_exchanger.h b/quic/qbone/bonnet/tun_device_packet_exchanger.h
index c909f7d..fe7c900 100644
--- a/quic/qbone/bonnet/tun_device_packet_exchanger.h
+++ b/quic/qbone/bonnet/tun_device_packet_exchanger.h
@@ -26,8 +26,8 @@
 
     virtual ~StatsInterface() = default;
 
-    virtual void OnPacketRead() = 0;
-    virtual void OnPacketWritten() = 0;
+    virtual void OnPacketRead(size_t count) = 0;
+    virtual void OnPacketWritten(size_t count) = 0;
     virtual void OnReadError(std::string* error) = 0;
     virtual void OnWriteError(std::string* error) = 0;
 

quic/qbone/bonnet/tun_device_packet_exchanger_test.cc

diff --git a/quic/qbone/bonnet/tun_device_packet_exchanger_test.cc b/quic/qbone/bonnet/tun_device_packet_exchanger_test.cc
index 8b4695c..30ef5ed 100644
--- a/quic/qbone/bonnet/tun_device_packet_exchanger_test.cc
+++ b/quic/qbone/bonnet/tun_device_packet_exchanger_test.cc
@@ -79,7 +79,7 @@
         return count;
       }));
 
-  EXPECT_CALL(mock_stats_, OnPacketWritten()).Times(1);
+  EXPECT_CALL(mock_stats_, OnPacketWritten(_)).Times(1);
   exchanger_.WritePacketToNetwork(packet.data(), packet.size());
 }
 
@@ -112,7 +112,7 @@
         return packet.size();
       }));
   EXPECT_CALL(mock_client_, ProcessPacketFromNetwork(StrEq(packet)));
-  EXPECT_CALL(mock_stats_, OnPacketRead()).Times(1);
+  EXPECT_CALL(mock_stats_, OnPacketRead(_)).Times(1);
   EXPECT_TRUE(exchanger_.ReadAndDeliverPacket(&mock_client_));
 }