From fe293d91ee7f9bf9f2391121392921dcbcffbadf Mon Sep 17 00:00:00 2001 From: Daniel Pyrathon Date: Fri, 14 Aug 2020 13:41:49 -0700 Subject: [PATCH 1/4] added smaller log --- packages/asset-swapper/src/utils/quote_requestor.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/asset-swapper/src/utils/quote_requestor.ts b/packages/asset-swapper/src/utils/quote_requestor.ts index 4d786f9631..8648468ecd 100644 --- a/packages/asset-swapper/src/utils/quote_requestor.ts +++ b/packages/asset-swapper/src/utils/quote_requestor.ts @@ -89,7 +89,9 @@ function convertIfAxiosError(error: any): Error | object /* axios' .d.ts has Axi if (error.hasOwnProperty('isAxiosError') && error.isAxiosError && error.hasOwnProperty('toJSON')) { return error.toJSON(); } else { - return error; + return { + message: error.message, + }; } } From 82806b6fcb16cc1254722d05059510aa3d7390d0 Mon Sep 17 00:00:00 2001 From: Daniel Pyrathon Date: Fri, 14 Aug 2020 14:54:53 -0700 Subject: [PATCH 2/4] avoid returning objects with circular buffers --- .../src/utils/quote_requestor.ts | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/packages/asset-swapper/src/utils/quote_requestor.ts b/packages/asset-swapper/src/utils/quote_requestor.ts index 8648468ecd..0aafe481b6 100644 --- a/packages/asset-swapper/src/utils/quote_requestor.ts +++ b/packages/asset-swapper/src/utils/quote_requestor.ts @@ -87,11 +87,30 @@ function hasExpectedAssetData( function convertIfAxiosError(error: any): Error | object /* axios' .d.ts has AxiosError.toJSON() returning object */ { if (error.hasOwnProperty('isAxiosError') && error.isAxiosError && error.hasOwnProperty('toJSON')) { - return error.toJSON(); - } else { + const { message, name, config } = error; + const { headers, timeout, httpsAgent } = config; + const { keepAlive, keepAliveMsecs, sockets } = httpsAgent; + + const socketCounts: { [key: string]: number } = {}; + for (const socket of Object.keys(sockets)) { + socketCounts[socket] = sockets[socket].length; + } + return { - message: error.message, + message, + name, + config: { + headers, + timeout, + httpsAgent: { + keepAlive, + keepAliveMsecs, + socketCounts, + }, + }, }; + } else { + return error; } } From d22c0641fb79ea6265a733c5aee3ad032c4f7c13 Mon Sep 17 00:00:00 2001 From: Daniel Pyrathon Date: Fri, 14 Aug 2020 15:45:06 -0700 Subject: [PATCH 3/4] are you included or not --- packages/asset-swapper/src/utils/quote_requestor.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/asset-swapper/src/utils/quote_requestor.ts b/packages/asset-swapper/src/utils/quote_requestor.ts index 0aafe481b6..0b567a5d3f 100644 --- a/packages/asset-swapper/src/utils/quote_requestor.ts +++ b/packages/asset-swapper/src/utils/quote_requestor.ts @@ -372,6 +372,7 @@ export class QuoteRequestor { rfqtMakerInteraction: { ...partialLogEntry, response: { + included: true, statusCode: response.status, latencyMs: Date.now() - timeBeforeAwait, }, @@ -383,6 +384,7 @@ export class QuoteRequestor { rfqtMakerInteraction: { ...partialLogEntry, response: { + included: false, statusCode: err.response ? err.response.status : undefined, latencyMs: Date.now() - timeBeforeAwait, }, From 39e157499dc6a5620026c359144a5313d27440bc Mon Sep 17 00:00:00 2001 From: Daniel Pyrathon Date: Fri, 14 Aug 2020 16:29:52 -0700 Subject: [PATCH 4/4] removed toJSON check --- packages/asset-swapper/src/utils/quote_requestor.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/asset-swapper/src/utils/quote_requestor.ts b/packages/asset-swapper/src/utils/quote_requestor.ts index 0b567a5d3f..27b05db5b4 100644 --- a/packages/asset-swapper/src/utils/quote_requestor.ts +++ b/packages/asset-swapper/src/utils/quote_requestor.ts @@ -86,7 +86,7 @@ function hasExpectedAssetData( } function convertIfAxiosError(error: any): Error | object /* axios' .d.ts has AxiosError.toJSON() returning object */ { - if (error.hasOwnProperty('isAxiosError') && error.isAxiosError && error.hasOwnProperty('toJSON')) { + if (error.hasOwnProperty('isAxiosError') && error.isAxiosError) { const { message, name, config } = error; const { headers, timeout, httpsAgent } = config; const { keepAlive, keepAliveMsecs, sockets } = httpsAgent;