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

Merge "Remove dimension fields in GaugeMetric output"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-09-10 17:47:30 +00:00
committed by Android (Google) Code Review
parent 2ba884df65 4c31f67965
commit b299070edf
4 changed files with 136 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,13 +367,26 @@ void GaugeMetricProducer::onSlicedConditionMayChangeLocked(bool overallCondition
}
std::shared_ptr<vector<FieldValue>> GaugeMetricProducer::getGaugeFields(const LogEvent& event) {
std::shared_ptr<vector<FieldValue>> gaugeFields;
if (mFieldMatchers.size() > 0) {
std::shared_ptr<vector<FieldValue>> gaugeFields = std::make_shared<vector<FieldValue>>();
gaugeFields = std::make_shared<vector<FieldValue>>();
filterGaugeValues(mFieldMatchers, event.getValues(), gaugeFields.get());
return gaugeFields;
} else {
return std::make_shared<vector<FieldValue>>(event.getValues());
gaugeFields = std::make_shared<vector<FieldValue>>(event.getValues());
}
// Trim all dimension fields from output. Dimensions will appear in output report and will
// benefit from dictionary encoding. For large pulled atoms, this can give the benefit of
// optional repeated field.
for (const auto& field : mDimensionsInWhat) {
for (auto it = gaugeFields->begin(); it != gaugeFields->end();) {
if (it->mField.matches(field)) {
it = gaugeFields->erase(it);
} else {
it++;
}
}
}
return gaugeFields;
}
void GaugeMetricProducer::onDataPulled(const std::vector<std::shared_ptr<LogEvent>>& allData) {

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

@@ -175,6 +175,7 @@ private:
FRIEND_TEST(GaugeMetricProducerTest, TestPulledEventsAnomalyDetection);
FRIEND_TEST(GaugeMetricProducerTest, TestFirstBucket);
FRIEND_TEST(GaugeMetricProducerTest, TestPullOnTrigger);
FRIEND_TEST(GaugeMetricProducerTest, TestRemoveDimensionInOutput);
};
} // namespace statsd

27
cmds/statsd/tests/e2e/GaugeMetric_e2e_pull_test.cpp
View File

@@ -48,6 +48,7 @@ StatsdConfig CreateStatsdConfig(const GaugeMetric::SamplingType sampling_type) {
*gaugeMetric->mutable_dimensions_in_what() =
CreateDimensions(android::util::TEMPERATURE, {2/* sensor name field */ });
gaugeMetric->set_bucket(FIVE_MINUTES);
config.set_hash_strings_in_metric_report(false);
return config;
}
@@ -150,7 +151,7 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvents) {
EXPECT_EQ(1, data.bucket_info(0).wall_clock_timestamp_nanos_size());
EXPECT_EQ(baseTimeNs + 2 * bucketSizeNs, data.bucket_info(0).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 3 * bucketSizeNs, data.bucket_info(0).end_bucket_elapsed_nanos());
EXPECT_FALSE(data.bucket_info(0).atom(0).temperature().sensor_name().empty());
EXPECT_TRUE(data.bucket_info(0).atom(0).temperature().sensor_name().empty());
EXPECT_GT(data.bucket_info(0).atom(0).temperature().temperature_dc(), 0);
EXPECT_EQ(1, data.bucket_info(1).atom_size());
@@ -159,7 +160,7 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvents) {
EXPECT_EQ(configAddedTimeNs + 55, data.bucket_info(0).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 3 * bucketSizeNs, data.bucket_info(1).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 4 * bucketSizeNs, data.bucket_info(1).end_bucket_elapsed_nanos());
EXPECT_FALSE(data.bucket_info(1).atom(0).temperature().sensor_name().empty());
EXPECT_TRUE(data.bucket_info(1).atom(0).temperature().sensor_name().empty());
EXPECT_GT(data.bucket_info(1).atom(0).temperature().temperature_dc(), 0);
EXPECT_EQ(1, data.bucket_info(2).atom_size());
@@ -168,7 +169,7 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvents) {
data.bucket_info(2).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 4 * bucketSizeNs, data.bucket_info(2).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 5 * bucketSizeNs, data.bucket_info(2).end_bucket_elapsed_nanos());
EXPECT_FALSE(data.bucket_info(2).atom(0).temperature().sensor_name().empty());
EXPECT_TRUE(data.bucket_info(2).atom(0).temperature().sensor_name().empty());
EXPECT_GT(data.bucket_info(2).atom(0).temperature().temperature_dc(), 0);
EXPECT_EQ(1, data.bucket_info(3).atom_size());
@@ -177,7 +178,7 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvents) {
data.bucket_info(3).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 5 * bucketSizeNs, data.bucket_info(3).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 6 * bucketSizeNs, data.bucket_info(3).end_bucket_elapsed_nanos());
EXPECT_FALSE(data.bucket_info(3).atom(0).temperature().sensor_name().empty());
EXPECT_TRUE(data.bucket_info(3).atom(0).temperature().sensor_name().empty());
EXPECT_GT(data.bucket_info(3).atom(0).temperature().temperature_dc(), 0);
EXPECT_EQ(1, data.bucket_info(4).atom_size());
@@ -186,7 +187,7 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvents) {
data.bucket_info(4).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 7 * bucketSizeNs, data.bucket_info(4).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 8 * bucketSizeNs, data.bucket_info(4).end_bucket_elapsed_nanos());
EXPECT_FALSE(data.bucket_info(4).atom(0).temperature().sensor_name().empty());
EXPECT_TRUE(data.bucket_info(4).atom(0).temperature().sensor_name().empty());
EXPECT_GT(data.bucket_info(4).atom(0).temperature().temperature_dc(), 0);
EXPECT_EQ(1, data.bucket_info(5).atom_size());
@@ -195,7 +196,7 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvents) {
data.bucket_info(5).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 8 * bucketSizeNs, data.bucket_info(5).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 9 * bucketSizeNs, data.bucket_info(5).end_bucket_elapsed_nanos());
EXPECT_FALSE(data.bucket_info(5).atom(0).temperature().sensor_name().empty());
EXPECT_TRUE(data.bucket_info(5).atom(0).temperature().sensor_name().empty());
EXPECT_GT(data.bucket_info(5).atom(0).temperature().temperature_dc(), 0);
}
@@ -273,7 +274,7 @@ TEST(GaugeMetricE2eTest, TestAllConditionChangesSamplePulledEvents) {
EXPECT_EQ(1, data.bucket_info(0).wall_clock_timestamp_nanos_size());
EXPECT_EQ(baseTimeNs + 2 * bucketSizeNs, data.bucket_info(0).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 3 * bucketSizeNs, data.bucket_info(0).end_bucket_elapsed_nanos());
EXPECT_FALSE(data.bucket_info(0).atom(0).temperature().sensor_name().empty());
EXPECT_TRUE(data.bucket_info(0).atom(0).temperature().sensor_name().empty());
EXPECT_GT(data.bucket_info(0).atom(0).temperature().temperature_dc(), 0);
EXPECT_EQ(1, data.bucket_info(1).atom_size());
@@ -282,7 +283,7 @@ TEST(GaugeMetricE2eTest, TestAllConditionChangesSamplePulledEvents) {
EXPECT_EQ(configAddedTimeNs + 55, data.bucket_info(0).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 3 * bucketSizeNs, data.bucket_info(1).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 4 * bucketSizeNs, data.bucket_info(1).end_bucket_elapsed_nanos());
EXPECT_FALSE(data.bucket_info(1).atom(0).temperature().sensor_name().empty());
EXPECT_TRUE(data.bucket_info(1).atom(0).temperature().sensor_name().empty());
EXPECT_GT(data.bucket_info(1).atom(0).temperature().temperature_dc(), 0);
EXPECT_EQ(2, data.bucket_info(2).atom_size());
@@ -293,9 +294,9 @@ TEST(GaugeMetricE2eTest, TestAllConditionChangesSamplePulledEvents) {
data.bucket_info(2).elapsed_timestamp_nanos(1));
EXPECT_EQ(baseTimeNs + 7 * bucketSizeNs, data.bucket_info(2).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 8 * bucketSizeNs, data.bucket_info(2).end_bucket_elapsed_nanos());
EXPECT_FALSE(data.bucket_info(2).atom(0).temperature().sensor_name().empty());
EXPECT_TRUE(data.bucket_info(2).atom(0).temperature().sensor_name().empty());
EXPECT_GT(data.bucket_info(2).atom(0).temperature().temperature_dc(), 0);
EXPECT_FALSE(data.bucket_info(2).atom(1).temperature().sensor_name().empty());
EXPECT_TRUE(data.bucket_info(2).atom(1).temperature().sensor_name().empty());
EXPECT_GT(data.bucket_info(2).atom(1).temperature().temperature_dc(), 0);
}
@@ -377,7 +378,7 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvent_LateAlarm) {
EXPECT_EQ(1, data.bucket_info(0).wall_clock_timestamp_nanos_size());
EXPECT_EQ(baseTimeNs + 2 * bucketSizeNs, data.bucket_info(0).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 3 * bucketSizeNs, data.bucket_info(0).end_bucket_elapsed_nanos());
EXPECT_FALSE(data.bucket_info(0).atom(0).temperature().sensor_name().empty());
EXPECT_TRUE(data.bucket_info(0).atom(0).temperature().sensor_name().empty());
EXPECT_GT(data.bucket_info(0).atom(0).temperature().temperature_dc(), 0);
EXPECT_EQ(1, data.bucket_info(1).atom_size());
@@ -386,7 +387,7 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvent_LateAlarm) {
EXPECT_EQ(configAddedTimeNs + 55, data.bucket_info(0).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 5 * bucketSizeNs, data.bucket_info(1).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 6 * bucketSizeNs, data.bucket_info(1).end_bucket_elapsed_nanos());
EXPECT_FALSE(data.bucket_info(1).atom(0).temperature().sensor_name().empty());
EXPECT_TRUE(data.bucket_info(1).atom(0).temperature().sensor_name().empty());
EXPECT_GT(data.bucket_info(1).atom(0).temperature().temperature_dc(), 0);
EXPECT_EQ(1, data.bucket_info(2).atom_size());
@@ -395,7 +396,7 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvent_LateAlarm) {
data.bucket_info(2).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 6 * bucketSizeNs, data.bucket_info(2).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 7 * bucketSizeNs, data.bucket_info(2).end_bucket_elapsed_nanos());
EXPECT_FALSE(data.bucket_info(2).atom(0).temperature().sensor_name().empty());
EXPECT_TRUE(data.bucket_info(2).atom(0).temperature().sensor_name().empty());
EXPECT_GT(data.bucket_info(2).atom(0).temperature().temperature_dc(), 0);
}

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

@@ -95,6 +95,8 @@ TEST(GaugeMetricProducerTest, TestPulledEventsNoCondition) {
data->clear();
shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10);
event->write(3);
event->write("some value");
event->write(11);
event->init();
data->push_back(event);
return true;
@@ -600,9 +602,109 @@ TEST(GaugeMetricProducerTest, TestPullOnTrigger) {
EXPECT_EQ(10, it->mValue.int_value);
EXPECT_EQ(1UL, gaugeProducer.mPastBuckets.size());
EXPECT_EQ(3UL, gaugeProducer.mPastBuckets.begin()->second.back().mGaugeAtoms.size());
EXPECT_EQ(3, gaugeProducer.mPastBuckets.begin()->second.back().mGaugeAtoms[0].mFields->begin()->mValue.int_value);
EXPECT_EQ(4, gaugeProducer.mPastBuckets.begin()->second.back().mGaugeAtoms[1].mFields->begin()->mValue.int_value);
EXPECT_EQ(5, gaugeProducer.mPastBuckets.begin()->second.back().mGaugeAtoms[2].mFields->begin()->mValue.int_value);
EXPECT_EQ(3, gaugeProducer.mPastBuckets.begin()
->second.back()
.mGaugeAtoms[0]
.mFields->begin()
->mValue.int_value);
EXPECT_EQ(4, gaugeProducer.mPastBuckets.begin()
->second.back()
.mGaugeAtoms[1]
.mFields->begin()
->mValue.int_value);
EXPECT_EQ(5, gaugeProducer.mPastBuckets.begin()
->second.back()
.mGaugeAtoms[2]
.mFields->begin()
->mValue.int_value);
}
TEST(GaugeMetricProducerTest, TestRemoveDimensionInOutput) {
GaugeMetric metric;
metric.set_id(metricId);
metric.set_bucket(ONE_MINUTE);
metric.set_sampling_type(GaugeMetric::ALL_CONDITION_CHANGES);
metric.mutable_gauge_fields_filter()->set_include_all(true);
auto dimensionMatcher = metric.mutable_dimensions_in_what();
// use field 1 as dimension.
dimensionMatcher->set_field(tagId);
dimensionMatcher->add_child()->set_field(1);
sp<MockConditionWizard> wizard = new NaggyMock<MockConditionWizard>();
sp<MockStatsPullerManager> pullerManager = new StrictMock<MockStatsPullerManager>();
EXPECT_CALL(*pullerManager, Pull(tagId, _, _))
.WillOnce(Invoke([](int tagId, int64_t timeNs,
vector<std::shared_ptr<LogEvent>>* data) {
data->clear();
shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 3);
event->write(3);
event->write(4);
event->init();
data->push_back(event);
return true;
}))
.WillOnce(Invoke([](int tagId, int64_t timeNs,
vector<std::shared_ptr<LogEvent>>* data) {
data->clear();
shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10);
event->write(4);
event->write(5);
event->init();
data->push_back(event);
return true;
}))
.WillOnce(Invoke([](int tagId, int64_t timeNs,
vector<std::shared_ptr<LogEvent>>* data) {
data->clear();
shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 20);
event->write(4);
event->write(6);
event->init();
data->push_back(event);
return true;
}));
int triggerId = 5;
GaugeMetricProducer gaugeProducer(kConfigKey, metric, -1 /*-1 meaning no condition*/, wizard,
tagId, triggerId, tagId, bucketStartTimeNs, bucketStartTimeNs,
pullerManager);
vector<shared_ptr<LogEvent>> allData;
allData.clear();
EXPECT_EQ(1UL, gaugeProducer.mCurrentSlicedBucket->size());
LogEvent trigger(triggerId, bucketStartTimeNs + 10);
trigger.init();
gaugeProducer.onMatchedLogEvent(1 /*log matcher index*/, trigger);
EXPECT_EQ(2UL, gaugeProducer.mCurrentSlicedBucket->size());
EXPECT_EQ(1UL, gaugeProducer.mCurrentSlicedBucket->begin()->second.size());
trigger.setElapsedTimestampNs(bucketStartTimeNs + 20);
gaugeProducer.onMatchedLogEvent(1 /*log matcher index*/, trigger);
EXPECT_EQ(2UL, gaugeProducer.mCurrentSlicedBucket->begin()->second.size());
allData.clear();
shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucket2StartTimeNs + 1);
event->write(4);
event->write(11);
event->init();
allData.push_back(event);
gaugeProducer.onDataPulled(allData);
EXPECT_EQ(1UL, gaugeProducer.mCurrentSlicedBucket->size());
auto it = gaugeProducer.mCurrentSlicedBucket->begin()->second.front().mFields->begin();
EXPECT_EQ(INT, it->mValue.getType());
EXPECT_EQ(11, it->mValue.int_value);
EXPECT_EQ(2UL, gaugeProducer.mPastBuckets.size());
auto bucketIt = gaugeProducer.mPastBuckets.begin();
EXPECT_EQ(1UL, bucketIt->second.back().mGaugeAtoms.size());
EXPECT_EQ(3, bucketIt->first.getDimensionKeyInWhat().getValues().begin()->mValue.int_value);
EXPECT_EQ(4, bucketIt->second.back().mGaugeAtoms[0].mFields->begin()->mValue.int_value);
bucketIt++;
EXPECT_EQ(2UL, bucketIt->second.back().mGaugeAtoms.size());
EXPECT_EQ(4, bucketIt->first.getDimensionKeyInWhat().getValues().begin()->mValue.int_value);
EXPECT_EQ(5, bucketIt->second.back().mGaugeAtoms[0].mFields->begin()->mValue.int_value);
EXPECT_EQ(6, bucketIt->second.back().mGaugeAtoms[1].mFields->begin()->mValue.int_value);
}
} // namespace statsd