Add history-table aggregation to UKM config.

Bug: 900230
Change-Id: I37dd02c2a7e1b8ef586e101e036d6871c7361424
Reviewed-on: https://chromium-review.googlesource.com/c/1307935Reviewed-by: Bryan McQuade <bmcquade@chromium.org>
Commit-Queue: Brian White <bcwhite@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604599}

tools/metrics/ukm/ukm.xml

@@ -603,6 +603,14 @@ be describing additional metrics about the same event.
       The average time taken by the compositing phase in microseconds in the
       event period.
     </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
   <metric name="Compositing.AverageRatio">
     <summary>
@@ -628,6 +636,14 @@ be describing additional metrics about the same event.
       The average time taken by the compositing commit at the end of the blink
       lifecycle, in microseconds in the event period.
     </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
   <metric name="CompositingCommit.AverageRatio">
     <summary>
@@ -654,6 +670,14 @@ be describing additional metrics about the same event.
       The average time taken by all forced style recalcs and layouts in
       microseconds in the event period.
     </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
   <metric name="ForcedStyleAndLayout.AverageRatio">
     <summary>
@@ -680,6 +704,14 @@ be describing additional metrics about the same event.
       The average time taken to compute IntersectionObserver observations in
       microseconds in the event period.
     </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
   <metric name="IntersectionObservation.AverageRatio">
     <summary>
@@ -706,6 +738,14 @@ be describing additional metrics about the same event.
       The average time between a BeginMainFrame and the commit of paint results,
       in microseconds.
     </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
   <metric name="MainFrame.WorstCase">
     <summary>
@@ -718,6 +758,14 @@ be describing additional metrics about the same event.
       The average time taken by the paint phase in microseconds in the event
       period.
     </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
   <metric name="Paint.AverageRatio">
     <summary>
@@ -743,6 +791,14 @@ be describing additional metrics about the same event.
       The average time taken by the pre-paint phase in microseconds in the event
       period.
     </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
   <metric name="PrePaint.AverageRatio">
     <summary>
@@ -768,6 +824,14 @@ be describing additional metrics about the same event.
       The average time taken by the style and layout phases in microseconds in
       the event period.
     </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
   <metric name="StyleAndLayout.AverageRatio">
     <summary>
@@ -802,6 +866,14 @@ be describing additional metrics about the same event.
     <summary>
       Opt-in UseCounter feature.
     </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <enumeration/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
 </event>
 
@@ -1426,6 +1498,13 @@ be describing additional metrics about the same event.
       the event, no recording is made. The first GSU of every scrolling sequence
       is excluded from this metric.
     </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
 </event>
 
@@ -1456,6 +1535,13 @@ be describing additional metrics about the same event.
       a given scroll gesture event sequence. If no swap was induced by the
       event, no recording is made.
     </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
 </event>
 
@@ -3003,12 +3089,26 @@ be describing additional metrics about the same event.
       start to the time the DOMContentLoaded event is fired, for main frame
       documents.
     </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
   <metric name="DocumentTiming.NavigationToLoadEventFired">
     <summary>
       Measures the time in milliseconds from navigation timing's navigation
       start to the time the load event is fired, for main frame documents.
     </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
   <metric name="Experimental.InputToNavigationStart">
     <summary>
@@ -3031,6 +3131,13 @@ be describing additional metrics about the same event.
       start to the first meaningful paint (http://bit.ly/ttfmp-doc), for main
       frame documents.
     </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
   <metric name="Experimental.PaintTiming.NavigationToLargestImagePaint">
     <summary>
@@ -3071,6 +3178,13 @@ be describing additional metrics about the same event.
       meaningful input per navigation. See https://goo.gl/tr1oTZ for a detailed
       explanation. In ms.
     </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
   <metric name="InteractiveTiming.FirstInputTimestamp">
     <summary>
@@ -3222,12 +3336,26 @@ be describing additional metrics about the same event.
       start to the time when the page first paints content. A contentful paint
       includes a paint of text, image, SVG, or canvas.
     </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
   <metric name="PaintTiming.NavigationToFirstPaint">
     <summary>
       Measures the time in milliseconds from navigation timing's navigation
       start to the time the first paint is performed.
     </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
   <metric name="ParseTiming.NavigationToParseStart">
     <summary>
@@ -4038,12 +4166,28 @@ be describing additional metrics about the same event.
       The final SecurityLevel of the page before it is closed or another
       navigation occurs. Based on the enum security_state::SecurityLevel.
     </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <enumeration/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
   <metric name="InitialSecurityLevel">
     <summary>
       The initial SecurityLevel of the page when the navigation commits. Based
       on the enum security_state::SecurityLevel.
     </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <enumeration/>
+        </statistics>
+      </history>
+    </aggregation>
   </metric>
   <metric name="ScoreDelta">
     <summary>

tools/metrics/ukm/ukm_model.py

@@ -16,6 +16,48 @@ _SUMMARY_TYPE = models.TextNodeType('summary')
 
 _LOWERCASE_NAME_FN = lambda n: n.attributes['name'].value.lower()
 
+_ENUMERATION_TYPE = models.ObjectNodeType(
+    'enumeration',
+    attributes=[],
+    single_line=True)
+
+_QUANTILES_TYPE = models.ObjectNodeType(
+    'quantiles',
+    attributes=[
+      ('type', unicode),
+    ],
+    single_line=True)
+
+_INDEX_TYPE = models.ObjectNodeType(
+    'index',
+    attributes=[
+      ('fields', unicode),
+    ],
+    single_line=True)
+
+_STATISTICS_TYPE =  models.ObjectNodeType(
+    'statistics',
+    attributes=[],
+    children=[
+        models.ChildType('quantiles', _QUANTILES_TYPE, False),
+        models.ChildType('enumeration', _ENUMERATION_TYPE, False),
+    ])
+
+_HISTORY_TYPE =  models.ObjectNodeType(
+    'history',
+    attributes=[],
+    children=[
+        models.ChildType('index', _INDEX_TYPE, False),
+        models.ChildType('statistics', _STATISTICS_TYPE, True),
+    ])
+
+_AGGREGATION_TYPE =  models.ObjectNodeType(
+    'aggregation',
+    attributes=[],
+    children=[
+        models.ChildType('history', _HISTORY_TYPE, False),
+    ])
+
 _METRIC_TYPE =  models.ObjectNodeType(
     'metric',
     attributes=[
@@ -26,6 +68,7 @@ _METRIC_TYPE =  models.ObjectNodeType(
         models.ChildType('obsolete', _OBSOLETE_TYPE, False),
         models.ChildType('owners', _OWNER_TYPE, True),
         models.ChildType('summary', _SUMMARY_TYPE, False),
+        models.ChildType('aggregation', _AGGREGATION_TYPE, True),
     ])
 
 _EVENT_TYPE =  models.ObjectNodeType(