Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0775117 authored by android-build-team Robot's avatar android-build-team Robot Committed by Android (Google) Code Review
Browse files

Merge "Clear the past buckets for no-report metrics" into pi-dev

parents a031ddd6 a802d73d

cmds/statsd/src/metrics/CountMetricProducer.cpp

+6 −0
Original line number Diff line number Diff line
@@ -122,6 +122,12 @@ void CountMetricProducer::onSlicedConditionMayChangeLocked(bool overallCondition 
    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,

                                             ProtoOutputStream* protoOutput) {

cmds/statsd/src/metrics/CountMetricProducer.h

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ private: 
                            const bool include_current_partial_bucket,

                            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;

cmds/statsd/src/metrics/DurationMetricProducer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -438,6 +438,11 @@ void DurationMetricProducer::dropDataLocked(const int64_t dropTimeNs) { 
    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,

                                                ProtoOutputStream* protoOutput) {

cmds/statsd/src/metrics/DurationMetricProducer.h

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ private: 
                            const bool include_current_partial_bucket,

                            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;

cmds/statsd/src/metrics/EventMetricProducer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -100,6 +100,10 @@ std::unique_ptr<std::vector<uint8_t>> serializeProtoLocked(ProtoOutputStream& pr 
    return buffer;

}



void EventMetricProducer::clearPastBucketsLocked(const int64_t dumpTimeNs) {

    mProto->clear();

}



void EventMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs,

                                             const bool include_current_partial_bucket,

                                             ProtoOutputStream* protoOutput) {