diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-12-15 04:39:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 04:39:05 +0000 |
commit | 63cb96b397b5df7c8d511b96a684dd92a170abf5 (patch) | |
tree | ceb7d02a01754fcd799aed414c32f3343c63ebd8 | |
parent | 2232018ac48eb086e39e92de6b43c566a2578d90 (diff) | |
parent | ddba8fc8a3df7b28e0d2dcdf33936f3b7aec6b60 (diff) | |
download | libtextclassifier-63cb96b397b5df7c8d511b96a684dd92a170abf5.tar.gz |
Merge "Backfill atom tests for new event metric format" am: 9706e6072f am: 291820727f am: fbe3035f4c am: ddba8fc8a3
Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/1922001
Change-Id: I4a3c1092ce4f0bd06cbff7e2caea204c61aae3df
-rw-r--r-- | java/tests/instrumentation/src/com/android/textclassifier/common/statsd/StatsdTestUtils.java | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/java/tests/instrumentation/src/com/android/textclassifier/common/statsd/StatsdTestUtils.java b/java/tests/instrumentation/src/com/android/textclassifier/common/statsd/StatsdTestUtils.java index 1bcd7b7..ffd2ee4 100644 --- a/java/tests/instrumentation/src/com/android/textclassifier/common/statsd/StatsdTestUtils.java +++ b/java/tests/instrumentation/src/com/android/textclassifier/common/statsd/StatsdTestUtils.java @@ -28,6 +28,7 @@ import com.android.internal.os.StatsdConfigProto.EventMetric; import com.android.internal.os.StatsdConfigProto.SimpleAtomMatcher; import com.android.internal.os.StatsdConfigProto.StatsdConfig; import com.android.os.AtomsProto.Atom; +import com.android.os.StatsLog.AggregatedAtomInfo; import com.android.os.StatsLog.ConfigMetricsReport; import com.android.os.StatsLog.ConfigMetricsReportList; import com.android.os.StatsLog.EventMetricData; @@ -85,6 +86,8 @@ public class StatsdTestUtils { return ImmutableList.copyOf( metricsList.stream() .flatMap(statsLogReport -> statsLogReport.getEventMetrics().getDataList().stream()) + .flatMap(eventMetricData -> backfillAggregatedAtomsinEventMetric( + eventMetricData).stream()) .sorted(Comparator.comparing(EventMetricData::getElapsedTimestampNanos)) .map(EventMetricData::getAtom) .collect(Collectors.toList())); @@ -131,4 +134,20 @@ public class StatsdTestUtils { /*input=*/ null); return ConfigMetricsReportList.parser().parseFrom(new ByteArrayInputStream(output)); } + + private static ImmutableList<EventMetricData> backfillAggregatedAtomsinEventMetric( + EventMetricData metricData) { + if (metricData.hasAtom()) { + return ImmutableList.of(metricData); + } + ImmutableList.Builder<EventMetricData> data = ImmutableList.builder(); + AggregatedAtomInfo atomInfo = metricData.getAggregatedAtomInfo(); + for (long timestamp : atomInfo.getElapsedTimestampNanosList()) { + EventMetricData.Builder newMetricData = EventMetricData.newBuilder(); + newMetricData.setAtom(atomInfo.getAtom()); + newMetricData.setElapsedTimestampNanos(timestamp); + data.add(newMetricData.build()); + } + return data.build(); + } } |