From 7d63322c6c85e34b5f7bfb0a829b134e5fa0edd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20DONNART?= Date: Thu, 25 Jun 2026 10:29:52 +0200 Subject: [PATCH 1/4] Use logHelper for AwsClient setup error logging Route the setup error through logHelper so the data store name and client type are included, consistent with the rest of AwsClient's logging. Issue: ARSN-603 --- lib/storage/data/external/AwsClient.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/storage/data/external/AwsClient.js b/lib/storage/data/external/AwsClient.js index 056c7d4f7..229af255a 100644 --- a/lib/storage/data/external/AwsClient.js +++ b/lib/storage/data/external/AwsClient.js @@ -102,10 +102,8 @@ class AwsClient { applyRegion(err.region); return; } - this._logger.error('error during setup', { - error: err, - method: 'AwsClient.setup', - }); + logHelper(this._logger, 'error', 'error during setup', + err, this._dataStoreName, this.clientType); throw err; } }); From 706ada0efaecffd4d2886586924aaf1d3c863e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20DONNART?= Date: Thu, 25 Jun 2026 10:33:14 +0200 Subject: [PATCH 2/4] Bump werelogs to 8.2.4 Issue: ARSN-603 --- package.json | 5 +++-- yarn.lock | 13 +++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index d2c2cfc08..ff1fb2ecd 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "sproxydclient": "github:scality/sproxydclient#8.1.0", "utf8": "^3.0.0", "uuid": "^10.0.0", - "werelogs": "scality/werelogs#8.2.2", + "werelogs": "scality/werelogs#8.2.4", "xml2js": "^0.6.2" }, "optionalDependencies": { @@ -123,7 +123,8 @@ } }, "resolutions": { - "tar": "^7.5.6" + "tar": "^7.5.6", + "werelogs": "scality/werelogs#8.2.4" }, "nyc": { "tempDirectory": "coverage", diff --git a/yarn.lock b/yarn.lock index 0208ef641..c1670f420 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8349,16 +8349,9 @@ webidl-conversions@^7.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== -"werelogs@github:scality/werelogs#8.2.2", werelogs@scality/werelogs#8.2.2: - version "8.2.2" - resolved "https://codeload.github.com/scality/werelogs/tar.gz/e53bef5145697bf8af940dcbe59408988d64854f" - dependencies: - fast-safe-stringify "^2.1.1" - safe-json-stringify "^1.2.0" - -werelogs@scality/werelogs#8.2.0: - version "8.2.0" - resolved "https://codeload.github.com/scality/werelogs/tar.gz/7bf334cea94002d118f27d7ec1c7a5af74b51b8d" +"werelogs@github:scality/werelogs#8.2.2", werelogs@scality/werelogs#8.2.0, werelogs@scality/werelogs#8.2.4: + version "8.2.4" + resolved "https://codeload.github.com/scality/werelogs/tar.gz/a7bbb5917a08b035d3763b24b070d517483d6982" dependencies: fast-safe-stringify "^2.1.1" safe-json-stringify "^1.2.0" From 8856021adb908004128954e8bc4d8d150e000058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20DONNART?= Date: Thu, 25 Jun 2026 11:18:45 +0200 Subject: [PATCH 3/4] Build a fresh RequestLogger per retrieveData test case werelogs 8.2.3 moved the "RequestLogger.end() has been called more than once" guard from log() into doLogIO(), where it now runs inside the dump's forEach over this.entries. The first end() in one it() leaves elapsedTime set on the shared module-level RequestLogger; the next test hits the guard, which calls this.error() inside the forEach and re-enters log()/doLogIO() over the still-buffered end-entry, blowing the stack. Build the RequestLogger fresh in beforeEach so each case starts with elapsedTime null and the recursion path is never reached. No production code change. Issue: ARSN-603 --- tests/unit/s3routes/routesUtils/retrieveData.spec.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/unit/s3routes/routesUtils/retrieveData.spec.js b/tests/unit/s3routes/routesUtils/retrieveData.spec.js index 312a45ca0..173ca3105 100644 --- a/tests/unit/s3routes/routesUtils/retrieveData.spec.js +++ b/tests/unit/s3routes/routesUtils/retrieveData.spec.js @@ -7,12 +7,13 @@ const DataWrapper = require('../../../../lib/storage/data/DataWrapper'); const HttpResponseMock = require('../../../utils/HttpResponseMock'); const logger = new werelogs.Logger('retrieveData', 'debug', 'debug'); -const log = logger.newRequestLogger(); describe('retrieveData', () => { + let log; let responseMock; beforeEach(() => { + log = logger.newRequestLogger(); responseMock = new HttpResponseMock(); sinon.spy(responseMock, 'writeHead'); sinon.spy(responseMock, 'end'); From 6c3772d837b4efcad93a62671f4550b5286b814d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20DONNART?= Date: Thu, 25 Jun 2026 10:33:42 +0200 Subject: [PATCH 4/4] Bump package.json to 8.3.13 Issue: ARSN-603 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ff1fb2ecd..fc0a4ce29 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "engines": { "node": ">=20" }, - "version": "8.3.12", + "version": "8.3.13", "description": "Common utilities for the S3 project components", "main": "build/index.js", "repository": {