Refine the project setup for SDK health metrics (#3438)

* Refine the project setup for SDK health metrics

- Reword languages in README and link to the health metrics page on Firebase devsite
- Move folders for size and macrobenchmark to `health-metrics` under project root

Author: yifanyang

apk-size/README.md

@@ -57,7 +57,8 @@ def binary_size(pull_request, log, metrics_service_url, access_token):
   artifacts = affected_artifacts if pull_request else all_artifacts
   sdks = ','.join(artifacts)
 
-  gradle.run('assemble', '--continue', gradle.P('sdks', sdks), workdir='apk-size', check=False)
+  workdir = 'health-metrics/apk-size'
+  gradle.run('assemble', '--continue', gradle.P('sdks', sdks), workdir=workdir, check=False)
 
   test_results = _measure_aar_sizes(artifacts) + _measure_apk_sizes()
   test_report = {'metric': 'BinarySize', 'results': test_results, 'log': log}
@@ -82,7 +83,8 @@ def _measure_aar_sizes(artifacts):
 def _measure_apk_sizes():
   test_results = []
 
-  apk_files = glob.glob(fr'./apk-size/**/*.apk', recursive=True)
+  regex = r'./health-metrics/apk-size/**/*.apk'
+  apk_files = glob.glob(regex, recursive=True)
   for apk_file in apk_files:
     filename = os.path.basename(apk_file)
     artifact, build_type, abi = os.path.splitext(filename)[0].split('::')

ci/README.md

@@ -53,7 +53,9 @@ async def _launch_macrobenchmark_test():
     _copy_google_services(),
   )
 
-  with chdir('macrobenchmark'):
+  _logger.info(f'Artifact versions: {artifact_versions}')
+
+  with chdir('health-metrics/macrobenchmark'):
     runners = [MacrobenchmarkTest(k, v, artifact_versions) for k, v in config.items()]
     results = await asyncio.gather(*[x.run() for x in runners], return_exceptions=True)
 
@@ -77,12 +79,12 @@ def _artifact_key_version(artifact):
 
 
 async def _parse_config_yaml():
-  with open('macrobenchmark/config.yaml') as yaml_file:
+  with open('health-metrics/macrobenchmark/config.yaml') as yaml_file:
     return yaml.safe_load(yaml_file)
 
 
 async def _create_gradle_wrapper():
-  with open('macrobenchmark/settings.gradle', 'w'):
+  with open('health-metrics/macrobenchmark/settings.gradle', 'w'):
     pass
 
   proc = await asyncio.subprocess.create_subprocess_exec(
@@ -91,15 +93,15 @@ async def _create_gradle_wrapper():
     '--gradle-version',
     '6.9',
     '--project-dir',
-    'macrobenchmark'
+    'health-metrics/macrobenchmark'
   )
   await proc.wait()
 
 
 async def _copy_google_services():
   if 'FIREBASE_CI' in os.environ:
     src = os.environ['FIREBASE_GOOGLE_SERVICES_PATH']
-    dst = 'macrobenchmark/template/app/google-services.json'
+    dst = 'health-metrics/macrobenchmark/template/app/google-services.json'
     _logger.info(f'Running on CI. Copying "{src}" to "{dst}"...')
     shutil.copyfile(src, dst)
 
@@ -222,7 +224,7 @@ async def _prepare_mustache_context(self):
   async def _aggregate_benchmark_results(self):
     results = []
     blobs = self.gcs_client.list_blobs(self.test_results_bucket, prefix=self.test_results_dir)
-    files = [x for x in blobs if re.search(r'artifacts/[^/]*\.json', x.name)]
+    files = [x for x in blobs if re.search(r'sdcard/Download/[^/]*\.json', x.name)]
     for file in files:
       device = re.search(r'([^/]*)/artifacts/', file.name).group(1)
       benchmarks = json.loads(file.download_as_bytes())['benchmarks']

ci/fireci/fireciplugins/binary_size.py

@@ -28,7 +28,7 @@ plugins {
     id "com.dorongold.task-tree" version "1.5"
 }
 
-apply from: '../sdkProperties.gradle'
+apply from: '../../sdkProperties.gradle'
 
 task clean(type: Delete) {
     delete rootProject.buildDir

ci/fireci/fireciplugins/macrobenchmark.py

@@ -15,7 +15,7 @@
 
 repositories {
     maven {
-        url '../../build/m2repository/'
+        url '../../../build/m2repository/'
     }
     google()
     jcenter()

health-metrics/README.md

@@ -41,7 +41,7 @@ allprojects {
         mavenCentral()
 
         maven {
-            url rootProject.file('../../../build/m2repository')
+            url rootProject.file('../../../../build/m2repository')
         }
     }
 }