From 00e6654eb9885a2153ac63190003895663dbe3fd Mon Sep 17 00:00:00 2001 From: Julian Gruber Date: Mon, 26 Jun 2023 11:27:48 +0200 Subject: [PATCH 1/3] telemetry: also search err.code --- lib/telemetry.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/telemetry.js b/lib/telemetry.js index 1758051c..a219b8c5 100644 --- a/lib/telemetry.js +++ b/lib/telemetry.js @@ -5,6 +5,7 @@ import assert from 'node:assert' import { platform, arch } from 'node:os' import fs from 'node:fs/promises' import * as paths from './paths.js' +import { inspect } from 'node:util' const { FIL_WALLET_ADDRESS, DEPLOYMENT_TYPE = 'cli' } = process.env @@ -34,7 +35,7 @@ const unactionableErrors = setInterval(() => { writeClient.flush().catch(err => { - if (!unactionableErrors.test(String(err))) { + if (!unactionableErrors.test(inspect(err))) { Sentry.captureException(err) } }) From 7d7bffa1f4d9de6732afe1b0258e97a786179e27 Mon Sep 17 00:00:00 2001 From: Julian Gruber Date: Tue, 27 Jun 2023 09:48:41 +0200 Subject: [PATCH 2/3] refactor --- lib/telemetry.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/telemetry.js b/lib/telemetry.js index a219b8c5..60775424 100644 --- a/lib/telemetry.js +++ b/lib/telemetry.js @@ -5,7 +5,6 @@ import assert from 'node:assert' import { platform, arch } from 'node:os' import fs from 'node:fs/promises' import * as paths from './paths.js' -import { inspect } from 'node:util' const { FIL_WALLET_ADDRESS, DEPLOYMENT_TYPE = 'cli' } = process.env @@ -35,9 +34,9 @@ const unactionableErrors = setInterval(() => { writeClient.flush().catch(err => { - if (!unactionableErrors.test(inspect(err))) { - Sentry.captureException(err) - } + if (unactionableErrors.test(String(err))) return + if (err?.code && unactionableErrors.test(err.code)) return + Sentry.captureException(err) }) }, 5_000).unref() From cf1103d48253e213956796255c2e5315055175b9 Mon Sep 17 00:00:00 2001 From: Julian Gruber Date: Tue, 27 Jun 2023 09:49:36 +0200 Subject: [PATCH 3/3] make it safer --- lib/telemetry.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/telemetry.js b/lib/telemetry.js index 60775424..57ffaeb1 100644 --- a/lib/telemetry.js +++ b/lib/telemetry.js @@ -34,8 +34,12 @@ const unactionableErrors = setInterval(() => { writeClient.flush().catch(err => { - if (unactionableErrors.test(String(err))) return - if (err?.code && unactionableErrors.test(err.code)) return + if (unactionableErrors.test(String(err))) { + return + } + if (typeof err?.code === 'string' && unactionableErrors.test(err.code)) { + return + } Sentry.captureException(err) }) }, 5_000).unref()