commit cd257648c84c6a452904c2a329d16427d67e7036
author Bernie Innocenti <codewiz@google.com> Thu Dec 20 15:56:40 2018 +0900
committer Bernie Innocenti <codewiz@google.com> Mon Jan 21 07:35:19 2019 +0900
tree c8d55392cfe95e33138cc940af0d0f1de31a7351
parent 054321124a697b5fe3b5b01330c1df40e2b6ca9a

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

resolv/resolver_test.cpp

diff --git a/resolv/resolver_test.cpp b/resolv/resolver_test.cpp
index 959b1ed..598aaba 100644
--- a/resolv/resolver_test.cpp
+++ b/resolv/resolver_test.cpp
@@ -111,27 +111,8 @@
 
 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 @@
             8,   8,  // {MIN,MAX}_SAMPLES
             100,     // BASE_TIMEOUT_MSEC
     };
-
-  private:
-    int mOriginalMetricsLevel;
 };
 
 TEST_F(ResolverTest, GetHostByName) {
@@ -2903,4 +2881,4 @@
 
         dns.clearQueries();
     }
-}
\ No newline at end of file
+}