Merge "Add State to statsd config language" (fda48657) · Commits · e / os / android_frameworks_base

cmds/statsd/src/stats_log.proto

+12 −1

Original line number	Diff line number	Diff line
		@@ -41,6 +41,15 @@ message DimensionsValueTuple {
		repeated DimensionsValue dimensions_value = 1;
		}

		message StateValue {
		optional int32 atom_id = 1;

		oneof contents {
		int64 group_id = 2;
		int32 value = 3;
		}
		}

		message EventMetricData {
		optional int64 elapsed_timestamp_nanos = 1;

		@@ -66,12 +75,14 @@ message CountBucketInfo {
		message CountMetricData {
		optional DimensionsValue dimensions_in_what = 1;

		optional DimensionsValue dimensions_in_condition = 2 [deprecated = true];
		repeated StateValue slice_by_state = 6;

		repeated CountBucketInfo bucket_info = 3;

		repeated DimensionsValue dimension_leaf_values_in_what = 4;

		optional DimensionsValue dimensions_in_condition = 2 [deprecated = true];

		repeated DimensionsValue dimension_leaf_values_in_condition = 5 [deprecated = true];
		}

+33 −1

Original line number	Diff line number	Diff line
		@@ -150,6 +150,24 @@ message Predicate {
		}
		}

		message StateMap {
		message StateGroup {
		optional int64 group_id = 1;

		repeated int32 value = 2;
		}

		repeated StateGroup group = 1;
		}

		message State {
		optional int64 id = 1;

		optional int32 atom_id = 2;

		optional StateMap map = 3;
		}

		message MetricConditionLink {
		optional int64 condition = 1;

		@@ -158,6 +176,14 @@ message MetricConditionLink {
		optional FieldMatcher fields_in_condition = 3;
		}

		message MetricStateLink {
		optional int64 state = 1;

		optional FieldMatcher fields_in_what = 2;

		optional FieldMatcher fields_in_state = 3;
		}

		message FieldFilter {
		optional bool include_all = 1 [default = false];
		optional FieldMatcher fields = 2;
		@@ -182,11 +208,15 @@ message CountMetric {

		optional FieldMatcher dimensions_in_what = 4;

		optional FieldMatcher dimensions_in_condition = 7 [deprecated = true];
		repeated int64 slice_by_state = 8;

		optional TimeUnit bucket = 5;

		repeated MetricConditionLink links = 6;

		repeated MetricStateLink state_link = 9;

		optional FieldMatcher dimensions_in_condition = 7 [deprecated = true];
		}

		message DurationMetric {
		@@ -438,6 +468,8 @@ message StatsdConfig {

		optional bool persist_locally = 20 [default = false];

		repeated State state = 21;

		// Field number 1000 is reserved for later use.
		reserved 1000;
		}