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

Commit 644c94f1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "ValueMetric pushed events should check condition" into pi-dev

parents 866b4de2 021e2530

cmds/statsd/src/StatsLogProcessor.cpp

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ StatsLogProcessor::StatsLogProcessor(const sp<UidMap>& uidMap, 
      mTimeBaseNs(timeBaseNs),

      mLargestTimestampSeen(0),

      mLastTimestampSeen(0) {

    mStatsPullerManager.ForceClearPullerCache();

}



StatsLogProcessor::~StatsLogProcessor() {

cmds/statsd/src/metrics/ValueMetricProducer.cpp

+5 −3
Original line number Diff line number Diff line
@@ -414,10 +414,12 @@ void ValueMetricProducer::onMatchedLogEventInternalLocked( 
                interval.tainted += 1;

            }

        }

    } else {    // for pushed events

    } else {    // for pushed events, only accumulate when condition is true

        if (mCondition == true || mConditionTrackerIndex < 0) {

            interval.sum += value;

            interval.hasValue = true;

        }

    }



    long wholeBucketVal = interval.sum;

    auto prev = mCurrentFullBucket.find(eventKey);

cmds/statsd/src/metrics/ValueMetricProducer.h

+3 −0
Original line number Diff line number Diff line
@@ -169,11 +169,14 @@ private: 
    const bool mUseAbsoluteValueOnReset;



    FRIEND_TEST(ValueMetricProducerTest, TestNonDimensionalEvents);

    FRIEND_TEST(ValueMetricProducerTest, TestPulledEventsTakeAbsoluteValueOnReset);

    FRIEND_TEST(ValueMetricProducerTest, TestPulledEventsTakeZeroOnReset);

    FRIEND_TEST(ValueMetricProducerTest, TestEventsWithNonSlicedCondition);

    FRIEND_TEST(ValueMetricProducerTest, TestPushedEventsWithUpgrade);

    FRIEND_TEST(ValueMetricProducerTest, TestPulledValueWithUpgrade);

    FRIEND_TEST(ValueMetricProducerTest, TestPulledValueWithUpgradeWhileConditionFalse);

    FRIEND_TEST(ValueMetricProducerTest, TestPushedEventsWithoutCondition);

    FRIEND_TEST(ValueMetricProducerTest, TestPushedEventsWithCondition);

    FRIEND_TEST(ValueMetricProducerTest, TestAnomalyDetection);

    FRIEND_TEST(ValueMetricProducerTest, TestBucketBoundaryNoCondition);

    FRIEND_TEST(ValueMetricProducerTest, TestBucketBoundaryWithCondition);

cmds/statsd/tests/e2e/PartialBucket_e2e_test.cpp

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ StatsdConfig MakeValueMetricConfig(int64_t minTime) { 
            CreateDimensions(android::util::TEMPERATURE, {2 /* sensor name field */});

    valueMetric->set_bucket(FIVE_MINUTES);

    valueMetric->set_min_bucket_size_nanos(minTime);

    valueMetric->set_use_absolute_value_on_reset(true);

    return config;

}

cmds/statsd/tests/e2e/ValueMetric_pull_e2e_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ StatsdConfig CreateStatsdConfig() { 
    *valueMetric->mutable_dimensions_in_what() =

        CreateDimensions(android::util::TEMPERATURE, {2/* sensor name field */ });

    valueMetric->set_bucket(FIVE_MINUTES);



    valueMetric->set_use_absolute_value_on_reset(true);

    return config;

}