diff options
| author | Vova Sharaienko <sharaienko@google.com> | 2024-01-12 08:35:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-12 08:35:16 +0000 |
| commit | adb2ec1d94611f66729dfac83e7ab1337982a3d7 (patch) | |
| tree | 2f5b93d67b9679a7b4d145a1dc166c4391bf4cc1 | |
| parent | 136eb0428a34020c84fde72107117a25d19a74c5 (diff) | |
| parent | 380a03da8638c05185456dbe8b53632d71a283d4 (diff) | |
| download | StatsD-adb2ec1d94611f66729dfac83e7ab1337982a3d7.tar.gz | |
Merge "[statsd] Aligned stats log proto field index" into main am: 380a03da86
Original change: https://android-review.googlesource.com/c/platform/packages/modules/StatsD/+/2907256
Change-Id: I668e8c29631512eb4a25551dfd5b4847d28dde1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | statsd/src/StatsLogProcessor.cpp | 2 | ||||
| -rw-r--r-- | statsd/src/stats_log.proto | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/statsd/src/StatsLogProcessor.cpp b/statsd/src/StatsLogProcessor.cpp index e2b3efa2..eadc93b0 100644 --- a/statsd/src/StatsLogProcessor.cpp +++ b/statsd/src/StatsLogProcessor.cpp @@ -72,7 +72,7 @@ const int FIELD_ID_LAST_REPORT_WALL_CLOCK_NANOS = 5; const int FIELD_ID_CURRENT_REPORT_WALL_CLOCK_NANOS = 6; const int FIELD_ID_DUMP_REPORT_REASON = 8; const int FIELD_ID_STRINGS = 9; -const int FIELD_ID_DATA_CORRUPTED_REASON = 10; +const int FIELD_ID_DATA_CORRUPTED_REASON = 11; // for ActiveConfigList const int FIELD_ID_ACTIVE_CONFIG_LIST_CONFIG = 1; diff --git a/statsd/src/stats_log.proto b/statsd/src/stats_log.proto index fdb031a9..7354f37c 100644 --- a/statsd/src/stats_log.proto +++ b/statsd/src/stats_log.proto @@ -400,7 +400,9 @@ message ConfigMetricsReport { repeated string strings = 9; - repeated DataCorruptedReason data_corrupted_reason = 10; + reserved 10; + + repeated DataCorruptedReason data_corrupted_reason = 11; } message ConfigMetricsReportList { |