[soundwave] Switch apk size to timeseries2

With crbug.com/981283 resolved, we can now fetch APK size data from the
newer timeseries2 API.

Also take the chance to do a bit of cleanup when building timeseries
keys from dicts.

TBR=benmason@chromium.org

Bug: 900218
Change-Id: I060921a01e380693e0633905aa2a3c7c43f73ecc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1692408Reviewed-by: Juan Antonio Navarro Pérez <perezju@chromium.org>
Commit-Queue: Juan Antonio Navarro Pérez <perezju@chromium.org>
Cr-Commit-Position: refs/heads/master@{#676376}

tools/perf/cli_tools/soundwave/studies/__init__.py

@@ -26,11 +26,6 @@ def PostProcess(df):
   df['reference'] = df['timestamp'].dt.date == df.groupby(
       'quarter')['timestamp'].transform('max').dt.date
 
-  # TODO(crbug.com/900218): This is needed for timeseries still using the
-  # legacy API with no units information. Remove when studies finally use
-  # timeseries.Key to identify all of their timeseries.
-  df['units'] = df['units'].fillna('')
-
   # Change units for values in ms to seconds, and percent values.
   is_ms_unit = df['units'].str.startswith('ms_')
   df.loc[is_ms_unit, 'value'] = df['value'] / 1000

tools/perf/cli_tools/soundwave/studies/health_study.py

@@ -33,6 +33,12 @@ STARTUP_BY_BROWSER = {
     }
 }
 
+APK_SIZE = {
+    'test_suite': 'resource_sizes:Monochrome.minimal.apks',
+    'measurement': 'Specifics:normalized apk size',
+    'bot': 'ChromiumPerf:android-builder-perf',
+}
+
 
 def IterSystemHealthBots():
   yield 'ChromiumPerf:android-go-perf'
@@ -54,24 +60,21 @@ def IterTestPaths():
   test_cases = GetHealthCheckStories()
   for bot in IterSystemHealthBots():
     browser = GetBrowserFromBot(bot)
-    series = STARTUP_BY_BROWSER[browser].copy()
-    series['bot'] = bot
-    yield timeseries.Key.FromDict(series)
 
+    # Startup.
+    yield timeseries.Key.FromDict(STARTUP_BY_BROWSER[browser], bot=bot)
+
+    # Memory.
     if bot == 'ChromiumPerf:android-pixel2_webview-perf':
       # The pixel2 webview bot incorrectly reports memory as if coming from
       # chrome. TODO(crbug.com/972620): Remove this when bug is fixed.
       browser = 'chrome'
 
     for series in SYSTEM_HEALTH:
-      series = series.copy()
-      series['bot'] = bot
-      series['measurement'] = series['measurement'].format(browser=browser)
+      measurement = series['measurement'].format(browser=browser)
       for test_case in test_cases:
-        series['test_case'] = test_case
-        yield timeseries.Key.FromDict(series)
+        yield timeseries.Key.FromDict(
+            series, bot=bot, measurement=measurement, test_case=test_case)
 
-  # TODO(crbug.com/981283): Switch to timeseries.Key when bug is resolved.
-  yield ('ChromiumPerf/android-builder-perf/'
-         'resource_sizes (MonochromePublic.minimal.apks)/'
-         'Specifics/normalized apk size')
+  # APK size.
+  yield timeseries.Key.FromDict(APK_SIZE)