Allow all log levels, only translate number based levels

Author: curusarn

packages/bunyan/src/helpers.ts

@@ -1,35 +1,15 @@
-import { LogLevel } from "@logtail/types";
+import { LogLevel, ILogLevel } from "@logtail/types";
 
 /**
  * Return a Logtail `LogLevel` based on the Bunyan level
  * @param level string|number - Bunyan log level
  */
-export function getLogLevel(level: number | string): LogLevel {
+export function getLogLevel(level: number | string): ILogLevel {
   // Are we dealing with a string log level?
   if (typeof level === "string") {
-    switch (level.toLowerCase()) {
-      // Fatal
-      case "fatal":
-        return LogLevel.Fatal;
-
-      // Error
-      case "error":
-        return LogLevel.Error;
-
-      // Warn
-      case "warn":
-        return LogLevel.Warn;
-
-      // Debug
-      case "debug":
-        return LogLevel.Debug;
-
-      // Trace
-      case "trace":
-        return LogLevel.Trace;
-
-    }
-  } else if (typeof level === "number") {
+    return level.toLowerCase()
+  }
+  if (typeof level === "number") {
     // Trace
     if (level <= 10) {
       return LogLevel.Trace;
@@ -54,11 +34,9 @@ export function getLogLevel(level: number | string): LogLevel {
     if (level <= 50) {
       return LogLevel.Error;
     }
-
     // Everything above this level is considered fatal
     return LogLevel.Fatal;
   }
-
   // By default, return info
   return LogLevel.Info;
 }

packages/core/src/base.ts

@@ -1,4 +1,5 @@
 import {
+  ILogLevel,
   ILogtailLog,
   ILogtailOptions,
   Context,
@@ -154,7 +155,7 @@ class Logtail {
    */
   public async log<TContext extends Context>(
     message: Message,
-    level: LogLevel = LogLevel.Info,
+    level: ILogLevel = LogLevel.Info,
     context: TContext = {} as TContext
   ): Promise<ILogtailLog & TContext> {
     // Check that we have a sync function

packages/node/src/node.ts

@@ -1,12 +1,12 @@
-import { Duplex, Writable } from "stream";
+import {Duplex, Writable} from "stream";
 
 import fetch from "cross-fetch";
-import { encode } from "@msgpack/msgpack";
+import {encode} from "@msgpack/msgpack";
 
-import { ILogtailLog, Context, StackContextHint, ILogtailOptions, LogLevel } from "@logtail/types";
-import { Base } from "@logtail/core";
+import {Context, ILogLevel, ILogtailLog, ILogtailOptions, LogLevel, StackContextHint} from "@logtail/types";
+import {Base} from "@logtail/core";
 
-import { getStackContext } from "./context";
+import {getStackContext} from "./context";
 
 export class Node extends Base {
   /**
@@ -57,7 +57,7 @@ export class Node extends Base {
    */
   public async log<TContext extends Context>(
     message: string,
-    level?: LogLevel,
+    level?: ILogLevel,
     context: TContext = {} as TContext,
     stackContextHint?: StackContextHint
   ) {

packages/types/src/types.ts

@@ -46,6 +46,7 @@ export interface ILogtailOptions {
   contextObjectCircularRefWarn: boolean;
 }
 
+export type ILogLevel = LogLevel | string;
 export enum LogLevel {
   // core log levels - available as functions
   Error = "error",
@@ -73,7 +74,7 @@ export type StackContextHint = { fileName: string, methodNames: [string] };
  */
 export interface ILogtailLog {
   dt: Date;
-  level: LogLevel;
+  level: ILogLevel;
   message: string;
   [key: string]: ContextKey | Context;
 }

packages/winston/src/helpers.ts

@@ -67,10 +67,6 @@ describe("Winston logging tests", () => {
     });
   }
 
-  it("should default to 'info' level when using custom logging", async () => {
-    return testLevel("xyz", LogLevel.Info, { xyz: 42 });
-  });
-
   it("should sync multiple logs", async done => {
     // Create multiple log entries
     const entries: LogEntry[] = [

packages/winston/src/winston.test.ts

@@ -3,7 +3,6 @@ import Transport from "winston-transport";
 
 import { Logtail } from "@logtail/node";
 import {LogLevel, StackContextHint} from "@logtail/types";
-import {getLogLevel} from "./helpers";
 
 const stackContextHint = { fileName: "node_modules/winston", methodNames: [ "log", "error", "warn", "info", "http", "verbose", "debug", "silly" ] };
 
@@ -21,10 +20,9 @@ export class LogtailTransport extends Transport {
     const { level, message, ...meta } = info;
 
     // Determine the log level
-    const logLevel = getLogLevel(level);
 
     // Log out to Logtail
-    void this._logtail.log(message, logLevel, meta, stackContextHint as StackContextHint);
+    void this._logtail.log(message, level, meta, stackContextHint as StackContextHint);
 
     // Winston callback...
     cb();