Merge lp:~hloeung/ubuntu-repository-cache/metadata-sync-metrics-only-once into lp:ubuntu-repository-cache

[Haw Loeung]

Add metrics for when success (zero failures); also only once at the end rather than metric for each failure

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Loïc Gomez (kotodama)]

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 369

=== modified file 'lib/ubuntu_repository_cache/metadata_sync.py'
--- lib/ubuntu_repository_cache/metadata_sync.py	2022-08-09 09:18:55 +0000
+++ lib/ubuntu_repository_cache/metadata_sync.py	2022-08-15 23:27:16 +0000
@@ -293,6 +293,10 @@
 
     log("Executing hook: {}".format(cmd))
 
+    metric_name = 'ubuntu_repository_cache_metadata_sync_failures'
+    label = 'meta_ver={}'.format(meta_ver)
+    failures = 0
+
     errors = []
     # Work around Juju instability issues causing juju-run to abort
     # (LP:1977798).
@@ -303,6 +307,7 @@
             msg = "{}".format(output)
             log(msg)
         except subprocess.CalledProcessError as e:
+            failures = attempt
             # Save the exact exception and reuse when we need to
             # reraise it after exhausting all available attempts.
             exp = e
@@ -313,9 +318,6 @@
             log(e.output.decode())
             errors.append(msg)
             errors.append(e.output.decode())
-            metric_name = 'ubuntu_repository_cache_metadata_sync_failures'
-            label = 'meta_ver={}'.format(meta_ver)
-            send_to_influx(render_influx(metric_name, label, attempt))
             time.sleep(sleep)
         else:
             break
@@ -326,11 +328,10 @@
         log(msg)
         print(msg)
         print('\n'.join(errors))
-        metric_name = 'ubuntu_repository_cache_metadata_sync_failures'
-        label = 'meta_ver={}'.format(meta_ver)
         send_to_influx(render_influx(metric_name, label, max_retries))
         raise exp
 
+    send_to_influx(render_influx(metric_name, label, failures))
     return meta_ver