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

Commit 70a7ee5f authored by tsaichristine's avatar tsaichristine
Browse files

Change SimplePredicate InitialValue default to UNKNOWN 

Previous default for InitialValue was FALSE. Currently, no predicates
configure this field.

Added unit tests to test the initial condition changes in Value and
Count metrics.
- ValueMetricE2eTest.TestInitialConditionChanges
- CountMetricE2eTest.TestInitialConditionChanges

Bug: b/156541904
Test: m statsd_test && adb sync data && adb shell data/nativetest/statsd_test/statsd_test
Change-Id: I242bcb0b60455355e699636aae7e620fabc310ef
parent 31db4f45

cmds/statsd/src/StatsLogProcessor.h

+5 −3
Original line number Diff line number Diff line
@@ -307,9 +307,6 @@ private: 
    FRIEND_TEST(GaugeMetricE2eTest, TestRandomSamplePulledEventsWithActivation);

    FRIEND_TEST(GaugeMetricE2eTest, TestRandomSamplePulledEventsNoCondition);

    FRIEND_TEST(GaugeMetricE2eTest, TestConditionChangeToTrueSamplePulledEvents);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_LateAlarm);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_WithActivation);



    FRIEND_TEST(AnomalyDetectionE2eTest, TestSlicedCountMetric_single_bucket);

    FRIEND_TEST(AnomalyDetectionE2eTest, TestSlicedCountMetric_multiple_buckets);
@@ -328,6 +325,7 @@ private: 
    FRIEND_TEST(MetricActivationE2eTest, TestCountMetricWithSameDeactivation);

    FRIEND_TEST(MetricActivationE2eTest, TestCountMetricWithTwoMetricsTwoDeactivations);



    FRIEND_TEST(CountMetricE2eTest, TestInitialConditionChanges);

    FRIEND_TEST(CountMetricE2eTest, TestSlicedState);

    FRIEND_TEST(CountMetricE2eTest, TestSlicedStateWithMap);

    FRIEND_TEST(CountMetricE2eTest, TestMultipleSlicedStates);
@@ -345,6 +343,10 @@ private: 
    FRIEND_TEST(DurationMetricE2eTest, TestSlicedStatePrimaryFieldsNotSubsetDimInWhat);

    FRIEND_TEST(DurationMetricE2eTest, TestWithSlicedStatePrimaryFieldsSubset);



    FRIEND_TEST(ValueMetricE2eTest, TestInitialConditionChanges);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_LateAlarm);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_WithActivation);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState_WithDimensions);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState_WithIncorrectDimensions);

cmds/statsd/src/metrics/MetricProducer.h

+2 −0
Original line number Diff line number Diff line
@@ -459,6 +459,7 @@ protected: 
    FRIEND_TEST(CountMetricE2eTest, TestSlicedStateWithMap);

    FRIEND_TEST(CountMetricE2eTest, TestMultipleSlicedStates);

    FRIEND_TEST(CountMetricE2eTest, TestSlicedStateWithPrimaryFields);

    FRIEND_TEST(CountMetricE2eTest, TestInitialConditionChanges);



    FRIEND_TEST(DurationMetricE2eTest, TestOneBucket);

    FRIEND_TEST(DurationMetricE2eTest, TestTwoBuckets);
@@ -488,6 +489,7 @@ protected: 
    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState_WithDimensions);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState_WithIncorrectDimensions);

    FRIEND_TEST(ValueMetricE2eTest, TestInitialConditionChanges);

};



}  // namespace statsd

cmds/statsd/src/metrics/MetricsManager.h

+5 −3
Original line number Diff line number Diff line
@@ -292,9 +292,6 @@ private: 
    FRIEND_TEST(GaugeMetricE2eTest, TestRandomSamplePulledEventsWithActivation);

    FRIEND_TEST(GaugeMetricE2eTest, TestRandomSamplePulledEventsNoCondition);

    FRIEND_TEST(GaugeMetricE2eTest, TestConditionChangeToTrueSamplePulledEvents);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_LateAlarm);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_WithActivation);



    FRIEND_TEST(AnomalyDetectionE2eTest, TestSlicedCountMetric_single_bucket);

    FRIEND_TEST(AnomalyDetectionE2eTest, TestSlicedCountMetric_multiple_buckets);
@@ -322,6 +319,7 @@ private: 
            TestActivationOnBootMultipleActivationsDifferentActivationTypes);

    FRIEND_TEST(StatsLogProcessorTest, TestActivationsPersistAcrossSystemServerRestart);



    FRIEND_TEST(CountMetricE2eTest, TestInitialConditionChanges);

    FRIEND_TEST(CountMetricE2eTest, TestSlicedState);

    FRIEND_TEST(CountMetricE2eTest, TestSlicedStateWithMap);

    FRIEND_TEST(CountMetricE2eTest, TestMultipleSlicedStates);
@@ -339,6 +337,10 @@ private: 
    FRIEND_TEST(DurationMetricE2eTest, TestWithSlicedStatePrimaryFieldsSuperset);

    FRIEND_TEST(DurationMetricE2eTest, TestWithSlicedStatePrimaryFieldsSubset);



    FRIEND_TEST(ValueMetricE2eTest, TestInitialConditionChanges);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_LateAlarm);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_WithActivation);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState_WithDimensions);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState_WithIncorrectDimensions);

cmds/statsd/src/statsd_config.proto

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ message SimplePredicate { 
    UNKNOWN = 0;

    FALSE = 1;

  }

  optional InitialValue initial_value = 5 [default = FALSE];

  optional InitialValue initial_value = 5 [default = UNKNOWN];



  optional FieldMatcher dimensions = 6;

}

cmds/statsd/tests/e2e/CountMetric_e2e_test.cpp

+91 −7
Original line number Diff line number Diff line
@@ -27,6 +27,92 @@ namespace statsd { 


#ifdef __ANDROID__



/**

 * Tests the initial condition and condition after the first log events for

 * count metrics with either a combination condition or simple condition.

 *

 * Metrics should be initialized with condition kUnknown (given that the

 * predicate is using the default InitialValue of UNKNOWN). The condition should

 * be updated to either kFalse or kTrue if a condition event is logged for all

 * children conditions.

 */

TEST(CountMetricE2eTest, TestInitialConditionChanges) {

    // Initialize config.

    StatsdConfig config;

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

    config.add_default_pull_packages("AID_ROOT");  // Fake puller is registered with root.



    auto syncStartMatcher = CreateSyncStartAtomMatcher();

    *config.add_atom_matcher() = syncStartMatcher;

    *config.add_atom_matcher() = CreateScreenTurnedOnAtomMatcher();

    *config.add_atom_matcher() = CreateScreenTurnedOffAtomMatcher();

    *config.add_atom_matcher() = CreateBatteryStateNoneMatcher();

    *config.add_atom_matcher() = CreateBatteryStateUsbMatcher();



    auto screenOnPredicate = CreateScreenIsOnPredicate();

    *config.add_predicate() = screenOnPredicate;



    auto deviceUnpluggedPredicate = CreateDeviceUnpluggedPredicate();

    *config.add_predicate() = deviceUnpluggedPredicate;



    auto screenOnOnBatteryPredicate = config.add_predicate();

    screenOnOnBatteryPredicate->set_id(StringToId("screenOnOnBatteryPredicate"));

    screenOnOnBatteryPredicate->mutable_combination()->set_operation(LogicalOperation::AND);

    addPredicateToPredicateCombination(screenOnPredicate, screenOnOnBatteryPredicate);

    addPredicateToPredicateCombination(deviceUnpluggedPredicate, screenOnOnBatteryPredicate);



    // CountSyncStartWhileScreenOnOnBattery (CombinationCondition)

    CountMetric* countMetric1 = config.add_count_metric();

    countMetric1->set_id(StringToId("CountSyncStartWhileScreenOnOnBattery"));

    countMetric1->set_what(syncStartMatcher.id());

    countMetric1->set_condition(screenOnOnBatteryPredicate->id());

    countMetric1->set_bucket(FIVE_MINUTES);



    // CountSyncStartWhileOnBattery (SimpleCondition)

    CountMetric* countMetric2 = config.add_count_metric();

    countMetric2->set_id(StringToId("CountSyncStartWhileOnBatterySliceScreen"));

    countMetric2->set_what(syncStartMatcher.id());

    countMetric2->set_condition(deviceUnpluggedPredicate.id());

    countMetric2->set_bucket(FIVE_MINUTES);



    const uint64_t bucketStartTimeNs = 10000000000;  // 0:10

    const uint64_t bucketSizeNs =

            TimeUnitToBucketSizeInMillis(config.count_metric(0).bucket()) * 1000000LL;

    int uid = 12345;

    int64_t cfgId = 98765;

    ConfigKey cfgKey(uid, cfgId);

    auto processor = CreateStatsLogProcessor(bucketStartTimeNs, bucketStartTimeNs, config, cfgKey);



    EXPECT_EQ(processor->mMetricsManagers.size(), 1u);

    sp<MetricsManager> metricsManager = processor->mMetricsManagers.begin()->second;

    EXPECT_TRUE(metricsManager->isConfigValid());

    EXPECT_EQ(2, metricsManager->mAllMetricProducers.size());



    sp<MetricProducer> metricProducer1 = metricsManager->mAllMetricProducers[0];

    sp<MetricProducer> metricProducer2 = metricsManager->mAllMetricProducers[1];



    EXPECT_EQ(ConditionState::kUnknown, metricProducer1->mCondition);

    EXPECT_EQ(ConditionState::kUnknown, metricProducer2->mCondition);



    auto screenOnEvent =

            CreateScreenStateChangedEvent(bucketStartTimeNs + 30, android::view::DISPLAY_STATE_ON);

    processor->OnLogEvent(screenOnEvent.get());

    EXPECT_EQ(ConditionState::kUnknown, metricProducer1->mCondition);

    EXPECT_EQ(ConditionState::kUnknown, metricProducer2->mCondition);



    auto pluggedUsbEvent = CreateBatteryStateChangedEvent(

            bucketStartTimeNs + 50, BatteryPluggedStateEnum::BATTERY_PLUGGED_USB);

    processor->OnLogEvent(pluggedUsbEvent.get());

    EXPECT_EQ(ConditionState::kFalse, metricProducer1->mCondition);

    EXPECT_EQ(ConditionState::kFalse, metricProducer2->mCondition);



    auto pluggedNoneEvent = CreateBatteryStateChangedEvent(

            bucketStartTimeNs + 70, BatteryPluggedStateEnum::BATTERY_PLUGGED_NONE);

    processor->OnLogEvent(pluggedNoneEvent.get());

    EXPECT_EQ(ConditionState::kTrue, metricProducer1->mCondition);

    EXPECT_EQ(ConditionState::kTrue, metricProducer2->mCondition);

}



/**

* Test a count metric that has one slice_by_state with no primary fields.

*
@@ -85,7 +171,7 @@ TEST(CountMetricE2eTest, TestSlicedState) { 
            x                x         x    x        x      x       (syncStartEvents)

          |                                       |                 (ScreenIsOnEvent)

                   |     |                                          (ScreenIsOffEvent)

                                                        |           (ScreenUnknownEvent)

                                                        |           (ScreenDozeEvent)

    */

    // Initialize log events - first bucket.

    std::vector<int> attributionUids1 = {123};
@@ -243,9 +329,8 @@ TEST(CountMetricE2eTest, TestSlicedStateWithMap) { 
    |-----------------------------|-----------------------------|--

      x   x     x       x    x   x      x         x         x       (syncStartEvents)

     -----------------------------------------------------------SCREEN_OFF events

       |                                                            (ScreenStateUnknownEvent = 0)

             |                  |                                   (ScreenStateOffEvent = 1)

                          |                                         (ScreenStateDozeEvent = 3)

       |                  |                                         (ScreenStateDozeEvent = 3)

                                                |                   (ScreenStateDozeSuspendEvent =

    4)

     -----------------------------------------------------------SCREEN_ON events
@@ -262,7 +347,7 @@ TEST(CountMetricE2eTest, TestSlicedStateWithMap) { 
                                          attributionTags1, "sync_name"));  // 0:30

    events.push_back(CreateScreenStateChangedEvent(

            bucketStartTimeNs + 30 * NS_PER_SEC,

            android::view::DisplayStateEnum::DISPLAY_STATE_UNKNOWN));  // 0:40

            android::view::DisplayStateEnum::DISPLAY_STATE_DOZE));  // 0:40

    events.push_back(CreateSyncStartEvent(bucketStartTimeNs + 60 * NS_PER_SEC, attributionUids1,

                                          attributionTags1, "sync_name"));  // 1:10

    events.push_back(CreateScreenStateChangedEvent(
@@ -625,9 +710,8 @@ TEST(CountMetricE2eTest, TestMultipleSlicedStates) { 
      |------------------------|------------------------|--

        1  1    1     1    1  2     1        1         2   (AppCrashEvents)

       ---------------------------------------------------SCREEN_OFF events

         |                                                 (ScreenUnknownEvent = 0)

             |                              |              (ScreenOffEvent = 1)

                        |                                  (ScreenDozeEvent = 3)

         |              |                                  (ScreenDozeEvent = 3)

       ---------------------------------------------------SCREEN_ON events

                   |                              |        (ScreenOnEvent = 2)

                                        |                  (ScreenOnSuspendEvent = 6)
@@ -660,7 +744,7 @@ TEST(CountMetricE2eTest, TestMultipleSlicedStates) { 
            CreateAppCrashOccurredEvent(bucketStartTimeNs + 20 * NS_PER_SEC, 1 /*uid*/));  // 0:30

    events.push_back(CreateScreenStateChangedEvent(

            bucketStartTimeNs + 30 * NS_PER_SEC,

            android::view::DisplayStateEnum::DISPLAY_STATE_UNKNOWN));  // 0:40

            android::view::DisplayStateEnum::DISPLAY_STATE_DOZE));  // 0:40

    events.push_back(

            CreateAppCrashOccurredEvent(bucketStartTimeNs + 60 * NS_PER_SEC, 1 /*uid*/));  // 1:10

    events.push_back(CreateUidProcessStateChangedEvent(