From 9440e096879d18339bebc589c0efd01e73d83a66 Mon Sep 17 00:00:00 2001 From: Howard Ro Date: Sun, 16 Dec 2018 19:15:21 -0800 Subject: [PATCH] Fix incorrect field ID for is_active in stats_log field number 13 in stats_log.proto conflicts with a copy in google3/ Bug: 121035918 Test: stats_test Change-Id: Iadc3a5c227bb361553ba2bee2534cc767d34d7a3 --- cmds/statsd/src/metrics/CountMetricProducer.cpp | 2 +- cmds/statsd/src/metrics/DurationMetricProducer.cpp | 2 +- cmds/statsd/src/metrics/EventMetricProducer.cpp | 2 +- cmds/statsd/src/metrics/GaugeMetricProducer.cpp | 2 +- cmds/statsd/src/metrics/ValueMetricProducer.cpp | 2 +- cmds/statsd/src/stats_log.proto | 4 +++- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cmds/statsd/src/metrics/CountMetricProducer.cpp b/cmds/statsd/src/metrics/CountMetricProducer.cpp index 14f2de0b1a485..13579d283de06 100644 --- a/cmds/statsd/src/metrics/CountMetricProducer.cpp +++ b/cmds/statsd/src/metrics/CountMetricProducer.cpp @@ -49,7 +49,7 @@ const int FIELD_ID_TIME_BASE = 9; const int FIELD_ID_BUCKET_SIZE = 10; const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11; const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12; -const int FIELD_ID_IS_ACTIVE = 13; +const int FIELD_ID_IS_ACTIVE = 14; // for CountMetricDataWrapper const int FIELD_ID_DATA = 1; diff --git a/cmds/statsd/src/metrics/DurationMetricProducer.cpp b/cmds/statsd/src/metrics/DurationMetricProducer.cpp index 7797bd98961dc..0425671b63670 100644 --- a/cmds/statsd/src/metrics/DurationMetricProducer.cpp +++ b/cmds/statsd/src/metrics/DurationMetricProducer.cpp @@ -48,7 +48,7 @@ const int FIELD_ID_TIME_BASE = 9; const int FIELD_ID_BUCKET_SIZE = 10; const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11; const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12; -const int FIELD_ID_IS_ACTIVE = 13; +const int FIELD_ID_IS_ACTIVE = 14; // for DurationMetricDataWrapper const int FIELD_ID_DATA = 1; // for DurationMetricData diff --git a/cmds/statsd/src/metrics/EventMetricProducer.cpp b/cmds/statsd/src/metrics/EventMetricProducer.cpp index 31a4361f353d0..ea125d02f337c 100644 --- a/cmds/statsd/src/metrics/EventMetricProducer.cpp +++ b/cmds/statsd/src/metrics/EventMetricProducer.cpp @@ -44,7 +44,7 @@ namespace statsd { // for StatsLogReport const int FIELD_ID_ID = 1; const int FIELD_ID_EVENT_METRICS = 4; -const int FIELD_ID_IS_ACTIVE = 13; +const int FIELD_ID_IS_ACTIVE = 14; // for EventMetricDataWrapper const int FIELD_ID_DATA = 1; // for EventMetricData diff --git a/cmds/statsd/src/metrics/GaugeMetricProducer.cpp b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp index 03e42ce764600..98a33f5280e6b 100644 --- a/cmds/statsd/src/metrics/GaugeMetricProducer.cpp +++ b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp @@ -49,7 +49,7 @@ const int FIELD_ID_TIME_BASE = 9; const int FIELD_ID_BUCKET_SIZE = 10; const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11; const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12; -const int FIELD_ID_IS_ACTIVE = 13; +const int FIELD_ID_IS_ACTIVE = 14; // for GaugeMetricDataWrapper const int FIELD_ID_DATA = 1; const int FIELD_ID_SKIPPED = 2; diff --git a/cmds/statsd/src/metrics/ValueMetricProducer.cpp b/cmds/statsd/src/metrics/ValueMetricProducer.cpp index 1f22a6af3a3dd..7475b53c0a841 100644 --- a/cmds/statsd/src/metrics/ValueMetricProducer.cpp +++ b/cmds/statsd/src/metrics/ValueMetricProducer.cpp @@ -52,7 +52,7 @@ const int FIELD_ID_TIME_BASE = 9; const int FIELD_ID_BUCKET_SIZE = 10; const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11; const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12; -const int FIELD_ID_IS_ACTIVE = 13; +const int FIELD_ID_IS_ACTIVE = 14; // for ValueMetricDataWrapper const int FIELD_ID_DATA = 1; const int FIELD_ID_SKIPPED = 2; diff --git a/cmds/statsd/src/stats_log.proto b/cmds/statsd/src/stats_log.proto index a6f27c8aa5354..5a87e46097ae2 100644 --- a/cmds/statsd/src/stats_log.proto +++ b/cmds/statsd/src/stats_log.proto @@ -220,7 +220,9 @@ message StatsLogReport { optional DimensionsValue dimensions_path_in_condition = 12; - optional bool is_active = 13; + // DO NOT USE field 13. + + optional bool is_active = 14; } message UidMapping {