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

Commit 9f951059 authored by tsaichristine's avatar tsaichristine
Browse files

Fix ValueMetric should only pull on real state changes 

In ValueMetricProducer, we now map the new and old state values from
onStateChanged to their correct group ids (no mapping happens if the
metric has no state map). We then check if the group ids are the same
and return if they are. Having the same group id means that the state
values are in the same group and no pull is needed.

onStateChanged was updated to take state values stored in FieldValue
objects instead of as ints. This makes it easier to utilize the
mapStateValue function in MetricProducer.

Bug: b/156428844
Test: m statsd_test && adb sync data && adb shell
data/nativetest/statsd_test/statsd_test

Change-Id: Id8f110db593470b8923e7c4259d70cc5f5bc9147
parent 31db4f45

cmds/statsd/src/metrics/CountMetricProducer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -122,11 +122,11 @@ CountMetricProducer::~CountMetricProducer() { 
}



void CountMetricProducer::onStateChanged(const int64_t eventTimeNs, const int32_t atomId,

                                         const HashableDimensionKey& primaryKey, int oldState,

                                         int newState) {

                                         const HashableDimensionKey& primaryKey,

                                         const FieldValue& oldState, const FieldValue& newState) {

    VLOG("CountMetric %lld onStateChanged time %lld, State%d, key %s, %d -> %d",

         (long long)mMetricId, (long long)eventTimeNs, atomId, primaryKey.toString().c_str(),

         oldState, newState);

         oldState.mValue.int_value, newState.mValue.int_value);

}



void CountMetricProducer::dumpStatesLocked(FILE* out, bool verbose) const {

cmds/statsd/src/metrics/CountMetricProducer.h

+2 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ public: 
    virtual ~CountMetricProducer();



    void onStateChanged(const int64_t eventTimeNs, const int32_t atomId,

                        const HashableDimensionKey& primaryKey, int oldState,

                        int newState) override;

                        const HashableDimensionKey& primaryKey, const FieldValue& oldState,

                        const FieldValue& newState) override;



protected:

    void onMatchedLogEventInternalLocked(

cmds/statsd/src/metrics/DurationMetricProducer.cpp

+5 −6
Original line number Diff line number Diff line
@@ -161,13 +161,12 @@ sp<AnomalyTracker> DurationMetricProducer::addAnomalyTracker( 


void DurationMetricProducer::onStateChanged(const int64_t eventTimeNs, const int32_t atomId,

                                            const HashableDimensionKey& primaryKey,

                                            const int32_t oldState, const int32_t newState) {

    // Create a FieldValue object to hold the new state.

    FieldValue value;

    value.mValue.setInt(newState);

                                            const FieldValue& oldState,

                                            const FieldValue& newState) {

    // Check if this metric has a StateMap. If so, map the new state value to

    // the correct state group id.

    mapStateValue(atomId, &value);

    FieldValue newStateCopy = newState;

    mapStateValue(atomId, &newStateCopy);



    flushIfNeededLocked(eventTimeNs);
@@ -185,7 +184,7 @@ void DurationMetricProducer::onStateChanged(const int64_t eventTimeNs, const int 
        if (!containsLinkedStateValues(whatIt.first, primaryKey, mMetric2StateLinks, atomId)) {

            continue;

        }

        whatIt.second->onStateChanged(eventTimeNs, atomId, value);

        whatIt.second->onStateChanged(eventTimeNs, atomId, newStateCopy);

    }

}

cmds/statsd/src/metrics/DurationMetricProducer.h

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ public: 
                                         const sp<AlarmMonitor>& anomalyAlarmMonitor) override;



    void onStateChanged(const int64_t eventTimeNs, const int32_t atomId,

                        const HashableDimensionKey& primaryKey, const int32_t oldState,

                        const int32_t newState) override;

                        const HashableDimensionKey& primaryKey, const FieldValue& oldState,

                        const FieldValue& newState) override;



protected:

    void onMatchedLogEventLocked(const size_t matcherIndex, const LogEvent& event) override;

cmds/statsd/src/metrics/MetricProducer.h

+2 −2
Original line number Diff line number Diff line
@@ -182,8 +182,8 @@ public: 
    };



    void onStateChanged(const int64_t eventTimeNs, const int32_t atomId,

                        const HashableDimensionKey& primaryKey, const int32_t oldState,

                        const int32_t newState){};

                        const HashableDimensionKey& primaryKey, const FieldValue& oldState,

                        const FieldValue& newState){};



    // Output the metrics data to [protoOutput]. All metrics reports end with the same timestamp.

    // This method clears all the past buckets.