Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f0cbbd2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Mark fields 100/101 as reserved" into rvc-dev am: 7131aa36 am: ff863698

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11814818

Change-Id: Iecd4d4fe1509248d52f67a539d4caa8a69dfdb4a
parents 1831016e ff863698
Loading
Loading
Loading
Loading
+15 −0
Original line number Original line Diff line number Diff line
@@ -198,6 +198,9 @@ message EventMetric {
  optional int64 condition = 3;
  optional int64 condition = 3;


  repeated MetricConditionLink links = 4;
  repeated MetricConditionLink links = 4;

  reserved 100;
  reserved 101;
}
}


message CountMetric {
message CountMetric {
@@ -218,6 +221,9 @@ message CountMetric {
  repeated MetricStateLink state_link = 9;
  repeated MetricStateLink state_link = 9;


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

  reserved 100;
  reserved 101;
}
}


message DurationMetric {
message DurationMetric {
@@ -245,6 +251,9 @@ message DurationMetric {
  optional TimeUnit bucket = 7;
  optional TimeUnit bucket = 7;


  optional FieldMatcher dimensions_in_condition = 8 [deprecated = true];
  optional FieldMatcher dimensions_in_condition = 8 [deprecated = true];

  reserved 100;
  reserved 101;
}
}


message GaugeMetric {
message GaugeMetric {
@@ -281,6 +290,9 @@ message GaugeMetric {
  optional int32 max_pull_delay_sec = 13 [default = 30];
  optional int32 max_pull_delay_sec = 13 [default = 30];


  optional bool split_bucket_for_app_upgrade = 14 [default = true];
  optional bool split_bucket_for_app_upgrade = 14 [default = true];

  reserved 100;
  reserved 101;
}
}


message ValueMetric {
message ValueMetric {
@@ -333,6 +345,9 @@ message ValueMetric {
  optional bool split_bucket_for_app_upgrade = 17 [default = true];
  optional bool split_bucket_for_app_upgrade = 17 [default = true];


  optional FieldMatcher dimensions_in_condition = 9 [deprecated = true];
  optional FieldMatcher dimensions_in_condition = 9 [deprecated = true];

  reserved 100;
  reserved 101;
}
}


message Alert {
message Alert {