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

Commit 9f6de4c5 authored by Frank Li's avatar Frank Li Committed by Automerger Merge Worker
Browse files

Merge "Adding UID to NetwrokDnsEventReported atom" into main am: 34671298 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2838136



Change-Id: I47c1ed8243e58d44693d5143fa65c1917eb2ae25
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a6ed440c 34671298

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 {