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

Commit e2482619 authored by Tej Singh's avatar Tej Singh
Browse files

Determine update status for count metric 

Splitting this off into its own cl so it's easier to review.

Bug: 162322532
Test: atest statsd_test
Change-Id: I2f17c9d975b5c0a2367a364c8edc2f0b4e122147
parent 13264fbb

cmds/statsd/src/metrics/parsing_utils/config_update_utils.cpp

+15 −0
Original line number Diff line number Diff line
@@ -501,6 +501,21 @@ bool determineAllMetricUpdateStatuses(const StatsdConfig& config, 
                                      const set<int64_t>& replacedStates,

                                      vector<UpdateStatus>& metricsToUpdate) {

    int metricIndex = 0;

    for (int i = 0; i < config.count_metric_size(); i++, metricIndex++) {

        const CountMetric& metric = config.count_metric(i);

        set<int64_t> conditionDependencies;

        if (metric.has_condition()) {

            conditionDependencies.insert(metric.condition());

        }

        if (!determineMetricUpdateStatus(

                    config, metric, metric.id(), METRIC_TYPE_COUNT, {metric.what()},

                    conditionDependencies, metric.slice_by_state(), metric.links(),

                    oldMetricProducerMap, oldMetricProducers, metricToActivationMap,

                    replacedMatchers, replacedConditions, replacedStates,

                    metricsToUpdate[metricIndex])) {

            return false;

        }

    }

    for (int i = 0; i < config.event_metric_size(); i++, metricIndex++) {

        const EventMetric& metric = config.event_metric(i);

        set<int64_t> conditionDependencies;

cmds/statsd/tests/metrics/parsing_utils/config_update_utils_test.cpp

+156 −0
Original line number Diff line number Diff line
@@ -1094,6 +1094,162 @@ TEST_F(ConfigUpdateTest, TestEventMetricActivationDepsChange) { 
    EXPECT_EQ(metricsToUpdate[0], UPDATE_REPLACE);

}



TEST_F(ConfigUpdateTest, TestCountMetricPreserve) {

    StatsdConfig config;

    AtomMatcher startMatcher = CreateScreenTurnedOnAtomMatcher();

    *config.add_atom_matcher() = startMatcher;

    AtomMatcher stopMatcher = CreateScreenTurnedOffAtomMatcher();

    *config.add_atom_matcher() = stopMatcher;

    AtomMatcher whatMatcher = CreateScreenBrightnessChangedAtomMatcher();

    *config.add_atom_matcher() = whatMatcher;



    Predicate predicate = CreateScreenIsOnPredicate();

    *config.add_predicate() = predicate;

    State sliceState = CreateScreenState();

    *config.add_state() = sliceState;



    CountMetric* metric = config.add_count_metric();

    metric->set_id(12345);

    metric->set_what(whatMatcher.id());

    metric->set_condition(predicate.id());

    metric->add_slice_by_state(sliceState.id());

    metric->set_bucket(ONE_HOUR);



    // Create an initial config.

    EXPECT_TRUE(initConfig(config));



    unordered_map<int64_t, int> metricToActivationMap;

    vector<UpdateStatus> metricsToUpdate(1, UPDATE_UNKNOWN);

    EXPECT_TRUE(determineAllMetricUpdateStatuses(config, oldMetricProducerMap, oldMetricProducers,

                                                 metricToActivationMap,

                                                 /*replacedMatchers*/ {}, /*replacedConditions=*/{},

                                                 /*replacedStates=*/{}, metricsToUpdate));

    EXPECT_EQ(metricsToUpdate[0], UPDATE_PRESERVE);

}



TEST_F(ConfigUpdateTest, TestCountMetricDefinitionChange) {

    StatsdConfig config;

    AtomMatcher startMatcher = CreateScreenTurnedOnAtomMatcher();

    *config.add_atom_matcher() = startMatcher;

    AtomMatcher stopMatcher = CreateScreenTurnedOffAtomMatcher();

    *config.add_atom_matcher() = stopMatcher;

    AtomMatcher whatMatcher = CreateScreenBrightnessChangedAtomMatcher();

    *config.add_atom_matcher() = whatMatcher;



    Predicate predicate = CreateScreenIsOnPredicate();

    *config.add_predicate() = predicate;



    CountMetric* metric = config.add_count_metric();

    metric->set_id(12345);

    metric->set_what(whatMatcher.id());

    metric->set_condition(predicate.id());

    metric->set_bucket(ONE_HOUR);



    // Create an initial config.

    EXPECT_TRUE(initConfig(config));



    // Change bucket size, which should change the proto, causing replacement.

    metric->set_bucket(TEN_MINUTES);



    unordered_map<int64_t, int> metricToActivationMap;

    vector<UpdateStatus> metricsToUpdate(1, UPDATE_UNKNOWN);

    EXPECT_TRUE(determineAllMetricUpdateStatuses(config, oldMetricProducerMap, oldMetricProducers,

                                                 metricToActivationMap,

                                                 /*replacedMatchers*/ {}, /*replacedConditions=*/{},

                                                 /*replacedStates=*/{}, metricsToUpdate));

    EXPECT_EQ(metricsToUpdate[0], UPDATE_REPLACE);

}



TEST_F(ConfigUpdateTest, TestCountMetricWhatChanged) {

    StatsdConfig config;

    AtomMatcher startMatcher = CreateScreenTurnedOnAtomMatcher();

    *config.add_atom_matcher() = startMatcher;

    AtomMatcher stopMatcher = CreateScreenTurnedOffAtomMatcher();

    *config.add_atom_matcher() = stopMatcher;

    AtomMatcher whatMatcher = CreateScreenBrightnessChangedAtomMatcher();

    *config.add_atom_matcher() = whatMatcher;



    Predicate predicate = CreateScreenIsOnPredicate();

    *config.add_predicate() = predicate;



    CountMetric* metric = config.add_count_metric();

    metric->set_id(12345);

    metric->set_what(whatMatcher.id());

    metric->set_condition(predicate.id());

    metric->set_bucket(ONE_HOUR);



    // Create an initial config.

    EXPECT_TRUE(initConfig(config));



    unordered_map<int64_t, int> metricToActivationMap;

    vector<UpdateStatus> metricsToUpdate(1, UPDATE_UNKNOWN);

    EXPECT_TRUE(determineAllMetricUpdateStatuses(

            config, oldMetricProducerMap, oldMetricProducers, metricToActivationMap,

            /*replacedMatchers*/ {whatMatcher.id()}, /*replacedConditions=*/{},

            /*replacedStates=*/{}, metricsToUpdate));

    EXPECT_EQ(metricsToUpdate[0], UPDATE_REPLACE);

}



TEST_F(ConfigUpdateTest, TestCountMetricConditionChanged) {

    StatsdConfig config;

    AtomMatcher startMatcher = CreateScreenTurnedOnAtomMatcher();

    *config.add_atom_matcher() = startMatcher;

    AtomMatcher stopMatcher = CreateScreenTurnedOffAtomMatcher();

    *config.add_atom_matcher() = stopMatcher;

    AtomMatcher whatMatcher = CreateScreenBrightnessChangedAtomMatcher();

    *config.add_atom_matcher() = whatMatcher;



    Predicate predicate = CreateScreenIsOnPredicate();

    *config.add_predicate() = predicate;



    CountMetric* metric = config.add_count_metric();

    metric->set_id(12345);

    metric->set_what(whatMatcher.id());

    metric->set_condition(predicate.id());

    metric->set_bucket(ONE_HOUR);



    // Create an initial config.

    EXPECT_TRUE(initConfig(config));



    unordered_map<int64_t, int> metricToActivationMap;

    vector<UpdateStatus> metricsToUpdate(1, UPDATE_UNKNOWN);

    EXPECT_TRUE(determineAllMetricUpdateStatuses(

            config, oldMetricProducerMap, oldMetricProducers, metricToActivationMap,

            /*replacedMatchers*/ {}, /*replacedConditions=*/{predicate.id()},

            /*replacedStates=*/{}, metricsToUpdate));

    EXPECT_EQ(metricsToUpdate[0], UPDATE_REPLACE);

}



TEST_F(ConfigUpdateTest, TestCountMetricStateChanged) {

    StatsdConfig config;

    AtomMatcher startMatcher = CreateScreenTurnedOnAtomMatcher();

    *config.add_atom_matcher() = startMatcher;

    AtomMatcher stopMatcher = CreateScreenTurnedOffAtomMatcher();

    *config.add_atom_matcher() = stopMatcher;

    AtomMatcher whatMatcher = CreateScreenBrightnessChangedAtomMatcher();

    *config.add_atom_matcher() = whatMatcher;



    State sliceState = CreateScreenState();

    *config.add_state() = sliceState;



    CountMetric* metric = config.add_count_metric();

    metric->set_id(12345);

    metric->set_what(whatMatcher.id());

    metric->add_slice_by_state(sliceState.id());

    metric->set_bucket(ONE_HOUR);



    // Create an initial config.

    EXPECT_TRUE(initConfig(config));



    unordered_map<int64_t, int> metricToActivationMap;

    vector<UpdateStatus> metricsToUpdate(1, UPDATE_UNKNOWN);

    EXPECT_TRUE(determineAllMetricUpdateStatuses(

            config, oldMetricProducerMap, oldMetricProducers, metricToActivationMap,

            /*replacedMatchers*/ {}, /*replacedConditions=*/{},

            /*replacedStates=*/{sliceState.id()}, metricsToUpdate));

    EXPECT_EQ(metricsToUpdate[0], UPDATE_REPLACE);

}



TEST_F(ConfigUpdateTest, TestUpdateEventMetrics) {

    StatsdConfig config;