From c6d1b3e7e698c2f6470ac6f28e9f5376366da8ed Mon Sep 17 00:00:00 2001 From: soulgalore Date: Sat, 28 Jun 2014 18:13:44 -0700 Subject: [PATCH] pickup data for each run, closes #436 --- lib/aggregators/webpagetest/firstViewFirstPaint.js | 10 ++++++---- lib/aggregators/webpagetest/imageSavings.js | 10 ++++++---- lib/aggregators/webpagetest/imageTotal.js | 6 ++++-- lib/aggregators/webpagetest/repeatViewFirstPaint.js | 10 ++++++---- lib/aggregators/webpagetest/serverRTT.js | 6 ++++-- lib/aggregators/webpagetest/speedIndex.js | 10 ++++++---- lib/aggregators/webpagetest/ttfb.js | 10 ++++++---- lib/aggregators/webpagetest/visualComplete.js | 8 +++++--- 8 files changed, 43 insertions(+), 27 deletions(-) diff --git a/lib/aggregators/webpagetest/firstViewFirstPaint.js b/lib/aggregators/webpagetest/firstViewFirstPaint.js index 9dd3d4e95..50a4678ec 100644 --- a/lib/aggregators/webpagetest/firstViewFirstPaint.js +++ b/lib/aggregators/webpagetest/firstViewFirstPaint.js @@ -11,7 +11,9 @@ module.exports = new Aggregator('wpt.firstViewFirstPaint', 'The first paint time fetched using WebPageTest','milliseconds',0, function(pageData) { if (pageData.webpagetest) { - if (pageData.webpagetest.response.data.median.firstView.firstPaint) - this.stats.push(pageData.webpagetest.response.data.median.firstView.firstPaint); - } - }); + var stats = this.stats; + pageData.webpagetest.response.data.run.forEach(function (run) { + stats.push(run.firstView.results.firstPaint); + }); + } +}); diff --git a/lib/aggregators/webpagetest/imageSavings.js b/lib/aggregators/webpagetest/imageSavings.js index a6585154d..7d9814947 100644 --- a/lib/aggregators/webpagetest/imageSavings.js +++ b/lib/aggregators/webpagetest/imageSavings.js @@ -11,7 +11,9 @@ module.exports = new Aggregator('wpt.imageSavings', 'How much that can be saved if the images are compressed (using WebPageTest)','bytes',0, function(pageData) { if (pageData.webpagetest) { - if (pageData.webpagetest.response.data.median.firstView.image_savings) - this.stats.push(pageData.webpagetest.response.data.median.firstView.image_savings); - } - }); + var stats = this.stats; + pageData.webpagetest.response.data.run.forEach(function (run) { + stats.push(run.firstView.results.image_savings); + }); + } +}); diff --git a/lib/aggregators/webpagetest/imageTotal.js b/lib/aggregators/webpagetest/imageTotal.js index 9383940cb..3dfbc81eb 100644 --- a/lib/aggregators/webpagetest/imageTotal.js +++ b/lib/aggregators/webpagetest/imageTotal.js @@ -11,7 +11,9 @@ module.exports = new Aggregator('wpt.imageTotal', 'Total image size (fetched by WebPageTest)','bytes',0, function(pageData) { if (pageData.webpagetest) { - if (pageData.webpagetest.response.data.median.firstView.image_total) - this.stats.push(pageData.webpagetest.response.data.median.firstView.image_total); + var stats = this.stats; + pageData.webpagetest.response.data.run.forEach(function (run) { + stats.push(run.firstView.results.image_total); + }); } }); diff --git a/lib/aggregators/webpagetest/repeatViewFirstPaint.js b/lib/aggregators/webpagetest/repeatViewFirstPaint.js index 85f02bca5..423a6e43d 100644 --- a/lib/aggregators/webpagetest/repeatViewFirstPaint.js +++ b/lib/aggregators/webpagetest/repeatViewFirstPaint.js @@ -11,7 +11,9 @@ module.exports = new Aggregator('wpt.repeatViewFirstPaint', '','milliseconds',0, function(pageData) { if (pageData.webpagetest) { - if (pageData.webpagetest.response.data.median.repeatView.firstPaint) - this.stats.push(pageData.webpagetest.response.data.median.repeatView.firstPaint); - } - }); + var stats = this.stats; + pageData.webpagetest.response.data.run.forEach(function (run) { + stats.push(run.repeatView.results.firstPaint); + }); + } +}); diff --git a/lib/aggregators/webpagetest/serverRTT.js b/lib/aggregators/webpagetest/serverRTT.js index d037d0df0..976b32b35 100644 --- a/lib/aggregators/webpagetest/serverRTT.js +++ b/lib/aggregators/webpagetest/serverRTT.js @@ -11,7 +11,9 @@ module.exports = new Aggregator('wpt.serverRTT', '',0, function(pageData) { if (pageData.webpagetest) { - if (pageData.webpagetest.response.data.median.firstView.server_rtt) - this.stats.push(pageData.webpagetest.response.data.median.firstView.server_rtt); + var stats = this.stats; + pageData.webpagetest.response.data.run.forEach(function (run) { + stats.push(run.firstView.results.server_rtt); + }); } }); diff --git a/lib/aggregators/webpagetest/speedIndex.js b/lib/aggregators/webpagetest/speedIndex.js index de9863e70..4ed7e942e 100644 --- a/lib/aggregators/webpagetest/speedIndex.js +++ b/lib/aggregators/webpagetest/speedIndex.js @@ -11,7 +11,9 @@ module.exports = new Aggregator('wpt.speedIndex', 'The Speed Index is the average time at which visible parts of the page are displayed. It is expressed in milliseconds and dependent on size of the view port. Using WebPageTest','',0, function(pageData) { if (pageData.webpagetest) { - if (pageData.webpagetest.response.data.median.firstView.SpeedIndex) - this.stats.push(pageData.webpagetest.response.data.median.firstView.SpeedIndex); - } - }); + var stats = this.stats; + pageData.webpagetest.response.data.run.forEach(function (run) { + stats.push(run.firstView.results.SpeedIndex); + }); + } +}); diff --git a/lib/aggregators/webpagetest/ttfb.js b/lib/aggregators/webpagetest/ttfb.js index 8554557d6..aa21f75d4 100644 --- a/lib/aggregators/webpagetest/ttfb.js +++ b/lib/aggregators/webpagetest/ttfb.js @@ -11,7 +11,9 @@ module.exports = new Aggregator('wpt.ttfb', 'Time To First Byte','milliseconds',0, function(pageData) { if (pageData.webpagetest) { - if (pageData.webpagetest.response.data.median.firstView.TTFB) - this.stats.push(pageData.webpagetest.response.data.median.firstView.TTFB); - } - }); + var stats = this.stats; + pageData.webpagetest.response.data.run.forEach(function (run) { + stats.push(run.firstView.results.TTFB); + }); + } +}); diff --git a/lib/aggregators/webpagetest/visualComplete.js b/lib/aggregators/webpagetest/visualComplete.js index ac1952156..02c6b3102 100644 --- a/lib/aggregators/webpagetest/visualComplete.js +++ b/lib/aggregators/webpagetest/visualComplete.js @@ -11,7 +11,9 @@ module.exports = new Aggregator('wpt.visualComplete', 'Time of the last visual change to the page. Using WebPageTest','milliseconds',0, function(pageData) { if (pageData.webpagetest) { - if (pageData.webpagetest.response.data.median.firstView.visualComplete) - this.stats.push(pageData.webpagetest.response.data.median.firstView.visualComplete); - } + var stats = this.stats; + pageData.webpagetest.response.data.run.forEach(function (run) { + stats.push(run.firstView.results.visualComplete); + }); + } });