diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-21 00:20:41 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-21 00:20:41 +0000 |
commit | c158a7a16a0f7be33b2a83a0e78da7c6c9de634b (patch) | |
tree | d04b6804f2de88e271c50cdac5e00b97bd61849b | |
parent | 7844a33014aea3287f7498d8374e80b58d2a97dd (diff) | |
parent | f0d72d65309a61edfe87d95b46a84ae41ede36d1 (diff) | |
download | DnsResolver-c158a7a16a0f7be33b2a83a0e78da7c6c9de634b.tar.gz |
Snap for 11124398 from f0d72d65309a61edfe87d95b46a84ae41ede36d1 to 24Q1-release
Change-Id: Ic19e8b6126495296240d1d63b9332d3c7932330d
-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 { |