commit 0aff90329b49d9c04743afbd453657acd0f0a022
author Yao Chen <yaochen@google.com> Tue Jul 03 10:51:05 2018 -0700
committer Yao Chen <yaochen@google.com> Tue Jul 03 10:51:05 2018 -0700
tree a17129bd0387f39e975b74cd4fbfa2952a283b9c
parent 54d7032b78e3b457aa618eb74ae644b95844ca54

Fix a bug in DurationMetric's dimensions from condition and make unit tests expect the right answer.

Bug: 111119889
Test: statsd_test
Change-Id: Ie8379031c93641c011bf27694b47ae21fe8f8d7a

cmds/statsd/src/metrics/DurationMetricProducer.cpp

diff --git a/cmds/statsd/src/metrics/DurationMetricProducer.cpp b/cmds/statsd/src/metrics/DurationMetricProducer.cpp
index 62237bc..5e51496 100644
--- a/cmds/statsd/src/metrics/DurationMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/DurationMetricProducer.cpp
@@ -783,7 +783,7 @@
         if (whatIt != mCurrentSlicedDurationTrackerMap.end()) {
             for (const auto& condIt : whatIt->second) {
                 const bool cond = dimensionKeysInCondition.find(condIt.first) !=
-                        dimensionKeysInCondition.end();
+                        dimensionKeysInCondition.end() && condition;
                 handleStartEvent(MetricDimensionKey(dimensionInWhat, condIt.first),
                     conditionKey, cond, event);
                 dimensionKeysInCondition.erase(condIt.first);