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

Commit 3276d94b authored by David Chen's avatar David Chen Committed by android-build-merger
Browse files

Merge "Deletes default allowed_log_sources in statsd." into pi-dev 

am: f5de606f

Change-Id: Id288fe64ea4027445b473185cee0b71bf0fde3bd
parents e4330eaa f5de606f

cmds/statsd/src/metrics/MetricsManager.cpp

+3 −9
Original line number Diff line number Diff line
@@ -64,15 +64,9 @@ MetricsManager::MetricsManager(const ConfigKey& key, const StatsdConfig& config, 
                             mTrackerToConditionMap, mNoReportMetricIds);



    if (config.allowed_log_source_size() == 0) {

        // TODO(b/70794411): uncomment the following line and remove the hard coded log source

        // after all configs have the log source added.

        // mConfigValid = false;

        // ALOGE("Log source white list is empty! This config won't get any data.");



        mAllowedUid.push_back(AID_ROOT);

        mAllowedUid.push_back(AID_STATSD);

        mAllowedUid.push_back(AID_SYSTEM);

        mAllowedLogSources.insert(mAllowedUid.begin(), mAllowedUid.end());

        mConfigValid = false;

        ALOGE("Log source whitelist is empty! This config won't get any data. Suggest adding at "

                      "least AID_SYSTEM and AID_STATSD to the allowed_log_source field.");

    } else {

        for (const auto& source : config.allowed_log_source()) {

            auto it = UidMap::sAidToUidMapping.find(source);

cmds/statsd/tests/e2e/Attribution_e2e_test.cpp

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ namespace { 


StatsdConfig CreateStatsdConfig(const Position position) {

    StatsdConfig config;

    config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.

    auto wakelockAcquireMatcher = CreateAcquireWakelockAtomMatcher();

    auto attributionNodeMatcher =

        wakelockAcquireMatcher.mutable_simple_atom_matcher()->add_field_value_matcher();

cmds/statsd/tests/e2e/DimensionInCondition_e2e_combination_AND_cond_test.cpp

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ namespace { 
StatsdConfig CreateDurationMetricConfig_NoLink_AND_CombinationCondition(

        DurationMetric::AggregationType aggregationType, bool addExtraDimensionInCondition) {

    StatsdConfig config;

    config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.

    *config.add_atom_matcher() = CreateStartScheduledJobAtomMatcher();

    *config.add_atom_matcher() = CreateFinishScheduledJobAtomMatcher();

    *config.add_atom_matcher() = CreateSyncStartAtomMatcher();
@@ -337,6 +338,7 @@ namespace { 
StatsdConfig CreateDurationMetricConfig_Link_AND_CombinationCondition(

        DurationMetric::AggregationType aggregationType, bool addExtraDimensionInCondition) {

    StatsdConfig config;

    config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.

    *config.add_atom_matcher() = CreateStartScheduledJobAtomMatcher();

    *config.add_atom_matcher() = CreateFinishScheduledJobAtomMatcher();

    *config.add_atom_matcher() = CreateSyncStartAtomMatcher();
@@ -580,6 +582,7 @@ namespace { 
StatsdConfig CreateDurationMetricConfig_PartialLink_AND_CombinationCondition(

        DurationMetric::AggregationType aggregationType) {

    StatsdConfig config;

    config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.

    *config.add_atom_matcher() = CreateStartScheduledJobAtomMatcher();

    *config.add_atom_matcher() = CreateFinishScheduledJobAtomMatcher();

    *config.add_atom_matcher() = CreateSyncStartAtomMatcher();

cmds/statsd/tests/e2e/DimensionInCondition_e2e_combination_OR_cond_test.cpp

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ namespace { 


StatsdConfig CreateCountMetric_NoLink_CombinationCondition_Config() {

    StatsdConfig config;

    config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.

    auto screenBrightnessChangeAtomMatcher = CreateScreenBrightnessChangedAtomMatcher();

    *config.add_atom_matcher() = screenBrightnessChangeAtomMatcher;

    *config.add_atom_matcher() = CreateScreenTurnedOnAtomMatcher();
@@ -229,6 +230,7 @@ namespace { 


StatsdConfig CreateCountMetric_Link_CombinationCondition() {

    StatsdConfig config;

    config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.

    auto appCrashMatcher = CreateProcessCrashAtomMatcher();

    *config.add_atom_matcher() = appCrashMatcher;

    *config.add_atom_matcher() = CreateScreenTurnedOnAtomMatcher();
@@ -416,6 +418,7 @@ namespace { 
StatsdConfig CreateDurationMetricConfig_NoLink_CombinationCondition(

        DurationMetric::AggregationType aggregationType) {

    StatsdConfig config;

    config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.

    *config.add_atom_matcher() = CreateBatterySaverModeStartAtomMatcher();

    *config.add_atom_matcher() = CreateBatterySaverModeStopAtomMatcher();

    *config.add_atom_matcher() = CreateScreenTurnedOnAtomMatcher();
@@ -603,6 +606,7 @@ namespace { 
StatsdConfig CreateDurationMetricConfig_Link_CombinationCondition(

        DurationMetric::AggregationType aggregationType) {

    StatsdConfig config;

    config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.

    *config.add_atom_matcher() = CreateMoveToBackgroundAtomMatcher();

    *config.add_atom_matcher() = CreateMoveToForegroundAtomMatcher();

    *config.add_atom_matcher() = CreateScreenTurnedOnAtomMatcher();

cmds/statsd/tests/e2e/DimensionInCondition_e2e_simple_cond_test.cpp

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ namespace { 
StatsdConfig CreateDurationMetricConfig_NoLink_SimpleCondition(

        DurationMetric::AggregationType aggregationType, bool addExtraDimensionInCondition) {

    StatsdConfig config;

    config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.

    *config.add_atom_matcher() = CreateStartScheduledJobAtomMatcher();

    *config.add_atom_matcher() = CreateFinishScheduledJobAtomMatcher();

    *config.add_atom_matcher() = CreateSyncStartAtomMatcher();
@@ -306,6 +307,7 @@ namespace { 
StatsdConfig createDurationMetric_Link_SimpleConditionConfig(

        DurationMetric::AggregationType aggregationType, bool addExtraDimensionInCondition) {

    StatsdConfig config;

    config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.

    *config.add_atom_matcher() = CreateStartScheduledJobAtomMatcher();

    *config.add_atom_matcher() = CreateFinishScheduledJobAtomMatcher();

    *config.add_atom_matcher() = CreateSyncStartAtomMatcher();
@@ -525,6 +527,7 @@ namespace { 
StatsdConfig createDurationMetric_PartialLink_SimpleConditionConfig(

        DurationMetric::AggregationType aggregationType) {

    StatsdConfig config;

    config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.

    *config.add_atom_matcher() = CreateStartScheduledJobAtomMatcher();

    *config.add_atom_matcher() = CreateFinishScheduledJobAtomMatcher();

    *config.add_atom_matcher() = CreateSyncStartAtomMatcher();