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

Commit 4448f164 authored by Christine Tsai's avatar Christine Tsai Committed by Android (Google) Code Review
Browse files

Merge "Deprecate dimensions_in_condition in statsd config"

parents 4fb674b3 0c3abcbd

cmds/statsd/src/stats_log.proto

+11 −11
Original line number Diff line number Diff line
@@ -66,13 +66,13 @@ message CountBucketInfo { 
message CountMetricData {

  optional DimensionsValue dimensions_in_what = 1;



  optional DimensionsValue dimensions_in_condition = 2;

  optional DimensionsValue dimensions_in_condition = 2 [deprecated = true];



  repeated CountBucketInfo bucket_info = 3;



  repeated DimensionsValue dimension_leaf_values_in_what = 4;



  repeated DimensionsValue dimension_leaf_values_in_condition = 5;

  repeated DimensionsValue dimension_leaf_values_in_condition = 5 [deprecated = true];

}



message DurationBucketInfo {
@@ -92,13 +92,13 @@ message DurationBucketInfo { 
message DurationMetricData {

  optional DimensionsValue dimensions_in_what = 1;



  optional DimensionsValue dimensions_in_condition = 2;

  optional DimensionsValue dimensions_in_condition = 2 [deprecated = true];



  repeated DurationBucketInfo bucket_info = 3;



  repeated DimensionsValue dimension_leaf_values_in_what = 4;



  repeated DimensionsValue dimension_leaf_values_in_condition = 5;

  repeated DimensionsValue dimension_leaf_values_in_condition = 5 [deprecated = true];

}



message ValueBucketInfo {
@@ -136,13 +136,13 @@ message ValueBucketInfo { 
message ValueMetricData {

  optional DimensionsValue dimensions_in_what = 1;



  optional DimensionsValue dimensions_in_condition = 2;

  optional DimensionsValue dimensions_in_condition = 2 [deprecated = true];



  repeated ValueBucketInfo bucket_info = 3;



  repeated DimensionsValue dimension_leaf_values_in_what = 4;



  repeated DimensionsValue dimension_leaf_values_in_condition = 5;

  repeated DimensionsValue dimension_leaf_values_in_condition = 5 [deprecated = true];

}



message GaugeBucketInfo {
@@ -166,13 +166,13 @@ message GaugeBucketInfo { 
message GaugeMetricData {

  optional DimensionsValue dimensions_in_what = 1;



  optional DimensionsValue dimensions_in_condition = 2;

  optional DimensionsValue dimensions_in_condition = 2 [deprecated = true];



  repeated GaugeBucketInfo bucket_info = 3;



  repeated DimensionsValue dimension_leaf_values_in_what = 4;



  repeated DimensionsValue dimension_leaf_values_in_condition = 5;

  repeated DimensionsValue dimension_leaf_values_in_condition = 5 [deprecated = true];

}



message StatsLogReport {
@@ -220,7 +220,7 @@ message StatsLogReport { 


  optional DimensionsValue dimensions_path_in_what = 11;



  optional DimensionsValue dimensions_path_in_condition = 12;

  optional DimensionsValue dimensions_path_in_condition = 12 [deprecated = true];



  // DO NOT USE field 13.
@@ -363,7 +363,7 @@ message StatsdStatsReport { 
        repeated ConditionStats condition_stats = 14;

        repeated MetricStats metric_stats = 15;

        repeated AlertStats alert_stats = 16;

        repeated MetricStats metric_dimension_in_condition_stats = 17;

        repeated MetricStats metric_dimension_in_condition_stats = 17 [deprecated = true];

        message Annotation {

            optional int64 field_int64 = 1;

            optional int32 field_int32 = 2;
@@ -483,7 +483,7 @@ message AlertTriggerDetails { 
    message MetricValue {

        optional int64 metric_id = 1;

        optional DimensionsValue dimension_in_what = 2;

        optional DimensionsValue dimension_in_condition = 3;

        optional DimensionsValue dimension_in_condition = 3 [deprecated = true];

        optional int64 value = 4;

    }

    oneof value {

cmds/statsd/src/statsd_config.proto

+4 −4
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ message CountMetric { 


  optional FieldMatcher dimensions_in_what = 4;



  optional FieldMatcher dimensions_in_condition = 7;

  optional FieldMatcher dimensions_in_condition = 7 [deprecated = true];



  optional TimeUnit bucket = 5;
@@ -207,7 +207,7 @@ message DurationMetric { 


  optional FieldMatcher dimensions_in_what = 6;



  optional FieldMatcher dimensions_in_condition = 8;

  optional FieldMatcher dimensions_in_condition = 8 [deprecated = true];



  optional TimeUnit bucket = 7;

}
@@ -225,7 +225,7 @@ message GaugeMetric { 


  optional FieldMatcher dimensions_in_what = 5;



  optional FieldMatcher dimensions_in_condition = 8;

  optional FieldMatcher dimensions_in_condition = 8 [deprecated = true];



  optional TimeUnit bucket = 6;
@@ -259,7 +259,7 @@ message ValueMetric { 


  optional FieldMatcher dimensions_in_what = 5;



  optional FieldMatcher dimensions_in_condition = 9;

  optional FieldMatcher dimensions_in_condition = 9 [deprecated = true];



  optional TimeUnit bucket = 6;