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

Commit 07e23ffa authored by Howard Ro's avatar Howard Ro
Browse files

Fix is_active that is logged as int64 to bool 

"Field type 3 is not supported when writing bool val." is being created
as we are trying to log is_active bit as int64.

Bug: 121035918
Test: statsd_test
Change-Id: I3d6ad610411a45caa5b3b99a5b936c6769be3502
parent 56208f49

cmds/statsd/src/metrics/CountMetricProducer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ void CountMetricProducer::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());

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





    if (mPastBuckets.empty()) {

cmds/statsd/src/metrics/DurationMetricProducer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ void DurationMetricProducer::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());

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



    if (mPastBuckets.empty()) {

        VLOG(" Duration metric, empty return");

cmds/statsd/src/metrics/EventMetricProducer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ void EventMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs, 
                                             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());

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

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

        return;

    }

cmds/statsd/src/metrics/GaugeMetricProducer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ void GaugeMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs, 
    }



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

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

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



    if (mPastBuckets.empty()) {

        return;

cmds/statsd/src/metrics/ValueMetricProducer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ void ValueMetricProducer::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());

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



    if (mPastBuckets.empty() && mSkippedBuckets.empty()) {

        return;