feat(s2n-quic-core): add nominal counter aggregations

aws · Nov 6, 2024 · 8118f05 · 8118f05
1 parent c7cf090
commit 8118f05
Show file tree

Hide file tree

Showing 26 changed files with 4,297 additions and 716 deletions.
diff --git a/dc/s2n-quic-dc/events/endpoint.rs b/dc/s2n-quic-dc/events/endpoint.rs
@@ -6,6 +6,8 @@
 struct EndpointInitialized<'a> {
     acceptor_addr: SocketAddress<'a>,
     handshake_addr: SocketAddress<'a>,
+    #[nominal_counter("tcp", "")]
     tcp: bool,
+    #[nominal_counter("udp", "")]
     udp: bool,
 }
diff --git a/dc/s2n-quic-dc/events/map.rs b/dc/s2n-quic-dc/events/map.rs
@@ -25,13 +25,15 @@ struct PathSecretMapUninitialized {
 #[subject(endpoint)]
 /// Emitted when a background handshake is requested
 struct PathSecretMapBackgroundHandshakeRequested<'a> {
+    #[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", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -42,6 +44,7 @@ struct PathSecretMapEntryInserted<'a> {
 #[subject(endpoint)]
 /// Emitted when the entry is considered ready for use
 struct PathSecretMapEntryReady<'a> {
+    #[nominal_counter("peer_address.protocol", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -52,6 +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", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -65,6 +69,7 @@ struct PathSecretMapEntryReplaced<'a> {
 #[subject(endpoint)]
 /// Emitted when an UnknownPathSecret packet was sent
 struct UnknownPathSecretPacketSent<'a> {
+    #[nominal_counter("peer_address.protocol", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -75,6 +80,7 @@ struct UnknownPathSecretPacketSent<'a> {
 #[subject(endpoint)]
 /// Emitted when an UnknownPathSecret packet was received
 struct UnknownPathSecretPacketReceived<'a> {
+    #[nominal_counter("peer_address.protocol", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -85,6 +91,7 @@ struct UnknownPathSecretPacketReceived<'a> {
 #[subject(endpoint)]
 /// Emitted when an UnknownPathSecret packet was authentic and processed
 struct UnknownPathSecretPacketAccepted<'a> {
+    #[nominal_counter("peer_address.protocol", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -95,6 +102,7 @@ struct UnknownPathSecretPacketAccepted<'a> {
 #[subject(endpoint)]
 /// Emitted when an UnknownPathSecret packet was rejected as invalid
 struct UnknownPathSecretPacketRejected<'a> {
+    #[nominal_counter("peer_address.protocol", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -105,6 +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", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -139,6 +148,7 @@ struct ReplayPotentiallyDetected<'a> {
 #[subject(endpoint)]
 /// Emitted when an ReplayDetected packet was sent
 struct ReplayDetectedPacketSent<'a> {
+    #[nominal_counter("peer_address.protocol", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -149,6 +159,7 @@ struct ReplayDetectedPacketSent<'a> {
 #[subject(endpoint)]
 /// Emitted when an ReplayDetected packet was received
 struct ReplayDetectedPacketReceived<'a> {
+    #[nominal_counter("peer_address.protocol", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -159,6 +170,7 @@ struct ReplayDetectedPacketReceived<'a> {
 #[subject(endpoint)]
 /// Emitted when an StaleKey packet was authentic and processed
 struct ReplayDetectedPacketAccepted<'a> {
+    #[nominal_counter("peer_address.protocol", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -171,6 +183,7 @@ struct ReplayDetectedPacketAccepted<'a> {
 #[subject(endpoint)]
 /// Emitted when an ReplayDetected packet was rejected as invalid
 struct ReplayDetectedPacketRejected<'a> {
+    #[nominal_counter("peer_address.protocol", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -181,6 +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", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -191,6 +205,7 @@ struct ReplayDetectedPacketDropped<'a> {
 #[subject(endpoint)]
 /// Emitted when an StaleKey packet was sent
 struct StaleKeyPacketSent<'a> {
+    #[nominal_counter("peer_address.protocol", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -201,6 +216,7 @@ struct StaleKeyPacketSent<'a> {
 #[subject(endpoint)]
 /// Emitted when an StaleKey packet was received
 struct StaleKeyPacketReceived<'a> {
+    #[nominal_counter("peer_address.protocol", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -211,6 +227,7 @@ struct StaleKeyPacketReceived<'a> {
 #[subject(endpoint)]
 /// Emitted when an StaleKey packet was authentic and processed
 struct StaleKeyPacketAccepted<'a> {
+    #[nominal_counter("peer_address.protocol", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -221,6 +238,7 @@ struct StaleKeyPacketAccepted<'a> {
 #[subject(endpoint)]
 /// Emitted when an StaleKey packet was rejected as invalid
 struct StaleKeyPacketRejected<'a> {
+    #[nominal_counter("peer_address.protocol", "")]
     peer_address: SocketAddress<'a>,
 
     #[snapshot("[HIDDEN]")]
@@ -231,6 +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", "")]
     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, Info, Recorder, Registry,
+            info, AsMetric, AsVariant, Info, NominalRecorder, Recorder, Registry,
         };
 
         pub mod probe {

diff --git a/dc/s2n-quic-dc/src/event/generated.rs b/dc/s2n-quic-dc/src/event/generated.rs
@@ -10,6 +10,8 @@ pub(crate) mod metrics;
 pub mod api {
     #![doc = r" This module contains events that are emitted to the [`Subscriber`](crate::event::Subscriber)"]
     use super::*;
+    #[allow(unused_imports)]
+    use crate::event::metrics::aggregate;
     pub use s2n_quic_core::event::api::{EndpointType, SocketAddress, Subject};
     pub use traits::Subscriber;
     #[derive(Clone, Debug)]