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

Commit a5b51913 authored by Stefan Lafon's avatar Stefan Lafon
Browse files

Rename EventConditionLink as MetricConditionLink in statsd_config.proto. 

Test: Ran statsd_test and cts tests.
Change-Id: Ia9a38892854443aa4f17d800a075860fcf874652
parent 05708745

cmds/statsd/src/condition/ConditionWizard.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ namespace android { 
namespace os {

namespace statsd {



// Held by MetricProducer, to query a condition state with input defined in EventConditionLink.

// Held by MetricProducer, to query a condition state with input defined in MetricConditionLink.

class ConditionWizard : public virtual android::RefBase {

public:

    ConditionWizard(){};  // for testing

cmds/statsd/src/condition/condition_util.cpp

+4 −4
Original line number Diff line number Diff line
@@ -94,17 +94,17 @@ ConditionState evaluateCombinationCondition(const std::vector<int>& children, 
}



HashableDimensionKey getDimensionKeyForCondition(const LogEvent& event,

                                                 const EventConditionLink& link) {

                                                 const MetricConditionLink& link) {

    vector<KeyMatcher> eventKey;

    eventKey.reserve(link.key_in_main().size());

    eventKey.reserve(link.key_in_what().size());



    for (const auto& key : link.key_in_main()) {

    for (const auto& key : link.key_in_what()) {

        eventKey.push_back(key);

    }



    vector<KeyValuePair> dimensionKey = getDimensionKey(event, eventKey);



    for (int i = 0; i < link.key_in_main_size(); i++) {

    for (int i = 0; i < link.key_in_what_size(); i++) {

        auto& kv = dimensionKey[i];

        kv.set_key(link.key_in_condition(i).key());

    }

cmds/statsd/src/condition/condition_util.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ ConditionState evaluateCombinationCondition(const std::vector<int>& children, 
                                            const std::vector<ConditionState>& conditionCache);



HashableDimensionKey getDimensionKeyForCondition(const LogEvent& event,

                                                 const EventConditionLink& link);

                                                 const MetricConditionLink& link);

}  // namespace statsd

}  // namespace os

}  // namespace android

cmds/statsd/src/config/ConfigManager.cpp

+5 −5
Original line number Diff line number Diff line
@@ -272,9 +272,9 @@ StatsdConfig build_fake_config() { 
    keyMatcher = metric->add_dimension();

    keyMatcher->set_key(WAKE_LOCK_UID_KEY_ID);

    metric->set_condition("APP_IS_BACKGROUND_AND_SCREEN_ON");

    EventConditionLink* link = metric->add_links();

    MetricConditionLink* link = metric->add_links();

    link->set_condition("APP_IS_BACKGROUND");

    link->add_key_in_main()->set_key(WAKE_LOCK_UID_KEY_ID);

    link->add_key_in_what()->set_key(WAKE_LOCK_UID_KEY_ID);

    link->add_key_in_condition()->set_key(APP_USAGE_UID_KEY_ID);



    // Duration of an app holding any wl, while screen on and app in background, slice by uid
@@ -288,7 +288,7 @@ StatsdConfig build_fake_config() { 
    durationMetric->set_condition("APP_IS_BACKGROUND_AND_SCREEN_ON");

    link = durationMetric->add_links();

    link->set_condition("APP_IS_BACKGROUND");

    link->add_key_in_main()->set_key(WAKE_LOCK_UID_KEY_ID);

    link->add_key_in_what()->set_key(WAKE_LOCK_UID_KEY_ID);

    link->add_key_in_condition()->set_key(APP_USAGE_UID_KEY_ID);



    // max Duration of an app holding any wl, while screen on and app in background, slice by uid
@@ -302,7 +302,7 @@ StatsdConfig build_fake_config() { 
    durationMetric->set_condition("APP_IS_BACKGROUND_AND_SCREEN_ON");

    link = durationMetric->add_links();

    link->set_condition("APP_IS_BACKGROUND");

    link->add_key_in_main()->set_key(WAKE_LOCK_UID_KEY_ID);

    link->add_key_in_what()->set_key(WAKE_LOCK_UID_KEY_ID);

    link->add_key_in_condition()->set_key(APP_USAGE_UID_KEY_ID);



    // Duration of an app holding any wl, while screen on and app in background
@@ -314,7 +314,7 @@ StatsdConfig build_fake_config() { 
    durationMetric->set_condition("APP_IS_BACKGROUND_AND_SCREEN_ON");

    link = durationMetric->add_links();

    link->set_condition("APP_IS_BACKGROUND");

    link->add_key_in_main()->set_key(WAKE_LOCK_UID_KEY_ID);

    link->add_key_in_what()->set_key(WAKE_LOCK_UID_KEY_ID);

    link->add_key_in_condition()->set_key(APP_USAGE_UID_KEY_ID);



    // Duration of screen on time.

cmds/statsd/src/metrics/MetricProducer.h

+2 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ protected: 
    // that StatsLogReport wants.

    std::unordered_map<HashableDimensionKey, std::vector<KeyValuePair>> mDimensionKeyMap;



    std::vector<EventConditionLink> mConditionLinks;

    std::vector<MetricConditionLink> mConditionLinks;



    std::vector<sp<AnomalyTracker>> mAnomalyTrackers;
@@ -149,7 +149,7 @@ protected: 
     * [eventKey]: the extracted dimension key for the final output. if the metric doesn't have

     *             dimensions, it will be DEFAULT_DIMENSION_KEY

     * [conditionKey]: the keys of conditions which should be used to query the condition for this

     *                 target event (from EventConditionLink). This is passed to individual metrics

     *                 target event (from MetricConditionLink). This is passed to individual metrics

     *                 because DurationMetric needs it to be cached.

     * [condition]: whether condition is met. If condition is sliced, this is the result coming from

     *              query with ConditionWizard; If condition is not sliced, this is the