Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b2bd592 authored by Frank Li's avatar Frank Li
Browse files

Adding UID to NetwrokDnsEventReported atom 

Ignore-AOSP-First: Change in topic has merge conflicts, will cherry-pick immediately afterwards
Bug: 309575211
Test: atest resolv_unit_test
Change-Id: Ied14657053cbef280311badd23cecb3951ce6835
parent 8f0b760c

DnsProxyListener.cpp

+6 −5
Original line number Diff line number Diff line
@@ -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);

stats.proto

+3 −0
Original line number Diff line number Diff line
@@ -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 {