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.py

diff --git a/api/metrics.py b/api/metrics.py
index f521ec6..101ddd5 100644
--- a/api/metrics.py
+++ b/api/metrics.py
@@ -11,7 +11,7 @@
 import collections
 import logging
 
-from chromite.utils import metrics
+from chromite.lib import metrics_lib
 
 
 def deserialize_metrics_log(output_events, prefix=None):
@@ -37,11 +37,11 @@
       return name
 
   # Reduce over the input events to append output_events.
-  for input_event in metrics.read_metrics_events():
-    if input_event.op == metrics.OP_START_TIMER:
+  for input_event in metrics_lib.read_metrics_events():
+    if input_event.op == metrics_lib.OP_START_TIMER:
       timers[input_event.arg] = (input_event.name,
                                  input_event.timestamp_epoch_millis)
-    elif input_event.op == metrics.OP_STOP_TIMER:
+    elif input_event.op == metrics_lib.OP_STOP_TIMER:
       # TODO(wbbradley): Drop the None fallback https://crbug.com/1001909.
       timer = timers.pop(input_event.arg, None)
       if timer is None:
@@ -54,28 +54,28 @@
         output_event.timestamp_milliseconds = input_event.timestamp_epoch_millis
         output_event.duration_milliseconds = (
             output_event.timestamp_milliseconds - timer[1])
-    elif input_event.op == metrics.OP_NAMED_EVENT:
+    elif input_event.op == metrics_lib.OP_NAMED_EVENT:
       output_event = output_events.add()
       output_event.name = make_name(input_event.name)
       output_event.timestamp_milliseconds = input_event.timestamp_epoch_millis
-    elif input_event.op == metrics.OP_GAUGE:
+    elif input_event.op == metrics_lib.OP_GAUGE:
       output_event = output_events.add()
       output_event.name = make_name(input_event.name)
       output_event.timestamp_milliseconds = input_event.timestamp_epoch_millis
       output_event.gauge = input_event.arg
-    elif input_event.op == metrics.OP_INCREMENT_COUNTER:
+    elif input_event.op == metrics_lib.OP_INCREMENT_COUNTER:
       counters[input_event.name] += input_event.arg
       counter_times[input_event.name] = max(
           input_event.timestamp_epoch_millis,
           counter_times.get(input_event.name, 0))
-    elif input_event.op == metrics.OP_DECREMENT_COUNTER:
+    elif input_event.op == metrics_lib.OP_DECREMENT_COUNTER:
       counters[input_event.name] -= input_event.arg
       counter_times[input_event.name] = max(
           input_event.timestamp_epoch_millis,
           counter_times.get(input_event.name, 0))
     else:
-      raise ValueError('unexpected op "%s" found in metric event: %s' % (
-          input_event.op, input_event))
+      raise ValueError('unexpected op "%s" found in metric event: %s' %
+                       (input_event.op, input_event))
 
   for counter, value in counters.items():
     output_event = output_events.add()