refactor upload_to_bq functions

1 files changed, 7 insertions, 2 deletions

diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index e04b13b24c..c4954df12b 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -1821,8 +1821,13 @@ def _build_and_run(check_cancelled,
         for antagonist in antagonists:
             antagonist.kill()
         if args.bq_result_table and resultset:
-            upload_results_to_bq(resultset, args.bq_result_table, args,
-                                 platform_string())
+            upload_extra_fields={
+                'compiler': args.compiler,
+                'config': args.config,
+                'iomgr_plaform': args.iomgr_platform,
+                'language': args.language[0],  # args.language is a list but will always have one element when uploading to BQ is enabled.
+                'plaform': platform_string()}
+            upload_results_to_bq(resultset, args.bq_result_table, upload_extra_fields)   
         if xml_report and resultset:
             report_utils.render_junit_xml_report(
                 resultset, xml_report, suite_name=args.report_suite_name)