Added a common prefix for StatsdListener's metric keys.
This enables easy identification of metrics from this collector in the
post processor.
Bug: 120569785
Test: atest CollectorDeviceLibPlatformTest
Change-Id: I9b873f1ad9ad1890cb2457aa4c5f49c7c9f4b41f
diff --git a/libraries/device-collectors/src/main/platform-collectors/src/android/device/collectors/StatsdListener.java b/libraries/device-collectors/src/main/platform-collectors/src/android/device/collectors/StatsdListener.java
index 8652525..a9799f5 100644
--- a/libraries/device-collectors/src/main/platform-collectors/src/android/device/collectors/StatsdListener.java
+++ b/libraries/device-collectors/src/main/platform-collectors/src/android/device/collectors/StatsdListener.java
@@ -67,6 +67,9 @@
// Prefix template for test-level metric report files.
static final String TEST_PREFIX_TEMPLATE = "%s-%d_";
+ // Common prefix for the metric key pointing to the report path.
+ static final String REPORT_KEY_PREFIX = "statsd-";
+
// Configs used for the test run and each test, respectively.
private Map<String, StatsdConfig> mRunLevelConfigs = new HashMap<String, StatsdConfig>();
private Map<String, StatsdConfig> mTestLevelConfigs = new HashMap<String, StatsdConfig>();
@@ -103,7 +106,7 @@
pullReportsAndRemoveConfigs(
mRunLevelConfigIds, Paths.get(REPORT_PATH_ROOT, REPORT_PATH_RUN_LEVEL), "");
for (String configName : configReports.keySet()) {
- runData.addFileMetric(configName, configReports.get(configName));
+ runData.addFileMetric(REPORT_KEY_PREFIX + configName, configReports.get(configName));
}
}
@@ -128,7 +131,7 @@
Paths.get(REPORT_PATH_ROOT, REPORT_PATH_TEST_LEVEL),
getTestPrefix(description));
for (String configName : configReports.keySet()) {
- testData.addFileMetric(configName, configReports.get(configName));
+ testData.addFileMetric(REPORT_KEY_PREFIX + configName, configReports.get(configName));
}
}
diff --git a/libraries/device-collectors/src/test/platform/android/device/collectors/StatsdListenerTest.java b/libraries/device-collectors/src/test/platform/android/device/collectors/StatsdListenerTest.java
index e704a53..170ded2 100644
--- a/libraries/device-collectors/src/test/platform/android/device/collectors/StatsdListenerTest.java
+++ b/libraries/device-collectors/src/test/platform/android/device/collectors/StatsdListenerTest.java
@@ -149,7 +149,7 @@
any());
verify(runData, times(1))
.addFileMetric(
- eq(CONFIG_NAME_1),
+ eq(StatsdListener.REPORT_KEY_PREFIX + CONFIG_NAME_1),
getExactFileNameMatcher(
Paths.get(
StatsdListener.REPORT_PATH_ROOT,
@@ -167,7 +167,7 @@
any());
verify(runData, times(1))
.addFileMetric(
- eq(CONFIG_NAME_2),
+ eq(StatsdListener.REPORT_KEY_PREFIX + CONFIG_NAME_2),
getExactFileNameMatcher(
Paths.get(
StatsdListener.REPORT_PATH_ROOT,
@@ -234,7 +234,7 @@
any());
verify(testData, times(1))
.addFileMetric(
- eq(CONFIG_NAME_1),
+ eq(StatsdListener.REPORT_KEY_PREFIX + CONFIG_NAME_1),
getPartialFileNameMatcher(
Paths.get(
StatsdListener.REPORT_PATH_ROOT,
@@ -258,7 +258,7 @@
any());
verify(testData, times(1))
.addFileMetric(
- eq(CONFIG_NAME_2),
+ eq(StatsdListener.REPORT_KEY_PREFIX + CONFIG_NAME_2),
getPartialFileNameMatcher(
Paths.get(
StatsdListener.REPORT_PATH_ROOT,
@@ -292,7 +292,7 @@
verify(testData1, times(1))
.addFileMetric(
- eq(CONFIG_NAME_1),
+ eq(StatsdListener.REPORT_KEY_PREFIX + CONFIG_NAME_1),
getPartialFileNameMatcher(
Paths.get(
StatsdListener.REPORT_PATH_ROOT,
@@ -311,7 +311,7 @@
verify(testData2, times(1))
.addFileMetric(
- eq(CONFIG_NAME_1),
+ eq(StatsdListener.REPORT_KEY_PREFIX + CONFIG_NAME_1),
getPartialFileNameMatcher(
Paths.get(
StatsdListener.REPORT_PATH_ROOT,
@@ -345,7 +345,7 @@
// The metric file name should contain the iteration number (1).
verify(testData1, times(1))
.addFileMetric(
- eq(CONFIG_NAME_1),
+ eq(StatsdListener.REPORT_KEY_PREFIX + CONFIG_NAME_1),
getPartialFileNameMatcher(
Paths.get(
StatsdListener.REPORT_PATH_ROOT,
@@ -365,7 +365,7 @@
// The metric file name should contain the iteration number (2).
verify(testData2, times(1))
.addFileMetric(
- eq(CONFIG_NAME_1),
+ eq(StatsdListener.REPORT_KEY_PREFIX + CONFIG_NAME_1),
getPartialFileNameMatcher(
Paths.get(
StatsdListener.REPORT_PATH_ROOT,
@@ -402,7 +402,7 @@
verify(testData, times(1))
.addFileMetric(
- eq(CONFIG_NAME_1),
+ eq(StatsdListener.REPORT_KEY_PREFIX + CONFIG_NAME_1),
getPartialFileNameMatcher(
Paths.get(
StatsdListener.REPORT_PATH_ROOT,
@@ -416,7 +416,7 @@
verify(runData, times(1))
.addFileMetric(
- eq(CONFIG_NAME_1),
+ eq(StatsdListener.REPORT_KEY_PREFIX + CONFIG_NAME_1),
getExactFileNameMatcher(
Paths.get(
StatsdListener.REPORT_PATH_ROOT,
