OSDN Git Service

Revert the field number change to make statsd_config proto backward-compatible.
authorYangster-mac <yanglu@google.com>
Fri, 19 Jan 2018 00:40:57 +0000 (16:40 -0800)
committerYangster-mac <yanglu@google.com>
Fri, 19 Jan 2018 00:40:57 +0000 (16:40 -0800)
Test: statsd unit test passed.
Change-Id: I28b28c0706d35da3617ec9dba4c5bfeb2527befc

cmds/statsd/src/statsd_config.proto

index ae8a835..afb0bc4 100644 (file)
@@ -180,11 +180,11 @@ message CountMetric {
 
     optional FieldMatcher dimensions_in_what = 4;
 
-    optional FieldMatcher dimensions_in_condition = 5;
+    optional FieldMatcher dimensions_in_condition = 7;
 
-    optional TimeUnit bucket = 6;
+    optional TimeUnit bucket = 5;
 
-    repeated MetricConditionLink links = 7;
+    repeated MetricConditionLink links = 6;
 }
 
 message DurationMetric {
@@ -205,9 +205,9 @@ message DurationMetric {
 
     optional FieldMatcher dimensions_in_what = 6;
 
-    optional FieldMatcher dimensions_in_condition = 7;
+    optional FieldMatcher dimensions_in_condition = 8;
 
-    optional TimeUnit bucket = 8;
+    optional TimeUnit bucket = 7;
 }
 
 message GaugeMetric {
@@ -221,11 +221,11 @@ message GaugeMetric {
 
     optional FieldMatcher dimensions_in_what = 5;
 
-    optional FieldMatcher dimensions_in_condition = 6;
+    optional FieldMatcher dimensions_in_condition = 8;
 
-    optional TimeUnit bucket = 7;
+    optional TimeUnit bucket = 6;
 
-    repeated MetricConditionLink links = 8;
+    repeated MetricConditionLink links = 7;
 }
 
 message ValueMetric {
@@ -239,14 +239,14 @@ message ValueMetric {
 
     optional FieldMatcher dimensions_in_what = 5;
 
-    optional FieldMatcher dimensions_in_condition = 6;
+    optional FieldMatcher dimensions_in_condition = 9;
 
-    optional TimeUnit bucket = 7;
+    optional TimeUnit bucket = 6;
 
-    repeated MetricConditionLink links = 8;
+    repeated MetricConditionLink links = 7;
 
     enum AggregationType { SUM = 1; }
-    optional AggregationType aggregation_type = 9 [default = SUM];
+    optional AggregationType aggregation_type = 8 [default = SUM];
 }
 
 message Alert {