Merge "Reduce statsd log data size." into pi-dev

diff --cc cmds/statsd/src/metrics/CountMetricProducer.cpp
index 511aec3,a020fb1..43f53e0
--- 1/cmds/statsd/src/metrics/CountMetricProducer.cpp
--- 2/cmds/statsd/src/metrics/CountMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/CountMetricProducer.cpp
@@@ -122,14 -132,9 +132,15 @@@ void CountMetricProducer::onSlicedCondi
      VLOG("Metric %lld onSlicedConditionMayChange", (long long)mMetricId);
  }
  
 +
 +void CountMetricProducer::clearPastBucketsLocked(const int64_t dumpTimeNs) {
 +    flushIfNeededLocked(dumpTimeNs);
 +    mPastBuckets.clear();
 +}
 +
  void CountMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs,
                                               const bool include_current_partial_bucket,
+                                              std::set<string> *str_set,
                                               ProtoOutputStream* protoOutput) {
      if (include_current_partial_bucket) {
          flushLocked(dumpTimeNs);

diff --cc cmds/statsd/src/metrics/CountMetricProducer.h
index 8e94a75,9c62cfc..139c083
--- 1/cmds/statsd/src/metrics/CountMetricProducer.h
--- 2/cmds/statsd/src/metrics/CountMetricProducer.h
+++ b/cmds/statsd/src/metrics/CountMetricProducer.h
@@@ -57,10 -57,9 +57,11 @@@ private
  
      void onDumpReportLocked(const int64_t dumpTimeNs,
                              const bool include_current_partial_bucket,
+                             std::set<string> *str_set,
                              android::util::ProtoOutputStream* protoOutput) override;
  
 +    void clearPastBucketsLocked(const int64_t dumpTimeNs) override;
 +
      // Internal interface to handle condition change.
      void onConditionChangedLocked(const bool conditionMet, const int64_t eventTime) override;
  

diff --cc cmds/statsd/src/metrics/DurationMetricProducer.cpp
index 5610492,05516c5..62237bc
--- 1/cmds/statsd/src/metrics/DurationMetricProducer.cpp
--- 2/cmds/statsd/src/metrics/DurationMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/DurationMetricProducer.cpp
@@@ -438,13 -448,9 +448,14 @@@ void DurationMetricProducer::dropDataLo
      mPastBuckets.clear();
  }
  
 +void DurationMetricProducer::clearPastBucketsLocked(const int64_t dumpTimeNs) {
 +    flushIfNeededLocked(dumpTimeNs);
 +    mPastBuckets.clear();
 +}
 +
  void DurationMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs,
                                                  const bool include_current_partial_bucket,
+                                                 std::set<string> *str_set,
                                                  ProtoOutputStream* protoOutput) {
      if (include_current_partial_bucket) {
          flushLocked(dumpTimeNs);

diff --cc cmds/statsd/src/metrics/DurationMetricProducer.h
index f755294,8e05edb..88e455a
--- 1/cmds/statsd/src/metrics/DurationMetricProducer.h
--- 2/cmds/statsd/src/metrics/DurationMetricProducer.h
+++ b/cmds/statsd/src/metrics/DurationMetricProducer.h
@@@ -63,10 -63,9 +63,11 @@@ private
  
      void onDumpReportLocked(const int64_t dumpTimeNs,
                              const bool include_current_partial_bucket,
+                             std::set<string> *str_set,
                              android::util::ProtoOutputStream* protoOutput) override;
  
 +    void clearPastBucketsLocked(const int64_t dumpTimeNs) override;
 +
      // Internal interface to handle condition change.
      void onConditionChangedLocked(const bool conditionMet, const int64_t eventTime) override;
  

diff --cc cmds/statsd/src/metrics/EventMetricProducer.cpp
index 23f780a,f278aa3..eec90fc
--- 1/cmds/statsd/src/metrics/EventMetricProducer.cpp
--- 2/cmds/statsd/src/metrics/EventMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/EventMetricProducer.cpp
@@@ -100,12 -100,9 +100,13 @@@ std::unique_ptr<std::vector<uint8_t>> s
      return buffer;
  }
  
 +void EventMetricProducer::clearPastBucketsLocked(const int64_t dumpTimeNs) {
 +    mProto->clear();
 +}
 +
  void EventMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs,
                                               const bool include_current_partial_bucket,
+                                              std::set<string> *str_set,
                                               ProtoOutputStream* protoOutput) {
      if (mProto->size() <= 0) {
          return;

diff --cc cmds/statsd/src/metrics/EventMetricProducer.h
index 23302c4,0cab611..62d1105
--- 1/cmds/statsd/src/metrics/EventMetricProducer.h
--- 2/cmds/statsd/src/metrics/EventMetricProducer.h
+++ b/cmds/statsd/src/metrics/EventMetricProducer.h
@@@ -48,8 -48,8 +48,9 @@@ private
  
      void onDumpReportLocked(const int64_t dumpTimeNs,
                              const bool include_current_partial_bucket,
+                             std::set<string> *str_set,
                              android::util::ProtoOutputStream* protoOutput) override;
 +    void clearPastBucketsLocked(const int64_t dumpTimeNs) override;
  
      // Internal interface to handle condition change.
      void onConditionChangedLocked(const bool conditionMet, const int64_t eventTime) override;

diff --cc cmds/statsd/src/metrics/GaugeMetricProducer.cpp
index 005cb71,2461a97..a940d58
--- 1/cmds/statsd/src/metrics/GaugeMetricProducer.cpp
--- 2/cmds/statsd/src/metrics/GaugeMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp
@@@ -160,14 -169,9 +169,15 @@@ void GaugeMetricProducer::dumpStatesLoc
      }
  }
  
 +void GaugeMetricProducer::clearPastBucketsLocked(const int64_t dumpTimeNs) {
 +    flushIfNeededLocked(dumpTimeNs);
 +    mPastBuckets.clear();
 +    mSkippedBuckets.clear();
 +}
 +
  void GaugeMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs,
                                               const bool include_current_partial_bucket,
+                                              std::set<string> *str_set,
                                               ProtoOutputStream* protoOutput) {
      VLOG("Gauge metric %lld report now...", (long long)mMetricId);
      if (include_current_partial_bucket) {

diff --cc cmds/statsd/src/metrics/GaugeMetricProducer.h
index 8af2f36,84a6a58..ac2bd77
--- 1/cmds/statsd/src/metrics/GaugeMetricProducer.h
--- 2/cmds/statsd/src/metrics/GaugeMetricProducer.h
+++ b/cmds/statsd/src/metrics/GaugeMetricProducer.h
@@@ -90,8 -90,8 +90,9 @@@ protected
  private:
      void onDumpReportLocked(const int64_t dumpTimeNs,
                              const bool include_current_partial_bucket,
+                             std::set<string> *str_set,
                              android::util::ProtoOutputStream* protoOutput) override;
 +    void clearPastBucketsLocked(const int64_t dumpTimeNs) override;
  
      // for testing
      GaugeMetricProducer(const ConfigKey& key, const GaugeMetric& gaugeMetric,

diff --cc cmds/statsd/src/metrics/MetricProducer.h
index 4239649,94b8c60..6fe4bfb
--- 1/cmds/statsd/src/metrics/MetricProducer.h
--- 2/cmds/statsd/src/metrics/MetricProducer.h
+++ b/cmds/statsd/src/metrics/MetricProducer.h
@@@ -114,16 -115,12 +115,17 @@@ public
      // This method clears all the past buckets.
      void onDumpReport(const int64_t dumpTimeNs,
                        const bool include_current_partial_bucket,
+                       std::set<string> *str_set,
                        android::util::ProtoOutputStream* protoOutput) {
          std::lock_guard<std::mutex> lock(mMutex);
-         return onDumpReportLocked(dumpTimeNs, include_current_partial_bucket, protoOutput);
+         return onDumpReportLocked(dumpTimeNs, include_current_partial_bucket, str_set, protoOutput);
      }
  
 +    void clearPastBuckets(const int64_t dumpTimeNs) {
 +        std::lock_guard<std::mutex> lock(mMutex);
 +        return clearPastBucketsLocked(dumpTimeNs);
 +    }
 +
      void dumpStates(FILE* out, bool verbose) const {
          std::lock_guard<std::mutex> lock(mMutex);
          dumpStatesLocked(out, verbose);
@@@ -181,8 -178,8 +183,9 @@@ protected
                                                    const int64_t eventTime) = 0;
      virtual void onDumpReportLocked(const int64_t dumpTimeNs,
                                      const bool include_current_partial_bucket,
+                                     std::set<string> *str_set,
                                      android::util::ProtoOutputStream* protoOutput) = 0;
 +    virtual void clearPastBucketsLocked(const int64_t dumpTimeNs) = 0;
      virtual size_t byteSizeLocked() const = 0;
      virtual void dumpStatesLocked(FILE* out, bool verbose) const = 0;
  

diff --cc cmds/statsd/src/metrics/MetricsManager.cpp
index 0d3aebf,e8c123b..9ca4daa
--- 1/cmds/statsd/src/metrics/MetricsManager.cpp
--- 2/cmds/statsd/src/metrics/MetricsManager.cpp
+++ b/cmds/statsd/src/metrics/MetricsManager.cpp
@@@ -197,12 -199,11 +199,13 @@@ void MetricsManager::onDumpReport(cons
      // one StatsLogReport per MetricProduer
      for (const auto& producer : mAllMetricProducers) {
          if (mNoReportMetricIds.find(producer->getMetricId()) == mNoReportMetricIds.end()) {
-             uint64_t token =
-                     protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_METRICS);
-             producer->onDumpReport(dumpTimeStampNs, include_current_partial_bucket, protoOutput);
+             uint64_t token = protoOutput->start(
+                     FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_METRICS);
+             producer->onDumpReport(dumpTimeStampNs, include_current_partial_bucket, str_set,
+                                    protoOutput);
              protoOutput->end(token);
 +        } else {
 +            producer->clearPastBuckets(dumpTimeStampNs);
          }
      }
      for (const auto& annotation : mAnnotations) {

diff --cc cmds/statsd/src/metrics/ValueMetricProducer.cpp
index 506cf38,c505d22..69330ba
--- 1/cmds/statsd/src/metrics/ValueMetricProducer.cpp
--- 2/cmds/statsd/src/metrics/ValueMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/ValueMetricProducer.cpp
@@@ -151,14 -160,9 +160,15 @@@ void ValueMetricProducer::dropDataLocke
      mPastBuckets.clear();
  }
  
 +void ValueMetricProducer::clearPastBucketsLocked(const int64_t dumpTimeNs) {
 +    flushIfNeededLocked(dumpTimeNs);
 +    mPastBuckets.clear();
 +    mSkippedBuckets.clear();
 +}
 +
  void ValueMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs,
                                               const bool include_current_partial_bucket,
+                                              std::set<string> *str_set,
                                               ProtoOutputStream* protoOutput) {
      VLOG("metric %lld dump report now...", (long long)mMetricId);
      if (include_current_partial_bucket) {

diff --cc cmds/statsd/src/metrics/ValueMetricProducer.h
index 64604c2,4d02b43..113be4b
--- 1/cmds/statsd/src/metrics/ValueMetricProducer.h
--- 2/cmds/statsd/src/metrics/ValueMetricProducer.h
+++ b/cmds/statsd/src/metrics/ValueMetricProducer.h
@@@ -88,8 -88,8 +88,9 @@@ protected
  private:
      void onDumpReportLocked(const int64_t dumpTimeNs,
                              const bool include_current_partial_bucket,
+                             std::set<string> *str_set,
                              android::util::ProtoOutputStream* protoOutput) override;
 +    void clearPastBucketsLocked(const int64_t dumpTimeNs) override;
  
      // Internal interface to handle condition change.
      void onConditionChangedLocked(const bool conditionMet, const int64_t eventTime) override;