autoninja: Use AUTONINJA_BUILD_ID for RBE_invocation_id as is.

To use build id/invocation id consistently, reclient_helper will set AUTONINJA_BUILD_ID as RBE_invocation_id as is.
The host name information will be added as a metrics label.

Bug: 355127782
Change-Id: I5609ef38d897b19029795adf1b288898986c7c70
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5737676
Auto-Submit: Junji Watanabe <jwata@google.com>
Reviewed-by: Michael Savigny <msavigny@google.com>
Commit-Queue: Michael Savigny <msavigny@google.com>
This commit is contained in:
Junji Watanabe
2024-07-25 14:21:27 +00:00
committed by LUCI CQ
parent b5029f0194
commit d3d4c0ac53
2 changed files with 23 additions and 9 deletions

View File

@@ -139,19 +139,24 @@ def set_reproxy_metrics_flags(tool):
RBE_metrics_project=chromium-reclient-metrics
RBE_invocation_id=$AUTONINJA_BUILD_ID
RBE_metrics_table=rbe_metrics.builds
RBE_metrics_labels=source=developer,tool={tool}
RBE_metrics_labels=\
source=developer,\
tool={tool},\
creds_cache_status={auth_status},\
creds_cache_mechanism={auth_mechanism},\
host={host}
RBE_metrics_prefix=go.chromium.org
"""
autoninja_id = os.environ.get("AUTONINJA_BUILD_ID")
if autoninja_id is not None:
os.environ.setdefault("RBE_invocation_id",
"%s/%s" % (get_hostname(), autoninja_id))
os.environ.setdefault("RBE_invocation_id", autoninja_id)
os.environ.setdefault("RBE_metrics_project", "chromium-reclient-metrics")
os.environ.setdefault("RBE_metrics_table", "rbe_metrics.builds")
labels = "source=developer,tool=" + tool
auth_status, auth_mechanism = auth_cache_status()
labels += ",creds_cache_status=" + auth_status
labels += ",creds_cache_mechanism=" + auth_mechanism
labels += ",host=" + get_hostname()
os.environ.setdefault("RBE_metrics_labels", labels)
os.environ.setdefault("RBE_metrics_prefix", "go.chromium.org")