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

Commit 635b4b37 authored by Yangster-mac's avatar Yangster-mac
Browse files

Do not output empty metric reports. 

Test: statsd unit test passed.

Change-Id: I296edbe621eaea72ad2e1dfe656698302614c0f3
parent 4ee9a3e9

cmds/statsd/src/metrics/CountMetricProducer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -112,6 +112,9 @@ void CountMetricProducer::onDumpReportLocked(const uint64_t dumpTimeNs, StatsLog 
void CountMetricProducer::onDumpReportLocked(const uint64_t dumpTimeNs,

                                             ProtoOutputStream* protoOutput) {

    flushIfNeededLocked(dumpTimeNs);

    if (mPastBuckets.empty()) {

        return;

    }



    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_ID, (long long)mMetricId);

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_REPORT_NANOS, (long long)mStartTimeNs);

cmds/statsd/src/metrics/DurationMetricProducer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -168,6 +168,9 @@ void DurationMetricProducer::onDumpReportLocked(const uint64_t dumpTimeNs, Stats 
void DurationMetricProducer::onDumpReportLocked(const uint64_t dumpTimeNs,

                                                ProtoOutputStream* protoOutput) {

    flushIfNeededLocked(dumpTimeNs);

    if (mPastBuckets.empty()) {

        return;

    }



    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_ID, (long long)mMetricId);

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_REPORT_NANOS, (long long)mStartTimeNs);

cmds/statsd/src/metrics/EventMetricProducer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ void EventMetricProducer::onDumpReportLocked(const uint64_t dumpTimeNs, StatsLog 


void EventMetricProducer::onDumpReportLocked(const uint64_t dumpTimeNs,

                                             ProtoOutputStream* protoOutput) {

    if (mProto->size() <= 0) {

        return;

    }

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_ID, (long long)mMetricId);

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_REPORT_NANOS, (long long)mStartTimeNs);

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_REPORT_NANOS, (long long)dumpTimeNs);

cmds/statsd/src/metrics/GaugeMetricProducer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -125,6 +125,9 @@ void GaugeMetricProducer::onDumpReportLocked(const uint64_t dumpTimeNs, 
    VLOG("gauge metric %lld report now...", (long long)mMetricId);



    flushIfNeededLocked(dumpTimeNs);

    if (mPastBuckets.empty()) {

        return;

    }



    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_ID, (long long)mMetricId);

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_REPORT_NANOS, (long long)mStartTimeNs);

cmds/statsd/src/metrics/ValueMetricProducer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -138,6 +138,9 @@ void ValueMetricProducer::onDumpReportLocked(const uint64_t dumpTimeNs, 
                                             ProtoOutputStream* protoOutput) {

    VLOG("metric %lld dump report now...", (long long)mMetricId);

    flushIfNeededLocked(dumpTimeNs);

    if (mPastBuckets.empty()) {

        return;

    }

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_ID, (long long)mMetricId);

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_REPORT_NANOS, (long long)mStartTimeNs);

    long long protoToken = protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_ID_VALUE_METRICS);