Merge "Increase statsd guardrails for atoms and metrics" into main am: 9b6437d986

Original change: https://android-review.googlesource.com/c/platform/packages/modules/StatsD/+/3023983

Change-Id: Idfddfb50a2b0dee4a5e3d34deb8de4cab6bfbe90
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/statsd/src/guardrail/StatsdStats.h b/statsd/src/guardrail/StatsdStats.h
index e3ab443..3adb668 100644
--- a/statsd/src/guardrail/StatsdStats.h
+++ b/statsd/src/guardrail/StatsdStats.h
@@ -180,8 +180,8 @@
     const static int kMaxConfigCountPerUid = 20;
     const static int kMaxAlertCountPerConfig = 200;
     const static int kMaxConditionCountPerConfig = 500;
-    const static int kMaxMetricCountPerConfig = 2000;
-    const static int kMaxMatcherCountPerConfig = 2500;
+    const static int kMaxMetricCountPerConfig = 3000;
+    const static int kMaxMatcherCountPerConfig = 3500;
 
     // The max number of old config stats we keep.
     const static int kMaxIceBoxSize = 20;
@@ -277,7 +277,7 @@
 
     // Maximum atom id value that we consider a platform pushed atom.
     // This should be updated once highest pushed atom id in atoms.proto approaches this value.
-    static const int kMaxPushedAtomId = 900;
+    static const int kMaxPushedAtomId = 1500;
 
     // Atom id that is the start of the pulled atoms.
     static const int kPullAtomStartTag = 10000;