commit 1ff4f4325882d812ded4f75ee6c2b6d352a85c9e
author Yao Chen <yaochen@google.com> Thu Nov 16 17:01:40 2017 -0800
committer Yao Chen <yaochen@google.com> Tue Nov 21 16:22:42 2017 -0800
tree 285d48f7f5d8e4b5ab7a349c8ae0af96f45ffa8f
parent 8cfd3d03de5d96797d00b0a4dbdce46be6d8dde1

Statsd test app.

Features:
+ Push baseline config to statsd
+ Have buttons to write events to StatsLog (plug/unplug, screen on/off, wake locks)
+ Dump stats log report, and display it on screen (currently support DurationMetricData display).

Test: manual

Change-Id: Ia58d215d30ed7570c0aa1b0627d3b88f8355d425

cmds/statsd/src/metrics/DurationMetricProducer.cpp

diff --git a/cmds/statsd/src/metrics/DurationMetricProducer.cpp b/cmds/statsd/src/metrics/DurationMetricProducer.cpp
index b0a97b1..a32e0cb 100644
--- a/cmds/statsd/src/metrics/DurationMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/DurationMetricProducer.cpp
@@ -163,6 +163,14 @@
             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 @@
                     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 @@
     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.