From 2f9ec4aefff6dcbe016599727e2baa67c751e491 Mon Sep 17 00:00:00 2001 From: Shane Exterkamp Date: Tue, 30 Apr 2019 13:09:13 -0700 Subject: [PATCH] Revert "clients(lr): apply Lightrider timings to NetworkRequests (#8109)" This reverts commit ca1731aba7df31b16f68abc0de23f9fffac38efd. --- lighthouse-core/lib/network-request.js | 35 +---- .../test/lib/network-request-test.js | 143 +----------------- 2 files changed, 4 insertions(+), 174 deletions(-) diff --git a/lighthouse-core/lib/network-request.js b/lighthouse-core/lib/network-request.js index b93c7eeb104c..c1be94fed1ac 100644 --- a/lighthouse-core/lib/network-request.js +++ b/lighthouse-core/lib/network-request.js @@ -428,41 +428,8 @@ class NetworkRequest { return; } - // Init timing. - this.timing = { - requestTime: this.startTime, - proxyStart: -1, - proxyEnd: -1, - dnsStart: -1, - dnsEnd: -1, - connectStart: -1, - connectEnd: -1, - sslStart: -1, - sslEnd: -1, - workerStart: -1, - workerReady: -1, - sendStart: -1, - sendEnd: -1, - pushStart: -1, - pushEnd: -1, - receiveHeadersEnd: -1, - }; - - const origEnd = this.endTime; - // `this.endTime` and `this.responseReceivedTime` are in seconds, so convert from milliseconds. - this.endTime = this.startTime + (totalMs / 1000); - this.responseReceivedTime = this.startTime + ((TCPMs + requestMs) / 1000); - - this.timing.connectStart = 0; - this.timing.connectEnd = TCPMs; - this.timing.sslStart = TCPMs - SSLMs; - this.timing.sslEnd = TCPMs; - this.timing.sendStart = TCPMs; - this.timing.sendEnd = TCPMs; - this.timing.receiveHeadersEnd = TCPMs + requestMs; - this.lrStatistics = { - endTimeDeltaMs: (origEnd - this.endTime) * 1000, + endTimeDeltaMs: (this.endTime - (this.startTime + (totalMs / 1000))) * 1000, TCPMs: TCPMs, requestMs: requestMs, responseMs: responseMs, diff --git a/lighthouse-core/test/lib/network-request-test.js b/lighthouse-core/test/lib/network-request-test.js index 5abdfa5d6234..ea6c5554ee6e 100644 --- a/lighthouse-core/test/lib/network-request-test.js +++ b/lighthouse-core/test/lib/network-request-test.js @@ -90,7 +90,7 @@ describe('NetworkRequest', () => { }; } - it('updates timings if in Lightrider', () => { + it('updates lrStatistics if in Lightrider', () => { const req = getRequest(); const devtoolsLog = networkRecordsToDevtoolsLog([req]); @@ -98,17 +98,8 @@ describe('NetworkRequest', () => { const record = NetworkRecorder.recordsFromLogs(devtoolsLog)[0]; expect(record.startTime).toStrictEqual(0); - expect(record.endTime).toStrictEqual(10); - expect(record.responseReceivedTime).toStrictEqual(7.5); - expect(record.timing).toMatchObject({ - connectStart: 0, - connectEnd: 5000, - sslStart: 4000, - sslEnd: 5000, - sendStart: 5000, - sendEnd: 5000, - receiveHeadersEnd: 7500, - }); + expect(record.endTime).toStrictEqual(2); + expect(record.responseReceivedTime).toStrictEqual(1); expect(record.lrStatistics).toStrictEqual({ endTimeDeltaMs: -8000, TCPMs: 5000, @@ -185,133 +176,5 @@ describe('NetworkRequest', () => { expect(record).toMatchObject(req); expect(record.lrStatistics).toStrictEqual(undefined); }); - - it('treats negative timings as 0', function() { - const req = getRequest(); - req.responseHeaders = [{name: NetworkRequest.HEADER_TOTAL, value: '10000'}, - {name: NetworkRequest.HEADER_TCP, value: '-1'}, - {name: NetworkRequest.HEADER_REQ, value: '-1'}, - {name: NetworkRequest.HEADER_SSL, value: '-1'}, - {name: NetworkRequest.HEADER_RES, value: '10000'}]; - - const devtoolsLog = networkRecordsToDevtoolsLog([req]); - global.isLightrider = true; - const record = NetworkRecorder.recordsFromLogs(devtoolsLog)[0]; - - expect(record.startTime).toStrictEqual(0); - expect(record.endTime).toStrictEqual(10); - expect(record.responseReceivedTime).toStrictEqual(0); - expect(record.timing).toMatchObject({ - connectStart: 0, - connectEnd: 0, - sslStart: 0, - sslEnd: 0, - sendStart: 0, - sendEnd: 0, - receiveHeadersEnd: 0, - }); - expect(record.lrStatistics).toStrictEqual({ - endTimeDeltaMs: -8000, - TCPMs: 0, - requestMs: 0, - responseMs: 10000, - }); - }); - - it('treats missing timings as 0', function() { - const req = getRequest(); - req.responseHeaders = [{name: NetworkRequest.HEADER_TOTAL, value: '10000'}, - {name: NetworkRequest.HEADER_TCP, value: '1000'}, - {name: NetworkRequest.HEADER_RES, value: '9000'}]; - - const devtoolsLog = networkRecordsToDevtoolsLog([req]); - global.isLightrider = true; - const record = NetworkRecorder.recordsFromLogs(devtoolsLog)[0]; - - expect(record.startTime).toStrictEqual(0); - expect(record.endTime).toStrictEqual(10); - expect(record.responseReceivedTime).toStrictEqual(1); - expect(record.timing).toMatchObject({ - connectStart: 0, - connectEnd: 1000, - sslStart: 1000, - sslEnd: 1000, - sendStart: 1000, - sendEnd: 1000, - receiveHeadersEnd: 1000, - }); - expect(record.lrStatistics).toStrictEqual({ - endTimeDeltaMs: -8000, - TCPMs: 1000, - requestMs: 0, - responseMs: 9000, - }); - }); - - it('created a new timing property if one did not exist', function() { - const req = getRequest(); - - const devtoolsLog = networkRecordsToDevtoolsLog([req]); - - const noLRRecord = NetworkRecorder.recordsFromLogs(devtoolsLog)[0]; - expect(noLRRecord.timing).toStrictEqual(undefined); - - global.isLightrider = true; - const lrRecord = NetworkRecorder.recordsFromLogs(devtoolsLog)[0]; - expect(lrRecord.timing.proxyStart).toStrictEqual(-1); - - expect(lrRecord.startTime).toStrictEqual(0); - expect(lrRecord.endTime).toStrictEqual(10); - expect(lrRecord.responseReceivedTime).toStrictEqual(7.5); - expect(lrRecord.timing).toMatchObject({ - proxyStart: -1, - connectStart: 0, - connectEnd: 5000, - sslStart: 4000, - sslEnd: 5000, - sendStart: 5000, - sendEnd: 5000, - receiveHeadersEnd: 7500, - }); - expect(lrRecord.lrStatistics).toStrictEqual({ - endTimeDeltaMs: -8000, - TCPMs: 5000, - requestMs: 2500, - responseMs: 2500, - }); - }); - - it('overrides existing timing properties', function() { - const req = getRequest(); - req.timing = {proxyStart: 17, sslStart: 35}; - const devtoolsLog = networkRecordsToDevtoolsLog([req]); - - const noLRRecord = NetworkRecorder.recordsFromLogs(devtoolsLog)[0]; - expect(noLRRecord.timing.proxyStart).toStrictEqual(17); - expect(noLRRecord.timing.sslStart).toStrictEqual(35); - - global.isLightrider = true; - const lrRecord = NetworkRecorder.recordsFromLogs(devtoolsLog)[0]; - - expect(lrRecord.startTime).toStrictEqual(0); - expect(lrRecord.endTime).toStrictEqual(10); - expect(lrRecord.responseReceivedTime).toStrictEqual(7.5); - expect(lrRecord.timing).toMatchObject({ - proxyStart: -1, - connectStart: 0, - connectEnd: 5000, - sslStart: 4000, - sslEnd: 5000, - sendStart: 5000, - sendEnd: 5000, - receiveHeadersEnd: 7500, - }); - expect(lrRecord.lrStatistics).toStrictEqual({ - endTimeDeltaMs: -8000, - TCPMs: 5000, - requestMs: 2500, - responseMs: 2500, - }); - }); }); });