Move autotest_stats stats to monarch metrics
BUG=chromium:667171
TEST=utils/unittest_suite
Change-Id: I8cc4ca866df514e791845c676409d2230615cff3
Reviewed-on: https://chromium-review.googlesource.com/414187
Commit-Ready: Ningning Xia <nxia@chromium.org>
Tested-by: Ningning Xia <nxia@chromium.org>
Reviewed-by: Ningning Xia <nxia@chromium.org>
diff --git a/site_utils/gmail_lib.py b/site_utils/gmail_lib.py
index 3917deb..77b6a60 100755
--- a/site_utils/gmail_lib.py
+++ b/site_utils/gmail_lib.py
@@ -26,7 +26,7 @@
import common
from autotest_lib.client.common_lib import global_config
-from autotest_lib.client.common_lib.cros.graphite import autotest_stats
+from autotest_lib.server import site_utils
try:
from apiclient.discovery import build as apiclient_build
@@ -40,9 +40,9 @@
# of a sys.path war between chromite and autotest crbug.com/622988
from autotest_lib.server import utils as server_utils
from chromite.lib import retry_util
+from chromite.lib import metrics
-EMAIL_COUNT_KEY = 'emails.%s'
DEFAULT_CREDS_FILE = global_config.global_config.get_config_value(
'NOTIFICATIONS', 'gmail_api_credentials', default=None)
RETRY_DELAY = 5
@@ -164,13 +164,13 @@
logging.warning('Will retry error %s', exc)
return should_retry
- autotest_stats.Counter(EMAIL_COUNT_KEY % 'total').increment()
+ metrics.Counter('chromeos/autotest/send_email/total').increment()
try:
retry_util.GenericRetry(
handler, retry_count, _run, sleep=RETRY_DELAY,
backoff_factor=RETRY_BACKOFF_FACTOR)
except Exception:
- autotest_stats.Counter(EMAIL_COUNT_KEY % 'fail').increment()
+ metrics.Counter('chromeos/autotest/send_email/fail').increment()
raise
@@ -188,4 +188,6 @@
sys.exit(1)
message_text = sys.stdin.read()
- send_email(','.join(args.recipients), args.subject , message_text)
+
+ with site_utils.SetupTsMonGlobalState('gmail_lib', short_lived=True):
+ send_email(','.join(args.recipients), args.subject , message_text)