From 9079767fca154f9d15644d22f41dd9d2a33423b3 Mon Sep 17 00:00:00 2001
From: Tej Singh <singhtejinder@google.com>
Date: Tue, 14 Sep 2021 19:12:03 -0700
Subject: [PATCH] [RESTRICT AUTOMERGE] Revert split bucket app upgrade default
 to true

On r and s-based branches, the default should be true.

Bug: 199806881
Test: TH
Change-Id: I4958d6b845b278e4865e087536c2089b028603ca
---
 cmds/statsd/src/statsd_config.proto | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmds/statsd/src/statsd_config.proto b/cmds/statsd/src/statsd_config.proto
index d3279715ad35e..d19147dab1d49 100644
--- a/cmds/statsd/src/statsd_config.proto
+++ b/cmds/statsd/src/statsd_config.proto
@@ -220,7 +220,7 @@ message CountMetric {
 
   repeated MetricStateLink state_link = 9;
 
-  optional bool split_bucket_for_app_upgrade = 11;
+  optional bool split_bucket_for_app_upgrade = 11 [default = true];
 
   optional FieldMatcher dimensions_in_condition = 7 [deprecated = true];
 
@@ -252,7 +252,7 @@ message DurationMetric {
 
   optional TimeUnit bucket = 7;
 
-  optional bool split_bucket_for_app_upgrade = 12;
+  optional bool split_bucket_for_app_upgrade = 12 [default = true];
 
   optional FieldMatcher dimensions_in_condition = 8 [deprecated = true];
 
@@ -293,7 +293,7 @@ message GaugeMetric {
 
   optional int32 max_pull_delay_sec = 13 [default = 30];
 
-  optional bool split_bucket_for_app_upgrade = 14;
+  optional bool split_bucket_for_app_upgrade = 14 [default = true];
 
   reserved 100;
   reserved 101;
@@ -346,7 +346,7 @@ message ValueMetric {
 
   optional int32 max_pull_delay_sec = 16 [default = 30];
 
-  optional bool split_bucket_for_app_upgrade = 17;
+  optional bool split_bucket_for_app_upgrade = 17 [default = true];
 
   optional FieldMatcher dimensions_in_condition = 9 [deprecated = true];