@athenna/logger 5.18.0 → 5.19.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@athenna/logger",
-  "version": "5.18.0",
+  "version": "5.19.0",
   "description": "The Athenna logging solution. Log in stdout, files and buckets.",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",

package/src/formatters/Formatter.js

@@ -70,7 +70,7 @@ export class Formatter {
         const contextBindings = this.configs.contextBindings || [];
         const resolved = {};
         for (const binding of contextBindings) {
-            const value = binding.resolver(activeContext);
+            const value = binding.resolve(activeContext);
             if (Is.Undefined(value)) {
                 continue;
             }

package/src/formatters/JsonFormatter.js

@@ -12,13 +12,14 @@ export class JsonFormatter extends Formatter {
     format(message) {
         const base = {
             ...(this.configs.defaults || {}),
-            ...this.contextBindings(),
             level: this.level(),
-            time: Date.now(),
+            date: new Date().toISOString(),
+            timestamp: Date.now(),
             pid: this.pid(),
             hostname: this.hostname(),
             traceId: this.traceId(),
-            spanId: this.spanId()
+            spanId: this.spanId(),
+            ...this.contextBindings(),
         };
         if (Is.String(message)) {
             base.msg = message;

package/src/formatters/RequestFormatter.js

@@ -21,6 +21,17 @@ export class RequestFormatter extends Formatter {
         if (!this.configs.asJson) {
             return this.clean(`${method}${status} ${ctx.request.baseUrl} - ${date} - ${responseTimeMs}`);
         }
+        const base = {
+            ...(this.configs.defaults || {}),
+            level: this.level(),
+            date,
+            timestamp: Date.now(),
+            pid: this.pid(),
+            hostname: this.hostname(),
+            traceId: this.traceId(),
+            spanId: this.spanId(),
+            ...this.contextBindings()
+        };
         const metadata = {
             method: ctx.request.method,
             duration: responseTimeMs,
@@ -28,9 +39,6 @@ export class RequestFormatter extends Formatter {
             statusCode,
             url: ctx.request.hostUrl,
             path: ctx.request.baseUrl,
-            createdAt: Date.now(),
-            traceId: this.traceId(),
-            spanId: this.spanId(),
             data: ctx.data
         };
         const request = {
@@ -45,6 +53,6 @@ export class RequestFormatter extends Formatter {
             body: ctx.response.body,
             headers: ctx.response.headers
         };
-        return JSON.stringify({ request, response, metadata }, this.getCircularReplacer());
+        return JSON.stringify({ ...base, request, response, metadata }, this.getCircularReplacer());
     }
 }

package/src/types/ContextBinding.d.ts

@@ -9,5 +9,5 @@
 import type { Context } from '@opentelemetry/api';
 export type ContextBinding = {
     field: string;
-    resolver: (activeContext: Context) => any;
+    resolve: (activeContext: Context) => any;
 };