From 5901acf5add4925e024680ddb530748c006dbcc2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Feb 2021 08:29:23 -0500 Subject: [PATCH] =?UTF-8?q?fix(deps):=20update=20dependency=20systeminform?= =?UTF-8?q?ation=20to=20version=205.x=20=F0=9F=8C=9F=20(#15115)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Renovate Bot Co-authored-by: Jennifer Shehane --- packages/server/lib/util/process_profiler.ts | 4 ++-- packages/server/package.json | 2 +- .../projects/firefox-memory/cypress/plugins/index.js | 2 +- packages/server/test/unit/util/process_profiler_spec.ts | 4 ++-- yarn.lock | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/server/lib/util/process_profiler.ts b/packages/server/lib/util/process_profiler.ts index 15bad22088..91f16e0500 100644 --- a/packages/server/lib/util/process_profiler.ts +++ b/packages/server/lib/util/process_profiler.ts @@ -162,8 +162,8 @@ export const _aggregateGroups = (processes: Process[]) => { group, processCount: groupedProcesses.length, pids: formatPidDisplay(groupedProcesses), - cpuPercent: _.sumBy(groupedProcesses, 'pcpu'), - memRssMb: _.sumBy(groupedProcesses, 'mem_rss') / 1024, + cpuPercent: _.sumBy(groupedProcesses, 'cpu'), + memRssMb: _.sumBy(groupedProcesses, 'memRss') / 1024, } }) .values() diff --git a/packages/server/package.json b/packages/server/package.json index d51922a514..fdf3134da8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -108,7 +108,7 @@ "squirrelly": "7.9.2", "strip-ansi": "6.0.0", "syntax-error": "1.4.0", - "systeminformation": "4.31.1", + "systeminformation": "5.3.1", "term-size": "2.1.0", "through": "2.3.8", "tough-cookie": "4.0.0", diff --git a/packages/server/test/support/fixtures/projects/firefox-memory/cypress/plugins/index.js b/packages/server/test/support/fixtures/projects/firefox-memory/cypress/plugins/index.js index 27da428049..9b16edf98c 100644 --- a/packages/server/test/support/fixtures/projects/firefox-memory/cypress/plugins/index.js +++ b/packages/server/test/support/fixtures/projects/firefox-memory/cypress/plugins/index.js @@ -90,7 +90,7 @@ module.exports = (on, config) => { .filter((proc) => { return ['firefox', 'firefox-bin'].includes(proc.command) }) - .sumBy('mem_rss') + .sumBy('memRss') .thru((kb) => { return Math.round(kb / 1024) // mb }) diff --git a/packages/server/test/unit/util/process_profiler_spec.ts b/packages/server/test/unit/util/process_profiler_spec.ts index e55679c65c..bc72388d04 100644 --- a/packages/server/test/unit/util/process_profiler_spec.ts +++ b/packages/server/test/unit/util/process_profiler_spec.ts @@ -177,8 +177,8 @@ describe('lib/util/process_profiler', function () { const processes = _.cloneDeep(PROCESSES) .map((proc) => { // add some dummy measurements so there is data to aggregate - proc.mem_rss = 10 * 1024 // 10mb - proc.pcpu = 20 + proc.memRss = 10 * 1024 // 10mb + proc.cpu = 20 return proc }) diff --git a/yarn.lock b/yarn.lock index 1a9d2766ee..aa865e9450 100644 --- a/yarn.lock +++ b/yarn.lock @@ -32152,10 +32152,10 @@ syntax-error@1.4.0, syntax-error@^1.1.1: dependencies: acorn-node "^1.2.0" -systeminformation@4.31.1: - version "4.31.1" - resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-4.31.1.tgz#2e02c26987494d4b6a4d2d83138724593bc98d50" - integrity sha512-dVCDWNMN8ncMZo5vbMCA5dpAdMgzafK2ucuJy5LFmGtp1cG6farnPg8QNvoOSky9SkFoEX1Aw0XhcOFV6TnLYA== +systeminformation@5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.3.1.tgz#72755645a982fbb9367736518ac4e5d91f5a49e1" + integrity sha512-1xG+6xfKXSowtZsAlUp6jVaV0q+5rq9yUN+ds6Hp2dR3/EdEU5r0v74qi5YF8BCGZfmddiOwDNB0h7ge70fmYA== table@4.0.2: version "4.0.2"