summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmds/statsd/src/condition/ConditionWizard.h2
-rw-r--r--cmds/statsd/src/condition/condition_util.cpp8
-rw-r--r--cmds/statsd/src/condition/condition_util.h2
-rw-r--r--cmds/statsd/src/config/ConfigManager.cpp10
-rw-r--r--cmds/statsd/src/metrics/MetricProducer.h4
-rw-r--r--cmds/statsd/src/metrics/metrics_manager_util.cpp12
-rw-r--r--cmds/statsd/src/metrics/metrics_manager_util.h4
-rw-r--r--cmds/statsd/src/statsd_config.proto14
-rw-r--r--cmds/statsd/tests/metrics/CountMetricProducer_test.cpp4
-rw-r--r--cmds/statsd/tests/metrics/EventMetricProducer_test.cpp4
-rw-r--r--cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/ConfigFactory.java22
11 files changed, 43 insertions, 43 deletions
diff --git a/cmds/statsd/src/condition/ConditionWizard.h b/cmds/statsd/src/condition/ConditionWizard.h
index 1a01afa7fbdc..30a368412c8e 100644
--- a/cmds/statsd/src/condition/ConditionWizard.h
+++ b/cmds/statsd/src/condition/ConditionWizard.h
@@ -24,7 +24,7 @@ namespace android {
namespace os {
namespace statsd {
-// Held by MetricProducer, to query a condition state with input defined in EventConditionLink.
+// Held by MetricProducer, to query a condition state with input defined in MetricConditionLink.
class ConditionWizard : public virtual android::RefBase {
public:
ConditionWizard(){}; // for testing
diff --git a/cmds/statsd/src/condition/condition_util.cpp b/cmds/statsd/src/condition/condition_util.cpp
index 669a4b77f3b4..ff0e3bc0d21a 100644
--- a/cmds/statsd/src/condition/condition_util.cpp
+++ b/cmds/statsd/src/condition/condition_util.cpp
@@ -94,17 +94,17 @@ ConditionState evaluateCombinationCondition(const std::vector<int>& children,
}
HashableDimensionKey getDimensionKeyForCondition(const LogEvent& event,
- const EventConditionLink& link) {
+ const MetricConditionLink& link) {
vector<KeyMatcher> eventKey;
- eventKey.reserve(link.key_in_main().size());
+ eventKey.reserve(link.key_in_what().size());
- for (const auto& key : link.key_in_main()) {
+ for (const auto& key : link.key_in_what()) {
eventKey.push_back(key);
}
vector<KeyValuePair> dimensionKey = getDimensionKey(event, eventKey);
- for (int i = 0; i < link.key_in_main_size(); i++) {
+ for (int i = 0; i < link.key_in_what_size(); i++) {
auto& kv = dimensionKey[i];
kv.set_key(link.key_in_condition(i).key());
}
diff --git a/cmds/statsd/src/condition/condition_util.h b/cmds/statsd/src/condition/condition_util.h
index 4167bf922b19..934c2076ddfa 100644
--- a/cmds/statsd/src/condition/condition_util.h
+++ b/cmds/statsd/src/condition/condition_util.h
@@ -37,7 +37,7 @@ ConditionState evaluateCombinationCondition(const std::vector<int>& children,
const std::vector<ConditionState>& conditionCache);
HashableDimensionKey getDimensionKeyForCondition(const LogEvent& event,
- const EventConditionLink& link);
+ const MetricConditionLink& link);
} // namespace statsd
} // namespace os
} // namespace android
diff --git a/cmds/statsd/src/config/ConfigManager.cpp b/cmds/statsd/src/config/ConfigManager.cpp
index 6a76c5573b90..83c1ca08d0d3 100644
--- a/cmds/statsd/src/config/ConfigManager.cpp
+++ b/cmds/statsd/src/config/ConfigManager.cpp
@@ -272,9 +272,9 @@ StatsdConfig build_fake_config() {
keyMatcher = metric->add_dimension();
keyMatcher->set_key(WAKE_LOCK_UID_KEY_ID);
metric->set_condition("APP_IS_BACKGROUND_AND_SCREEN_ON");
- EventConditionLink* link = metric->add_links();
+ MetricConditionLink* link = metric->add_links();
link->set_condition("APP_IS_BACKGROUND");
- link->add_key_in_main()->set_key(WAKE_LOCK_UID_KEY_ID);
+ link->add_key_in_what()->set_key(WAKE_LOCK_UID_KEY_ID);
link->add_key_in_condition()->set_key(APP_USAGE_UID_KEY_ID);
// Duration of an app holding any wl, while screen on and app in background, slice by uid
@@ -288,7 +288,7 @@ StatsdConfig build_fake_config() {
durationMetric->set_condition("APP_IS_BACKGROUND_AND_SCREEN_ON");
link = durationMetric->add_links();
link->set_condition("APP_IS_BACKGROUND");
- link->add_key_in_main()->set_key(WAKE_LOCK_UID_KEY_ID);
+ link->add_key_in_what()->set_key(WAKE_LOCK_UID_KEY_ID);
link->add_key_in_condition()->set_key(APP_USAGE_UID_KEY_ID);
// max Duration of an app holding any wl, while screen on and app in background, slice by uid
@@ -302,7 +302,7 @@ StatsdConfig build_fake_config() {
durationMetric->set_condition("APP_IS_BACKGROUND_AND_SCREEN_ON");
link = durationMetric->add_links();
link->set_condition("APP_IS_BACKGROUND");
- link->add_key_in_main()->set_key(WAKE_LOCK_UID_KEY_ID);
+ link->add_key_in_what()->set_key(WAKE_LOCK_UID_KEY_ID);
link->add_key_in_condition()->set_key(APP_USAGE_UID_KEY_ID);
// Duration of an app holding any wl, while screen on and app in background
@@ -314,7 +314,7 @@ StatsdConfig build_fake_config() {
durationMetric->set_condition("APP_IS_BACKGROUND_AND_SCREEN_ON");
link = durationMetric->add_links();
link->set_condition("APP_IS_BACKGROUND");
- link->add_key_in_main()->set_key(WAKE_LOCK_UID_KEY_ID);
+ link->add_key_in_what()->set_key(WAKE_LOCK_UID_KEY_ID);
link->add_key_in_condition()->set_key(APP_USAGE_UID_KEY_ID);
// Duration of screen on time.
diff --git a/cmds/statsd/src/metrics/MetricProducer.h b/cmds/statsd/src/metrics/MetricProducer.h
index 819df7705a75..e7e84ab1dcc8 100644
--- a/cmds/statsd/src/metrics/MetricProducer.h
+++ b/cmds/statsd/src/metrics/MetricProducer.h
@@ -137,7 +137,7 @@ protected:
// that StatsLogReport wants.
std::unordered_map<HashableDimensionKey, std::vector<KeyValuePair>> mDimensionKeyMap;
- std::vector<EventConditionLink> mConditionLinks;
+ std::vector<MetricConditionLink> mConditionLinks;
std::vector<sp<AnomalyTracker>> mAnomalyTrackers;
@@ -149,7 +149,7 @@ protected:
* [eventKey]: the extracted dimension key for the final output. if the metric doesn't have
* dimensions, it will be DEFAULT_DIMENSION_KEY
* [conditionKey]: the keys of conditions which should be used to query the condition for this
- * target event (from EventConditionLink). This is passed to individual metrics
+ * target event (from MetricConditionLink). This is passed to individual metrics
* because DurationMetric needs it to be cached.
* [condition]: whether condition is met. If condition is sliced, this is the result coming from
* query with ConditionWizard; If condition is not sliced, this is the
diff --git a/cmds/statsd/src/metrics/metrics_manager_util.cpp b/cmds/statsd/src/metrics/metrics_manager_util.cpp
index 1fc4d425a6bd..943becb6fb3c 100644
--- a/cmds/statsd/src/metrics/metrics_manager_util.cpp
+++ b/cmds/statsd/src/metrics/metrics_manager_util.cpp
@@ -64,7 +64,7 @@ bool handleMetricWithLogTrackers(const string what, const int metricIndex,
bool handleMetricWithConditions(
const string condition, const int metricIndex,
const unordered_map<string, int>& conditionTrackerMap,
- const ::google::protobuf::RepeatedPtrField<::android::os::statsd::EventConditionLink>&
+ const ::google::protobuf::RepeatedPtrField<::android::os::statsd::MetricConditionLink>&
links,
vector<sp<ConditionTracker>>& allConditionTrackers, int& conditionIndex,
unordered_map<int, std::vector<int>>& conditionToMetricMap) {
@@ -232,7 +232,7 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config,
}
} else {
if (metric.links_size() > 0) {
- ALOGW("metrics has a EventConditionLink but doesn't have a condition");
+ ALOGW("metrics has a MetricConditionLink but doesn't have a condition");
return false;
}
}
@@ -303,7 +303,7 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config,
}
} else {
if (metric.links_size() > 0) {
- ALOGW("metrics has a EventConditionLink but doesn't have a condition");
+ ALOGW("metrics has a MetricConditionLink but doesn't have a condition");
return false;
}
}
@@ -340,7 +340,7 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config,
}
} else {
if (metric.links_size() > 0) {
- ALOGW("metrics has a EventConditionLink but doesn't have a condition");
+ ALOGW("metrics has a MetricConditionLink but doesn't have a condition");
return false;
}
}
@@ -390,7 +390,7 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config,
}
} else {
if (metric.links_size() > 0) {
- ALOGW("metrics has a EventConditionLink but doesn't have a condition");
+ ALOGW("metrics has a MetricConditionLink but doesn't have a condition");
return false;
}
}
@@ -439,7 +439,7 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config,
}
} else {
if (metric.links_size() > 0) {
- ALOGW("metrics has a EventConditionLink but doesn't have a condition");
+ ALOGW("metrics has a MetricConditionLink but doesn't have a condition");
return false;
}
}
diff --git a/cmds/statsd/src/metrics/metrics_manager_util.h b/cmds/statsd/src/metrics/metrics_manager_util.h
index 751d8dff02f8..8e9c8e3616ab 100644
--- a/cmds/statsd/src/metrics/metrics_manager_util.h
+++ b/cmds/statsd/src/metrics/metrics_manager_util.h
@@ -62,7 +62,7 @@ bool initConditions(const ConfigKey& key, const StatsdConfig& config,
std::unordered_map<std::string, int>& conditionTrackerMap,
std::vector<sp<ConditionTracker>>& allConditionTrackers,
std::unordered_map<int, std::vector<int>>& trackerToConditionMap,
- std::unordered_map<int, std::vector<EventConditionLink>>& eventConditionLinks);
+ std::unordered_map<int, std::vector<MetricConditionLink>>& eventConditionLinks);
// Initialize MetricProducers.
// input:
@@ -79,7 +79,7 @@ bool initMetrics(
const ConfigKey& key, const StatsdConfig& config,
const std::unordered_map<std::string, int>& logTrackerMap,
const std::unordered_map<std::string, int>& conditionTrackerMap,
- const std::unordered_map<int, std::vector<EventConditionLink>>& eventConditionLinks,
+ const std::unordered_map<int, std::vector<MetricConditionLink>>& eventConditionLinks,
const vector<sp<LogMatchingTracker>>& allAtomMatchers,
vector<sp<ConditionTracker>>& allConditionTrackers,
std::vector<sp<MetricProducer>>& allMetricProducers,
diff --git a/cmds/statsd/src/statsd_config.proto b/cmds/statsd/src/statsd_config.proto
index ca63b033a625..c9654af13137 100644
--- a/cmds/statsd/src/statsd_config.proto
+++ b/cmds/statsd/src/statsd_config.proto
@@ -112,10 +112,10 @@ message Bucket {
optional int64 bucket_size_millis = 1;
}
-message EventConditionLink {
+message MetricConditionLink {
optional string condition = 1;
- repeated KeyMatcher key_in_main = 2;
+ repeated KeyMatcher key_in_what = 2;
repeated KeyMatcher key_in_condition = 3;
}
@@ -127,7 +127,7 @@ message EventMetric {
optional string condition = 3;
- repeated EventConditionLink links = 4;
+ repeated MetricConditionLink links = 4;
}
message CountMetric {
@@ -141,7 +141,7 @@ message CountMetric {
optional Bucket bucket = 5;
- repeated EventConditionLink links = 6;
+ repeated MetricConditionLink links = 6;
}
message DurationMetric {
@@ -151,7 +151,7 @@ message DurationMetric {
optional string condition = 3;
- repeated EventConditionLink links = 4;
+ repeated MetricConditionLink links = 4;
enum AggregationType {
SUM = 1;
@@ -178,7 +178,7 @@ message GaugeMetric {
optional Bucket bucket = 6;
- repeated EventConditionLink links = 7;
+ repeated MetricConditionLink links = 7;
}
message ValueMetric {
@@ -194,7 +194,7 @@ message ValueMetric {
optional Bucket bucket = 6;
- repeated EventConditionLink links = 7;
+ repeated MetricConditionLink links = 7;
enum AggregationType { SUM = 1; }
optional AggregationType aggregation_type = 8 [default = SUM];
diff --git a/cmds/statsd/tests/metrics/CountMetricProducer_test.cpp b/cmds/statsd/tests/metrics/CountMetricProducer_test.cpp
index dc42943e8233..9b94099625a5 100644
--- a/cmds/statsd/tests/metrics/CountMetricProducer_test.cpp
+++ b/cmds/statsd/tests/metrics/CountMetricProducer_test.cpp
@@ -141,9 +141,9 @@ TEST(CountMetricProducerTest, TestEventsWithSlicedCondition) {
metric.set_name("1");
metric.mutable_bucket()->set_bucket_size_millis(bucketSizeNs / 1000000);
metric.set_condition("APP_IN_BACKGROUND_PER_UID_AND_SCREEN_ON");
- EventConditionLink* link = metric.add_links();
+ MetricConditionLink* link = metric.add_links();
link->set_condition("APP_IN_BACKGROUND_PER_UID");
- link->add_key_in_main()->set_key(1);
+ link->add_key_in_what()->set_key(1);
link->add_key_in_condition()->set_key(2);
LogEvent event1(1, bucketStartTimeNs + 1);
diff --git a/cmds/statsd/tests/metrics/EventMetricProducer_test.cpp b/cmds/statsd/tests/metrics/EventMetricProducer_test.cpp
index 724ad59eeab6..f3302fd5b8e9 100644
--- a/cmds/statsd/tests/metrics/EventMetricProducer_test.cpp
+++ b/cmds/statsd/tests/metrics/EventMetricProducer_test.cpp
@@ -91,9 +91,9 @@ TEST(EventMetricProducerTest, TestEventsWithSlicedCondition) {
EventMetric metric;
metric.set_name("1");
metric.set_condition("APP_IN_BACKGROUND_PER_UID_AND_SCREEN_ON");
- EventConditionLink* link = metric.add_links();
+ MetricConditionLink* link = metric.add_links();
link->set_condition("APP_IN_BACKGROUND_PER_UID");
- link->add_key_in_main()->set_key(1);
+ link->add_key_in_what()->set_key(1);
link->add_key_in_condition()->set_key(2);
LogEvent event1(1, bucketStartTimeNs + 1);
diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/ConfigFactory.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/ConfigFactory.java
index 8d20f9759c96..071e1f9c504a 100644
--- a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/ConfigFactory.java
+++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/ConfigFactory.java
@@ -24,7 +24,7 @@ import com.android.internal.os.StatsdConfigProto.Bucket;
import com.android.internal.os.StatsdConfigProto.Predicate;
import com.android.internal.os.StatsdConfigProto.CountMetric;
import com.android.internal.os.StatsdConfigProto.DurationMetric;
-import com.android.internal.os.StatsdConfigProto.EventConditionLink;
+import com.android.internal.os.StatsdConfigProto.MetricConditionLink;
import com.android.internal.os.StatsdConfigProto.EventMetric;
import com.android.internal.os.StatsdConfigProto.GaugeMetric;
import com.android.internal.os.StatsdConfigProto.ValueMetric;
@@ -130,13 +130,13 @@ public class ConfigFactory {
}
/**
- * Creates {@link EventConditionLink}s that are identical to the one passed to this method,
+ * Creates {@link MetricConditionLink}s that are identical to the one passed to this method,
* except that the names are appended with the provided suffix.
*/
- private List<EventConditionLink> getLinks(
- List<EventConditionLink> links, int suffix) {
- List<EventConditionLink> newLinks = new ArrayList();
- for (EventConditionLink link : links) {
+ private List<MetricConditionLink> getLinks(
+ List<MetricConditionLink> links, int suffix) {
+ List<MetricConditionLink> newLinks = new ArrayList();
+ for (MetricConditionLink link : links) {
newLinks.add(link.toBuilder()
.setCondition(link.getCondition() + suffix)
.build());
@@ -156,7 +156,7 @@ public class ConfigFactory {
metric.setCondition(template.getCondition() + suffix);
}
if (template.getLinksCount() > 0) {
- List<EventConditionLink> links = getLinks(template.getLinksList(), suffix);
+ List<MetricConditionLink> links = getLinks(template.getLinksList(), suffix);
metric.clearLinks();
metric.addAllLinks(links);
}
@@ -182,7 +182,7 @@ public class ConfigFactory {
metric.setCondition(template.getCondition() + suffix);
}
if (template.getLinksCount() > 0) {
- List<EventConditionLink> links = getLinks(template.getLinksList(), suffix);
+ List<MetricConditionLink> links = getLinks(template.getLinksList(), suffix);
metric.clearLinks();
metric.addAllLinks(links);
}
@@ -203,7 +203,7 @@ public class ConfigFactory {
metric.setCondition(template.getCondition() + suffix);
}
if (template.getLinksCount() > 0) {
- List<EventConditionLink> links = getLinks(template.getLinksList(), suffix);
+ List<MetricConditionLink> links = getLinks(template.getLinksList(), suffix);
metric.clearLinks();
metric.addAllLinks(links);
}
@@ -224,7 +224,7 @@ public class ConfigFactory {
metric.setCondition(template.getCondition() + suffix);
}
if (template.getLinksCount() > 0) {
- List<EventConditionLink> links = getLinks(template.getLinksList(), suffix);
+ List<MetricConditionLink> links = getLinks(template.getLinksList(), suffix);
metric.clearLinks();
metric.addAllLinks(links);
}
@@ -245,7 +245,7 @@ public class ConfigFactory {
metric.setCondition(template.getCondition() + suffix);
}
if (template.getLinksCount() > 0) {
- List<EventConditionLink> links = getLinks(template.getLinksList(), suffix);
+ List<MetricConditionLink> links = getLinks(template.getLinksList(), suffix);
metric.clearLinks();
metric.addAllLinks(links);
}
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-11-04 06:17:20 +0000