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

Commit e5cbd8f8 authored by android-build-team Robot's avatar android-build-team Robot Committed by Automerger Merge Worker
Browse files

Snap for 7302914 from 77e32a44 to sc-release am: c42582c9 

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

Change-Id: I3bdd921e5224465ecfbbfb102aaa9bdbb4af9279
parents fa0b263e c42582c9

res_cache.cpp

+1 −1
Original line number Diff line number Diff line
@@ -903,7 +903,7 @@ namespace { 
// if the ReturnCode is not associated with any rate_denom, use default

// Sampling rate varies by return code; events to log are chosen randomly, with a

// probability proportional to the sampling rate.

constexpr const char DEFAULT_SUBSAMPLING_MAP[] = "default:1 0:100 7:10";

constexpr const char DEFAULT_SUBSAMPLING_MAP[] = "default:8 0:400 2:110 7:110";



std::unordered_map<int, uint32_t> resolv_get_dns_event_subsampling_map() {

    using android::base::ParseInt;

tests/resolv_cache_unit_test.cpp

+6 −5
Original line number Diff line number Diff line
@@ -935,15 +935,16 @@ class ScopedCacheCreate { 
}  // namespace



TEST_F(ResolvCacheTest, DnsEventSubsampling) {

    // Test defaults, default flag is "default:1 0:100 7:10" if no experiment flag is set

    // Test defaults, default flag is "default:8 0:400 2:110 7:110" if no experiment flag is set

    {

        ScopedCacheCreate scopedCacheCreate(TEST_NETID, "");

        EXPECT_EQ(resolv_cache_get_subsampling_denom(TEST_NETID, EAI_NODATA), 10U);

        EXPECT_EQ(resolv_cache_get_subsampling_denom(TEST_NETID, EAI_OK), 100U);

        EXPECT_EQ(resolv_cache_get_subsampling_denom(TEST_NETID, EAI_AGAIN), 110U);

        EXPECT_EQ(resolv_cache_get_subsampling_denom(TEST_NETID, EAI_NODATA), 110U);

        EXPECT_EQ(resolv_cache_get_subsampling_denom(TEST_NETID, EAI_OK), 400U);

        EXPECT_EQ(resolv_cache_get_subsampling_denom(TEST_NETID, EAI_BADFLAGS),

                  1U);  // default

                  8U);  // default

        EXPECT_THAT(resolv_cache_dump_subsampling_map(TEST_NETID),

                    testing::UnorderedElementsAreArray({"default:1", "0:100", "7:10"}));

                    testing::UnorderedElementsAreArray({"default:8", "0:400", "2:110", "7:110"}));

    }

    // Now change the experiment flag to "0:42 default:666"

    {