TypeScript
fix(server): OTLP export settings survive a saved token streaming mode (#29786)
Alex Southwellcedcc3109659
diff --git a/packages/shared/src/serverSettings.test.ts b/packages/shared/src/serverSettings.test.tsindex cfbc9339e4e..01c921d80c6 100644--- a/packages/shared/src/serverSettings.test.ts+++ b/packages/shared/src/serverSettings.test.ts@@ -271,6 +271,15 @@ describe("serverSettings helpers", () => {otlpMetricsUrl: "http://localhost:4318/v1/metrics",otlpLogsUrl: "http://localhost:4318/v1/logs",});+ // The server still loads a file holding the retired token streaming mode.+ expect(+ parsePersistedServerObservabilitySettings(+ JSON.stringify({+ responseStreamingMode: "token",+ observability: { otlpTracesUrl: "http://localhost:4318/v1/traces" },+ }),+ ).otlpTracesUrl,+ ).toBe("http://localhost:4318/v1/traces");});it("falls back cleanly when persisted settings are invalid", () => {diff --git a/packages/shared/src/serverSettings.ts b/packages/shared/src/serverSettings.tsindex 0db213a90f7..d6ba8c89fe5 100644--- a/packages/shared/src/serverSettings.ts+++ b/packages/shared/src/serverSettings.ts@@ -35,8 +35,13 @@ import {resolveBackgroundActivitySettings,} from "./backgroundActivitySettings.ts";-const ServerSettingsJson = fromLenientJson(ServerSettings);-const decodeServerSettingsJson = Schema.decodeUnknownOption(ServerSettingsJson);+// Only observability: a value the server migrates on load elsewhere in the file must not drop it.+const ServerObservabilitySettingsJson = fromLenientJson(+ Schema.Struct({ observability: ServerSettings.fields.observability }),+);+const decodeServerObservabilitySettingsJson = Schema.decodeUnknownOption(+ ServerObservabilitySettingsJson,+);export function isModelSelectionProviderEnabled(settings: ServerSettings,@@ -181,7 +186,7 @@ function extractPersistedServerObservabilitySettings(input: {export function parsePersistedServerObservabilitySettings(raw: string,): PersistedServerObservabilitySettings {- const decoded = decodeServerSettingsJson(raw);+ const decoded = decodeServerObservabilitySettingsJson(raw);if (Option.isSome(decoded)) {return extractPersistedServerObservabilitySettings(decoded.value);}