Skip to content

Commit 1670c4c

Browse files
committed
Remove "log" Log Level, unify log and info messages under the "info" log level
1 parent 9d6c424 commit 1670c4c

File tree

6 files changed

+21
-14
lines changed

6 files changed

+21
-14
lines changed

.changeset/clever-donkeys-hunt.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"trigger.dev": patch
3+
"@trigger.dev/core": patch
4+
---
5+
6+
Remove "log" Log Level, unify log and info messages under the "info" log level

packages/cli-v3/src/workers/dev/worker-facade.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ clock.setGlobalClock(durableClock);
5555
const tracer = new TriggerTracer({ tracer: otelTracer, logger: otelLogger });
5656
const consoleInterceptor = new ConsoleInterceptor(
5757
otelLogger,
58-
__PROJECT_CONFIG__.enableConsoleLogging ?? false
58+
typeof __PROJECT_CONFIG__.enableConsoleLogging === "boolean"
59+
? __PROJECT_CONFIG__.enableConsoleLogging
60+
: true
5961
);
6062

6163
const devRuntimeManager = new DevRuntimeManager();
@@ -73,7 +75,7 @@ const configLogLevel = triggerLogLevel
7375
const otelTaskLogger = new OtelTaskLogger({
7476
logger: otelLogger,
7577
tracer: tracer,
76-
level: logLevels.includes(configLogLevel as any) ? (configLogLevel as LogLevel) : "log",
78+
level: logLevels.includes(configLogLevel as any) ? (configLogLevel as LogLevel) : "info",
7779
});
7880

7981
logger.setGlobalTaskLogger(otelTaskLogger);

packages/cli-v3/src/workers/prod/worker-facade.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const configLogLevel = triggerLogLevel
6262
const otelTaskLogger = new OtelTaskLogger({
6363
logger: otelLogger,
6464
tracer: tracer,
65-
level: logLevels.includes(configLogLevel as any) ? (configLogLevel as LogLevel) : "log",
65+
level: logLevels.includes(configLogLevel as any) ? (configLogLevel as LogLevel) : "info",
6666
});
6767

6868
logger.setGlobalTaskLogger(otelTaskLogger);

packages/core/src/v3/logger/taskLogger.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import { flattenAttributes } from "../utils/flattenAttributes";
77
import { ClockTime } from "../clock/clock";
88
import { clock } from "../clock-api";
99

10-
export type LogLevel = "none" | "log" | "error" | "warn" | "info" | "debug";
10+
export type LogLevel = "none" | "error" | "warn" | "info" | "debug";
1111

12-
export const logLevels: Array<LogLevel> = ["none", "error", "warn", "log", "info", "debug"];
12+
export const logLevels: Array<LogLevel> = ["none", "error", "warn", "info", "debug"];
1313

1414
export type TaskLoggerConfig = {
1515
logger: Logger;
@@ -34,31 +34,31 @@ export class OtelTaskLogger implements TaskLogger {
3434
}
3535

3636
debug(message: string, properties?: Record<string, unknown>) {
37-
if (this._level < 5) return;
37+
if (this._level < 4) return; // ["none", "error", "warn", "info", "debug"];
3838

3939
this.#emitLog(message, this.#getTimestampInHrTime(), "debug", SeverityNumber.DEBUG, properties);
4040
}
4141

4242
log(message: string, properties?: Record<string, unknown>) {
43-
if (this._level < 3) return;
43+
if (this._level < 3) return; // ["none", "error", "warn", "info", "debug"];
4444

4545
this.#emitLog(message, this.#getTimestampInHrTime(), "log", SeverityNumber.INFO, properties);
4646
}
4747

4848
info(message: string, properties?: Record<string, unknown>) {
49-
if (this._level < 4) return;
49+
if (this._level < 3) return; // ["none", "error", "warn", "info", "debug"];
5050

5151
this.#emitLog(message, this.#getTimestampInHrTime(), "info", SeverityNumber.INFO, properties);
5252
}
5353

5454
warn(message: string, properties?: Record<string, unknown>) {
55-
if (this._level < 2) return;
55+
if (this._level < 2) return; // ["none", "error", "warn", "info", "debug"];
5656

5757
this.#emitLog(message, this.#getTimestampInHrTime(), "warn", SeverityNumber.WARN, properties);
5858
}
5959

6060
error(message: string, properties?: Record<string, unknown>) {
61-
if (this._level < 1) return;
61+
if (this._level < 1) return; // ["none", "error", "warn", "info", "debug"];
6262

6363
this.#emitLog(message, this.#getTimestampInHrTime(), "error", SeverityNumber.ERROR, properties);
6464
}

packages/core/src/v3/types/config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ export interface ProjectConfig {
3737
instrumentations?: InstrumentationOption[];
3838

3939
/**
40-
* Set the log level for the logger. Defaults to "log", so you will see "log", "warn", and "error" messages, but not "info", or "debug" messages.
40+
* Set the log level for the logger. Defaults to "info", so you will see "log", "info", "warn", and "error" messages, but not "debug" messages.
4141
*
4242
* We automatically set the logLevel to "debug" during test runs
4343
*
44-
* @default "log"
44+
* @default "info"
4545
*/
4646
logLevel?: LogLevel;
4747

references/v3-catalog/trigger.config.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ export const config: TriggerConfig = {
2020
additionalFiles: ["./wrangler/wrangler.toml", "./prisma/schema.prisma"],
2121
dependenciesToBundle: [/@sindresorhus/, "escape-string-regexp"],
2222
instrumentations: [new OpenAIInstrumentation()],
23-
logLevel: "log",
24-
enableConsoleLogging: true,
23+
logLevel: "info",
2524
onStart: async (payload, { ctx }) => {
2625
if (ctx.organization.id === "clsylhs0v0002dyx75xx4pod1") {
2726
console.log("Initializing the app data source");

0 commit comments

Comments
 (0)