Skip to content

Commit

Permalink
merge and cloppy
Browse files Browse the repository at this point in the history
  • Loading branch information
@WesleyRosenblum
WesleyRosenblum committed Nov 9, 2024
1 parent b3dbee3 commit 70c9b60
Show file tree
Hide file tree
Showing 5 changed files with 589 additions and 87 deletions.
12 changes: 9 additions & 3 deletions quic/s2n-quic/src/tests/dc.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,10 @@ fn self_test<S: ServerProviders, C: ClientProviders>(
let metrics = aggregate::testing::Registry::snapshot();

let server_event = (
((dc::ConfirmComplete, dc::MtuConfirmComplete), metrics.subscriber("server")),
(
(dc::ConfirmComplete, dc::MtuConfirmComplete),
metrics.subscriber("server"),
),
(tracing_events(), server_subscriber),
);

Expand Down Expand Up @@ -354,7 +357,10 @@ fn self_test<S: ServerProviders, C: ClientProviders>(
});

let client_event = (
((dc::ConfirmComplete, dc::MtuConfirmComplete), metrics.subscriber("client")),
(
(dc::ConfirmComplete, dc::MtuConfirmComplete),
metrics.subscriber("client"),
),
(tracing_events(), client_subscriber),
);

Expand Down Expand Up @@ -478,7 +484,7 @@ fn assert_dc_complete(events: &[DcStateChangedEvent]) {
}

fn assert_mtu_probing_completed(events: &[MtuUpdatedEvent]) {
assert!(events.len() > 0);
assert!(!events.is_empty());
let last_event = events.last().unwrap();
assert!(last_event.search_complete);
// 1472 = default MaxMtu (1500) - headers
Expand Down
68 changes: 51 additions & 17 deletions quic/s2n-quic/src/tests/snapshots/tests__dc__dc_handshake_self_test__events.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,19 +338,6 @@ measure#recovery_metrics.bytes_in_flight=[REDACTED]
count#recovery_metrics.congestion_limited=false
count#platform_event_loop_sleep=1
timer#platform_event_loop_sleep.processing_duration=1µs
count#connection_closed=1
timer#connection_closed.latency=299.999ms
count#connection_closed.error|CLOSED=1
count#frame_sent=1
count#frame_sent.packet|ONE_RTT=1
count#frame_sent.frame|CONNECTION_CLOSE=1
count#frame_sent=1
count#frame_sent.packet|ONE_RTT=1
count#frame_sent.frame|PADDING=1
count#packet_sent=1
count#packet_sent.kind|ONE_RTT=1
count#packet_sent.bytes.total=[REDACTED]b
measure#packet_sent.bytes=[REDACTED]b
count#platform_event_loop_wakeup=1
count#platform_tx=1
count#platform_tx.packets.total=2
Expand All @@ -364,16 +351,63 @@ measure#platform_tx.errors=0
count#platform_tx.errors.dropped.total=0
measure#platform_tx.errors.dropped=0
count#platform_rx=1
count#platform_rx.packets.total=0
measure#platform_rx.packets=0
count#platform_rx.syscalls.total=1
measure#platform_rx.syscalls=1
count#platform_rx.packets.total=2
measure#platform_rx.packets=2
count#platform_rx.syscalls.total=2
measure#platform_rx.syscalls=2
count#platform_rx.syscalls.blocked.total=1
measure#platform_rx.syscalls.blocked=1
count#platform_rx.errors.total=0
measure#platform_rx.errors=0
count#platform_rx.errors.dropped.total=0
measure#platform_rx.errors.dropped=0
count#datagram_received=1
count#datagram_received.bytes.total=[REDACTED]b
measure#datagram_received.bytes=[REDACTED]b
count#packet_received=1
count#packet_received.kind|ONE_RTT=1
count#connection_id_updated=1
count#frame_received=1
count#frame_received.packet|ONE_RTT=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|ONE_RTT=1
count#mtu_updated=1
measure#mtu_updated.mtu=1472b
count#mtu_updated.cause|PROBE_ACKNOWLEDGED=1
count#mtu_updated.search_complete=true
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=99.999ms
measure#recovery_metrics.smoothed_rtt=99.99923ms
measure#recovery_metrics.latest_rtt=100ms
measure#recovery_metrics.rtt_variance=28.125122ms
measure#recovery_metrics.max_ack_delay=25ms
measure#recovery_metrics.pto_count=0
measure#recovery_metrics.congestion_window=14720
measure#recovery_metrics.bytes_in_flight=[REDACTED]
count#recovery_metrics.congestion_limited=false
count#frame_received=1
count#frame_received.packet|ONE_RTT=1
count#frame_received.frame|RETIRE_CONNECTION_ID=1
count#frame_received=1
count#frame_received.packet|ONE_RTT=1
count#frame_received.frame|PADDING=1
count#datagram_received=1
count#datagram_received.bytes.total=[REDACTED]b
measure#datagram_received.bytes=[REDACTED]b
count#packet_received=1
count#packet_received.kind|ONE_RTT=1
count#frame_received=1
count#frame_received.packet|ONE_RTT=1
count#frame_received.frame|CONNECTION_CLOSE=1
count#connection_closed=1
timer#connection_closed.latency=299.999ms
count#connection_closed.error|CLOSED=1
count#platform_event_loop_sleep=1
timer#platform_event_loop_sleep.processing_duration=1µs
count#platform_event_loop_wakeup=1
count#platform_event_loop_sleep=1
timer#platform_event_loop_sleep.processing_duration=1µs
=== server ===
count#platform_event_loop_started=1
count#platform_event_loop_wakeup=1
Expand Down
68 changes: 51 additions & 17 deletions quic/s2n-quic/src/tests/snapshots/tests__dc__dc_mtls_handshake_self_test__events.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,19 +343,6 @@ measure#recovery_metrics.bytes_in_flight=[REDACTED]
count#recovery_metrics.congestion_limited=false
count#platform_event_loop_sleep=1
timer#platform_event_loop_sleep.processing_duration=1µs
count#connection_closed=1
timer#connection_closed.latency=299.999ms
count#connection_closed.error|CLOSED=1
count#frame_sent=1
count#frame_sent.packet|ONE_RTT=1
count#frame_sent.frame|CONNECTION_CLOSE=1
count#frame_sent=1
count#frame_sent.packet|ONE_RTT=1
count#frame_sent.frame|PADDING=1
count#packet_sent=1
count#packet_sent.kind|ONE_RTT=1
count#packet_sent.bytes.total=[REDACTED]b
measure#packet_sent.bytes=[REDACTED]b
count#platform_event_loop_wakeup=1
count#platform_tx=1
count#platform_tx.packets.total=2
Expand All @@ -369,16 +356,63 @@ measure#platform_tx.errors=0
count#platform_tx.errors.dropped.total=0
measure#platform_tx.errors.dropped=0
count#platform_rx=1
count#platform_rx.packets.total=0
measure#platform_rx.packets=0
count#platform_rx.syscalls.total=1
measure#platform_rx.syscalls=1
count#platform_rx.packets.total=2
measure#platform_rx.packets=2
count#platform_rx.syscalls.total=2
measure#platform_rx.syscalls=2
count#platform_rx.syscalls.blocked.total=1
measure#platform_rx.syscalls.blocked=1
count#platform_rx.errors.total=0
measure#platform_rx.errors=0
count#platform_rx.errors.dropped.total=0
measure#platform_rx.errors.dropped=0
count#datagram_received=1
count#datagram_received.bytes.total=[REDACTED]b
measure#datagram_received.bytes=[REDACTED]b
count#packet_received=1
count#packet_received.kind|ONE_RTT=1
count#connection_id_updated=1
count#frame_received=1
count#frame_received.packet|ONE_RTT=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|ONE_RTT=1
count#mtu_updated=1
measure#mtu_updated.mtu=1472b
count#mtu_updated.cause|PROBE_ACKNOWLEDGED=1
count#mtu_updated.search_complete=true
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=99.999ms
measure#recovery_metrics.smoothed_rtt=99.99923ms
measure#recovery_metrics.latest_rtt=100ms
measure#recovery_metrics.rtt_variance=28.125122ms
measure#recovery_metrics.max_ack_delay=25ms
measure#recovery_metrics.pto_count=0
measure#recovery_metrics.congestion_window=14720
measure#recovery_metrics.bytes_in_flight=[REDACTED]
count#recovery_metrics.congestion_limited=false
count#frame_received=1
count#frame_received.packet|ONE_RTT=1
count#frame_received.frame|RETIRE_CONNECTION_ID=1
count#frame_received=1
count#frame_received.packet|ONE_RTT=1
count#frame_received.frame|PADDING=1
count#datagram_received=1
count#datagram_received.bytes.total=[REDACTED]b
measure#datagram_received.bytes=[REDACTED]b
count#packet_received=1
count#packet_received.kind|ONE_RTT=1
count#frame_received=1
count#frame_received.packet|ONE_RTT=1
count#frame_received.frame|CONNECTION_CLOSE=1
count#connection_closed=1
timer#connection_closed.latency=299.999ms
count#connection_closed.error|CLOSED=1
count#platform_event_loop_sleep=1
timer#platform_event_loop_sleep.processing_duration=1µs
count#platform_event_loop_wakeup=1
count#platform_event_loop_sleep=1
timer#platform_event_loop_sleep.processing_duration=1µs
=== server ===
count#platform_event_loop_started=1
count#platform_event_loop_wakeup=1
Expand Down
Loading

0 comments on commit 70c9b60

Please sign in to comment.