Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Statsd: Remove storage of bucketNum" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-14 16:51:41 +00:00
committed by Android (Google) Code Review
parent dc8e7fa0ae 3f5ab3ff1d
commit aaadf6663f
10 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmds/statsd/src/metrics/CountMetricProducer.cpp
View File

@@ -267,7 +267,6 @@ void CountMetricProducer::flushCurrentBucketLocked(const uint64_t& eventTimeNs)
} else {
info.mBucketEndNs = fullBucketEndTimeNs;
}
info.mBucketNum = mCurrentBucketNum;
for (const auto& counter : *mCurrentSlicedCounter) {
info.mCount = counter.second;
auto& bucketList = mPastBuckets[counter.first];

1
cmds/statsd/src/metrics/CountMetricProducer.h
View File

@@ -36,7 +36,6 @@ struct CountBucket {
int64_t mBucketStartNs;
int64_t mBucketEndNs;
int64_t mCount;
uint64_t mBucketNum;
};
class CountMetricProducer : public MetricProducer {

1
cmds/statsd/src/metrics/GaugeMetricProducer.cpp
View File

@@ -411,7 +411,6 @@ void GaugeMetricProducer::flushCurrentBucketLocked(const uint64_t& eventTimeNs)
} else {
info.mBucketEndNs = fullBucketEndTimeNs;
}
info.mBucketNum = mCurrentBucketNum;
for (const auto& slice : *mCurrentSlicedBucket) {
info.mGaugeAtoms = slice.second;

1
cmds/statsd/src/metrics/GaugeMetricProducer.h
View File

@@ -44,7 +44,6 @@ struct GaugeBucket {
int64_t mBucketStartNs;
int64_t mBucketEndNs;
std::vector<GaugeAtom> mGaugeAtoms;
uint64_t mBucketNum;
};
typedef std::unordered_map<MetricDimensionKey, std::vector<GaugeAtom>>

1
cmds/statsd/src/metrics/ValueMetricProducer.cpp
View File

@@ -372,7 +372,6 @@ void ValueMetricProducer::flushCurrentBucketLocked(const uint64_t& eventTimeNs)
} else {
info.mBucketEndNs = fullBucketEndTimeNs;
}
info.mBucketNum = mCurrentBucketNum;
int tainted = 0;
for (const auto& slice : mCurrentSlicedBucket) {

1
cmds/statsd/src/metrics/ValueMetricProducer.h
View File

@@ -34,7 +34,6 @@ struct ValueBucket {
int64_t mBucketStartNs;
int64_t mBucketEndNs;
int64_t mValue;
uint64_t mBucketNum;
};
class ValueMetricProducer : public virtual MetricProducer, public virtual PullDataReceiver {

1
cmds/statsd/src/metrics/duration_helper/DurationTracker.h
View File

@@ -55,7 +55,6 @@ struct DurationBucket {
uint64_t mBucketStartNs;
uint64_t mBucketEndNs;
uint64_t mDuration;
uint64_t mBucketNum;
};
class DurationTracker {

1
cmds/statsd/src/metrics/duration_helper/MaxDurationTracker.cpp
View File

@@ -219,7 +219,6 @@ bool MaxDurationTracker::flushCurrentBucket(
DurationBucket info;
info.mBucketStartNs = mCurrentBucketStartTimeNs;
info.mBucketEndNs = currentBucketEndTimeNs;
info.mBucketNum = mCurrentBucketNum;
info.mDuration = mDuration;
(*output)[mEventKey].push_back(info);
VLOG(" final duration for last bucket: %lld", (long long)mDuration);

6
cmds/statsd/src/metrics/duration_helper/OringDurationTracker.cpp
View File

@@ -165,13 +165,12 @@ bool OringDurationTracker::flushCurrentBucket(
DurationBucket current_info;
current_info.mBucketStartNs = mCurrentBucketStartTimeNs;
current_info.mBucketEndNs = currentBucketEndTimeNs;
current_info.mBucketNum = mCurrentBucketNum;
current_info.mDuration = mDuration;
(*output)[mEventKey].push_back(current_info);
mDurationFullBucket += mDuration;
if (eventTimeNs > fullBucketEnd) {
// End of full bucket, can send to anomaly tracker now.
addPastBucketToAnomalyTrackers(mDurationFullBucket, current_info.mBucketNum);
addPastBucketToAnomalyTrackers(mDurationFullBucket, mCurrentBucketNum);
mDurationFullBucket = 0;
}
VLOG(" duration: %lld", (long long)current_info.mDuration);
@@ -182,12 +181,11 @@ bool OringDurationTracker::flushCurrentBucket(
DurationBucket info;
info.mBucketStartNs = fullBucketEnd + mBucketSizeNs * (i - 1);
info.mBucketEndNs = info.mBucketStartNs + mBucketSizeNs;
info.mBucketNum = mCurrentBucketNum + i;
info.mDuration = mBucketSizeNs;
(*output)[mEventKey].push_back(info);
// Safe to send these buckets to anomaly tracker since they must be full buckets.
// If it's a partial bucket, numBucketsForward would be 0.
addPastBucketToAnomalyTrackers(info.mDuration, info.mBucketNum);
addPastBucketToAnomalyTrackers(info.mDuration, mCurrentBucketNum + i);
VLOG(" add filling bucket with duration %lld", (long long)info.mDuration);
}
}

3
cmds/statsd/tests/metrics/GaugeMetricProducer_test.cpp
View File

@@ -112,7 +112,6 @@ TEST(GaugeMetricProducerTest, TestNoCondition) {
it++;
EXPECT_EQ(INT, it->mValue.getType());
EXPECT_EQ(11L, it->mValue.int_value);
EXPECT_EQ(1UL, gaugeProducer.mPastBuckets.begin()->second.back().mBucketNum);
gaugeProducer.flushIfNeededLocked(bucket4StartTimeNs);
EXPECT_EQ(0UL, gaugeProducer.mCurrentSlicedBucket->size());
@@ -125,7 +124,6 @@ TEST(GaugeMetricProducerTest, TestNoCondition) {
it++;
EXPECT_EQ(INT, it->mValue.getType());
EXPECT_EQ(25L, it->mValue.int_value);
EXPECT_EQ(2UL, gaugeProducer.mPastBuckets.begin()->second.back().mBucketNum);
}
TEST(GaugeMetricProducerTest, TestPushedEventsWithUpgrade) {
@@ -337,7 +335,6 @@ TEST(GaugeMetricProducerTest, TestWithCondition) {
.mGaugeAtoms.front()
.mFields->begin()
->mValue.int_value);
EXPECT_EQ(1UL, gaugeProducer.mPastBuckets.begin()->second.back().mBucketNum);
}
TEST(GaugeMetricProducerTest, TestAnomalyDetection) {