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

Commit 59cc24db authored Feb 13, 2018 by yro

Add a guardrail to limit minimum bucket duration to be 5 minutes except

when configured through adb command

Bug: 73287251
Test: statsd_test
Change-Id: Iee51fedbaabb2c1f534a6edef3c564da88ef658b

parent 147e7996

cmds/statsd/src/metrics/CountMetricProducer.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,8 @@ CountMetricProducer::CountMetricProducer(const ConfigKey& key, const CountMetric
		: MetricProducer(metric.id(), key, startTimeNs, conditionIndex, wizard) {
		// TODO: evaluate initial conditions. and set mConditionMet.
		if (metric.has_bucket()) {
		mBucketSizeNs = TimeUnitToBucketSizeInMillis(metric.bucket()) * 1000000;
		mBucketSizeNs =
		TimeUnitToBucketSizeInMillisGuardrailed(key.GetUid(), metric.bucket()) * 1000000;
		} else {
		mBucketSizeNs = LLONG_MAX;
		}

cmds/statsd/src/metrics/DurationMetricProducer.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,8 @@ DurationMetricProducer::DurationMetricProducer(const ConfigKey& key, const Durat
		// them in the base class, because the proto generated CountMetric, and DurationMetric are
		// not related. Maybe we should add a template in the future??
		if (metric.has_bucket()) {
		mBucketSizeNs = TimeUnitToBucketSizeInMillis(metric.bucket()) * 1000000;
		mBucketSizeNs =
		TimeUnitToBucketSizeInMillisGuardrailed(key.GetUid(), metric.bucket()) * 1000000;
		} else {
		mBucketSizeNs = LLONG_MAX;
		}

cmds/statsd/src/metrics/GaugeMetricProducer.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ GaugeMetricProducer::GaugeMetricProducer(const ConfigKey& key, const GaugeMetric
		mCurrentSlicedBucketForAnomaly = std::make_shared<DimToValMap>();
		int64_t bucketSizeMills = 0;
		if (metric.has_bucket()) {
		bucketSizeMills = TimeUnitToBucketSizeInMillis(metric.bucket());
		bucketSizeMills = TimeUnitToBucketSizeInMillisGuardrailed(key.GetUid(), metric.bucket());
		} else {
		bucketSizeMills = TimeUnitToBucketSizeInMillis(ONE_HOUR);
		}

cmds/statsd/src/metrics/MetricProducer.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,11 @@ public:
		return mBucketSizeNs;
		}

		// Only needed for unit-testing to override guardrail.
		void setBucketSize(int64_t bucketSize) {
		mBucketSizeNs = bucketSize;
		}

		inline const int64_t& getMetricId() {
		return mMetricId;
		}

cmds/statsd/src/metrics/ValueMetricProducer.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ ValueMetricProducer::ValueMetricProducer(const ConfigKey& key, const ValueMetric
		// TODO: valuemetric for pushed events may need unlimited bucket length
		int64_t bucketSizeMills = 0;
		if (metric.has_bucket()) {
		bucketSizeMills = TimeUnitToBucketSizeInMillis(metric.bucket());
		bucketSizeMills = TimeUnitToBucketSizeInMillisGuardrailed(key.GetUid(), metric.bucket());
		} else {
		bucketSizeMills = TimeUnitToBucketSizeInMillis(ONE_HOUR);
		}