aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "siso: Set --namespace flag to "ninja" subcommand"

Browse Source 
This reverts commit 86e72435d8.

Reason for revert: It fails when building at an old revision, where
siso didn't have --namespace flag.

Original change's description:
> siso: Set --namespace flag to "ninja" subcommand
>
> To distinguish builds from developers and LUCI bots, this CL adds
> "--namespace=developer" flag to "siso ninja" command. Additionally, it
> sets "--namespace=developer:ai-agent" to distinguish AI agent builds from human builds.
>
> LUCI bot builds specify "--namespace=builder:{builder}". See also
> https://crrev.com/c/7731009
>
> The namespace will be set to Cloud logging's `generic_task.namespace`,
> which will be stored to the BigQuery table, as well.
> https://docs.cloud.google.com/logging/docs/api/v2/resource-list
>
> Bug: 354589168
> Change-Id: I264d5c4ac756dec04e7b443775e1894946d9bd56
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7730256
> Commit-Queue: Junji Watanabe <jwata@google.com>
> Reviewed-by: Philipp Wollermann <philwo@google.com>
> Reviewed-by: Nicole Desrosiers <nicolede@google.com>

Bug: 354589168
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: I330a78d40a8fb39e1921aadadf6e0488e88fe67b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7735104
Auto-Submit: Junji Watanabe <jwata@google.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
changes/04/7735104/2
Junji Watanabe 2 weeks ago committed by LUCI CQ
parent 86e72435d8
commit 58c5376e7b
2 changed files with 15 additions and 41 deletions
Show Stats Download Patch File Download Diff File

13
siso.py
Unescape Escape View File

@ -247,9 +247,8 @@ def check_outdir(out_dir: str) -> None:
sys.exit(1)
def apply_telemetry_flags(subcmd_args: list[str],
env: dict[str, str],
is_ai_agent: bool = False) -> list[str]:
def apply_telemetry_flags(subcmd_args: list[str], env: dict[str,
str]) -> list[str]:
user_system = _SYSTEM_DICT.get(sys.platform, sys.platform)
user_provided_labels_present = False
@ -268,11 +267,6 @@ def apply_telemetry_flags(subcmd_args: list[str],
result.append(f"host_os={user_system}")
subcmd_args = subcmd_args + ["--metrics_labels", ",".join(result)]
namespace = "developer"
if is_ai_agent:
namespace += ":ai-agent"
subcmd_args = subcmd_args + [f"--namespace={namespace}"]
telemetry_flags = [
"enable_cloud_monitoring", "enable_cloud_profiler",
"enable_cloud_trace", "enable_cloud_logging"
@ -582,8 +576,7 @@ def main(args: list[str],
(telemetry_cfg.enabled(), subcmd == "ninja",
no_help_flag(args)))
if should_collect_logs:
subcmd_args = apply_telemetry_flags(
subcmd_args, env, is_ai_agent)
subcmd_args = apply_telemetry_flags(subcmd_args, env)
env = _handle_collector(siso_path, subcmd_args, env)
new_args = pre_args + [subcmd] + subcmd_args

43
tests/siso_test.py
Unescape Escape View File

@ -237,7 +237,6 @@ Subcommands for auth:
"out/Default",
"--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer",
],
id="no_env_flags",
),
@ -256,7 +255,6 @@ Subcommands for auth:
"--enable_cloud_profiler",
"--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer",
],
id="some_already_applied_no_env_flags",
),
@ -270,7 +268,6 @@ Subcommands for auth:
"some_project",
"--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer",
"--enable_cloud_monitoring",
"--enable_cloud_profiler",
"--enable_cloud_trace",
@ -286,7 +283,6 @@ Subcommands for auth:
"out/Default",
"--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer",
"--enable_cloud_monitoring",
"--enable_cloud_profiler",
"--enable_cloud_trace",
@ -304,7 +300,6 @@ Subcommands for auth:
"some_project",
"--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer",
"--enable_cloud_monitoring",
"--enable_cloud_profiler",
"--enable_cloud_trace",
@ -321,7 +316,6 @@ Subcommands for auth:
"out/Default",
"--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer",
"--enable_cloud_monitoring",
"--enable_cloud_profiler",
"--enable_cloud_trace",
@ -339,7 +333,6 @@ Subcommands for auth:
"--enable_cloud_profiler=false",
"--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer",
"--enable_cloud_monitoring",
"--enable_cloud_trace",
"--enable_cloud_logging",
@ -354,7 +347,6 @@ Subcommands for auth:
"--help",
"--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer",
],
id="help_flag",
),
@ -365,17 +357,13 @@ Subcommands for auth:
"-h",
"--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer",
],
id="short_help_flag",
),
pytest.param(
["-C", "out/Default", "--metrics_labels=foo=bar"],
{},
[
"-C", "out/Default", "--metrics_labels=foo=bar",
"--namespace=developer"
],
["-C", "out/Default", "--metrics_labels=foo=bar"],
id="labels_exist",
),
],
@ -692,12 +680,10 @@ def test_handle_collector_remove_socket_file_fails(siso_test_fixture: Any,
"out/Default",
"--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer",
],
"depot_tools/siso.py: %s\n" % shlex.join([
"ninja", "-C", "out/Default", "--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer"
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}"
]),
id="ninja_with_logs_no_project",
),
@ -714,7 +700,6 @@ def test_handle_collector_remove_socket_file_fails(siso_test_fixture: Any,
"--project=test-project",
"--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer",
"--enable_cloud_monitoring",
"--enable_cloud_profiler",
"--enable_cloud_trace",
@ -725,9 +710,9 @@ def test_handle_collector_remove_socket_file_fails(siso_test_fixture: Any,
"ninja", "-C", "out/Default", "--project=test-project",
"--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer", "--enable_cloud_monitoring",
"--enable_cloud_profiler", "--enable_cloud_trace",
"--enable_cloud_logging", "--metrics_project=test-project"
"--enable_cloud_monitoring", "--enable_cloud_profiler",
"--enable_cloud_trace", "--enable_cloud_logging",
"--metrics_project=test-project"
]),
id="ninja_with_logs_with_project_in_args",
),
@ -743,7 +728,6 @@ def test_handle_collector_remove_socket_file_fails(siso_test_fixture: Any,
"out/Default",
"--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer",
"--enable_cloud_monitoring",
"--enable_cloud_profiler",
"--enable_cloud_trace",
@ -753,9 +737,9 @@ def test_handle_collector_remove_socket_file_fails(siso_test_fixture: Any,
"depot_tools/siso.py: %s\n" % shlex.join([
"ninja", "-C", "out/Default", "--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer", "--enable_cloud_monitoring",
"--enable_cloud_profiler", "--enable_cloud_trace",
"--enable_cloud_logging", "--metrics_project=test-project"
"--enable_cloud_monitoring", "--enable_cloud_profiler",
"--enable_cloud_trace", "--enable_cloud_logging",
"--metrics_project=test-project"
]),
id="ninja_with_logs_with_project_in_env",
),
@ -822,7 +806,6 @@ def test_handle_collector_remove_socket_file_fails(siso_test_fixture: Any,
"out/Default",
"--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer",
"--enable_cloud_monitoring",
"--enable_cloud_profiler",
"--enable_cloud_trace",
@ -833,9 +816,9 @@ def test_handle_collector_remove_socket_file_fails(siso_test_fixture: Any,
"-gflag_tel", "ninja", "-sflag_tel", "-C", "out/Default",
"--metrics_labels",
f"type=developer,tool=siso,host_os={siso._SYSTEM_DICT.get(sys.platform, sys.platform)}",
"--namespace=developer", "--enable_cloud_monitoring",
"--enable_cloud_profiler", "--enable_cloud_trace",
"--enable_cloud_logging", "--metrics_project=telemetry-project"
"--enable_cloud_monitoring", "--enable_cloud_profiler",
"--enable_cloud_trace", "--enable_cloud_logging",
"--metrics_project=telemetry-project"
]),
id="with_sisorc_global_and_subcmd_flags_and_telemetry",
),
@ -1761,7 +1744,7 @@ def test_ai_agent_env_prepends_flags(
siso_bin_path = _get_siso_bin_path(tmp_path)
mock_stdout = mocker.patch("sys.stdout", new_callable=io.StringIO)
runner = mocker.Mock(return_value=exit_code)
cfg = create_telemetry_cfg(tmp_path, mocker, enabled=True)
cfg = create_telemetry_cfg(tmp_path, mocker, enabled=False)
env = {"SISO_PATH": str(siso_bin_path)}
if env_var:
env[env_var] = "1"
@ -1778,7 +1761,6 @@ def test_ai_agent_env_prepends_flags(
if env_var and subcmd == "ninja":
assert "--quiet" in subcmd_args
assert "--batch=false" in subcmd_args
assert "--namespace=developer:ai-agent" in subcmd_args
assert "Detected AI agent env" in stdout
if exit_code == 0:
assert "Success" in stdout
@ -1787,7 +1769,6 @@ def test_ai_agent_env_prepends_flags(
else:
assert "--quiet" not in args
assert "--batch=false" not in args
assert "--namespace=developer:ai-agent" not in subcmd_args
assert "Detected AI agent env" not in stdout
assert "Success" not in stdout

Write Preview
Loading…
Cancel
Save