Skip to content

GitLab

T
tangled
Commit d62dadaf authored by dominikg@chromium.org's avatar dominikg@chromium.org
Browse files
Options

Telemetry: Fix printing of number of failed pages. 

Pass 'telemetry_page_measurement_results' as measurement for both metrics.
Distinguish them by passing different values as the trace parameter. This
allows us to show both metrics as separate lines in the same graph.

BUG=238864

Review URL: https://codereview.chromium.org/25593004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226484 0039d316-1c4b-4281-b951-d872f2087c98
parent 9bf7636a
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 66 deletions
tools/telemetry/telemetry/page/buildbot_page_measurement_results.py
View file @ d62dadaf
......@@ -120,9 +120,9 @@ class BuildbotPageMeasurementResults(
values, value.units, value.data_type)
# Print the number of failed and errored pages.
self._PrintPerfResult('telemetry_num_failed_pages', '',
self._PrintPerfResult('telemetry_page_measurement_results', 'num_failed',
[len(self.failures)], 'count', 'unimportant')
self._PrintPerfResult('telemetry_num_errored_pages', '',
self._PrintPerfResult('telemetry_page_measurement_results', 'num_errored',
[len(self.errors)], 'count', 'unimportant')
super(BuildbotPageMeasurementResults, self).PrintSummary()
tools/telemetry/telemetry/page/buildbot_page_measurement_results_unittest.py
View file @ d62dadaf
......@@ -46,9 +46,11 @@ class BuildbotPageMeasurementResultsTest(unittest.TestCase):
expected = ['RESULT a_by_url: http___www.foo.com_= 3 seconds',
'RESULT a_by_url: http___www.bar.com_= 7 seconds',
'*RESULT a: a= [3,7] seconds\nAvg a: 5.000000seconds\n' +
'Sd a: 2.828427seconds',
'RESULT telemetry_num_failed_pages: 0 count',
'RESULT telemetry_num_errored_pages: 0 count']
'Sd a: 2.828427seconds',
'RESULT telemetry_page_measurement_results: ' +
'num_failed= 0 count',
'RESULT telemetry_page_measurement_results: ' +
'num_errored= 0 count']
self.assertEquals(measurement_results.results, expected)
def test_basic_summary_nonuniform_results(self):
......@@ -79,8 +81,10 @@ class BuildbotPageMeasurementResultsTest(unittest.TestCase):
'RESULT b_by_url: http___www.foo.com_= 10 seconds',
'RESULT b_by_url: http___www.bar.com_= 10 seconds',
'*RESULT b: b= [10,10] seconds\nAvg b: 10.000000seconds',
'RESULT telemetry_num_failed_pages: 0 count',
'RESULT telemetry_num_errored_pages: 0 count']
'RESULT telemetry_page_measurement_results: ' +
'num_failed= 0 count',
'RESULT telemetry_page_measurement_results: ' +
'num_errored= 0 count']
self.assertEquals(measurement_results.results, expected)
def test_basic_summary_pass_and_fail_page(self):
......@@ -99,8 +103,10 @@ class BuildbotPageMeasurementResultsTest(unittest.TestCase):
measurement_results.PrintSummary()
expected = ['RESULT a_by_url: http___www.bar.com_= 7 seconds',
'RESULT telemetry_num_failed_pages: 1 count',
'RESULT telemetry_num_errored_pages: 0 count']
'RESULT telemetry_page_measurement_results: ' +
'num_failed= 1 count',
'RESULT telemetry_page_measurement_results: ' +
'num_errored= 0 count']
self.assertEquals(measurement_results.results, expected)
def test_repeated_pageset_one_iteration_one_page_fails(self):
......@@ -127,10 +133,12 @@ class BuildbotPageMeasurementResultsTest(unittest.TestCase):
measurement_results.PrintSummary()
expected = ['RESULT a_by_url: http___www.foo.com_= [3,4] seconds\n' +
'Avg a_by_url: 3.500000seconds\n' +
'Sd a_by_url: 0.707107seconds',
'RESULT telemetry_num_failed_pages: 1 count',
'RESULT telemetry_num_errored_pages: 0 count']
'Avg a_by_url: 3.500000seconds\n' +
'Sd a_by_url: 0.707107seconds',
'RESULT telemetry_page_measurement_results: ' +
'num_failed= 1 count',
'RESULT telemetry_page_measurement_results: ' +
'num_errored= 0 count']
self.assertEquals(measurement_results.results, expected)
def test_repeated_pageset_one_iteration_one_page_error(self):
......@@ -157,10 +165,12 @@ class BuildbotPageMeasurementResultsTest(unittest.TestCase):
measurement_results.PrintSummary()
expected = ['RESULT a_by_url: http___www.foo.com_= [3,4] seconds\n' +
'Avg a_by_url: 3.500000seconds\n' +
'Sd a_by_url: 0.707107seconds',
'RESULT telemetry_num_failed_pages: 0 count',
'RESULT telemetry_num_errored_pages: 1 count']
'Avg a_by_url: 3.500000seconds\n' +
'Sd a_by_url: 0.707107seconds',
'RESULT telemetry_page_measurement_results: ' +
'num_failed= 0 count',
'RESULT telemetry_page_measurement_results:' +
' num_errored= 1 count']
self.assertEquals(measurement_results.results, expected)
def test_repeated_pageset(self):
......@@ -185,16 +195,18 @@ class BuildbotPageMeasurementResultsTest(unittest.TestCase):
measurement_results.PrintSummary()
expected = ['RESULT a_by_url: http___www.foo.com_= [3,4] seconds\n' +
'Avg a_by_url: 3.500000seconds\n' +
'Sd a_by_url: 0.707107seconds',
'Avg a_by_url: 3.500000seconds\n' +
'Sd a_by_url: 0.707107seconds',
'RESULT a_by_url: http___www.bar.com_= [7,8] seconds\n' +
'Avg a_by_url: 7.500000seconds\n' +
'Sd a_by_url: 0.707107seconds',
'Avg a_by_url: 7.500000seconds\n' +
'Sd a_by_url: 0.707107seconds',
'*RESULT a: a= [3,7,4,8] seconds\n' +
'Avg a: 5.500000seconds\n'
'Sd a: 2.380476seconds',
'RESULT telemetry_num_failed_pages: 0 count',
'RESULT telemetry_num_errored_pages: 0 count'
'Avg a: 5.500000seconds\n' +
'Sd a: 2.380476seconds',
'RESULT telemetry_page_measurement_results: ' +
'num_failed= 0 count',
'RESULT telemetry_page_measurement_results: ' +
'num_errored= 0 count'
]
self.assertEquals(
measurement_results.results,
......@@ -222,16 +234,18 @@ class BuildbotPageMeasurementResultsTest(unittest.TestCase):
measurement_results.PrintSummary()
expected = ['RESULT a_by_url: http___www.foo.com_= [3,4] seconds\n' +
'Avg a_by_url: 3.500000seconds\n' +
'Sd a_by_url: 0.707107seconds',
'Avg a_by_url: 3.500000seconds\n' +
'Sd a_by_url: 0.707107seconds',
'RESULT a_by_url: http___www.bar.com_= [7,8] seconds\n' +
'Avg a_by_url: 7.500000seconds\n' +
'Sd a_by_url: 0.707107seconds',
'Avg a_by_url: 7.500000seconds\n' +
'Sd a_by_url: 0.707107seconds',
'*RESULT a: a= [3,4,7,8] seconds\n' +
'Avg a: 5.500000seconds\n' +
'Sd a: 2.380476seconds',
'RESULT telemetry_num_failed_pages: 0 count',
'RESULT telemetry_num_errored_pages: 0 count'
'Avg a: 5.500000seconds\n' +
'Sd a: 2.380476seconds',
'RESULT telemetry_page_measurement_results: ' +
'num_failed= 0 count',
'RESULT telemetry_page_measurement_results: ' +
'num_errored= 0 count'
]
self.assertEquals(
measurement_results.results,
......@@ -261,11 +275,11 @@ class BuildbotPageMeasurementResultsTest(unittest.TestCase):
['RESULT b_by_url: http___www.foo.com_= 2 seconds',
'RESULT b_by_url: http___www.bar.com_= 3 seconds',
'*RESULT b: b= [2,3] seconds\n' +
'Avg b: 2.500000seconds\nSd b: 0.707107seconds',
'Avg b: 2.500000seconds\nSd b: 0.707107seconds',
'*RESULT a: a= 1 seconds',
'*RESULT c: c= 4 seconds',
'RESULT telemetry_num_failed_pages: 0 count',
'RESULT telemetry_num_errored_pages: 0 count'])
'RESULT telemetry_page_measurement_results: num_failed= 0 count',
'RESULT telemetry_page_measurement_results: num_errored= 0 count'])
def test_overall_results_trace_tag(self):
test_page_set = _MakePageSet()
......@@ -289,11 +303,11 @@ class BuildbotPageMeasurementResultsTest(unittest.TestCase):
self.assertEquals(
measurement_results.results,
['*RESULT b: b_ref= [2,3] seconds\n' +
'Avg b: 2.500000seconds\nSd b: 0.707107seconds',
'Avg b: 2.500000seconds\nSd b: 0.707107seconds',
'*RESULT a: a_ref= 1 seconds',
'*RESULT c: c_ref= 4 seconds',
'RESULT telemetry_num_failed_pages: 0 count',
'RESULT telemetry_num_errored_pages: 0 count'])
'RESULT telemetry_page_measurement_results: num_failed= 0 count',
'RESULT telemetry_page_measurement_results: num_errored= 0 count'])
def test_histogram(self):
test_page_set = _MakePageSet()
......@@ -315,11 +329,11 @@ class BuildbotPageMeasurementResultsTest(unittest.TestCase):
expected = [
'HISTOGRAM a_by_url: http___www.foo.com_= ' +
'{"buckets": [{"low": 1, "high": 2, "count": 1}]} units\n' +
'Avg a_by_url: 1.500000units',
'{"buckets": [{"low": 1, "high": 2, "count": 1}]} units\n' +
'Avg a_by_url: 1.500000units',
'HISTOGRAM a_by_url: http___www.bar.com_= ' +
'{"buckets": [{"low": 2, "high": 3, "count": 1}]} units\n' +
'Avg a_by_url: 2.500000units',
'RESULT telemetry_num_failed_pages: 0 count',
'RESULT telemetry_num_errored_pages: 0 count']
'{"buckets": [{"low": 2, "high": 3, "count": 1}]} units\n' +
'Avg a_by_url: 2.500000units',
'RESULT telemetry_page_measurement_results: num_failed= 0 count',
'RESULT telemetry_page_measurement_results: num_errored= 0 count']
self.assertEquals(measurement_results.results, expected)
tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py
View file @ d62dadaf
......@@ -70,12 +70,17 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
'"units": "seconds", '
'"important": true'
'}, '
'"telemetry_page_measurement_results.num_failed": {'
'"current": [0], '
'"units": "count", '
'"important": false'
'}, '
'"a_by_url.http://www.bar.com/": {'
'"current": [7], '
'"units": "seconds", '
'"important": false'
'}, '
'"telemetry_num_failed_pages.": {'
'"telemetry_page_measurement_results.num_errored": {'
'"current": [0], '
'"units": "count", '
'"important": false'
......@@ -84,11 +89,6 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
'"current": [3], '
'"units": "seconds", '
'"important": false'
'}, '
'"telemetry_num_errored_pages.": {'
'"current": [0], '
'"units": "count", '
'"important": false'
'}'
'}'
'}'
......@@ -123,24 +123,24 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
'"units": "seconds", '
'"important": true'
'}, '
'"a_by_url.http://www.bar.com/": {'
'"current": [7], '
'"units": "seconds", '
'"telemetry_page_measurement_results.num_failed": {'
'"current": [0], '
'"units": "count", '
'"important": false'
'}, '
'"a_by_url.http://www.foo.com/": {'
'"current": [3], '
'"a_by_url.http://www.bar.com/": {'
'"current": [7], '
'"units": "seconds", '
'"important": false'
'}, '
'"telemetry_num_failed_pages.": {'
'"telemetry_page_measurement_results.num_errored": {'
'"current": [0], '
'"units": "count", '
'"important": false'
'}, '
'"telemetry_num_errored_pages.": {'
'"current": [0], '
'"units": "count", '
'"a_by_url.http://www.foo.com/": {'
'"current": [3], '
'"units": "seconds", '
'"important": false'
'}'
'}'
......@@ -159,12 +159,17 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
'"units": "seconds", '
'"important": true'
'}, '
'"telemetry_page_measurement_results.num_failed": {'
'"current": [0], '
'"units": "count", '
'"important": false'
'}, '
'"a_by_url.http://www.bar.com/": {'
'"current": [8], '
'"units": "seconds", '
'"important": false'
'}, '
'"telemetry_num_failed_pages.": {'
'"telemetry_page_measurement_results.num_errored": {'
'"current": [0], '
'"units": "count", '
'"important": false'
......@@ -173,11 +178,6 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
'"current": [4], '
'"units": "seconds", '
'"important": false'
'}, '
'"telemetry_num_errored_pages.": {'
'"current": [0], '
'"units": "count", '
'"important": false'
'}'
'}'
'}'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment