Construct the test app still with all products

Author: yifanyang

ci/fireci/fireciplugins/macrobenchmark/run/runner.py

@@ -22,7 +22,7 @@
 from .test_project_builder import TestProjectBuilder
 from .utils import execute
 from pathlib import Path
-from typing import Dict, List
+from typing import Dict, List, Set
 
 
 logger = logging.getLogger('fireci.macrobenchmark')
@@ -40,7 +40,7 @@ async def start(
   config = _process_config_yaml()
   product_versions = _assemble_all_products()
   test_dir = _prepare_test_directory()
-  changed_modules = _process_changed_modules(changed_modules_file)
+  changed_traces = _process_changed_modules(changed_modules_file)
   template_project_dir = Path('health-metrics/benchmark/template')
 
   test_projects = [
@@ -49,7 +49,7 @@ async def start(
       test_dir,
       template_project_dir,
       product_versions,
-      changed_modules,
+      changed_traces,
     ).build() for test_config in config['test-apps']]
 
   if not build_only:
@@ -110,14 +110,39 @@ def _prepare_test_directory() -> Path:
 
 
 def _process_changed_modules(path: Path) -> List[str]:
-  results = []
+  trace_names = {
+    ":appcheck": ["fire-app-check"],
+    ":firebase-abt": ["fire-abt"],
+    ":firebase-appdistribution": ["fire-appdistribution"],
+    ":firebase-config": ["fire-rc"],
+    ":firebase-common": ["Firebase", "ComponentDiscovery", "Runtime"],
+    ":firebase-components": ["Firebase", "ComponentDiscovery", "Runtime"],
+    ":firebase-database": ["fire-rtdb"],
+    ":firebase-datatransport": ["fire-transport"],
+    ":firebase-dynamic-links": ["fire-dl"],
+    ":firebase-crashlytics": ["fire-cls"],
+    ":firebase-crashlytics-ndk": ["fire-cls"],
+    ":firebase-firestore": ["fire-fst"],
+    ":firebase-functions": ["fire-fn"],
+    ":firebase-inappmessaging": ["fire-fiam"],
+    ":firebase-inappmessaging-display": ["fire-fiamd"],
+    ":firebase-installations": ["fire-installations"],
+    ":firebase-installations-interop": ["fire-installations"],
+    ":firebase-messaging": ["fire-fcm"],
+    ":firebase-messaging-directboot": ["fire-fcm"],
+    ":firebase-ml-modeldownloader": ["firebase-ml-modeldownloader"],
+    ":firebase-perf": ["fire-perf"],
+    ":firebase-storage": ["fire-gcs"],
+    ":transport": ["fire-transport"],
+  }
+
+  results: Set[str] = set()
   if path:
     with open(path) as changed_modules_file:
       changed_modules = json.load(changed_modules_file)
       for module in changed_modules:
-        names = module.split(':')
-        for name in names:
-          if name.startswith('firebase-'):
-            results.append(f'com.google.firebase:{name}')
-  logger.info(f"Extracted changed modules {results} from {path}")
-  return results
+        for product in trace_names:
+          if module.startswith(product):
+            results.update(trace_names[product])
+  logger.info(f"Extracted changed traces {results} from {path}")
+  return list(results)

ci/fireci/fireciplugins/macrobenchmark/run/test_project_builder.py

@@ -34,14 +34,14 @@ def __init__(
       test_dir: Path,
       template_project_dir: Path,
       product_versions: Dict[str, str],
-      changed_modules: List[str],
+      changed_traces: List[str],
   ):
     self.test_config = test_config
     self.template_project_dir = template_project_dir
     self.product_versions = product_versions
-    self.changed_modules = changed_modules
+    self.changed_traces = changed_traces
 
-    self.name = 'test-changed' if changed_modules else 'test-all'
+    self.name = 'test-changed' if changed_traces else 'test-all'
     self.logger = LogDecorator(logger, self.name)
     self.project_dir = test_dir.joinpath(self.name)
 
@@ -68,7 +68,7 @@ def _flesh_out_mustache_template_files(self):
     mustache_context = {
       'm2repository': os.path.abspath('build/m2repository'),
       'plugins': self.test_config.get('plugins', []),
-      'traces': self.test_config.get('traces', []),
+      'traces': [],
       'dependencies': [],
     }
 
@@ -79,8 +79,12 @@ def _flesh_out_mustache_template_files(self):
           dependency = {'key': key, 'version': version}
         else:
           dependency = {'key': dep, 'version': self.product_versions[dep]}
-        if not self.changed_modules or dep in self.changed_modules:
-          mustache_context['dependencies'].append(dependency)
+        mustache_context['dependencies'].append(dependency)
+
+    if 'traces' in self.test_config:
+      for trace in self.test_config['traces']:
+        if not self.changed_traces or trace in self.changed_traces:
+          mustache_context['traces'].append(trace)
 
     renderer = pystache.Renderer()
     mustaches = self.project_dir.rglob('**/*.mustache')