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

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

Merge "Statsd test app."

parents 005b5008 1ff4f432

cmds/statsd/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -180,3 +180,7 @@ statsd_common_aidl_includes:= 
statsd_common_c_includes:=



include $(BUILD_NATIVE_TEST)



##############################



include $(call all-makefiles-under,$(LOCAL_PATH))

cmds/statsd/src/metrics/CountMetricProducer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ std::unique_ptr<std::vector<uint8_t>> CountMetricProducer::onDumpReport() { 
                    mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DIMENSION);

            mProto->write(FIELD_TYPE_INT32 | FIELD_ID_KEY, kv.key());

            if (kv.has_value_str()) {

                mProto->write(FIELD_TYPE_INT32 | FIELD_ID_VALUE_STR, kv.value_str());

                mProto->write(FIELD_TYPE_STRING | FIELD_ID_VALUE_STR, kv.value_str());

            } else if (kv.has_value_int()) {

                mProto->write(FIELD_TYPE_INT64 | FIELD_ID_VALUE_INT, kv.value_int());

            } else if (kv.has_value_bool()) {

cmds/statsd/src/metrics/DurationMetricProducer.cpp

+9 −2
Original line number Diff line number Diff line
@@ -163,6 +163,14 @@ std::unique_ptr<std::vector<uint8_t>> DurationMetricProducer::onDumpReport() { 
            ALOGW("Dimension key %s not found?!?! skip...", hashableKey.c_str());

            continue;

        }



        // If there is no duration bucket info for this key, don't include it in the report.

        // For example, duration started, but condition is never turned to true.

        // TODO: Only add the key to the map when we add duration buckets info for it.

        if (pair.second.size() == 0) {

            continue;

        }



        long long wrapperToken =

                mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DATA);
@@ -172,7 +180,7 @@ std::unique_ptr<std::vector<uint8_t>> DurationMetricProducer::onDumpReport() { 
                    mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DIMENSION);

            mProto->write(FIELD_TYPE_INT32 | FIELD_ID_KEY, kv.key());

            if (kv.has_value_str()) {

                mProto->write(FIELD_TYPE_INT32 | FIELD_ID_VALUE_STR, kv.value_str());

                mProto->write(FIELD_TYPE_STRING | FIELD_ID_VALUE_STR, kv.value_str());

            } else if (kv.has_value_int()) {

                mProto->write(FIELD_TYPE_INT64 | FIELD_ID_VALUE_INT, kv.value_int());

            } else if (kv.has_value_bool()) {
@@ -203,7 +211,6 @@ std::unique_ptr<std::vector<uint8_t>> DurationMetricProducer::onDumpReport() { 
    mProto->end(mProtoToken);

    mProto->write(FIELD_TYPE_INT64 | FIELD_ID_END_REPORT_NANOS,

                  (long long)mCurrentBucketStartTimeNs);



    std::unique_ptr<std::vector<uint8_t>> buffer = serializeProto();

    startNewProtoOutputStream(endTime);

    // TODO: Properly clear the old buckets.

cmds/statsd/src/metrics/GaugeMetricProducer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ std::unique_ptr<std::vector<uint8_t>> GaugeMetricProducer::onDumpReport() { 
                    mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DIMENSION);

            mProto->write(FIELD_TYPE_INT32 | FIELD_ID_KEY, kv.key());

            if (kv.has_value_str()) {

                mProto->write(FIELD_TYPE_INT32 | FIELD_ID_VALUE_STR, kv.value_str());

                mProto->write(FIELD_TYPE_STRING | FIELD_ID_VALUE_STR, kv.value_str());

            } else if (kv.has_value_int()) {

                mProto->write(FIELD_TYPE_INT64 | FIELD_ID_VALUE_INT, kv.value_int());

            } else if (kv.has_value_bool()) {

cmds/statsd/src/metrics/ValueMetricProducer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ std::unique_ptr<std::vector<uint8_t>> ValueMetricProducer::onDumpReport() { 
                    mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DIMENSION);

            mProto->write(FIELD_TYPE_INT32 | FIELD_ID_KEY, kv.key());

            if (kv.has_value_str()) {

                mProto->write(FIELD_TYPE_INT32 | FIELD_ID_VALUE_STR, kv.value_str());

                mProto->write(FIELD_TYPE_STRING | FIELD_ID_VALUE_STR, kv.value_str());

            } else if (kv.has_value_int()) {

                mProto->write(FIELD_TYPE_INT64 | FIELD_ID_VALUE_INT, kv.value_int());

            } else if (kv.has_value_bool()) {