Skip to content
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

Jump to bottom

Enable full DNS names #266

Merged
merged 2 commits into from
Sep 3, 2024
Merged

Enable full DNS names #266

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
40dcc89
sign, migrate to new branch
jakub-racek-swi May 16, 2024
95569c7
Merge branch 'main' into main
yonch Sep 3, 2024
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
4 changes: 2 additions & 2 deletions collector/kernel/buffered_poller.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ void BufferedPoller::handle_dns_message(message_metadata const &metadata, jb_age

send_a_aaaa_response = 1;
// truncate hostname */
sent_hostname_len = (hostname_len < MAX_ENCODED_DOMAIN_NAME) ? (u16)hostname_len : MAX_ENCODED_DOMAIN_NAME;
sent_hostname_len = (hostname_len < DNS_NAME_MAX_LENGTH) ? (u16)hostname_len : DNS_NAME_MAX_LENGTH;
sent_hostname = hostname_out + hostname_len - sent_hostname_len;
}

Expand Down Expand Up @@ -534,7 +534,7 @@ void BufferedPoller::timeout_dns_request(u64 timestamp_ns, const DnsRequests::Re
const char *hostname_out = req->first.name.c_str();
size_t hostname_len = req->first.name.size();

u16 sent_hostname_len = (hostname_len < MAX_ENCODED_DOMAIN_NAME) ? (u16)hostname_len : MAX_ENCODED_DOMAIN_NAME;
u16 sent_hostname_len = (hostname_len < DNS_NAME_MAX_LENGTH) ? (u16)hostname_len : DNS_NAME_MAX_LENGTH;

const char *sent_hostname = hostname_out + hostname_len - sent_hostname_len;

Expand Down
4 changes: 1 addition & 3 deletions collector/kernel/dns/dns.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@ extern "C" {
#endif /* __cplusplus */

#define DNS_NAME_MAX_LENGTH 256

#define MAX_ENCODED_DOMAIN_NAME 80
#define MAX_ENCODED_IP_ADDRS 16

#define MAX_ENCODED_DNS_MESSAGE \
(/* timestamp */ sizeof(u64) + /* jb message */ jb_ingest__dns_response__data_size + \
/* ip addrs */ (sizeof(u32) * MAX_ENCODED_IP_ADDRS) + /* DNS name */ MAX_ENCODED_DOMAIN_NAME)
/* ip addrs */ (sizeof(u32) * MAX_ENCODED_IP_ADDRS) + /* DNS name */ DNS_NAME_MAX_LENGTH)

int dns_name_length(const unsigned char *encoded, const unsigned char *abuf, int alen);

Expand Down
2 changes: 1 addition & 1 deletion reducer/dns_cache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace reducer {
namespace dns {
struct hash_ipv6_address;
struct eq_ipv6_address;
static constexpr u32 max_len = 80;
static constexpr u32 max_len = 256;
typedef short_string<max_len> dns_record;
} // namespace dns

Expand Down
10 changes: 5 additions & 5 deletions render/ebpf_net.render
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@ app ingest {
description "DNS A/AAAA record query response, with name, response address(es), and latency information"
severity 0
1: u32 sk_id
2: u16 total_dn_len // Total length of domain name without truncation (MAX_ENCODED_DOMAIN_NAME)
2: u16 total_dn_len // Total length of domain name without truncation (DNS_NAME_MAX_LENGTH)
3: string domain_name // Domain name being queried (possibly truncated)
4: string ipv4_addrs // IPv4 addresses corresponding to domain name 'dn'
5: string ipv6_addrs // IPv6 addresses corresponding to domain name 'dn'
Expand All @@ -1051,7 +1051,7 @@ app ingest {
description "A DNS A/AAAA record request timeout"
severity 0
1: u32 sk_id
2: u16 total_dn_len // Total length of domain name without truncation (MAX_ENCODED_DOMAIN_NAME)
2: u16 total_dn_len // Total length of domain name without truncation (DNS_NAME_MAX_LENGTH)
3: string domain_name // Domain name being queried (possibly truncated)
4: u64 timeout_ns // Timeout duration for request (in ns)
}
Expand All @@ -1065,7 +1065,7 @@ app ingest {
description "DNS A/AAAA record query response, with name, response address(es), and latency information, with direction"
severity 0
1: u32 sk_id
2: u16 total_dn_len // Total length of domain name without truncation (MAX_ENCODED_DOMAIN_NAME)
2: u16 total_dn_len // Total length of domain name without truncation (DNS_NAME_MAX_LENGTH)
3: string domain_name // Domain name being queried (possibly truncated)
4: string ipv4_addrs // IPv4 addresses corresponding to domain name 'dn'
5: string ipv6_addrs // IPv6 addresses corresponding to domain name 'dn'
Expand Down Expand Up @@ -1329,7 +1329,7 @@ app matching {
pool_size 4800000
proxy aggregation.agg_root shard_by (role1, az1, role2, az2)
string<80> role1
string<80> role2
string<256> role2
string<32> az1
string<32> az2
}
Expand Down Expand Up @@ -1429,7 +1429,7 @@ app aggregation {
span role {
pool_size 70000
index (s, version, env, ns, node_type, process, container)
string<80> s
string<256> s
string<80> uid
string<64> version
string<32> env
Expand Down
Loading