github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(connlib): gate more trace logs on debug_assertions (#10026)

Browse Source 
These are otherwise hit pretty often in the hot-path and slow packet
routing down because tracing needs to evaluate whether it should log the
statement.
This commit is contained in:
Thomas Eizinger
2025-07-28 21:38:23 +00:00
committed by GitHub
parent 1317bbb9e2
commit 9c71026416
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rust/connlib/dns-over-tcp/src/client.rs
View File

@@ -1,5 +1,5 @@
use std::{
collections::{BTreeMap, BTreeSet, HashMap, HashSet, VecDeque},
collections::{BTreeMap, HashMap, HashSet, VecDeque},
net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
time::{Duration, Instant},
};
@@ -118,12 +118,14 @@ impl<const MIN_PORT: u16, const MAX_PORT: u16> Client<MIN_PORT, MAX_PORT> {
/// Only TCP packets originating from one of the connected DNS resolvers are accepted.
pub fn accepts(&self, packet: &IpPacket) -> bool {
let Some(tcp) = packet.as_tcp() else {
#[cfg(debug_assertions)]
tracing::trace!(?packet, "Not a TCP packet");
return false;
};
let Some((ipv4_source, ipv6_source)) = self.source_ips else {
#[cfg(debug_assertions)]
tracing::trace!("No source interface");
return false;
@@ -139,8 +141,10 @@ impl<const MIN_PORT: u16, const MAX_PORT: u16> Client<MIN_PORT, MAX_PORT> {
let remote = SocketAddr::new(packet.source(), tcp.source_port());
let has_socket = self.sockets_by_remote.contains_key(&remote);
#[cfg(debug_assertions)]
if !has_socket && tracing::enabled!(tracing::Level::TRACE) {
let open_sockets = BTreeSet::from_iter(self.sockets_by_remote.keys().copied());
let open_sockets =
std::collections::BTreeSet::from_iter(self.sockets_by_remote.keys().copied());
tracing::trace!(%remote, ?open_sockets, "No open socket for remote");
}

2
rust/connlib/dns-over-tcp/src/server.rs
View File

@@ -112,6 +112,7 @@ impl Server {
/// Only TCP packets targeted at one of sockets configured with [`Server::set_listen_addresses`] are accepted.
pub fn accepts(&self, packet: &IpPacket) -> bool {
let Some(tcp) = packet.as_tcp() else {
#[cfg(debug_assertions)]
tracing::trace!(?packet, "Not a TCP packet");
return false;
@@ -120,6 +121,7 @@ impl Server {
let dst = SocketAddr::new(packet.destination(), tcp.destination_port());
let is_listening = self.listen_endpoints.values().any(|s| s == &dst);
#[cfg(debug_assertions)]
if !is_listening && tracing::enabled!(tracing::Level::TRACE) {
let listen_endpoints = BTreeSet::from_iter(self.listen_endpoints.values().copied());