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

Commit 129308ff authored by Bookatz's avatar Bookatz Committed by android-build-merger
Browse files

Merge "Statsd MAX now obeys refractory periods too" into pi-dev am: 3b826c60 

am: a44330dd

Change-Id: I15cf0b24a1ffcba7368c6045e34fe82acb302b6b
parents 87f9b87b a44330dd

cmds/statsd/src/metrics/duration_helper/MaxDurationTracker.cpp

+3 −2
Original line number Diff line number Diff line
@@ -327,8 +327,9 @@ int64_t MaxDurationTracker::predictAnomalyTimestampNs(const DurationAnomalyTrack 
            }

        }

    }

    int64_t threshold = anomalyTracker.getAnomalyThreshold();

    return currentTimestamp + threshold - maxElapsed;

    int64_t anomalyTimeNs = currentTimestamp + anomalyTracker.getAnomalyThreshold() - maxElapsed;

    int64_t refractoryEndNs = anomalyTracker.getRefractoryPeriodEndsSec(mEventKey) * NS_PER_SEC;

    return std::max(anomalyTimeNs, refractoryEndNs);

}



void MaxDurationTracker::dumpStates(FILE* out, bool verbose) const {

cmds/statsd/tests/metrics/MaxDurationTracker_test.cpp

+30 −1
Original line number Diff line number Diff line
@@ -344,7 +344,36 @@ TEST(MaxDurationTrackerTest, TestAnomalyPredictedTimestamp) { 
    tracker.noteConditionChanged(key1, true, conditionStarts2);

    EXPECT_EQ(1U, anomalyTracker->mAlarms.size());

    auto alarm = anomalyTracker->mAlarms.begin()->second;

    uint64_t anomalyFireTimeSec = alarm->timestampSec;

    EXPECT_EQ(conditionStarts2 + 36 * NS_PER_SEC,

            (unsigned long long)anomalyFireTimeSec * NS_PER_SEC);



    // Now we test the calculation now that there's a refractory period.

    // At the correct time, declare the anomaly. This will set a refractory period. Make sure it

    // gets correctly taken into account in future predictAnomalyTimestampNs calculations.

    std::unordered_set<sp<const InternalAlarm>, SpHash<InternalAlarm>> firedAlarms({alarm});

    anomalyTracker->informAlarmsFired(anomalyFireTimeSec * NS_PER_SEC, firedAlarms);

    EXPECT_EQ(0u, anomalyTracker->mAlarms.size());

    uint64_t refractoryPeriodEndsSec = anomalyFireTimeSec + refPeriodSec;

    EXPECT_EQ(anomalyTracker->getRefractoryPeriodEndsSec(eventKey), refractoryPeriodEndsSec);



    // Now stop and start again. Make sure the new predictAnomalyTimestampNs takes into account

    // the refractory period correctly.

    uint64_t eventStopTimeNs = anomalyFireTimeSec * NS_PER_SEC + 10;

    tracker.noteStop(key1, eventStopTimeNs, false);

    tracker.noteStop(key2, eventStopTimeNs, false);

    tracker.noteStart(key1, true, eventStopTimeNs + 1000000, conditionKey1);

    // Anomaly is ongoing, but we're still in the refractory period.

    EXPECT_EQ(1U, anomalyTracker->mAlarms.size());

    alarm = anomalyTracker->mAlarms.begin()->second;

    EXPECT_EQ(refractoryPeriodEndsSec, (unsigned long long)(alarm->timestampSec));



    // Makes sure it is correct after the refractory period is over.

    tracker.noteStop(key1, eventStopTimeNs + 2000000, false);

    uint64_t justBeforeRefPeriodNs = (refractoryPeriodEndsSec - 2) * NS_PER_SEC;

    tracker.noteStart(key1, true, justBeforeRefPeriodNs, conditionKey1);

    alarm = anomalyTracker->mAlarms.begin()->second;

    EXPECT_EQ(justBeforeRefPeriodNs + 40 * NS_PER_SEC,

                (unsigned long long)(alarm->timestampSec * NS_PER_SEC));

}