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

Commit eb12479a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Always report the metric id even if the metric has no data to upload."

parents af4fcdcb b4722912

cmds/statsd/src/metrics/CountMetricProducer.cpp

+6 −1
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ const int FIELD_ID_TIME_BASE = 9; 
const int FIELD_ID_BUCKET_SIZE = 10;

const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11;

const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12;

const int FIELD_ID_IS_ACTIVE = 13;



// for CountMetricDataWrapper

const int FIELD_ID_DATA = 1;

// for CountMetricData
@@ -151,10 +153,13 @@ void CountMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs, 
    } else {

        flushIfNeededLocked(dumpTimeNs);

    }

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

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_IS_ACTIVE, isActiveLocked());





    if (mPastBuckets.empty()) {

        return;

    }

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

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_TIME_BASE, (long long)mTimeBaseNs);

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_BUCKET_SIZE, (long long)mBucketSizeNs);

cmds/statsd/src/metrics/DurationMetricProducer.cpp

+4 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ const int FIELD_ID_TIME_BASE = 9; 
const int FIELD_ID_BUCKET_SIZE = 10;

const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11;

const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12;

const int FIELD_ID_IS_ACTIVE = 13;

// for DurationMetricDataWrapper

const int FIELD_ID_DATA = 1;

// for DurationMetricData
@@ -461,12 +462,14 @@ void DurationMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs, 
    } else {

        flushIfNeededLocked(dumpTimeNs);

    }

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

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_IS_ACTIVE, isActiveLocked());



    if (mPastBuckets.empty()) {

        VLOG(" Duration metric, empty return");

        return;

    }



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

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_TIME_BASE, (long long)mTimeBaseNs);

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_BUCKET_SIZE, (long long)mBucketSizeNs);

cmds/statsd/src/metrics/EventMetricProducer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ namespace statsd { 
// for StatsLogReport

const int FIELD_ID_ID = 1;

const int FIELD_ID_EVENT_METRICS = 4;

const int FIELD_ID_IS_ACTIVE = 13;

// for EventMetricDataWrapper

const int FIELD_ID_DATA = 1;

// for EventMetricData
@@ -108,10 +109,11 @@ void EventMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs, 
                                             const bool erase_data,

                                             std::set<string> *str_set,

                                             ProtoOutputStream* protoOutput) {

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

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_IS_ACTIVE, isActiveLocked());

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

        return;

    }

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



    size_t bufferSize = mProto->size();

    VLOG("metric %lld dump report now... proto size: %zu ",

cmds/statsd/src/metrics/GaugeMetricProducer.cpp

+4 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ const int FIELD_ID_TIME_BASE = 9; 
const int FIELD_ID_BUCKET_SIZE = 10;

const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11;

const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12;

const int FIELD_ID_IS_ACTIVE = 13;

// for GaugeMetricDataWrapper

const int FIELD_ID_DATA = 1;

const int FIELD_ID_SKIPPED = 2;
@@ -192,11 +193,13 @@ void GaugeMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs, 
        flushIfNeededLocked(dumpTimeNs);

    }



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

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_IS_ACTIVE, isActiveLocked());



    if (mPastBuckets.empty()) {

        return;

    }



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

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_TIME_BASE, (long long)mTimeBaseNs);

    protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_BUCKET_SIZE, (long long)mBucketSizeNs);

cmds/statsd/src/metrics/MetricProducer.h

+4 −0
Original line number Diff line number Diff line
@@ -223,6 +223,10 @@ protected: 


    void activateLocked(int activationTrackerIndex, int64_t elapsedTimestampNs);



    inline bool isActiveLocked() const {

        return mIsActive;

    }



    /**

     * Flushes the current bucket if the eventTime is after the current bucket's end time. This will

       also flush the current partial bucket in memory.