commit 09f358bae36c316e3c4c39cd344de964bd0fed7c
author Edward Lesmes <ehmaldonado@google.com> Tue Jun 22 22:31:52 2021 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jun 22 22:31:52 2021 +0000
tree 48cda0e9c4d7129c763c36c942301080260f60cd
parent b714c17658d3e34a6e6abdc2b54be954b79cc4fa

metrics: Don't collect metrics on DEPOT_TOOLS_METRICS=0

Before crrev.com/c/2876082, DEPOT_TOOLS_METRICS=0 was the
env var used to disable metrics collection.

Bug: b/191388102
Change-Id: I0db9d034562f2eb1afb53818b3853cef50c09826
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2980230
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Jack Neus <jackneus@google.com>
Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Jack Neus <jackneus@google.com>

metrics_utils.py

diff --git a/metrics_utils.py b/metrics_utils.py
index 1df2d05..7097857 100644
--- a/metrics_utils.py
+++ b/metrics_utils.py
@@ -25,7 +25,9 @@
 APP_URL = 'https://cit-cli-metrics.appspot.com'
 
 REPORT_BUILD = os.getenv('DEPOT_TOOLS_REPORT_BUILD')
-COLLECT_METRICS = os.getenv('DEPOT_TOOLS_COLLECT_METRICS') != '0'
+COLLECT_METRICS = (
+    os.getenv('DEPOT_TOOLS_COLLECT_METRICS') != '0'
+    and os.getenv('DEPOT_TOOLS_METRICS') != '0')
 
 SYNC_STATUS_SUCCESS = 'SYNC_STATUS_SUCCESS'
 SYNC_STATUS_FAILURE = 'SYNC_STATUS_FAILURE'