Snap for 8512216 from bfe94814f3f2b02162e24159902524e4b90a0828 to tm-frc-os-statsd-release (492fd305) · Commits · e / os / android_packages_modules_DnsResolver

Dns64Configuration.cpp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,6 @@

	namespace android {		namespace android {

	using android::net::NetworkDnsEventReported;
	using netdutils::DumpWriter;		using netdutils::DumpWriter;
	using netdutils::IPAddress;		using netdutils::IPAddress;
	using netdutils::IPPrefix;		using netdutils::IPPrefix;

DnsProxyListener.cpp

+11 −7

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,6 @@
	using aidl::android::net::metrics::INetdEventListener;		using aidl::android::net::metrics::INetdEventListener;
	using aidl::android::net::resolv::aidl::DnsHealthEventParcel;		using aidl::android::net::resolv::aidl::DnsHealthEventParcel;
	using aidl::android::net::resolv::aidl::IDnsResolverUnsolicitedEventListener;		using aidl::android::net::resolv::aidl::IDnsResolverUnsolicitedEventListener;
	using android::net::NetworkDnsEventReported;
	using std::span;		using std::span;

	namespace android {		namespace android {
	@@ -333,7 +332,8 @@ void maybeLogQuery(int eventType, const android_net_context& netContext,
	void reportDnsEvent(int eventType, const android_net_context& netContext, int latencyUs,		void reportDnsEvent(int eventType, const android_net_context& netContext, int latencyUs,
	int returnCode, NetworkDnsEventReported& event, const std::string& query_name,		int returnCode, NetworkDnsEventReported& event, const std::string& query_name,
	const std::vector<std::string>& ip_addrs = {}, int total_ip_addr_count = 0) {		const std::vector<std::string>& ip_addrs = {}, int total_ip_addr_count = 0) {
	uint32_t rate = (query_name.ends_with(".local") &&		uint32_t rate =
			(query_name.ends_with(".local") && is_mdns_supported_network(netContext.dns_netid) &&
	android::net::Experiments::getInstance()->getFlag("mdns_resolution", 1))		android::net::Experiments::getInstance()->getFlag("mdns_resolution", 1))
	? getDnsEventSubsamplingRate(netContext.dns_netid, returnCode, true)		? getDnsEventSubsamplingRate(netContext.dns_netid, returnCode, true)
	: getDnsEventSubsamplingRate(netContext.dns_netid, returnCode, false);		: getDnsEventSubsamplingRate(netContext.dns_netid, returnCode, false);
	@@ -1159,7 +1159,9 @@ void DnsProxyListener::GetHostByNameHandler::run() {
	event.set_latency_micros(latencyUs);		event.set_latency_micros(latencyUs);
	event.set_event_type(EVENT_GETHOSTBYNAME);		event.set_event_type(EVENT_GETHOSTBYNAME);

	LOG(DEBUG) << "GetHostByNameHandler::run: result: " << gai_strerror(rv);		if (rv) {
			LOG(DEBUG) << "GetHostByNameHandler::run: result failed: " << gai_strerror(rv);
			}

	bool success = true;		bool success = true;
	if (hp) {		if (hp) {
	@@ -1314,7 +1316,9 @@ void DnsProxyListener::GetHostByAddrHandler::run() {
	event.set_latency_micros(latencyUs);		event.set_latency_micros(latencyUs);
	event.set_event_type(EVENT_GETHOSTBYADDR);		event.set_event_type(EVENT_GETHOSTBYADDR);

	LOG(DEBUG) << "GetHostByAddrHandler::run: result: " << gai_strerror(rv);		if (rv) {
			LOG(DEBUG) << "GetHostByAddrHandler::run: result failed: " << gai_strerror(rv);
			}

	bool success = true;		bool success = true;
	if (hp) {		if (hp) {

DnsQueryLogTest.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@
	#include <gtest/gtest.h>		#include <gtest/gtest.h>

	#include "DnsQueryLog.h"		#include "DnsQueryLog.h"
			#include "tests/resolv_test_base.h"

	using namespace std::chrono_literals;		using namespace std::chrono_literals;

	@@ -58,7 +59,7 @@ void verifyDumpOutput(const std::string& dumpLog, const std::vector<int>& expect

	} // namespace		} // namespace

	class DnsQueryLogTest : public ::testing::Test {		class DnsQueryLogTest : public ResolvTestBase {
	protected:		protected:
	const std::vector<std::string> serversV4 = {"127.0.0.1", "1.2.3.4"};		const std::vector<std::string> serversV4 = {"127.0.0.1", "1.2.3.4"};
	const std::vector<std::string> serversV4V6 = {"127.0.0.1", "1.2.3.4", "2001:db8::1",		const std::vector<std::string> serversV4V6 = {"127.0.0.1", "1.2.3.4", "2001:db8::1",

DnsResolver.cpp

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -31,10 +31,8 @@
	bool resolv_init(const ResolverNetdCallbacks* callbacks) {		bool resolv_init(const ResolverNetdCallbacks* callbacks) {
	android::base::InitLogging(/argv=/nullptr);		android::base::InitLogging(/argv=/nullptr);
	LOG(INFO) << __func__ << ": Initializing resolver";		LOG(INFO) << __func__ << ": Initializing resolver";
	// TODO(b/170539625): restore log level to WARNING after clarifying flaky tests.		resolv_set_log_severity(android::base::WARNING);
	const bool isDebug = isUserDebugBuild();		doh_init_logger(DOH_LOG_LEVEL_WARN);
	resolv_set_log_severity(isDebug ? android::base::DEBUG : android::base::WARNING);
	doh_init_logger(isDebug ? DOH_LOG_LEVEL_DEBUG : DOH_LOG_LEVEL_WARN);
	using android::net::gApiLevel;		using android::net::gApiLevel;
	gApiLevel = getApiLevel();		gApiLevel = getApiLevel();
	using android::net::gResNetdCallbacks;		using android::net::gResNetdCallbacks;

DnsStatsTest.cpp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@
	#include <gtest/gtest.h>		#include <gtest/gtest.h>

	#include "DnsStats.h"		#include "DnsStats.h"
			#include "tests/resolv_test_base.h"

	namespace android::net {		namespace android::net {

	@@ -66,7 +67,7 @@ StatsData makeStatsData(const IPSockAddr& server, const int total, const microse

	// TODO: add StatsDataTest to ensure its methods return correct outputs.		// TODO: add StatsDataTest to ensure its methods return correct outputs.

	class StatsRecordsTest : public ::testing::Test {};		class StatsRecordsTest : public ResolvTestBase {};

	TEST_F(StatsRecordsTest, PushRecord) {		TEST_F(StatsRecordsTest, PushRecord) {
	const IPSockAddr server = IPSockAddr::toIPSockAddr("127.0.0.2", 53);		const IPSockAddr server = IPSockAddr::toIPSockAddr("127.0.0.2", 53);
	@@ -104,7 +105,7 @@ TEST_F(StatsRecordsTest, PushRecord) {
	makeStatsData(server, 3, 750ms, {{NS_R_NO_ERROR, 0}, {NS_R_TIMEOUT, 3}}));		makeStatsData(server, 3, 750ms, {{NS_R_NO_ERROR, 0}, {NS_R_TIMEOUT, 3}}));
	}		}

	class DnsStatsTest : public ::testing::Test {		class DnsStatsTest : public ResolvTestBase {
	protected:		protected:
	std::string captureDumpOutput() {		std::string captureDumpOutput() {
	netdutils::DumpWriter dw(STDOUT_FILENO);		netdutils::DumpWriter dw(STDOUT_FILENO);