@takeshape/logger 11.121.6 → 11.121.9

package/dist/logger.d.ts

@@ -1,4 +1,4 @@
-import type Sentry from '@sentry/types';
+import type Sentry from '@sentry/core';
 import type { LogContext, Logger, LogProvider } from './types.ts';
 type JsonLog = {
     [key: string]: unknown;
@@ -19,6 +19,7 @@ type LoggerOptions = {
     provider: LogProvider;
     level: string;
     sentryClient?: Pick<Sentry.Client, 'captureException' | 'captureMessage'>;
+    messageOnly?: boolean;
 };
 export declare function createLogger({ level, ...options }: LoggerOptions, logContext?: LogContext): Logger;
 export {};

package/dist/logger.js

@@ -24,7 +24,7 @@ function getFargateEmf(now, metadata) {
         },
         serviceName: metadata.context?.platform?.fargate?.service,
         taskRevision: metadata.context?.platform?.fargate?.task_revision,
-        time: metadata.event?.http_response?.time_ms
+        time: metadata.event?.duration
     };
 }
 function getLambdaEmf(now, metadata) {
@@ -46,7 +46,7 @@ function getLambdaEmf(now, metadata) {
             ]
         },
         functionVersion: '$LATEST',
-        time: metadata.event?.http_response?.time_ms
+        time: metadata.event?.duration
     };
 }
 /**
@@ -54,7 +54,7 @@ function getLambdaEmf(now, metadata) {
  *
  * @link https://docs.aws.amazon.com/lambda/latest/dg/nodejs-logging.html#nodejs-logging-advanced-JSON
  */
-function getJsonLog({ level, message, metadata, requestId, error }, emfFn) {
+function getJsonLog({ level, message, metadata, requestId, error, messageOnly }, emfFn) {
     const now = metadata.timestamp ? new Date(metadata.timestamp).valueOf() : Date.now();
     // https://docs.aws.amazon.com/lambda/latest/dg/nodejs-logging.html#nodejs-logging-advanced-level
     let jsonLog = {
@@ -63,7 +63,7 @@ function getJsonLog({ level, message, metadata, requestId, error }, emfFn) {
         level,
         timestamp: new Date(now).toISOString(),
         requestId,
-        ...(!metadata.messageOnly ? metadata : undefined)
+        ...(!messageOnly ? metadata : undefined)
     };
     if (error) {
         jsonLog = {
@@ -73,7 +73,7 @@ function getJsonLog({ level, message, metadata, requestId, error }, emfFn) {
             stackTrace: error.stack
         };
     }
-    if (emfFn && metadata.event?.http_response?.time_ms) {
+    if (emfFn && metadata.event?.duration) {
         // https://docs.aws.amazon.com/lambda/latest/dg/nodejs-logging.html#nodejs-logging-advanced-emf
         jsonLog = {
             ...jsonLog,
@@ -152,7 +152,7 @@ export function shouldReportToSentry(error) {
     }
     return true;
 }
-function decorateLogFn({ provider, level, sentryClient }, entry) {
+function decorateLogFn({ provider, level, sentryClient, messageOnly }, entry) {
     return (messageOrError, logMetadata) => {
         let metadata = logMetadata;
         let message;
@@ -215,11 +215,11 @@ function decorateLogFn({ provider, level, sentryClient }, entry) {
         if (provider === 'CONSOLE') {
             // biome-ignore lint/suspicious/noConsole: allowed
             const consoleMethod = console[level.toLowerCase()];
-            if (!metadata?.messageOnly) {
-                consoleMethod(messageOrError, metadata);
+            if (!messageOnly) {
+                consoleMethod(...[message, error, metadata].filter((x) => x));
             }
             else {
-                consoleMethod(messageOrError);
+                consoleMethod(...[message, error].filter((x) => x));
             }
             return;
         }
@@ -228,7 +228,8 @@ function decorateLogFn({ provider, level, sentryClient }, entry) {
             message,
             metadata,
             error,
-            requestId: metadata?.context?.http?.request_id
+            requestId: metadata?.context?.http?.request_id,
+            messageOnly
         }, provider === 'CLOUDWATCH_LAMBDA' ? getLambdaEmf : getFargateEmf);
         process.stdout.write(formatLogEntry(jsonLog, {
             prefixMessage: provider === 'CLOUDWATCH_LAMBDA'

package/dist/types.d.ts

@@ -113,6 +113,7 @@ export type LogContext = {
         path?: HttpPath;
         remote_addr?: HttpRemoteAddr;
         request_id?: HttpRequestId;
+        start_at?: TimeMs;
     };
     /**
      * Represents a task or job execution, typically for background tasks or jobs.
@@ -233,6 +234,10 @@ export type LogEvent = {
      * Represents an error or exception.
      */
     error?: LogError;
+    /**
+     * The duration, in milliseconds, that it took to complete this event.
+     */
+    duration?: TimeMs;
     /**
      * Represents a HTTP request, both incoming and outgoing. Note the direction field.
      */
@@ -250,6 +255,10 @@ export type LogEvent = {
         request_id?: HttpRequestId;
         scheme?: HttpScheme;
         service_name?: HttpServiceName;
+        start_time?: TimeMs;
+        path_parameters?: Record<string, string | undefined>;
+        query_parameters?: Record<string, string | string[] | undefined>;
+        route_key?: string;
     };
     /**
      * Represents a HTTP response event, both outgoing and incoming. Note the direction field.
@@ -263,17 +272,7 @@ export type LogEvent = {
         request_id?: HttpRequestId;
         service_name?: HttpServiceName;
         status: HttpStatus;
-        time_ms?: TimeMs;
-        /**
-         * The request being responded to. This couples the request data with the response event avoiding the need for joins or external data dependencies. In many cases the data must be coupled with this event because it is represented as a single event (nginx, apache web server, and other reverse proxy servers).
-         */
-        request?: {
-            [k: string]: any;
-            host?: HttpHost;
-            method?: HttpMethod;
-            path?: HttpPath;
-            scheme?: HttpScheme;
-        };
+        end_time?: TimeMs;
     };
 };
 export type LogEntry = {
@@ -293,10 +292,6 @@ export type LogEntry = {
      * A controlled representation of the event this log line represents.
      */
     event?: LogEvent | undefined;
-    /**
-     * Only print the message line, not the metadata.
-     */
-    messageOnly?: boolean;
 };
 export type LogMetadata = {
     error?: Error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/logger",
-  "version": "11.121.6",
+  "version": "11.121.9",
   "description": "Logging utility.",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -25,7 +25,7 @@
     "lodash": "4.17.21"
   },
   "devDependencies": {
-    "@sentry/types": "8.55.0",
+    "@sentry/core": "8.55.0",
     "@types/lodash": "4.17.20",
     "graphql": "16.10.0"
   },