archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-18 14:58:43 +00:00
Code Issues Projects Releases Wiki Activity

fix(Telemetry): Split stack lines properly on all OS-es

Browse Source
This commit is contained in:
Piotr Grzesik 2021-05-03 11:58:47 +02:00
parent 3ab06282fd
commit bdbf154c97
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/utils/telemetry/resolve-error-location.js
View File

@ -5,7 +5,7 @@ const anonymizeStacktracePaths = require('./anonymize-stacktrace-paths');
const resolveErrorLocation = (exceptionTokens) => {
if (!exceptionTokens.stack) return '<not accessible due to non-error exception>';
const splittedStack = exceptionTokens.stack.split('\n');
const splittedStack = exceptionTokens.stack.split(/[\r\n]+/);
if (splittedStack.length === 1 && exceptionTokens.code) return '<not available>';
const stacktraceLineRegex = /(?:\s*at.*\((.*)\).?|\s*at\s(.*))/;

22
test/unit/lib/utils/telemetry/resolve-error-location.test.js
View File

@ -76,11 +76,11 @@ describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
it('should correctly handle paths not enclosed in parentheses', () => {
const err = new Error('test');
err.stack =
'Error: spawn E2BIG\n' +
' at ChildProcess.spawn (node:internal/child_process:403:11)\n' +
' at Object.spawn (node:child_process:573:9)\n' +
' at C:\\home\\xxx\\api\\node_modules\\bestzip\\lib\\bestzip.js:75:29\n' +
' at C:\\home\\xxx\\api\\node_modules\\async\\dist\\async.js:1802:20\n';
'Error: spawn E2BIG\r\n' +
' at ChildProcess.spawn (node:internal/child_process:403:11)\r\n' +
' at Object.spawn (node:child_process:573:9)\r\n' +
' at C:\\home\\xxx\\api\\node_modules\\bestzip\\lib\\bestzip.js:75:29\r\n' +
' at C:\\home\\xxx\\api\\node_modules\\async\\dist\\async.js:1802:20\r\n';
const result = resolveErrorLocation(tokenizeException(err));
expect(result).to.equal(
@ -97,12 +97,12 @@ describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
const err = new Error('test');
err.stack =
'Error:\n' +
' at Context.it (C:\\home\\xxx\\serverless\\test\\unit\\lib\\utils\\resolve-error-location.test.js:10:17)\n' +
' at callFn (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runnable.js:366:21)\n' +
' at Test.Runnable.run (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runnable.js:354:5)\n' +
' at Runner.runTest (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:677:10)\n' +
' at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:801:12)\n' +
' at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:594:14)\n';
' at Context.it (C:\\home\\xxx\\serverless\\test\\unit\\lib\\utils\\resolve-error-location.test.js:10:17)\r\n' +
' at callFn (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runnable.js:366:21)\r\n' +
' at Test.Runnable.run (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runnable.js:354:5)\r\n' +
' at Runner.runTest (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:677:10)\r\n' +
' at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:801:12)\r\n' +
' at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:594:14)\r\n';
const result = resolveErrorLocation(tokenizeException(err));
expect(result).to.equal(
[