mirror of
https://chromium.googlesource.com/chromium/tools/depot_tools.git
synced 2026-01-11 18:51:29 +00:00
Revert "Enable telemetry flags for Google corp machines only."
This reverts commit 4e2be179a1.
Reason for revert:
This caused exception
```
+ autoninja -strict_remote -d keepdepfile -d keeprsp -C out/Default chrome
siso ninja -strict_remote -d keepdepfile -d keeprsp -C out/Default chrome
ninja: Entering directory `out/Default'
4.51s init credentials by "credhelper"
https://console.cloud.google.com/logs/viewer?project=rbe-chrome-untrusted&resource=generic_task/task_id/25d8cbb8-4fa1-486d-ba78-7865d0eea5ac
use RBE instance "projects/rbe-chrome-untrusted/instances/default_instance"
2.27s loading/recompacting deps log
3.47s Regenerating ninja files
1.17s load siso config
build finished
local:3636 remote:33214 cache:3317 cache-write:0(err:0) fallback:0 retry:0 skip:40752
reapi: ops: 102977(err:33221) / r:46503(err:8) 3.13GiB / w:72424(err:0) 152.35MiB
fs: ops: 2790971(err:182693) / r:227138(err:0) 6.68GiB / w:13508(err:4) 1.87GiB
resource/capa used(err) wait-avg | s m | serv-avg | s m |
pool=action/128 2372(0) 0.00s |█ | 0.30s | █▅▂▂▂ |
rbe:sched 33214(0) 0.01s |▃█▂▂ | 6.43s | ▂█▃▂ |
rbe:worker 33214(0) 0.87s | █ | 5.56s | ▂█▃▂ |
remoteexec/10240 33214(0) 0.10s |█▂▂▂ | 15.37s | ██▂ |
1.00s shutdown cloud logging/monitoring
4m08.96s Build Succeeded: 40167 steps - 161.34/s
flag provided but not defined: -enable_cloud_monitoring
summarize siso_metrics.json
$ siso metrics summary -C <dir> \
[--step_types <types>] \
[--elapsed_time_sorting] \
[--elapsed_time=run|step] \
[--input siso_metrics.json]
summarize <dir>/.siso_metrics.json (--input)
as depot_tools/post_ninja_build_summary.py does.
-C string
ninja running directory, where siso_metrics.json exists (default ".")
-elapsed_time string
metrics to use for elapsed time. "run" or "step". "run": time to run local command or call remote execution. "step": full duration for the step, including preproc, waiting resource to run command etc. (default "run")
-elapsed_time_sorting
Sort output by elapsed time instead of weighted time
-input string
filename of siso_metrics.json to summarize (default "siso_metrics.json")
-step_types string
semicolon separated glob patterns (go filepath.Match) for build-step grouping
Traceback (most recent call last):
File "/usr/local/google/home/tikuta/depot_tools/post_build_ninja_summary.py", line 390, in <module>
sys.exit(main())
^^^^^^
File "/usr/local/google/home/tikuta/depot_tools/post_build_ninja_summary.py", line 375, in main
subprocess.run(cmd, check=True)
File "/usr/local/google/home/tikuta/depot_tools/bootstrap-2@3.11.8.chromium.35_bin/python3/lib/python3.11/subprocess.py", line 571, in run
raise CalledProcessError(retcode, process.args,
subprocess.CalledProcessError: Command '['/usr/local/google/home/tikuta/depot_tools/bootstrap-2@3.11.8.chromium.35_bin/python3/bin/python3', '/usr/local/google/home/tikuta/depot_tools/siso.py', 'metrics', 'summary', '-C', 'out/Default', '--step_types', 'trict_remote']' returned non-zero exit status 2.
```
Original change's description:
> Enable telemetry flags for Google corp machines only.
>
> Bug: b/348530235
> Change-Id: I4ac32c60b806f44920bd06e31ec6c3b86a6a6964
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7104218
> Commit-Queue: Alex Ovsienko <ovsienko@google.com>
> Reviewed-by: Junji Watanabe <jwata@google.com>
Bug: b/348530235
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Iff13fa73745e09d2dab4278e9571f7ed77bf3d0c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7136522
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Alex Ovsienko <ovsienko@google.com>
Commit-Queue: Alex Ovsienko <ovsienko@google.com>
This commit is contained in:
13
autoninja.py
13
autoninja.py
@@ -26,7 +26,6 @@ import sys
|
||||
import time
|
||||
import uuid
|
||||
import warnings
|
||||
from typing import Optional
|
||||
|
||||
import android_build_server_helper
|
||||
import build_telemetry
|
||||
@@ -276,10 +275,7 @@ def _check_reclient_cfgs(output_dir):
|
||||
file=sys.stderr,
|
||||
)
|
||||
|
||||
|
||||
def _main_inner(input_args,
|
||||
build_id,
|
||||
telemetry_cfg: Optional[build_telemetry.Config] = None):
|
||||
def _main_inner(input_args, build_id):
|
||||
# If running in the Gemini CLI, automatically add --quiet if it's not
|
||||
# already present to avoid filling the context window.
|
||||
if os.environ.get('GEMINI_CLI') == '1':
|
||||
@@ -498,7 +494,7 @@ def _main_inner(input_args,
|
||||
# Print the command-line to reassure the user that the right
|
||||
# settings are being used.
|
||||
_print_cmd(args)
|
||||
return siso.main(args, telemetry_cfg)
|
||||
return siso.main(args)
|
||||
if use_remoteexec:
|
||||
if use_reclient and not t_specified:
|
||||
# TODO: crbug.com/379584977 - Remove siso/reclient
|
||||
@@ -687,16 +683,15 @@ def main(args):
|
||||
# are not supported by autoninja, but that is not a real limitation.
|
||||
input_args = args
|
||||
exit_code = 127
|
||||
telemetry_cfg = build_telemetry.load_config()
|
||||
should_collect_logs = telemetry_cfg.enabled()
|
||||
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, telemetry_cfg)
|
||||
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:
|
||||
warnings.simplefilter("ignore", ResourceWarning)
|
||||
elapsed = time.time() - start
|
||||
|
||||
Reference in New Issue
Block a user