commit cb29fbd231d64bbc5d23bbf04fb47637111b71bb
author Mike Nichols <mikenichols@chromium.org> Tue Jul 24 11:09:33 2018 -0600
committer Mike Nichols <mikenichols@chromium.org> Wed Jul 25 14:47:34 2018 +0000
tree 94743d696aa78bde16ef07b4015d7ea807962e9a
parent 09f0990a2db0cf45d076a0c6d99a88853b258a10

cbuildbot_launch: Wrap duration with per instance timing metric.

Initial test wrapper of duration to capture per instance timing metrics,
rather than cumulative distributions.  This is temporary as I think it
might be a better approach to combine both timers in one call for
wrapping throughout, rather than wrapping everything twice to get
timings.  No decision to remove distributions, as they have their place
as well, from collection.

BUG=chromium:864596
TEST=`cros tryjob -g 1148648 poppy-paladin-tryjob`

Change-Id: I5b7a125db212d03ebe5a67f3c281ed87bb2698ce
Reviewed-on: https://chromium-review.googlesource.com/1148648
Reviewed-by: Jason Clinton <jclinton@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Tested-by: Mike Nichols <mikenichols@chromium.org>
Commit-Queue: Mike Nichols <mikenichols@chromium.org>

scripts/cbuildbot_launch.py

diff --git a/scripts/cbuildbot_launch.py b/scripts/cbuildbot_launch.py
index 2ed2f0c..1bfe58a 100644
--- a/scripts/cbuildbot_launch.py
+++ b/scripts/cbuildbot_launch.py
@@ -41,18 +41,19 @@
 _DISTFILES_CACHE_EXPIRY_HOURS = 8 * 24
 
 # Metrics reported to Monarch.
-METRIC_ACTIVE = 'chromeos/chromite/cbuildbot_launch/active'
-METRIC_INVOKED = 'chromeos/chromite/cbuildbot_launch/invoked'
-METRIC_COMPLETED = 'chromeos/chromite/cbuildbot_launch/completed'
-METRIC_PREP = 'chromeos/chromite/cbuildbot_launch/prep_completed'
-METRIC_CLEAN = 'chromeos/chromite/cbuildbot_launch/clean_buildroot_durations'
-METRIC_INITIAL = 'chromeos/chromite/cbuildbot_launch/initial_checkout_durations'
-METRIC_CBUILDBOT = 'chromeos/chromite/cbuildbot_launch/cbuildbot_durations'
-METRIC_CLOBBER = 'chromeos/chromite/cbuildbot_launch/clobber'
-METRIC_BRANCH_CLEANUP = 'chromeos/chromite/cbuildbot_launch/branch_cleanup'
-METRIC_DISTFILES_CLEANUP = (
-    'chromeos/chromite/cbuildbot_launch/distfiles_cleanup')
-METRIC_CHROOT_CLEANUP = 'chromeos/chromite/cbuildbot_launch/chroot_cleanup'
+METRIC_PREFIX = 'chromeos/chromite/cbuildbot_launch/'
+METRIC_ACTIVE = METRIC_PREFIX + 'active'
+METRIC_INVOKED = METRIC_PREFIX + 'invoked'
+METRIC_COMPLETED = METRIC_PREFIX + 'completed'
+METRIC_PREP = METRIC_PREFIX + 'prep_completed'
+METRIC_CLEAN = METRIC_PREFIX + 'clean_buildroot_durations'
+METRIC_INITIAL = METRIC_PREFIX + 'initial_checkout_durations'
+METRIC_CBUILDBOT = METRIC_PREFIX + 'cbuildbot_durations'
+METRIC_CBUILDBOT_INSTANCE = METRIC_PREFIX + 'cbuildbot_instance_durations'
+METRIC_CLOBBER = METRIC_PREFIX + 'clobber'
+METRIC_BRANCH_CLEANUP = METRIC_PREFIX + 'branch_cleanup'
+METRIC_DISTFILES_CLEANUP = METRIC_PREFIX + 'distfiles_cleanup'
+METRIC_CHROOT_CLEANUP = METRIC_PREFIX + 'chroot_cleanup'
 
 # Builder state
 BUILDER_STATE_FILENAME = '.cbuildbot_build_state.json'
@@ -461,7 +462,9 @@
           InitialCheckout(repo)
 
     # Run cbuildbot inside the full ChromeOS checkout, on the specified branch.
-    with metrics.SecondsTimer(METRIC_CBUILDBOT, fields=metrics_fields):
+    with metrics.SecondsTimer(METRIC_CBUILDBOT, fields=metrics_fields), \
+         metrics.SecondsInstanceTimer(METRIC_CBUILDBOT_INSTANCE,
+                                      fields=metrics_fields):
       if previous_build_state.is_valid():
         argv.append('--previous-build-state')
         argv.append(base64.b64encode(previous_build_state.to_json()))