Skip to content

Commit b629870

Browse files
fix(observability): log kill switch warnings through the configured logger
The warnings were logged while the observability layer was being built, before the server and desktop loggers were installed, so they only reached the default console logger and never an OTLP logs endpoint. They are now logged by a layer that runs after the loggers are in place. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
1 parent 841ee8f commit b629870

3 files changed

Lines changed: 48 additions & 10 deletions

File tree

‎apps/desktop/src/app/DesktopObservability.test.ts‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,36 @@ describe("DesktopObservability", () => {
428428
);
429429
});
430430

431+
it.effect("exports kill switch warnings through the configured logger", () => {
432+
const requests: Array<ExportedRequest> = [];
433+
return Effect.gen(function* () {
434+
const fileSystem = yield* FileSystem.FileSystem;
435+
const baseDir = yield* fileSystem.makeTempDirectoryScoped({
436+
prefix: "t3-desktop-observability-test-",
437+
});
438+
const environmentLayer = makeEnvironmentLayer(baseDir, true, {
439+
T3CODE_OTLP_LOGS_URL: "https://collector.example.com/v1/logs",
440+
});
441+
442+
yield* Effect.scoped(
443+
Effect.void.pipe(
444+
Effect.provide(DesktopObservability.layer.pipe(Layer.provideMerge(environmentLayer))),
445+
),
446+
);
447+
448+
assert.include(requests[0]?.body ?? "", "OTEL_SDK_DISABLED=1 was read as false");
449+
}).pipe(
450+
Effect.scoped,
451+
Effect.provide(
452+
Layer.mergeAll(
453+
NodeServices.layer,
454+
collectorLayer(requests),
455+
ConfigProvider.layer(ConfigProvider.fromEnv({ env: { OTEL_SDK_DISABLED: "1" } })),
456+
),
457+
),
458+
);
459+
});
460+
431461
it.effect("reads every signal endpoint from Settings when the environment names none", () => {
432462
const requests: Array<ExportedRequest> = [];
433463
return Effect.gen(function* () {

‎apps/desktop/src/app/DesktopObservability.ts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -355,11 +355,8 @@ const readPersistedObservabilitySettings: Effect.Effect<
355355
*/
356356
const resolveOtlpEndpoints = Effect.gen(function* () {
357357
const otel = yield* OtelEnvironment.load;
358-
for (const warning of otel.warnings) {
359-
yield* Effect.logWarning(warning);
360-
}
361358
if (otel.disabled) {
362-
return { traces: undefined, metrics: undefined, logs: undefined };
359+
return { traces: undefined, metrics: undefined, logs: undefined, warnings: otel.warnings };
363360
}
364361

365362
const environment = yield* DesktopEnvironment.DesktopEnvironment;
@@ -368,6 +365,7 @@ const resolveOtlpEndpoints = Effect.gen(function* () {
368365
traces: Option.getOrUndefined(environment.otlpTracesUrl) ?? persisted.otlpTracesUrl,
369366
metrics: Option.getOrUndefined(environment.otlpMetricsUrl) ?? persisted.otlpMetricsUrl,
370367
logs: Option.getOrUndefined(environment.otlpLogsUrl) ?? persisted.otlpLogsUrl,
368+
warnings: otel.warnings,
371369
};
372370
});
373371

@@ -680,7 +678,12 @@ const telemetryLayer = Layer.unwrap(
680678
// resource,
681679
// }).pipe(Layer.provide(serializationLayer));
682680

683-
return Layer.mergeAll(loggerLayer, tracerLayer);
681+
// Logged once the loggers above are installed, so the warnings use them.
682+
const otelWarningsLayer = Layer.effectDiscard(
683+
Effect.forEach(endpoints.warnings, (warning) => Effect.logWarning(warning)),
684+
);
685+
686+
return otelWarningsLayer.pipe(Layer.provideMerge(Layer.mergeAll(loggerLayer, tracerLayer)));
684687
}),
685688
);
686689

‎apps/server/src/observability/Layers/Observability.ts‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ export const ObservabilityLive = Layer.unwrap(
2121
Effect.gen(function* () {
2222
const config = yield* ServerConfig.ServerConfig;
2323

24-
for (const warning of config.otelEnvironment.warnings) {
25-
yield* Effect.logWarning(warning);
26-
}
27-
2824
const traces = config.otlpTracesExport;
2925
const metrics = config.otlpMetricsExport;
3026
// The trace serializer stays in the returned context because the browser
@@ -91,6 +87,15 @@ export const ObservabilityLive = Layer.unwrap(
9187
resource,
9288
}).pipe(Layer.provide(otlpSerializationLayer(metrics.protocol)));
9389

94-
return Layer.mergeAll(ServerLoggerLive, traceReferencesLayer, tracerLayer, metricsLayer);
90+
// Logged once the server's loggers are installed, so the warnings use them.
91+
const otelWarningsLayer = Layer.effectDiscard(
92+
Effect.forEach(config.otelEnvironment.warnings, (warning) => Effect.logWarning(warning)),
93+
);
94+
95+
return otelWarningsLayer.pipe(
96+
Layer.provideMerge(
97+
Layer.mergeAll(ServerLoggerLive, traceReferencesLayer, tracerLayer, metricsLayer),
98+
),
99+
);
95100
}),
96101
);

0 commit comments

Comments
 (0)