autotest: move or eliminate a bunch of autotest_stats stats
BUG=chromium:667171
TEST=unittests; guado_moblab tryjob + test run
Change-Id: I815d2d748a2daa3bc869ead5d09f722245b7317b
Reviewed-on: https://chromium-review.googlesource.com/413103
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Commit-Queue: Aviv Keshet <akeshet@chromium.org>
Tested-by: Aviv Keshet <akeshet@chromium.org>
diff --git a/frontend/afe/json_rpc/serviceHandler.py b/frontend/afe/json_rpc/serviceHandler.py
index bd63cd3..e3e52f9 100644
--- a/frontend/afe/json_rpc/serviceHandler.py
+++ b/frontend/afe/json_rpc/serviceHandler.py
@@ -31,6 +31,10 @@
from json import encoder
json_encoder = encoder.JSONEncoder()
+# TODO(akeshet): Eliminate this and replace with monarch metrics. (At the
+# moment, I don't think we can just easily swap out, because this module is
+# called by apache for rpc handling, and we don't have a ts_mon thread for that
+# yet).
from autotest_lib.client.common_lib.cros.graphite import autotest_stats
diff --git a/frontend/afe/model_logic.py b/frontend/afe/model_logic.py
index cec7dad..580e7cd 100644
--- a/frontend/afe/model_logic.py
+++ b/frontend/afe/model_logic.py
@@ -9,6 +9,8 @@
from django.db import transaction
from django.db.models.sql import query
import django.db.models.sql.where
+# TODO(akeshet): Replace with monarch stats once we know how to instrument rpc
+# handling with ts_mon.
from autotest_lib.client.common_lib.cros.graphite import autotest_stats
from autotest_lib.frontend.afe import rdb_model_extensions
diff --git a/frontend/afe/rpc_interface.py b/frontend/afe/rpc_interface.py
index 519987a..92e66e4 100644
--- a/frontend/afe/rpc_interface.py
+++ b/frontend/afe/rpc_interface.py
@@ -41,6 +41,8 @@
from autotest_lib.client.common_lib import control_data
from autotest_lib.client.common_lib import priorities
from autotest_lib.client.common_lib.cros import dev_server
+# TODO(akeshet): Replace with monarch stats once we know how to instrument rpc
+# server with ts_mon.
from autotest_lib.client.common_lib.cros.graphite import autotest_stats
from autotest_lib.frontend.afe import control_file, rpc_utils
from autotest_lib.frontend.afe import models, model_logic, model_attributes
diff --git a/frontend/afe/rpc_utils.py b/frontend/afe/rpc_utils.py
index 95206bb..3ff81cd 100644
--- a/frontend/afe/rpc_utils.py
+++ b/frontend/afe/rpc_utils.py
@@ -19,6 +19,8 @@
from autotest_lib.client.common_lib import control_data, error
from autotest_lib.client.common_lib import global_config, priorities
from autotest_lib.client.common_lib import time_utils
+# TODO(akeshet): Replace with monarch once we know how to instrument rpc server
+# with ts_mon.
from autotest_lib.client.common_lib.cros.graphite import autotest_stats
from autotest_lib.server import utils as server_utils
from autotest_lib.server.cros import provision
diff --git a/frontend/afe/site_rpc_interface.py b/frontend/afe/site_rpc_interface.py
index 0eb6054..1ea6c4e 100644
--- a/frontend/afe/site_rpc_interface.py
+++ b/frontend/afe/site_rpc_interface.py
@@ -16,6 +16,7 @@
from autotest_lib.client.common_lib import priorities
from autotest_lib.client.common_lib import time_utils
from autotest_lib.client.common_lib.cros import dev_server
+# TODO(akeshet): Replace with monarch.
from autotest_lib.client.common_lib.cros.graphite import autotest_stats
from autotest_lib.frontend.afe import rpc_utils
from autotest_lib.server import utils