Address feedback.

Author: yifanyang

ci/fireci/fireciplugins/coverage.py

@@ -15,6 +15,7 @@
 import click
 import glob
 import json
+import logging
 import os
 import re
 import requests
@@ -24,25 +25,71 @@
 from fireci import ci_command
 from fireci import gradle
 
+_logger = logging.getLogger('fireci.coverage')
+
+
+def prow_job_log_link():
+  job_name = os.getenv('JOB_NAME')
+  job_type = os.getenv('JOB_TYPE')
+  build_id = os.getenv('BUILD_ID')
+  repo_owner = os.getenv('REPO_OWNER')
+  repo_name = os.getenv('REPO_NAME')
+  pull_number = os.getenv('PULL_NUMBER')
+
+  domain = "android-ci.firebaseopensource.com"
+  bucket = "android-ci"
+
+  dir_pre_submit = f'pr-logs/pull/{repo_owner}_{repo_name}/{pull_number}'
+  dir_post_submit = "logs"
+  directory = dir_pre_submit if job_type == 'presubmit' else dir_post_submit
+  path = f'{job_name}/{build_id}'
+
+  return f'https://{domain}/view/gcs/{bucket}/{directory}/{path}'
+
+
+def gcloud_identity_token():
+  result = subprocess.run(['gcloud', 'auth', 'print-identity-token'], stdout=subprocess.PIPE, check=True)
+  return result.stdout.decode('utf-8').strip()
+
 
 @click.option(
   '--gradle-task',
-  type=click.Choice(['checkCoverage', 'checkCoverageChanged']),
   default='checkCoverage',
-  help='Run coverage tasks for affected products only in pre-submit and all products in post-submit'
+  help='The gradle task, which collects coverage for affected or all products.'
+)
+@click.option(
+  '--log',
+  default=prow_job_log_link,
+  help='The link to the log of the prow job, which runs this coverage check.'
+)
+@click.option(
+  '--metrics-service-url',
+  envvar='METRICS_SERVICE_URL',
+  help='The URL to the metrics service, which persists data and calculates diff.'
+)
+@click.option(
+  '--access-token',
+  default=gcloud_identity_token,
+  help='The access token, used to authorize http requests to the metrics service.'
 )
 @ci_command()
-def coverage_check(gradle_task):
+def coverage(gradle_task, log, metrics_service_url, access_token):
+  """Produces and uploads code coverage reports."""
+
   gradle.run(gradle_task, '--continue')
 
-  test_report = parse_xml_reports()
-  post_request(test_report)
+  test_results = parse_xml_reports()
+  test_report = {'metric': 'Coverage', 'results': test_results, 'log': log}
+
+  post_report(metrics_service_url, access_token, test_report)
 
 
 def parse_xml_reports():
   test_results = []
 
   xml_reports = glob.glob('./**/reports/jacoco/*.xml', recursive=True)
+  _logger.info(f'Found {len(xml_reports)} coverage reports: {xml_reports}')
+
   for xml_report in xml_reports:
     sdk = re.search(r'([^/]*)\.xml', xml_report).group(1)
     report = ElementTree.parse(xml_report).getroot()
@@ -54,9 +101,7 @@ def parse_xml_reports():
       file_coverage = calculate_coverage(source_file)
       test_results.append({'sdk': sdk, 'type': file_name, 'value': file_coverage})
 
-  test_report = {'metric': 'Coverage', 'results': test_results, 'log': find_prow_job_link()}
-
-  return json.dumps(test_report)
+  return test_results
 
 
 def calculate_coverage(element):
@@ -68,41 +113,19 @@ def calculate_coverage(element):
   return 0
 
 
-def find_prow_job_link():
-  job_name = os.getenv('JOB_NAME')
-  job_type = os.getenv('JOB_TYPE')
-  build_id = os.getenv('BUILD_ID')
-  repo_owner = os.getenv('REPO_OWNER')
-  repo_name = os.getenv('REPO_NAME')
-  pull_number = os.getenv('PULL_NUMBER')
-
-  domain = "android-ci.firebaseopensource.com"
-  bucket = "android-ci"
-
-  dir_pre_submit = f'pr-logs/pull/{repo_owner}_{repo_name}/{pull_number}'
-  dir_post_submit = "logs"
-  directory = dir_pre_submit if job_type == 'presubmit' else dir_post_submit
-  path = f'{job_name}/{build_id}'
-
-  return f'https://{domain}/view/gcs/{bucket}/{directory}/{path}'
-
-
-def post_request(data):
-  metrics_service_url = os.getenv('METRICS_SERVICE_URL')
+def post_report(metrics_service_url, access_token, test_report):
   endpoint = construct_request_endpoint()
-  headers = construct_request_header()
+  headers = {'Authorization': f'Bearer {access_token}', 'Content-Type': 'application/json'}
+  data = json.dumps(test_report)
 
-  print('Posting to the metrics service ...')
-  print(f'Request endpoint: {endpoint}')
-  print(f'Request data: {data}')
-  result = requests.post(f'{metrics_service_url}{endpoint}', data=data, headers=headers)
-  print(f'Response: {result.text}')
+  _logger.info('Posting to the metrics service ...')
+  _logger.info(f'Request endpoint: {endpoint}')
+  _logger.info(f'Request data: {data}')
 
+  request_url = f'{metrics_service_url}{endpoint}'
+  result = requests.post(request_url, data=data, headers=headers)
 
-def construct_request_header():
-  result = subprocess.run(['gcloud', 'auth', 'print-identity-token'], stdout=subprocess.PIPE)
-  access_token = result.stdout.decode('utf-8').strip()
-  return {'Authorization': f'Bearer {access_token}', 'Content-Type': 'application/json'}
+  _logger.info(f'Response: {result.text}')
 
 
 def construct_request_endpoint():