From 5a9f3696b22b982d2850c153ebd08bc6626de716 Mon Sep 17 00:00:00 2001
From: RahulGautamSingh <rahultesnik@gmail.com>
Date: Fri, 10 Jan 2025 17:16:44 +0530
Subject: [PATCH] refactor(logger): remove templating from ERROR logs (#33489)
---
lib/modules/datasource/deb/index.ts | 5 +++--
lib/modules/platform/azure/util.spec.ts | 2 +-
lib/modules/platform/azure/util.ts | 4 ++--
lib/workers/repository/update/pr/index.spec.ts | 6 +++---
lib/workers/repository/update/pr/index.ts | 2 +-
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/lib/modules/datasource/deb/index.ts b/lib/modules/datasource/deb/index.ts
index ad29d107df..006d81d289 100644
--- a/lib/modules/datasource/deb/index.ts
+++ b/lib/modules/datasource/deb/index.ts
@@ -90,13 +90,14 @@ export class DebDatasource extends Datasource {
await extract(compressedFile, compression, extractedFile);
lastTimestamp = await getFileCreationTime(extractedFile);
} catch (error) {
- logger.error(
+ logger.warn(
{
+ compressedFile,
componentUrl,
compression,
error: error.message,
},
- `Failed to extract package file from ${compressedFile}`,
+ 'Failed to extract package file from compressed file',
);
} finally {
await fs.rmCache(compressedFile);
diff --git a/lib/modules/platform/azure/util.spec.ts b/lib/modules/platform/azure/util.spec.ts
index bfdea61b10..14c277e276 100644
--- a/lib/modules/platform/azure/util.spec.ts
+++ b/lib/modules/platform/azure/util.spec.ts
@@ -170,7 +170,7 @@ describe('modules/platform/azure/util', () => {
it('should return an error', () => {
expect(() => getProjectAndRepo('prjName/myRepoName/blalba')).toThrow(
Error(
- `prjName/myRepoName/blalba can be only structured this way : 'repository' or 'projectName/repository'!`,
+ `Azure repository can be only structured this way : 'repository' or 'projectName/repository'!`,
),
);
});
diff --git a/lib/modules/platform/azure/util.ts b/lib/modules/platform/azure/util.ts
index 74ca2ab7d2..ccc3b43d7d 100644
--- a/lib/modules/platform/azure/util.ts
+++ b/lib/modules/platform/azure/util.ts
@@ -160,8 +160,8 @@ export function getProjectAndRepo(str: string): {
repo: strSplit[1],
};
}
- const msg = `${str} can be only structured this way : 'repository' or 'projectName/repository'!`;
- logger.error(msg);
+ const msg = `Azure repository can be only structured this way : 'repository' or 'projectName/repository'!`;
+ logger.warn({ repository: str }, msg);
throw new Error(msg);
}
diff --git a/lib/workers/repository/update/pr/index.spec.ts b/lib/workers/repository/update/pr/index.spec.ts
index c0a8f6ac09..2583501774 100644
--- a/lib/workers/repository/update/pr/index.spec.ts
+++ b/lib/workers/repository/update/pr/index.spec.ts
@@ -730,9 +730,9 @@ describe('workers/repository/update/pr/index', () => {
assignAutomerge: false,
});
- expect(logger.logger.error).toHaveBeenCalledWith(
- { err },
- 'Failed to ensure PR: ' + prTitle,
+ expect(logger.logger.warn).toHaveBeenCalledWith(
+ { err, prTitle },
+ 'Failed to ensure PR',
);
});
diff --git a/lib/workers/repository/update/pr/index.ts b/lib/workers/repository/update/pr/index.ts
index edc8517705..aa6817daf3 100644
--- a/lib/workers/repository/update/pr/index.ts
+++ b/lib/workers/repository/update/pr/index.ts
@@ -573,7 +573,7 @@ export async function ensurePr(
logger.debug('Passing error up');
throw err;
}
- logger.error({ err }, 'Failed to ensure PR: ' + prTitle);
+ logger.warn({ err, prTitle }, 'Failed to ensure PR');
}
if (existingPr) {
return { type: 'with-pr', pr: existingPr };
--
GitLab