Improve AS14,

3 files changed, 44 insertions, 13 deletions

diff --git a/library/cpp/actors/helpers/selfping_actor.cpp b/library/cpp/actors/helpers/selfping_actor.cpp
index f9bfaf8dc09..dc383f8c4ca 100644
--- a/library/cpp/actors/helpers/selfping_actor.cpp
+++ b/library/cpp/actors/helpers/selfping_actor.cpp
@@ -61,10 +61,14 @@ struct TAvgOperation {
 class TSelfPingActor : public TActorBootstrapped<TSelfPingActor> {
 private:
     const TDuration SendInterval;
-    const NMonitoring::TDynamicCounters::TCounterPtr Counter;
+    const NMonitoring::TDynamicCounters::TCounterPtr MaxPingCounter;
+    const NMonitoring::TDynamicCounters::TCounterPtr AvgPingCounter;
+    const NMonitoring::TDynamicCounters::TCounterPtr AvgPingCounterWithSmallWindow;
     const NMonitoring::TDynamicCounters::TCounterPtr CalculationTimeCounter;
 
-    NSlidingWindow::TSlidingWindow<NSlidingWindow::TMaxOperation<ui64>> SlidingWindow;
+    NSlidingWindow::TSlidingWindow<NSlidingWindow::TMaxOperation<ui64>> MaxPingSlidingWindow;
+    NSlidingWindow::TSlidingWindow<TAvgOperation<ui64>> AvgPingSlidingWindow;
+    NSlidingWindow::TSlidingWindow<TAvgOperation<ui64>> AvgPingSmallSlidingWindow;
     NSlidingWindow::TSlidingWindow<TAvgOperation<ui64>> CalculationSlidingWindow;
 
     THPTimer Timer;
@@ -74,12 +78,19 @@ public:
         return SELF_PING_ACTOR;
     }
 
-    TSelfPingActor(TDuration sendInterval, const NMonitoring::TDynamicCounters::TCounterPtr& counter,
+    TSelfPingActor(TDuration sendInterval,
+            const NMonitoring::TDynamicCounters::TCounterPtr& maxPingCounter,
+            const NMonitoring::TDynamicCounters::TCounterPtr& avgPingCounter,
+            const NMonitoring::TDynamicCounters::TCounterPtr& avgPingSmallWindowCounter,
             const NMonitoring::TDynamicCounters::TCounterPtr& calculationTimeCounter)
         : SendInterval(sendInterval)
-        , Counter(counter)
+        , MaxPingCounter(maxPingCounter)
+        , AvgPingCounter(avgPingCounter)
+        , AvgPingCounterWithSmallWindow(avgPingSmallWindowCounter)
         , CalculationTimeCounter(calculationTimeCounter)
-        , SlidingWindow(TDuration::Seconds(15), 100)
+        , MaxPingSlidingWindow(TDuration::Seconds(15), 100)
+        , AvgPingSlidingWindow(TDuration::Seconds(15), 100)
+        , AvgPingSmallSlidingWindow(TDuration::Seconds(1), 100)
         , CalculationSlidingWindow(TDuration::Seconds(15), 100)
     {
     }
@@ -154,11 +165,23 @@ public:
         const double passedTime = hpNow - e.TimeStart;
         const ui64 delayUs = passedTime > 0.0 ? static_cast<ui64>(passedTime * 1e6) : 0;
 
-        *Counter = SlidingWindow.Update(delayUs, now);
+        if (MaxPingCounter) {
+            *MaxPingCounter = MaxPingSlidingWindow.Update(delayUs, now);
+        }
+        if (AvgPingCounter) {
+            auto res = AvgPingSlidingWindow.Update({1, delayUs}, now);
+            *AvgPingCounter = double(res.Sum) / double(res.Count + 1);
+        }
+        if (AvgPingCounterWithSmallWindow) {
+            auto res = AvgPingSmallSlidingWindow.Update({1, delayUs}, now);
+            *AvgPingCounterWithSmallWindow = double(res.Sum) / double(res.Count + 1);
+        }
 
-        ui64 d = MeasureTaskDurationNs();
-        auto res = CalculationSlidingWindow.Update({1, d}, now);
-        *CalculationTimeCounter = double(res.Sum) / double(res.Count + 1);
+        if (CalculationTimeCounter) {
+            ui64 d = MeasureTaskDurationNs();
+            auto res = CalculationSlidingWindow.Update({1, d}, now);
+            *CalculationTimeCounter = double(res.Sum) / double(res.Count + 1);
+        }
 
         SchedulePing(ctx, hpNow);
     }
@@ -174,10 +197,12 @@ private:
 
 IActor* CreateSelfPingActor(
     TDuration sendInterval,
-    const NMonitoring::TDynamicCounters::TCounterPtr& counter,
+    const NMonitoring::TDynamicCounters::TCounterPtr& maxPingCounter,
+    const NMonitoring::TDynamicCounters::TCounterPtr& avgPingCounter,
+    const NMonitoring::TDynamicCounters::TCounterPtr& avgPingSmallWindowCounter,
     const NMonitoring::TDynamicCounters::TCounterPtr& calculationTimeCounter)
 {
-    return new TSelfPingActor(sendInterval, counter, calculationTimeCounter);
+    return new TSelfPingActor(sendInterval, maxPingCounter, avgPingCounter, avgPingSmallWindowCounter, calculationTimeCounter);
 }
 
 } // NActors
diff --git a/library/cpp/actors/helpers/selfping_actor.h b/library/cpp/actors/helpers/selfping_actor.h
index d7d07f9fa8b..a976a4f4259 100644
--- a/library/cpp/actors/helpers/selfping_actor.h
+++ b/library/cpp/actors/helpers/selfping_actor.h
@@ -7,7 +7,9 @@ namespace NActors {
 
 NActors::IActor* CreateSelfPingActor(
     TDuration sendInterval,
-    const NMonitoring::TDynamicCounters::TCounterPtr& counter,
+    const NMonitoring::TDynamicCounters::TCounterPtr& maxPingCounter,
+    const NMonitoring::TDynamicCounters::TCounterPtr& avgPingCounter,
+    const NMonitoring::TDynamicCounters::TCounterPtr& avgPingSmallWindowCounter,
     const NMonitoring::TDynamicCounters::TCounterPtr& calculationTimeCounter);
 
 } // NActors
diff --git a/library/cpp/actors/helpers/selfping_actor_ut.cpp b/library/cpp/actors/helpers/selfping_actor_ut.cpp
index 459635fa24a..542f817755c 100644
--- a/library/cpp/actors/helpers/selfping_actor_ut.cpp
+++ b/library/cpp/actors/helpers/selfping_actor_ut.cpp
@@ -22,13 +22,17 @@ Y_UNIT_TEST_SUITE(TSelfPingTest) {
 
         NMonitoring::TDynamicCounters::TCounterPtr counter(new NMonitoring::TCounterForPtr());
         NMonitoring::TDynamicCounters::TCounterPtr counter2(new NMonitoring::TCounterForPtr());
+        NMonitoring::TDynamicCounters::TCounterPtr counter3(new NMonitoring::TCounterForPtr());
+        NMonitoring::TDynamicCounters::TCounterPtr counter4(new NMonitoring::TCounterForPtr());
 
         auto actor = CreateSelfPingActor(
             TDuration::MilliSeconds(100), // sendInterval (unused in test)
-            counter, counter2);
+            counter, counter2, counter3, counter4);
 
         UNIT_ASSERT_VALUES_EQUAL(counter->Val(), 0);
         UNIT_ASSERT_VALUES_EQUAL(counter2->Val(), 0);
+        UNIT_ASSERT_VALUES_EQUAL(counter3->Val(), 0);
+        UNIT_ASSERT_VALUES_EQUAL(counter4->Val(), 0);
 
         const TActorId actorId = runtime->Register(actor);
         Y_UNUSED(actorId);