Skip to content

refactor(s2n-events): Reduce generated diffs when changing metric definitions #2993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mark-Simulacrum merged 2 commits into from
Mar 11, 2026
Merged

refactor(s2n-events): Reduce generated diffs when changing metric definitions #2993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc34475
Reduce generated diffs when changing metric definitions
Mark-Simulacrum Feb 27, 2026
ba88e9c
Add events for TLS stream connect errors
Mark-Simulacrum Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions dc/s2n-quic-dc/events/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,22 @@ pub struct StreamTcpConnect {
latency: core::time::Duration,
}

/// Tracks TLS stream establishment.
#[event("stream:tls_connect")]
#[subject(endpoint)]
pub struct StreamTlsConnect {
#[bool_counter("error")]
error: bool,

// Does not include errors (otherwise we'd need to incorrectly emit zeros on tls_latency).
#[timer("tcp_latency")]
tcp_latency: core::time::Duration,

// This includes the error latencies.
#[timer("tls_latency")]
tls_latency: core::time::Duration,
}

/// Tracks stream connect where dcQUIC owns the TCP connect().
#[event("stream:connect")]
#[subject(endpoint)]
Expand Down
107 changes: 107 additions & 0 deletions dc/s2n-quic-dc/src/event/generated.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1283,6 +1283,27 @@ pub mod api {
}
#[derive(Clone, Debug)]
#[non_exhaustive]
#[doc = " Tracks TLS stream establishment."]
pub struct StreamTlsConnect {
pub error: bool,
pub tcp_latency: core::time::Duration,
pub tls_latency: core::time::Duration,
}
#[cfg(any(test, feature = "testing"))]
impl crate::event::snapshot::Fmt for StreamTlsConnect {
fn fmt(&self, fmt: &mut core::fmt::Formatter) -> core::fmt::Result {
let mut fmt = fmt.debug_struct("StreamTlsConnect");
fmt.field("error", &self.error);
fmt.field("tcp_latency", &self.tcp_latency);
fmt.field("tls_latency", &self.tls_latency);
fmt.finish()
}
}
impl Event for StreamTlsConnect {
const NAME: &'static str = "stream:tls_connect";
}
#[derive(Clone, Debug)]
#[non_exhaustive]
#[doc = " Tracks stream connect where dcQUIC owns the TCP connect()."]
pub struct StreamConnect {
pub error: bool,
Expand Down Expand Up @@ -3133,6 +3154,16 @@ pub mod tracing {
tracing :: event ! (target : "stream_tcp_connect" , parent : parent , tracing :: Level :: DEBUG , { error = tracing :: field :: debug (error) , latency = tracing :: field :: debug (latency) });
}
#[inline]
fn on_stream_tls_connect(&self, meta: &api::EndpointMeta, event: &api::StreamTlsConnect) {
let parent = self.parent(meta);
let api::StreamTlsConnect {
error,
tcp_latency,
tls_latency,
} = event;
tracing :: event ! (target : "stream_tls_connect" , parent : parent , tracing :: Level :: DEBUG , { error = tracing :: field :: debug (error) , tcp_latency = tracing :: field :: debug (tcp_latency) , tls_latency = tracing :: field :: debug (tls_latency) });
}
#[inline]
fn on_stream_connect(&self, meta: &api::EndpointMeta, event: &api::StreamConnect) {
let parent = self.parent(meta);
let api::StreamConnect {
Expand Down Expand Up @@ -4957,6 +4988,28 @@ pub mod builder {
}
}
#[derive(Clone, Debug)]
#[doc = " Tracks TLS stream establishment."]
pub struct StreamTlsConnect {
pub error: bool,
pub tcp_latency: core::time::Duration,
pub tls_latency: core::time::Duration,
}
impl IntoEvent<api::StreamTlsConnect> for StreamTlsConnect {
#[inline]
fn into_event(self) -> api::StreamTlsConnect {
let StreamTlsConnect {
error,
tcp_latency,
tls_latency,
} = self;
api::StreamTlsConnect {
error: error.into_event(),
tcp_latency: tcp_latency.into_event(),
tls_latency: tls_latency.into_event(),
}
}
}
#[derive(Clone, Debug)]
#[doc = " Tracks stream connect where dcQUIC owns the TCP connect()."]
pub struct StreamConnect {
pub error: bool,
Expand Down Expand Up @@ -6661,6 +6714,12 @@ mod traits {
let _ = meta;
let _ = event;
}
#[doc = "Called when the `StreamTlsConnect` event is triggered"]
#[inline]
fn on_stream_tls_connect(&self, meta: &api::EndpointMeta, event: &api::StreamTlsConnect) {
let _ = meta;
let _ = event;
}
#[doc = "Called when the `StreamConnect` event is triggered"]
#[inline]
fn on_stream_connect(&self, meta: &api::EndpointMeta, event: &api::StreamConnect) {
Expand Down Expand Up @@ -7588,6 +7647,10 @@ mod traits {
self.as_ref().on_stream_tcp_connect(meta, event);
}
#[inline]
fn on_stream_tls_connect(&self, meta: &api::EndpointMeta, event: &api::StreamTlsConnect) {
self.as_ref().on_stream_tls_connect(meta, event);
}
#[inline]
fn on_stream_connect(&self, meta: &api::EndpointMeta, event: &api::StreamConnect) {
self.as_ref().on_stream_connect(meta, event);
}
Expand Down Expand Up @@ -8453,6 +8516,11 @@ mod traits {
(self.1).on_stream_tcp_connect(meta, event);
}
#[inline]
fn on_stream_tls_connect(&self, meta: &api::EndpointMeta, event: &api::StreamTlsConnect) {
(self.0).on_stream_tls_connect(meta, event);
(self.1).on_stream_tls_connect(meta, event);
}
#[inline]
fn on_stream_connect(&self, meta: &api::EndpointMeta, event: &api::StreamConnect) {
(self.0).on_stream_connect(meta, event);
(self.1).on_stream_connect(meta, event);
Expand Down Expand Up @@ -8978,6 +9046,8 @@ mod traits {
fn on_acceptor_stream_dequeued(&self, event: builder::AcceptorStreamDequeued);
#[doc = "Publishes a `StreamTcpConnect` event to the publisher's subscriber"]
fn on_stream_tcp_connect(&self, event: builder::StreamTcpConnect);
#[doc = "Publishes a `StreamTlsConnect` event to the publisher's subscriber"]
fn on_stream_tls_connect(&self, event: builder::StreamTlsConnect);
#[doc = "Publishes a `StreamConnect` event to the publisher's subscriber"]
fn on_stream_connect(&self, event: builder::StreamConnect);
#[doc = "Publishes a `StreamConnectError` event to the publisher's subscriber"]
Expand Down Expand Up @@ -9292,6 +9362,12 @@ mod traits {
self.subscriber.on_event(&self.meta, &event);
}
#[inline]
fn on_stream_tls_connect(&self, event: builder::StreamTlsConnect) {
let event = event.into_event();
self.subscriber.on_stream_tls_connect(&self.meta, &event);
self.subscriber.on_event(&self.meta, &event);
}
#[inline]
fn on_stream_connect(&self, event: builder::StreamConnect) {
let event = event.into_event();
self.subscriber.on_stream_connect(&self.meta, &event);
Expand Down Expand Up @@ -10031,6 +10107,7 @@ pub mod testing {
pub acceptor_stream_pruned: AtomicU64,
pub acceptor_stream_dequeued: AtomicU64,
pub stream_tcp_connect: AtomicU64,
pub stream_tls_connect: AtomicU64,
pub stream_connect: AtomicU64,
pub stream_connect_error: AtomicU64,
pub endpoint_initialized: AtomicU64,
Expand Down Expand Up @@ -10123,6 +10200,7 @@ pub mod testing {
acceptor_stream_pruned: AtomicU64::new(0),
acceptor_stream_dequeued: AtomicU64::new(0),
stream_tcp_connect: AtomicU64::new(0),
stream_tls_connect: AtomicU64::new(0),
stream_connect: AtomicU64::new(0),
stream_connect_error: AtomicU64::new(0),
endpoint_initialized: AtomicU64::new(0),
Expand Down Expand Up @@ -10453,6 +10531,17 @@ pub mod testing {
let out = format!("{meta:?} {event:?}");
self.output.lock().unwrap().push(out);
}
fn on_stream_tls_connect(
&self,
meta: &api::EndpointMeta,
event: &api::StreamTlsConnect,
) {
self.stream_tls_connect.fetch_add(1, Ordering::Relaxed);
let meta = crate::event::snapshot::Fmt::to_snapshot(meta);
let event = crate::event::snapshot::Fmt::to_snapshot(event);
let out = format!("{meta:?} {event:?}");
self.output.lock().unwrap().push(out);
}
fn on_stream_connect(&self, meta: &api::EndpointMeta, event: &api::StreamConnect) {
self.stream_connect.fetch_add(1, Ordering::Relaxed);
let meta = crate::event::snapshot::Fmt::to_snapshot(meta);
Expand Down Expand Up @@ -10933,6 +11022,7 @@ pub mod testing {
pub stream_read_socket_errored: AtomicU64,
pub stream_decrypt_packet: AtomicU64,
pub stream_tcp_connect: AtomicU64,
pub stream_tls_connect: AtomicU64,
pub stream_connect: AtomicU64,
pub stream_connect_error: AtomicU64,
pub stream_packet_transmitted: AtomicU64,
Expand Down Expand Up @@ -11057,6 +11147,7 @@ pub mod testing {
stream_read_socket_errored: AtomicU64::new(0),
stream_decrypt_packet: AtomicU64::new(0),
stream_tcp_connect: AtomicU64::new(0),
stream_tls_connect: AtomicU64::new(0),
stream_connect: AtomicU64::new(0),
stream_connect_error: AtomicU64::new(0),
stream_packet_transmitted: AtomicU64::new(0),
Expand Down Expand Up @@ -11683,6 +11774,13 @@ pub mod testing {
let out = format!("{meta:?} {event:?}");
self.output.lock().unwrap().push(out);
}
fn on_stream_tls_connect(&self, meta: &api::EndpointMeta, event: &api::StreamTlsConnect) {
self.stream_tls_connect.fetch_add(1, Ordering::Relaxed);
let meta = crate::event::snapshot::Fmt::to_snapshot(meta);
let event = crate::event::snapshot::Fmt::to_snapshot(event);
let out = format!("{meta:?} {event:?}");
self.output.lock().unwrap().push(out);
}
fn on_stream_connect(&self, meta: &api::EndpointMeta, event: &api::StreamConnect) {
self.stream_connect.fetch_add(1, Ordering::Relaxed);
let meta = crate::event::snapshot::Fmt::to_snapshot(meta);
Expand Down Expand Up @@ -12336,6 +12434,7 @@ pub mod testing {
pub stream_read_socket_errored: AtomicU64,
pub stream_decrypt_packet: AtomicU64,
pub stream_tcp_connect: AtomicU64,
pub stream_tls_connect: AtomicU64,
pub stream_connect: AtomicU64,
pub stream_connect_error: AtomicU64,
pub stream_packet_transmitted: AtomicU64,
Expand Down Expand Up @@ -12450,6 +12549,7 @@ pub mod testing {
stream_read_socket_errored: AtomicU64::new(0),
stream_decrypt_packet: AtomicU64::new(0),
stream_tcp_connect: AtomicU64::new(0),
stream_tls_connect: AtomicU64::new(0),
stream_connect: AtomicU64::new(0),
stream_connect_error: AtomicU64::new(0),
stream_packet_transmitted: AtomicU64::new(0),
Expand Down Expand Up @@ -12701,6 +12801,13 @@ pub mod testing {
let out = format!("{event:?}");
self.output.lock().unwrap().push(out);
}
fn on_stream_tls_connect(&self, event: builder::StreamTlsConnect) {
self.stream_tls_connect.fetch_add(1, Ordering::Relaxed);
let event = event.into_event();
let event = crate::event::snapshot::Fmt::to_snapshot(&event);
let out = format!("{event:?}");
self.output.lock().unwrap().push(out);
}
fn on_stream_connect(&self, event: builder::StreamConnect) {
self.stream_connect.fetch_add(1, Ordering::Relaxed);
let event = event.into_event();
Expand Down
Loading
Loading