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

Commit c876b492 authored by tsaichristine's avatar tsaichristine
Browse files

Slice by state in ValueMetricProducer 

- Added #onStateChanged logic to ValueMetricProducer
- #onDumpReport fills in slice_by_state values in ValueMetricProducer
- Base information is tracked in a separate data structure and keyed by
dimensions_in_what HashableDimensionKey. The current state key is also
stored in base info so we can close the interval for this state once we
get a new state key.
- Added unit tests for ValueMetricProducer onStateChange

Other changes:
- mCondition parameter was removed from #pullAndMatchEventsLocked and
 #accumulateEvents because it is unused in these functions.
- The event key is initialized in each metric's internal
 onMatchedLogEvent function. This allows ValueMetric to skip events that
 have primary keys that do not match the current state change primary
 key.

Test: bit statsd_test:*
Change-Id: I565c6d251262be57abf10fdef243b8bdc01f3772
parent 30959eba

cmds/statsd/src/HashableDimensionKey.cpp

+4 −0
Original line number Diff line number Diff line
@@ -152,6 +152,10 @@ bool LessThan(const vector<FieldValue>& s1, const vector<FieldValue>& s2) { 
    return false;

}



bool HashableDimensionKey::operator!=(const HashableDimensionKey& that) const {

    return !((*this) == that);

}



bool HashableDimensionKey::operator==(const HashableDimensionKey& that) const {

    if (mValues.size() != that.getValues().size()) {

        return false;

cmds/statsd/src/HashableDimensionKey.h

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ public: 


    std::string toString() const;



    bool operator!=(const HashableDimensionKey& that) const;



    bool operator==(const HashableDimensionKey& that) const;



    bool operator<(const HashableDimensionKey& that) const;

cmds/statsd/src/StatsLogProcessor.h

+4 −0
Original line number Diff line number Diff line
@@ -284,6 +284,10 @@ private: 
    FRIEND_TEST(DurationMetricE2eTest, TestWithCondition);

    FRIEND_TEST(DurationMetricE2eTest, TestWithSlicedCondition);

    FRIEND_TEST(DurationMetricE2eTest, TestWithActivationAndSlicedCondition);



    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState_WithDimensions);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState_WithIncorrectDimensions);

};



}  // namespace statsd

cmds/statsd/src/metrics/CountMetricProducer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -277,8 +277,8 @@ bool CountMetricProducer::hitGuardRailLocked(const MetricDimensionKey& newKey) { 


void CountMetricProducer::onMatchedLogEventInternalLocked(

        const size_t matcherIndex, const MetricDimensionKey& eventKey,

        const ConditionKey& conditionKey, bool condition,

        const LogEvent& event) {

        const ConditionKey& conditionKey, bool condition, const LogEvent& event,

        const map<int, HashableDimensionKey>& statePrimaryKeys) {

    int64_t eventTimeNs = event.GetElapsedTimestampNs();

    flushIfNeededLocked(eventTimeNs);

cmds/statsd/src/metrics/CountMetricProducer.h

+2 −2
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ public: 
protected:

    void onMatchedLogEventInternalLocked(

            const size_t matcherIndex, const MetricDimensionKey& eventKey,

            const ConditionKey& conditionKey, bool condition,

            const LogEvent& event) override;

            const ConditionKey& conditionKey, bool condition, const LogEvent& event,

            const std::map<int, HashableDimensionKey>& statePrimaryKeys) override;



private: