commit 54db2eb0cfe2b491ca5699b8542cd8c1aa9e02fa
author yro <yro@google.com> Wed May 09 19:24:10 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 09 19:24:10 2018 -0700
tree c0ef060cb5fbe27ccce4555c5e6a0b9f3138b29c
parent 715b5be177fbda0bc44e658700100f421d74abc1
parent ef16759cdd104963fdad9550c43013d3ea2c4e14

Merge "Skip writing metrics to disk if it's entirely composed of no_report_metric" into pi-dev am: 3f57b16deb
am: ef16759cdd

Change-Id: I68f6ff7f259acd0ac43c7e34bf259e35bcc2fd1a

cmds/statsd/src/StatsLogProcessor.cpp

diff --git a/cmds/statsd/src/StatsLogProcessor.cpp b/cmds/statsd/src/StatsLogProcessor.cpp
index daafe9c..8487e67 100644
--- a/cmds/statsd/src/StatsLogProcessor.cpp
+++ b/cmds/statsd/src/StatsLogProcessor.cpp
@@ -503,7 +503,8 @@
 void StatsLogProcessor::WriteDataToDiskLocked(const ConfigKey& key,
                                               const int64_t timestampNs,
                                               const DumpReportReason dumpReportReason) {
-    if (mMetricsManagers.find(key) == mMetricsManagers.end()) {
+    if (mMetricsManagers.find(key) == mMetricsManagers.end() ||
+        !mMetricsManagers.find(key)->second->shouldWriteToDisk()) {
         return;
     }
     ProtoOutputStream proto;

cmds/statsd/src/metrics/MetricsManager.h

diff --git a/cmds/statsd/src/metrics/MetricsManager.h b/cmds/statsd/src/metrics/MetricsManager.h
index 456da98..e143b5a 100644
--- a/cmds/statsd/src/metrics/MetricsManager.h
+++ b/cmds/statsd/src/metrics/MetricsManager.h
@@ -67,6 +67,10 @@
         return !mAllowedPkg.empty();
     }
 
+    bool shouldWriteToDisk() const {
+        return mNoReportMetricIds.size() != mAllMetricProducers.size();
+    }
+
     void dumpStates(FILE* out, bool verbose);
 
     inline bool isInTtl(const int64_t timestampNs) const {