use monotonic ids, bool counters

aws · Nov 7, 2024 · f7dc5d9 · f7dc5d9
1 parent 8118f05
commit f7dc5d9
Show file tree

Hide file tree

Showing 24 changed files with 2,040 additions and 1,673 deletions.
diff --git a/dc/s2n-quic-dc/events/connection.rs b/dc/s2n-quic-dc/events/connection.rs
@@ -4,23 +4,23 @@
 #[event("application:write")]
 pub struct ApplicationWrite {
     /// The number of bytes that the application tried to write
-    #[measure("provided", "b")]
+    #[measure("provided", Bytes)]
     total_len: usize,
 
     /// The amount that was written
-    #[measure("committed", "b")]
-    #[counter("committed.total", "b")]
+    #[measure("committed", Bytes)]
+    #[counter("committed.total", Bytes)]
     write_len: usize,
 }
 
 #[event("application:read")]
 pub struct ApplicationRead {
     /// The number of bytes that the application tried to read
-    #[measure("capacity", "b")]
+    #[measure("capacity", Bytes)]
     capacity: usize,
 
     /// The amount that was read
-    #[measure("committed", "b")]
-    #[counter("committed.total", "b")]
+    #[measure("committed", Bytes)]
+    #[counter("committed.total", Bytes)]
     read_len: usize,
 }
diff --git a/dc/s2n-quic-dc/events/endpoint.rs b/dc/s2n-quic-dc/events/endpoint.rs
@@ -4,10 +4,12 @@
 #[event("endpoint:initialized")]
 #[subject(endpoint)]
 struct EndpointInitialized<'a> {
+    #[nominal_counter("acceptor.protocol")]
     acceptor_addr: SocketAddress<'a>,
+    #[nominal_counter("handshake.protocol")]
     handshake_addr: SocketAddress<'a>,
-    #[nominal_counter("tcp", "")]
+    #[bool_counter("tcp")]
     tcp: bool,
-    #[nominal_counter("udp", "")]
+    #[bool_counter("udp")]
     udp: bool,
 }
diff --git a/dc/s2n-quic-dc/events/map.rs b/dc/s2n-quic-dc/events/map.rs
@@ -25,15 +25,15 @@ struct PathSecretMapUninitialized {
 #[subject(endpoint)]
 /// Emitted when a background handshake is requested
 struct PathSecretMapBackgroundHandshakeRequested<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 }
 
 #[event("path_secret_map:entry_replaced")]
 #[subject(endpoint)]
 /// Emitted when the entry is inserted into the path secret map
 struct PathSecretMapEntryInserted<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -44,7 +44,7 @@ struct PathSecretMapEntryInserted<'a> {
 #[subject(endpoint)]
 /// Emitted when the entry is considered ready for use
 struct PathSecretMapEntryReady<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -55,7 +55,7 @@ struct PathSecretMapEntryReady<'a> {
 #[subject(endpoint)]
 /// Emitted when an entry is replaced by a new one for the same `peer_address`
 struct PathSecretMapEntryReplaced<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -69,7 +69,7 @@ struct PathSecretMapEntryReplaced<'a> {
 #[subject(endpoint)]
 /// Emitted when an UnknownPathSecret packet was sent
 struct UnknownPathSecretPacketSent<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -80,7 +80,7 @@ struct UnknownPathSecretPacketSent<'a> {
 #[subject(endpoint)]
 /// Emitted when an UnknownPathSecret packet was received
 struct UnknownPathSecretPacketReceived<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -91,7 +91,7 @@ struct UnknownPathSecretPacketReceived<'a> {
 #[subject(endpoint)]
 /// Emitted when an UnknownPathSecret packet was authentic and processed
 struct UnknownPathSecretPacketAccepted<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -102,7 +102,7 @@ struct UnknownPathSecretPacketAccepted<'a> {
 #[subject(endpoint)]
 /// Emitted when an UnknownPathSecret packet was rejected as invalid
 struct UnknownPathSecretPacketRejected<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -113,7 +113,7 @@ struct UnknownPathSecretPacketRejected<'a> {
 #[subject(endpoint)]
 /// Emitted when an UnknownPathSecret packet was dropped due to a missing entry
 struct UnknownPathSecretPacketDropped<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -148,7 +148,7 @@ struct ReplayPotentiallyDetected<'a> {
 #[subject(endpoint)]
 /// Emitted when an ReplayDetected packet was sent
 struct ReplayDetectedPacketSent<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -159,7 +159,7 @@ struct ReplayDetectedPacketSent<'a> {
 #[subject(endpoint)]
 /// Emitted when an ReplayDetected packet was received
 struct ReplayDetectedPacketReceived<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -170,7 +170,7 @@ struct ReplayDetectedPacketReceived<'a> {
 #[subject(endpoint)]
 /// Emitted when an StaleKey packet was authentic and processed
 struct ReplayDetectedPacketAccepted<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -183,7 +183,7 @@ struct ReplayDetectedPacketAccepted<'a> {
 #[subject(endpoint)]
 /// Emitted when an ReplayDetected packet was rejected as invalid
 struct ReplayDetectedPacketRejected<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -194,7 +194,7 @@ struct ReplayDetectedPacketRejected<'a> {
 #[subject(endpoint)]
 /// Emitted when an ReplayDetected packet was dropped due to a missing entry
 struct ReplayDetectedPacketDropped<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -205,7 +205,7 @@ struct ReplayDetectedPacketDropped<'a> {
 #[subject(endpoint)]
 /// Emitted when an StaleKey packet was sent
 struct StaleKeyPacketSent<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -216,7 +216,7 @@ struct StaleKeyPacketSent<'a> {
 #[subject(endpoint)]
 /// Emitted when an StaleKey packet was received
 struct StaleKeyPacketReceived<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -227,7 +227,7 @@ struct StaleKeyPacketReceived<'a> {
 #[subject(endpoint)]
 /// Emitted when an StaleKey packet was authentic and processed
 struct StaleKeyPacketAccepted<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -238,7 +238,7 @@ struct StaleKeyPacketAccepted<'a> {
 #[subject(endpoint)]
 /// Emitted when an StaleKey packet was rejected as invalid
 struct StaleKeyPacketRejected<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -249,7 +249,7 @@ struct StaleKeyPacketRejected<'a> {
 #[subject(endpoint)]
 /// Emitted when an StaleKey packet was dropped due to a missing entry
 struct StaleKeyPacketDropped<'a> {
-    #[nominal_counter("peer_address.protocol", "")]
+    #[nominal_counter("peer_address.protocol")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]

diff --git a/dc/s2n-quic-dc/src/event.rs b/dc/s2n-quic-dc/src/event.rs
@@ -36,7 +36,7 @@ pub mod metrics {
     pub mod aggregate {
         pub use crate::event::generated::metrics::aggregate::*;
         pub use s2n_quic_core::event::metrics::aggregate::{
-            info, AsMetric, AsVariant, Info, NominalRecorder, Recorder, Registry,
+            info, AsVariant, BoolRecorder, Info, Metric, NominalRecorder, Recorder, Registry, Units,
         };
 
         pub mod probe {