From 6b0494b7c306c11f9449683439a29c671a0e97de Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Tue, 29 Jan 2019 12:43:05 -0800 Subject: [PATCH] core(lhr): include resourceSize in network-requests audit (#7056) --- lighthouse-core/audits/network-requests.js | 8 +++++++ lighthouse-core/test/results/sample_v2.json | 25 +++++++++++++++++++++ proto/sample_v2_round_trip.json | 25 +++++++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/lighthouse-core/audits/network-requests.js b/lighthouse-core/audits/network-requests.js index 6fb5aa3c2f57..5ef3c2e88d4b 100644 --- a/lighthouse-core/audits/network-requests.js +++ b/lighthouse-core/audits/network-requests.js @@ -46,6 +46,7 @@ class NetworkRequests extends Audit { startTime: timeToMs(record.startTime), endTime: timeToMs(record.endTime), transferSize: record.transferSize, + resourceSize: record.resourceSize, statusCode: record.statusCode, mimeType: record.mimeType, resourceType: record.resourceType, @@ -63,6 +64,13 @@ class NetworkRequests extends Audit { granularity: 1, text: 'Transfer Size', }, + { + key: 'resourceSize', + itemType: 'bytes', + displayUnit: 'kb', + granularity: 1, + text: 'Resource Size', + }, {key: 'statusCode', itemType: 'text', text: 'Status Code'}, {key: 'mimeType', itemType: 'text', text: 'MIME Type'}, {key: 'resourceType', itemType: 'text', text: 'Resource Type'}, diff --git a/lighthouse-core/test/results/sample_v2.json b/lighthouse-core/test/results/sample_v2.json index 9dfa1e3b66c2..079be8601663 100644 --- a/lighthouse-core/test/results/sample_v2.json +++ b/lighthouse-core/test/results/sample_v2.json @@ -821,6 +821,13 @@ "granularity": 1, "text": "Transfer Size" }, + { + "key": "resourceSize", + "itemType": "bytes", + "displayUnit": "kb", + "granularity": 1, + "text": "Resource Size" + }, { "key": "statusCode", "itemType": "text", @@ -843,6 +850,7 @@ "startTime": 0, "endTime": 640.1550000009593, "transferSize": 12640, + "resourceSize": 12519, "statusCode": 200, "mimeType": "text/html", "resourceType": "Document" @@ -852,6 +860,7 @@ "startTime": 630.2950000099372, "endTime": 2635.035000013886, "transferSize": 821, + "resourceSize": 677, "statusCode": 200, "mimeType": "text/css", "resourceType": "Stylesheet" @@ -861,6 +870,7 @@ "startTime": 635.496000002604, "endTime": 1204.6590000099968, "transferSize": 821, + "resourceSize": 677, "statusCode": 200, "mimeType": "text/css", "resourceType": "Stylesheet" @@ -870,6 +880,7 @@ "startTime": 636.6400000115391, "endTime": 1213.2910000218544, "transferSize": 139, + "resourceSize": 0, "statusCode": 404, "mimeType": "text/css", "resourceType": "Stylesheet" @@ -879,6 +890,7 @@ "startTime": 638.0040000076406, "endTime": 2849.3670000170823, "transferSize": 821, + "resourceSize": 677, "statusCode": 200, "mimeType": "text/css", "resourceType": "Stylesheet" @@ -888,6 +900,7 @@ "startTime": 638.7899999972433, "endTime": 1220.04100002232, "transferSize": 1108, + "resourceSize": 964, "statusCode": 200, "mimeType": "text/css", "resourceType": "Stylesheet" @@ -897,6 +910,7 @@ "startTime": 640.5979999981355, "endTime": 1228.5180000180844, "transferSize": 736, + "resourceSize": 616, "statusCode": 200, "mimeType": "text/html", "resourceType": "Document" @@ -906,6 +920,7 @@ "startTime": 641.3450000109151, "endTime": 1776.4320000133011, "transferSize": 733, + "resourceSize": 613, "statusCode": 200, "mimeType": "text/html", "resourceType": "Document" @@ -915,6 +930,7 @@ "startTime": 642.8679999953602, "endTime": 4216.161000018474, "transferSize": 821, + "resourceSize": 677, "statusCode": 200, "mimeType": "text/css", "resourceType": "Stylesheet" @@ -924,6 +940,7 @@ "startTime": 644.0820000134408, "endTime": 1792.0860000012908, "transferSize": 1703, + "resourceSize": 1552, "statusCode": 200, "mimeType": "text/javascript", "resourceType": "Script" @@ -933,6 +950,7 @@ "startTime": 645.529000001261, "endTime": 1236.1859999946319, "transferSize": 144, + "resourceSize": 0, "statusCode": 200, "mimeType": "text/javascript", "resourceType": "Script" @@ -942,6 +960,7 @@ "startTime": 3951.6250000160653, "endTime": 4779.641000000993, "transferSize": 24741, + "resourceSize": 24620, "statusCode": 200, "mimeType": "image/jpeg", "resourceType": "Image" @@ -951,6 +970,7 @@ "startTime": 2849.7340000176337, "endTime": 3961.049000005005, "transferSize": 71654, + "resourceSize": 71501, "statusCode": 200, "mimeType": "text/javascript", "resourceType": "Script" @@ -960,6 +980,7 @@ "startTime": 3874.7540000185836, "endTime": 4796.288000012282, "transferSize": 30174, + "resourceSize": 84245, "statusCode": 200, "mimeType": "text/javascript", "resourceType": "Script" @@ -969,6 +990,7 @@ "startTime": 2924.34100000537, "endTime": 3964.233000006061, "transferSize": 821, + "resourceSize": 677, "statusCode": 200, "mimeType": "text/css", "resourceType": "Stylesheet" @@ -978,6 +1000,7 @@ "startTime": 3066.252999997232, "endTime": 3772.7560000203084, "transferSize": 12640, + "resourceSize": 12519, "statusCode": 200, "mimeType": "text/html", "resourceType": "XHR" @@ -987,6 +1010,7 @@ "startTime": 3829.6360000094865, "endTime": 3968.59800000675, "transferSize": 0, + "resourceSize": 4, "statusCode": 200, "mimeType": "text/plain", "resourceType": "Image" @@ -996,6 +1020,7 @@ "startTime": 4967.373000021325, "endTime": 5536.498000001302, "transferSize": 221, + "resourceSize": 95, "statusCode": 404, "mimeType": "text/plain", "resourceType": "Other" diff --git a/proto/sample_v2_round_trip.json b/proto/sample_v2_round_trip.json index 28dbdbfba49a..1fef49b1d441 100644 --- a/proto/sample_v2_round_trip.json +++ b/proto/sample_v2_round_trip.json @@ -1359,6 +1359,13 @@ "key": "transferSize", "text": "Transfer Size" }, + { + "displayUnit": "kb", + "granularity": 1.0, + "itemType": "bytes", + "key": "resourceSize", + "text": "Resource Size" + }, { "itemType": "text", "key": "statusCode", @@ -1379,6 +1386,7 @@ { "endTime": 640.1550000009593, "mimeType": "text/html", + "resourceSize": 12519.0, "resourceType": "Document", "startTime": 0.0, "statusCode": 200.0, @@ -1388,6 +1396,7 @@ { "endTime": 2635.035000013886, "mimeType": "text/css", + "resourceSize": 677.0, "resourceType": "Stylesheet", "startTime": 630.2950000099372, "statusCode": 200.0, @@ -1397,6 +1406,7 @@ { "endTime": 1204.6590000099968, "mimeType": "text/css", + "resourceSize": 677.0, "resourceType": "Stylesheet", "startTime": 635.496000002604, "statusCode": 200.0, @@ -1406,6 +1416,7 @@ { "endTime": 1213.2910000218544, "mimeType": "text/css", + "resourceSize": 0.0, "resourceType": "Stylesheet", "startTime": 636.6400000115391, "statusCode": 404.0, @@ -1415,6 +1426,7 @@ { "endTime": 2849.3670000170823, "mimeType": "text/css", + "resourceSize": 677.0, "resourceType": "Stylesheet", "startTime": 638.0040000076406, "statusCode": 200.0, @@ -1424,6 +1436,7 @@ { "endTime": 1220.04100002232, "mimeType": "text/css", + "resourceSize": 964.0, "resourceType": "Stylesheet", "startTime": 638.7899999972433, "statusCode": 200.0, @@ -1433,6 +1446,7 @@ { "endTime": 1228.5180000180844, "mimeType": "text/html", + "resourceSize": 616.0, "resourceType": "Document", "startTime": 640.5979999981355, "statusCode": 200.0, @@ -1442,6 +1456,7 @@ { "endTime": 1776.4320000133011, "mimeType": "text/html", + "resourceSize": 613.0, "resourceType": "Document", "startTime": 641.3450000109151, "statusCode": 200.0, @@ -1451,6 +1466,7 @@ { "endTime": 4216.161000018474, "mimeType": "text/css", + "resourceSize": 677.0, "resourceType": "Stylesheet", "startTime": 642.8679999953602, "statusCode": 200.0, @@ -1460,6 +1476,7 @@ { "endTime": 1792.0860000012908, "mimeType": "text/javascript", + "resourceSize": 1552.0, "resourceType": "Script", "startTime": 644.0820000134408, "statusCode": 200.0, @@ -1469,6 +1486,7 @@ { "endTime": 1236.1859999946319, "mimeType": "text/javascript", + "resourceSize": 0.0, "resourceType": "Script", "startTime": 645.529000001261, "statusCode": 200.0, @@ -1478,6 +1496,7 @@ { "endTime": 4779.641000000993, "mimeType": "image/jpeg", + "resourceSize": 24620.0, "resourceType": "Image", "startTime": 3951.6250000160653, "statusCode": 200.0, @@ -1487,6 +1506,7 @@ { "endTime": 3961.049000005005, "mimeType": "text/javascript", + "resourceSize": 71501.0, "resourceType": "Script", "startTime": 2849.7340000176337, "statusCode": 200.0, @@ -1496,6 +1516,7 @@ { "endTime": 4796.288000012282, "mimeType": "text/javascript", + "resourceSize": 84245.0, "resourceType": "Script", "startTime": 3874.7540000185836, "statusCode": 200.0, @@ -1505,6 +1526,7 @@ { "endTime": 3964.233000006061, "mimeType": "text/css", + "resourceSize": 677.0, "resourceType": "Stylesheet", "startTime": 2924.34100000537, "statusCode": 200.0, @@ -1514,6 +1536,7 @@ { "endTime": 3772.7560000203084, "mimeType": "text/html", + "resourceSize": 12519.0, "resourceType": "XHR", "startTime": 3066.252999997232, "statusCode": 200.0, @@ -1523,6 +1546,7 @@ { "endTime": 3968.59800000675, "mimeType": "text/plain", + "resourceSize": 4.0, "resourceType": "Image", "startTime": 3829.6360000094865, "statusCode": 200.0, @@ -1532,6 +1556,7 @@ { "endTime": 5536.498000001302, "mimeType": "text/plain", + "resourceSize": 95.0, "resourceType": "Other", "startTime": 4967.373000021325, "statusCode": 404.0,