Moved sampler and throttler tests to jaeger_tracing folder (#1572)

Author: domwst

ydb/core/control/ut/ya.make

@@ -22,8 +22,6 @@ PEERDIR(
 SRCS(
     immediate_control_board_ut.cpp
     immediate_control_board_actor_ut.cpp
-    immediate_control_board_sampler_ut.cpp
-    immediate_control_board_throttler_ut.cpp
 )
 
 END()

ydb/core/jaeger_tracing/control_wrapper.h

@@ -6,7 +6,7 @@ namespace NKikimr::NJaegerTracing {
 
 class TControlWrapper {
 public:
-    TControlWrapper(ui64 initial = 0) : Control(MakeIntrusive<TControl>(initial)) {}
+    explicit TControlWrapper(ui64 initial = 0) : Control(MakeIntrusive<TControl>(initial)) {}
 
     ui64 Get() const {
         return Control->Get();

ydb/core/control/immediate_control_board_sampler_ut.cpp renamed to ydb/core/jaeger_tracing/sampler_ut.cpp

@@ -1,8 +1,8 @@
-#include "immediate_control_board_sampler.h"
+#include "sampler.h"
 
 #include <library/cpp/testing/unittest/registar.h>
 
-namespace NKikimr {
+namespace NKikimr::NJaegerTracing {
 
 Y_UNIT_TEST_SUITE(SamplingControlTests) {
     ui32 RunTrials(TSampler& sampler, ui32 trials) {
@@ -16,41 +16,41 @@ Y_UNIT_TEST_SUITE(SamplingControlTests) {
     }
 
     Y_UNIT_TEST(Simple) {
-        TControlWrapper control(500'000, 0, 1'000'000);
-        TSampler sampler(control, 42);
+        TControlWrapper ppm(500'000);
+        TSampler sampler(ppm, 42);
 
         auto samples = RunTrials(sampler, 100'000);
         UNIT_ASSERT_GE(samples, 48'000);
         UNIT_ASSERT_LE(samples, 52'000);
     }
 
     Y_UNIT_TEST(EdgeCaseLower) {
-        TControlWrapper control(0, 0, 1'000'000);
-        TSampler sampler(control, 42);
+        TControlWrapper ppm(0);
+        TSampler sampler(ppm, 42);
 
         auto samples = RunTrials(sampler, 100'000);
         UNIT_ASSERT_EQUAL(samples, 0);
     }
 
     Y_UNIT_TEST(EdgeCaseUpper) {
-        TControlWrapper control(1'000'000, 0, 1'000'000);
-        TSampler sampler(control, 42);
+        TControlWrapper ppm(1'000'000);
+        TSampler sampler(ppm, 42);
 
         auto samples = RunTrials(sampler, 100'000);
         UNIT_ASSERT_EQUAL(samples, 100'000);
     }
 
     Y_UNIT_TEST(ChangingControl) {
-        TControlWrapper control(250'000, 0, 1'000'000);
-        TSampler sampler(control, 42);
+        TControlWrapper ppm(250'000);
+        TSampler sampler(ppm, 42);
 
         {
             auto samples = RunTrials(sampler, 100'000);
             UNIT_ASSERT_GE(samples, 23'000);
             UNIT_ASSERT_LE(samples, 27'000);
         }
 
-        control = 750'000;
+        ppm.Set(750'000);
         {
             auto samples = RunTrials(sampler, 100'000);
             UNIT_ASSERT_GE(samples, 73'000);
@@ -59,4 +59,4 @@ Y_UNIT_TEST_SUITE(SamplingControlTests) {
     }
 }
 
-} // namespace NKikimr
+} // namespace NKikimr::NJaegerTracing

ydb/core/control/immediate_control_board_throttler_ut.cpp renamed to ydb/core/jaeger_tracing/throttler_ut.cpp

@@ -1,8 +1,8 @@
-#include "immediate_control_board_throttler.h"
+#include "throttler.h"
 
 #include <library/cpp/testing/unittest/registar.h>
 
-namespace NKikimr {
+namespace NKikimr::NJaegerTracing {
 
 class TTimeProviderMock : public ITimeProvider {
 public:
@@ -33,8 +33,8 @@ Y_UNIT_TEST_SUITE(ThrottlerControlTests) {
     }
 
     Y_UNIT_TEST(Simple) {
-        TControlWrapper maxPerMinute(6, 0, 180);
-        TControlWrapper maxBurst(2, 0, 180);
+        TControlWrapper maxPerMinute(6);
+        TControlWrapper maxBurst(2);
 
         auto timeProvider = MakeIntrusive<TTimeProviderMock>(TInstant::Now());
 
@@ -55,8 +55,8 @@ Y_UNIT_TEST_SUITE(ThrottlerControlTests) {
     }
 
     Y_UNIT_TEST(LongIdle) {
-        TControlWrapper maxPerMinute(10, 0, 180);
-        TControlWrapper maxBurst(2, 0, 180);
+        TControlWrapper maxPerMinute(10);
+        TControlWrapper maxBurst(2);
 
         auto timeProvider = MakeIntrusive<TTimeProviderMock>(TInstant::Now());
 
@@ -68,8 +68,8 @@ Y_UNIT_TEST_SUITE(ThrottlerControlTests) {
     }
 
     Y_UNIT_TEST(Overflow) {
-        TControlWrapper maxPerMinute(6'000, 0, 6'000);
-        TControlWrapper maxBurst(6'000, 0, 6'000);
+        TControlWrapper maxPerMinute(6'000);
+        TControlWrapper maxBurst(6'000);
 
         auto timeProvider = MakeIntrusive<TTimeProviderMock>(TInstant::Now());
 
@@ -82,45 +82,45 @@ Y_UNIT_TEST_SUITE(ThrottlerControlTests) {
     }
 
     Y_UNIT_TEST(ChangingControls) {
-        TControlWrapper maxPerMinute(6, 0, 180);
-        TControlWrapper maxBurst(2, 0, 180);
+        TControlWrapper maxPerMinute(6);
+        TControlWrapper maxBurst(2);
 
         auto timeProvider = MakeIntrusive<TTimeProviderMock>(TInstant::Now());
 
         TThrottler throttler(maxPerMinute, maxBurst, timeProvider);
         CheckExact(throttler, 3);
 
-        maxBurst = 4;
+        maxBurst.Set(4);
         CheckExact(throttler, 2);
 
-        maxBurst = 0;
+        maxBurst.Set(0);
         CheckExact(throttler, 0);
 
         timeProvider->Advance(TDuration::Seconds(9));
         CheckExact(throttler, 0);
         timeProvider->Advance(TDuration::Seconds(1));
         CheckExact(throttler, 1);
 
-        maxPerMinute = 12 * 60;
+        maxPerMinute.Set(12 * 60);
         timeProvider->Advance(TDuration::Seconds(1));
         CheckExact(throttler, 1);
 
-        maxBurst = 20;
+        maxBurst.Set(20);
 
         timeProvider->Advance(TDuration::Seconds(3));
         CheckExact(throttler, 21);
 
-        maxBurst = 0;
+        maxBurst.Set(0);
         timeProvider->Advance(TDuration::Seconds(59));
         CheckAtLeast(throttler, 1);
-        maxPerMinute = 1;
+        maxPerMinute.Set(1);
         CheckExact(throttler, 0);
         timeProvider->Advance(TDuration::Minutes(1));
         CheckExact(throttler, 1);
 
-        maxBurst = 2;
+        maxBurst.Set(2);
         CheckExact(throttler, 2);
     }
 }
 
-} // namespace NKikimr
+} // namespace NKikimr::NJaegerTracing

ydb/core/jaeger_tracing/ut/ya.make

@@ -0,0 +1,14 @@
+UNITTEST_FOR(ydb/core/jaeger_tracing)
+
+FORK_SUBTESTS()
+
+TIMEOUT(600)
+
+SIZE(MEDIUM)
+
+SRCS(
+    sampler_ut.cpp
+    throttler_ut.cpp
+)
+
+END()

ydb/core/jaeger_tracing/ya.make

@@ -17,9 +17,6 @@ SRCS(
 
 END()
 
-RECURSE(
-)
-
 RECURSE_FOR_TESTS(
+    ut
 )
-