commit aef41948c534691e12ea4bc9770a4ee1e2cc344b
author Alex Klein <saklein@chromium.org> Tue Apr 19 14:13:17 2022 -0600
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Apr 26 23:31:48 2022 +0000
tree b52955486f08264674d46c3081d3ce24e8abdf1e
parent e29977b6ebbf58080b4296de3c38a269b32c6c04

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>

api/metrics_unittest.py

diff --git a/api/metrics_unittest.py b/api/metrics_unittest.py
index 7d9b72e..9530213 100644
--- a/api/metrics_unittest.py
+++ b/api/metrics_unittest.py
@@ -9,7 +9,7 @@
 from chromite.api import metrics as api_metrics
 from chromite.api.gen.chromite.api import build_api_test_pb2
 from chromite.lib import cros_test_lib
-from chromite.utils import metrics
+from chromite.lib import metrics_lib
 
 
 class MetricsTest(cros_test_lib.TestCase):
@@ -19,11 +19,13 @@
     """Test timer math and deserialization into proto objects."""
     response = build_api_test_pb2.TestResultMessage()
     mock_events = [
-        metrics.MetricEvent(600, 'a.b', metrics.OP_START_TIMER, arg='100'),
-        metrics.MetricEvent(1000, 'a.b', metrics.OP_STOP_TIMER, arg='100'),
+        metrics_lib.MetricEvent(
+            600, 'a.b', metrics_lib.OP_START_TIMER, arg='100'),
+        metrics_lib.MetricEvent(
+            1000, 'a.b', metrics_lib.OP_STOP_TIMER, arg='100'),
     ]
     with mock.patch(
-        'chromite.api.metrics.metrics.read_metrics_events',
+        'chromite.api.metrics.metrics_lib.read_metrics_events',
         return_value=mock_events):
       api_metrics.deserialize_metrics_log(response.events)
       self.assertEqual(len(response.events), 1)
@@ -38,11 +40,11 @@
     """
     response = build_api_test_pb2.TestResultMessage()
     mock_events = [
-        metrics.MetricEvent(
-            1000, 'a.named_event', metrics.OP_NAMED_EVENT, arg=None),
+        metrics_lib.MetricEvent(
+            1000, 'a.named_event', metrics_lib.OP_NAMED_EVENT, arg=None),
     ]
     with mock.patch(
-        'chromite.api.metrics.metrics.read_metrics_events',
+        'chromite.api.metrics.metrics_lib.read_metrics_events',
         return_value=mock_events):
       api_metrics.deserialize_metrics_log(response.events, prefix='prefix')
       self.assertEqual(len(response.events), 1)
@@ -54,10 +56,10 @@
     """Test deserialization of a gauge."""
     response = build_api_test_pb2.TestResultMessage()
     mock_events = [
-        metrics.MetricEvent(1000, 'a.gauge', metrics.OP_GAUGE, arg=17),
+        metrics_lib.MetricEvent(1000, 'a.gauge', metrics_lib.OP_GAUGE, arg=17),
     ]
     with mock.patch(
-        'chromite.api.metrics.metrics.read_metrics_events',
+        'chromite.api.metrics.metrics_lib.read_metrics_events',
         return_value=mock_events):
       api_metrics.deserialize_metrics_log(response.events)
       self.assertEqual(len(response.events), 1)
@@ -69,17 +71,17 @@
     """Test deserialization of a counter."""
     response = build_api_test_pb2.TestResultMessage()
     mock_events = [
-        metrics.MetricEvent(
-            1000, 'a.counter', metrics.OP_INCREMENT_COUNTER, arg=1),
-        metrics.MetricEvent(
-            1001, 'a.counter', metrics.OP_INCREMENT_COUNTER, arg=2),
-        metrics.MetricEvent(
-            1002, 'a.counter', metrics.OP_INCREMENT_COUNTER, arg=3),
-        metrics.MetricEvent(
-            1003, 'a.counter', metrics.OP_DECREMENT_COUNTER, arg=4),
+        metrics_lib.MetricEvent(
+            1000, 'a.counter', metrics_lib.OP_INCREMENT_COUNTER, arg=1),
+        metrics_lib.MetricEvent(
+            1001, 'a.counter', metrics_lib.OP_INCREMENT_COUNTER, arg=2),
+        metrics_lib.MetricEvent(
+            1002, 'a.counter', metrics_lib.OP_INCREMENT_COUNTER, arg=3),
+        metrics_lib.MetricEvent(
+            1003, 'a.counter', metrics_lib.OP_DECREMENT_COUNTER, arg=4),
     ]
     with mock.patch(
-        'chromite.api.metrics.metrics.read_metrics_events',
+        'chromite.api.metrics.metrics_lib.read_metrics_events',
         return_value=mock_events):
       api_metrics.deserialize_metrics_log(response.events)
       self.assertEqual(len(response.events), 1)