feat: supporitng pino-caller

MapColonies · Sep 18, 2024 · a99e3c2 · a99e3c2
1 parent f20f81c
commit a99e3c2
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 71 deletions.
diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json
@@ -8,6 +8,10 @@
       "prettyPrint": {
         "__name": "LOG_PRETTY_PRINT_ENABLED",
         "__format": "boolean"
+      },
+      "pinoCaller": {
+        "__name": "LOG_PINO_CALLER_ENABLED",
+        "__format": "boolean"
       }
     },
     "tracing": {

diff --git a/config/default.json b/config/default.json
@@ -2,7 +2,8 @@
   "telemetry": {
     "logger": {
       "level": "info",
-      "prettyPrint": false
+      "prettyPrint": false,
+      "pinoCaller": false
     },
     "tracing": {
       "enabled": "true",

diff --git a/helm/templates/configmap.yaml b/helm/templates/configmap.yaml
@@ -13,6 +13,7 @@ data:
   RESPONSE_COMPRESSION_ENABLED: {{ .Values.env.responseCompressionEnabled | quote }}
   LOG_LEVEL: {{ .Values.env.logLevel | quote }}
   LOG_PRETTY_PRINT_ENABLED: {{ .Values.env.logPrettyPrintEnabled | quote }}
+  LOG_PINO_CALLER_ENABLED: {{ .Values.env.logPinoCallerEnabled | quote }}
   {{ if $tracing.enabled }}
   TELEMETRY_TRACING_ENABLED: 'true'
   TELEMETRY_TRACING_URL: {{ $tracing.url }}

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -94,6 +94,7 @@ env:
   protocol: TCP
   logLevel: info
   logPrettyPrintEnabled: false
+  logPinoCallerEnabled: false
   responseCompressionEnabled: true
   requestPayloadLimit: 1mb
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "@godaddy/terminus": "^4.12.1",
     "@map-colonies/error-express-handler": "^2.1.0",
     "@map-colonies/express-access-log-middleware": "^2.0.1",
-    "@map-colonies/js-logger": "^1.0.1",
+    "@map-colonies/js-logger": "^1.1.0",
     "@map-colonies/mc-model-types": "^17.1.6",
     "@map-colonies/mc-priority-queue": "^8.1.1",
     "@map-colonies/mc-utils": "^3.1.0",

diff --git a/src/containerConfig.ts b/src/containerConfig.ts
@@ -22,8 +22,8 @@ export const queueClientFactory = (container: DependencyContainer): QueueClient
   const logger = container.resolve<Logger>(SERVICES.LOGGER);
   const config = container.resolve<IConfig>(SERVICES.CONFIG);
   const queueConfig = config.get<IJobManagerConfig>('jobManagement.config');
-  const httpRetryConfig = config.get<IHttpRetryConfig>('server.httpRetry');
-  const disableHttpClientLogs = config.get<boolean>('server.disableHttpClientLogs');
+  const httpRetryConfig = config.get<IHttpRetryConfig>('httpRetry');
+  const disableHttpClientLogs = config.get<boolean>('disableHttpClientLogs');
   const jobManagerServiceName = 'JobManager';
   const heartbeatServiceName = 'Heartbeat';
   return new QueueClient(
@@ -45,7 +45,7 @@ export interface RegisterOptions {
 
 export const registerExternalValues = (options?: RegisterOptions): DependencyContainer => {
   const loggerConfig = config.get<LoggerOptions>('telemetry.logger');
-  const logger = jsLogger({ ...loggerConfig, prettyPrint: loggerConfig.prettyPrint, mixin: getOtelMixin() });
+  const logger = jsLogger({ ...loggerConfig, prettyPrint: loggerConfig.prettyPrint, mixin: getOtelMixin(), pinoCaller: loggerConfig.pinoCaller });
 
   const metrics = new Metrics();
   metrics.start();

diff --git a/tests/unit/mocks/configMock.ts b/tests/unit/mocks/configMock.ts
@@ -47,6 +47,7 @@ const registerDefaultConfig = (): void => {
       logger: {
         level: 'info',
         prettyPrint: false,
+        pinoCaller: false,
       },
       tracing: {
         enabled: true, // Changed from string "true" to boolean true