diff options
| author | Frank Li <lifr@google.com> | 2023-11-20 01:52:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-11-20 01:52:14 +0000 |
| commit | d122185498665d98a60bfcda8e5fc37c30462f5f (patch) | |
| tree | d04b6804f2de88e271c50cdac5e00b97bd61849b | |
| parent | 52afb18ff10bf39cfa530b127407e30285bebe82 (diff) | |
| parent | 0b2bd5927b983ae21cb68e8f7ececb06e0bb7543 (diff) | |
| download | DnsResolver-d122185498665d98a60bfcda8e5fc37c30462f5f.tar.gz | |
Merge "Adding UID to NetwrokDnsEventReported atom" into udc-mainline-prod
| -rw-r--r-- | DnsProxyListener.cpp | 11 | ||||
| -rw-r--r-- | stats.proto | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/DnsProxyListener.cpp b/DnsProxyListener.cpp index 7534ed34..e70ddb40 100644 --- a/DnsProxyListener.cpp +++ b/DnsProxyListener.cpp @@ -336,11 +336,12 @@ void reportDnsEvent(int eventType, const android_net_context& netContext, int la stats::BytesField dnsQueryBytesField{dnsQueryStats.c_str(), dnsQueryStats.size()}; event.set_return_code(static_cast<ReturnCode>(returnCode)); event.set_network_type(resolv_get_network_types_for_net(netContext.dns_netid)); - android::net::stats::stats_write(android::net::stats::NETWORK_DNS_EVENT_REPORTED, - event.event_type(), event.return_code(), - event.latency_micros(), event.hints_ai_flags(), - event.res_nsend_flags(), event.network_type(), - event.private_dns_modes(), dnsQueryBytesField, rate); + event.set_uid(netContext.uid); + android::net::stats::stats_write( + android::net::stats::NETWORK_DNS_EVENT_REPORTED, event.event_type(), + event.return_code(), event.latency_micros(), event.hints_ai_flags(), + event.res_nsend_flags(), event.network_type(), event.private_dns_modes(), + dnsQueryBytesField, rate, event.uid()); } maybeLogQuery(eventType, netContext, event, query_name, ip_addrs); diff --git a/stats.proto b/stats.proto index 4052ec7d..1356b7fc 100644 --- a/stats.proto +++ b/stats.proto @@ -412,6 +412,9 @@ message NetworkDnsEventReported { // The sample rate of DNS stats (to statsd) is 1/sampling_rate_denom. optional int32 sampling_rate_denom = 9; + + // UID sends the DNS query. + optional int32 uid = 10; } enum HandshakeResult { |