From dd8909f2123922b1d2c5e6a9a717d0a1f5250bf0 Mon Sep 17 00:00:00 2001 From: Junji Watanabe Date: Sun, 13 Jul 2025 20:11:12 -0700 Subject: [PATCH] autoninja: Do not collect Reclient build metrics We don't need to collect metrics from Reclient, anymore since most builds are done by Siso. Change-Id: I38fcb42aca966acc1b45a0876634cb9949bd255d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6733778 Auto-Submit: Junji Watanabe Reviewed-by: Fumitoshi Ukai Commit-Queue: Junji Watanabe Commit-Queue: Fumitoshi Ukai --- autoninja.py | 28 +++++++++++++--------------- reclient_helper.py | 2 +- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/autoninja.py b/autoninja.py index b872611aa9..67abbca52e 100755 --- a/autoninja.py +++ b/autoninja.py @@ -251,7 +251,7 @@ def _convert_ninja_j_to_siso_flags(j_value, use_remoteexec, args): return return_args -def _main_inner(input_args, build_id, should_collect_logs=False): +def _main_inner(input_args, build_id): # if user doesn't set PYTHONPYCACHEPREFIX and PYTHONDONTWRITEBYTECODE # set PYTHONDONTWRITEBYTECODE=1 not to create many *.pyc in workspace # and keep workspace clean. @@ -465,16 +465,14 @@ def _main_inner(input_args, build_id, should_collect_logs=False): if use_reclient and not t_specified: # TODO: crbug.com/379584977 - Remove siso/reclient # integration. - return reclient_helper.run_siso( - [ - 'siso', - 'ninja', - # Do not authenticate when using Reproxy. - '-project=', - '-reapi_instance=', - '-reapi_address=', - ] + input_args[1:], - should_collect_logs) + return reclient_helper.run_siso([ + 'siso', + 'ninja', + # Do not authenticate when using Reproxy. + '-project=', + '-reapi_instance=', + '-reapi_address=', + ] + input_args[1:]) return run_siso(["siso", "ninja"] + input_args[1:]) return run_siso(["siso", "ninja", "--offline"] + input_args[1:]) @@ -572,7 +570,7 @@ def _main_inner(input_args, build_id, should_collect_logs=False): build_id, output_dir, use_android_build_server=use_android_build_server): if use_reclient and not t_specified: - return reclient_helper.run_ninja(ninja_args, should_collect_logs) + return reclient_helper.run_ninja(ninja_args) return ninja.main(ninja_args) @@ -609,8 +607,6 @@ def main(args): build_id = str(uuid.uuid4()) os.environ.setdefault("AUTONINJA_BUILD_ID", build_id) - # Check the log collection opt-in/opt-out status, and display notice if necessary. - should_collect_logs = build_telemetry.enabled() # On Windows the autoninja.bat script passes along the arguments enclosed in # double quotes. This prevents multiple levels of parsing of the special '^' # characters needed when compiling a single file but means that this script @@ -623,10 +619,12 @@ def main(args): if sys.platform.startswith("win") and len(args) == 2: input_args = args[:1] + args[1].split() try: - exit_code = _main_inner(input_args, build_id, should_collect_logs) + exit_code = _main_inner(input_args, build_id) except KeyboardInterrupt: exit_code = 1 finally: + # Check the log collection opt-in/opt-out status, and display notice if necessary. + should_collect_logs = build_telemetry.enabled() if should_collect_logs: elapsed = time.time() - start _upload_ninjalog(input_args, exit_code, elapsed) diff --git a/reclient_helper.py b/reclient_helper.py index 79d593f5e6..a0e9b715e9 100644 --- a/reclient_helper.py +++ b/reclient_helper.py @@ -312,7 +312,7 @@ def reclient_setup_docs_url(): @contextlib.contextmanager -def build_context(argv, tool, should_collect_logs): +def build_context(argv, tool, should_collect_logs=False): # If use_remoteexec is set, but the reclient binaries or configs don't # exist, display an error message and stop. Otherwise, the build will # attempt to run with rewrapper wrapping actions, but will fail with