diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-31 23:26:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-31 23:26:28 +0000 |
| commit | b65ef22737d087ea670554fcd1228e5b8ac4fcdc (patch) | |
| tree | 558b4101b131fdf54946ad84334ed15f77f6f9f4 | |
| parent | aada8da3055195440666c27668871906ea5767a1 (diff) | |
| parent | a477e2e564aee5e2e860250ed2eb8de71599401f (diff) | |
| download | tradefederation-b65ef22737d087ea670554fcd1228e5b8ac4fcdc.tar.gz | |
Merge "Backport perfetto file size in rvc-dev." into rvc-dev am: d1f63cbfd6 am: a477e2e564
Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/tradefederation/+/12436196
Change-Id: I1388b0b0effdb3e0b88da71755d9e84d6bbd5756
| -rw-r--r-- | test_framework/com/android/tradefed/device/metric/PerfettoPullerMetricCollector.java | 10 | ||||
| -rw-r--r-- | tests/src/com/android/tradefed/device/metric/PerfettoPullerMetricCollectorTest.java | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/test_framework/com/android/tradefed/device/metric/PerfettoPullerMetricCollector.java b/test_framework/com/android/tradefed/device/metric/PerfettoPullerMetricCollector.java index 0b1a3adbc..9e5662610 100644 --- a/test_framework/com/android/tradefed/device/metric/PerfettoPullerMetricCollector.java +++ b/test_framework/com/android/tradefed/device/metric/PerfettoPullerMetricCollector.java @@ -63,6 +63,7 @@ public class PerfettoPullerMetricCollector extends FilePullerDeviceMetricCollect private static final String EXTRACTOR_SUCCESS = "1"; private static final String EXTRACTOR_FAILURE = "0"; private static final String EXTRACTOR_RUNTIME = "trace_extractor_runtime"; + private static final String RAW_TRACE_FILE_SIZE = "perfetto_trace_file_size_bytes"; private static final String NSS_CACHE_ERROR = "base/nsscache-inl.h failed to lookup"; public enum METRIC_FILE_FORMAT { @@ -191,6 +192,15 @@ public class PerfettoPullerMetricCollector extends FilePullerDeviceMetricCollect processSrcFile = decompressFile(metricFile); } + // Update the file size metrics. + if (processSrcFile != null) { + double perfettoFileSizeInBytes = processSrcFile.length(); + Metric.Builder metricDurationBuilder = Metric.newBuilder(); + metricDurationBuilder.getMeasurementsBuilder().setSingleDouble( + perfettoFileSizeInBytes); + data.addMetric(RAW_TRACE_FILE_SIZE, metricDurationBuilder.setType(DataType.RAW)); + } + // Convert to perfetto metric format. if (mConvertToMetricFile) { File convertedMetricFile = convertToMetricProto(processSrcFile); diff --git a/tests/src/com/android/tradefed/device/metric/PerfettoPullerMetricCollectorTest.java b/tests/src/com/android/tradefed/device/metric/PerfettoPullerMetricCollectorTest.java index 24418a6c5..a9807b0d3 100644 --- a/tests/src/com/android/tradefed/device/metric/PerfettoPullerMetricCollectorTest.java +++ b/tests/src/com/android/tradefed/device/metric/PerfettoPullerMetricCollectorTest.java @@ -120,6 +120,9 @@ public class PerfettoPullerMetricCollectorTest { assertTrue("Trace duration metrics not available but expected.", currentMetrics.get("perfetto_trace_extractor_runtime").getMeasurements() .getSingleDouble() >= 0); + assertTrue("Trace file size metric is not available.", + currentMetrics.get("perfetto_trace_file_size_bytes").getMeasurements() + .getSingleDouble() >= 0); } @Test |