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

Commit 2fef2b83 authored by Bernie Innocenti's avatar Bernie Innocenti
Browse files

Remove DNS event reporting level 

Reporting level was used only by microbenchmarks, but CI go/apct-net
doesn't show a significant timing difference between test runs with and
without reporting enabled.

Test: atest resolv_integration_test
Test: m netd_benchmark && adb sync data && adb shell /data/benchmarktest64/netd_benchmark/netd_benchmark
Change-Id: I0db0522e1cf229649c2516973d8942549ccd5476
parent ba7bef92

resolver_test.cpp

+3 −25
Original line number Diff line number Diff line
@@ -111,27 +111,8 @@ bool UnorderedCompareArray(const A& a, const B& b) { 


class ResolverTest : public ::testing::Test, public DnsResponderClient {

  protected:

    void SetUp() {

        // Ensure resolutions go via proxy.

        DnsResponderClient::SetUp();



        // If DNS reporting is off: turn it on so we run through everything.

        auto rv = mNetdSrv->getMetricsReportingLevel(&mOriginalMetricsLevel);

        ASSERT_TRUE(rv.isOk());

        if (mOriginalMetricsLevel != INetdEventListener::REPORTING_LEVEL_FULL) {

            rv = mNetdSrv->setMetricsReportingLevel(INetdEventListener::REPORTING_LEVEL_FULL);

            ASSERT_TRUE(rv.isOk());

        }

    }



    void TearDown() {

        if (mOriginalMetricsLevel != INetdEventListener::REPORTING_LEVEL_FULL) {

            auto rv = mNetdSrv->setMetricsReportingLevel(mOriginalMetricsLevel);

            ASSERT_TRUE(rv.isOk());

        }



        DnsResponderClient::TearDown();

    }

    void SetUp() { DnsResponderClient::SetUp(); }

    void TearDown() { DnsResponderClient::TearDown(); }



    bool GetResolverInfo(std::vector<std::string>* servers, std::vector<std::string>* domains,

                         std::vector<std::string>* tlsServers, __res_params* params,
@@ -298,9 +279,6 @@ class ResolverTest : public ::testing::Test, public DnsResponderClient { 
            8,   8,  // {MIN,MAX}_SAMPLES

            100,     // BASE_TIMEOUT_MSEC

    };



  private:

    int mOriginalMetricsLevel;

};



TEST_F(ResolverTest, GetHostByName) {