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

Commit 56dc5fdd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert the field number change to make statsd_config proto backward-compatible."

parents 42f92549 6622e942

cmds/statsd/src/statsd_config.proto

+12 −12
Original line number Diff line number Diff line
@@ -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 {