summaryrefslogtreecommitdiff
path: root/cmds
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-06-13 06:38:22 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-06-13 06:38:22 +0000
commit5c4b92a1b9600b93ea06afe8a07f778a04f7cf25 (patch)
tree26a5af63141ad16eaededa2b7e8e4e6fd58268a2 /cmds
parent7fc567f7a3fac753c6a8038e9bdb48a15c293332 (diff)
parentde28706dd2e5f8710691ea225f746ce612bf269e (diff)
Merge "Fix testValueMetric flake" into rvc-dev
Diffstat (limited to 'cmds')
-rw-r--r--cmds/statsd/src/metrics/ValueMetricProducer.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmds/statsd/src/metrics/ValueMetricProducer.cpp b/cmds/statsd/src/metrics/ValueMetricProducer.cpp
index 8203f38de393..9dcba7cad9a8 100644
--- a/cmds/statsd/src/metrics/ValueMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/ValueMetricProducer.cpp
@@ -959,7 +959,10 @@ void ValueMetricProducer::flushCurrentBucketLocked(const int64_t& eventTimeNs,
int64_t fullBucketEndTimeNs = getCurrentBucketEndTimeNs();
int64_t bucketEndTime = fullBucketEndTimeNs;
int64_t numBucketsForward = calcBucketsForwardCount(eventTimeNs);
- if (numBucketsForward > 1) {
+
+ // Skip buckets if this is a pulled metric or a pushed metric that is diffed.
+ if (numBucketsForward > 1 && (mIsPulled || mUseDiff)) {
+
VLOG("Skipping forward %lld buckets", (long long)numBucketsForward);
StatsdStats::getInstance().noteSkippedForwardBuckets(mMetricId);
// Something went wrong. Maybe the device was sleeping for a long time. It is better