feat: otlp logger

.gitignore

@@ -111,3 +111,5 @@ dist
 # Jest
 jest_html_reporters.html
 reports
+
+config/local*.json

config/default.json

@@ -13,7 +13,10 @@
     "shared": {},
     "logger": {
       "level": "info",
-      "prettyPrint": false
+      "prettyPrint": false,
+      "opentelemetryOptions": {
+        "enabled": false
+      }
     }
   },
   "server": {

helm/templates/deployment.yaml

@@ -67,6 +67,10 @@ spec:
               {{ toYaml .Values.extraVolumeMounts | nindent 12 }}
             {{- end }}
           env:
+            - name: K8S_POD_UID
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.uid
             - name: SERVER_PORT
               value: {{ .Values.env.targetPort | quote }}
             {{- if .Values.caSecretName }}

package.json

@@ -34,12 +34,12 @@
     "@godaddy/terminus": "^4.12.1",
     "@map-colonies/config": "^4.0.1",
     "@map-colonies/error-express-handler": "^4.0.0",
-    "@map-colonies/express-access-log-middleware": "^4.0.0",
-    "@map-colonies/js-logger": "^4.0.0",
+    "@map-colonies/express-access-log-middleware": "^4.1.0",
+    "@map-colonies/js-logger": "^5.0.0",
     "@map-colonies/openapi-express-viewer": "^5.0.0",
     "@map-colonies/prometheus": "^1.0.0",
     "@map-colonies/read-pkg": "^1.0.0",
-    "@map-colonies/schemas": "^1.17.0",
+    "@map-colonies/schemas": "^1.18.0",
     "@map-colonies/tracing": "^1.0.0",
     "@map-colonies/tracing-utils": "^1.0.0",
     "@opentelemetry/api": "^1.9.0",

src/common/config.ts

@@ -1,8 +1,8 @@
 import { type ConfigInstance, config } from '@map-colonies/config';
-import { commonBoilerplateV2, type commonBoilerplateV2Type } from '@map-colonies/schemas';
+import { commonBoilerplateV3, type commonBoilerplateV3Type } from '@map-colonies/schemas';
 
 // Choose here the type of the config instance and import this type from the entire application
-type ConfigType = ConfigInstance<commonBoilerplateV2Type>;
+type ConfigType = ConfigInstance<commonBoilerplateV3Type>;
 
 let configInstance: ConfigType | undefined;
 
@@ -13,7 +13,7 @@ let configInstance: ConfigType | undefined;
  */
 async function initConfig(offlineMode?: boolean): Promise<void> {
   configInstance = await config({
-    schema: commonBoilerplateV2,
+    schema: commonBoilerplateV3,
     offlineMode,
   });
 }

src/containerConfig.ts

@@ -20,7 +20,7 @@ export const registerExternalValues = async (options?: RegisterOptions): Promise
 
   const loggerConfig = configInstance.get('telemetry.logger');
 
-  const logger = jsLogger({ ...loggerConfig, prettyPrint: loggerConfig.prettyPrint, mixin: getOtelMixin() });
+  const logger = await jsLogger({ ...loggerConfig, prettyPrint: loggerConfig.prettyPrint, mixin: getOtelMixin() });
 
   const tracer = trace.getTracer(SERVICE_NAME);
   const metricsRegistry = new Registry();

tests/integration/anotherResource/anotherResourceName.spec.ts

@@ -18,7 +18,7 @@ describe('anotherResourceName', function () {
   beforeEach(async function () {
     const [app] = await getApp({
       override: [
-        { token: SERVICES.LOGGER, provider: { useValue: jsLogger({ enabled: false }) } },
+        { token: SERVICES.LOGGER, provider: { useValue: await jsLogger({ enabled: false }) } },
         { token: SERVICES.TRACER, provider: { useValue: trace.getTracer('testTracer') } },
       ],
       useChild: true,

tests/integration/docs/docs.spec.ts

@@ -17,7 +17,7 @@ describe('docs', function () {
   beforeEach(async function () {
     const [app] = await getApp({
       override: [
-        { token: SERVICES.LOGGER, provider: { useValue: jsLogger({ enabled: false }) } },
+        { token: SERVICES.LOGGER, provider: { useValue: await jsLogger({ enabled: false }) } },
         { token: SERVICES.TRACER, provider: { useValue: trace.getTracer('testTracer') } },
       ],
       useChild: true,

tests/integration/resourceName/resourceName.spec.ts

@@ -18,7 +18,7 @@ describe('resourceName', function () {
   beforeEach(async function () {
     const [app] = await getApp({
       override: [
-        { token: SERVICES.LOGGER, provider: { useValue: jsLogger({ enabled: false }) } },
+        { token: SERVICES.LOGGER, provider: { useValue: await jsLogger({ enabled: false }) } },
         { token: SERVICES.TRACER, provider: { useValue: trace.getTracer('testTracer') } },
       ],
       useChild: true,

tests/unit/anotherResource/models/anotherResourceManager.spec.ts

@@ -5,8 +5,8 @@ import { AnotherResourceManager } from '@src/anotherResource/models/anotherResou
 let anotherResourceManager: AnotherResourceManager;
 
 describe('ResourceNameManager', () => {
-  beforeEach(function () {
-    anotherResourceManager = new AnotherResourceManager(jsLogger({ enabled: false }));
+  beforeEach(async function () {
+    anotherResourceManager = new AnotherResourceManager(await jsLogger({ enabled: false }));
   });
 
   describe('#getResource', () => {

tests/unit/resourceName/models/resourceNameModel.spec.ts

@@ -5,8 +5,8 @@ import { ResourceNameManager } from '@src/resourceName/models/resourceNameManage
 let resourceNameManager: ResourceNameManager;
 
 describe('ResourceNameManager', () => {
-  beforeEach(function () {
-    resourceNameManager = new ResourceNameManager(jsLogger({ enabled: false }));
+  beforeEach(async function () {
+    resourceNameManager = new ResourceNameManager(await jsLogger({ enabled: false }));
   });
 
   describe('#getResource', () => {