utils/metrics: Move to lib
utils/metrics depends on chromite.lib, and is written such that it
contains logic a little too coupled to CrOS/chromite implementation
detials to qualify for utils.
BUG=b:223433932
TEST=run_tests, CQ
Change-Id: Ia9a21e4f97b42e13f2443c8007412ef31b9d80af
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3595160
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>
Tested-by: Alex Klein <saklein@chromium.org>
diff --git a/api/controller/test.py b/api/controller/test.py
index 4fa149a..0618e79 100644
--- a/api/controller/test.py
+++ b/api/controller/test.py
@@ -27,6 +27,7 @@
from chromite.lib import cros_build_lib
from chromite.lib import goma_lib
from chromite.lib import image_lib
+from chromite.lib import metrics_lib
from chromite.lib import osutils
from chromite.lib import sysroot_lib
from chromite.lib.parser import package_info
@@ -35,7 +36,6 @@
from chromite.service import test
from chromite.third_party.google.protobuf import json_format
from chromite.utils import key_value_store
-from chromite.utils import metrics
@faux.empty_success
@@ -88,7 +88,7 @@
@faux.error(_BuildTargetUnitTestFailedResponse)
@validate.require_each('packages', ['category', 'package_name'])
@validate.validation_complete
-@metrics.collect_metrics
+@metrics_lib.collect_metrics
def BuildTargetUnitTest(input_proto, output_proto, _config):
"""Run a build target's ebuild unit tests."""
# Method flags.