| ... | ... | @@ -11,43 +11,34 @@ import { resolveServerBackgroundActivitySettings } from "./backgroundActivitySet |
| 11 | 11 | import { createModelSelection } from "./model.ts"; |
| 12 | 12 | import { |
| 13 | 13 | applyServerSettingsPatch, |
| 14 | | extractPersistedServerObservabilitySettings, |
| 15 | 14 | isModelSelectionProviderEnabled, |
| 16 | | normalizePersistedServerSettingString, |
| 17 | 15 | parsePersistedServerObservabilitySettings, |
| 18 | 16 | resolveSourceControlWriterModelSelection, |
| 19 | 17 | } from "./serverSettings.ts"; |
| 20 | 18 | |
| 21 | 19 | describe("serverSettings helpers", () => { |
| 22 | | it("normalizes optional persisted strings", () => { |
| 23 | | expect(normalizePersistedServerSettingString(undefined)).toBeUndefined(); |
| 24 | | expect(normalizePersistedServerSettingString(" ")).toBeUndefined(); |
| 25 | | expect(normalizePersistedServerSettingString(" http://localhost:4318/v1/traces ")).toBe( |
| 26 | | "http://localhost:4318/v1/traces", |
| 27 | | ); |
| 28 | | }); |
| 29 | | |
| 30 | | it("extracts persisted observability settings", () => { |
| 20 | it("ignores missing and blank persisted observability URLs", () => { |
| 21 | expect(parsePersistedServerObservabilitySettings("{}")).toEqual({ |
| 22 | otlpTracesUrl: undefined, |
| 23 | otlpMetricsUrl: undefined, |
| 24 | }); |
| 31 | 25 | expect( |
| 32 | | extractPersistedServerObservabilitySettings({ |
| 33 | | observability: { |
| 34 | | otlpTracesUrl: " http://localhost:4318/v1/traces ", |
| 35 | | otlpMetricsUrl: " http://localhost:4318/v1/metrics ", |
| 36 | | }, |
| 37 | | }), |
| 26 | parsePersistedServerObservabilitySettings( |
| 27 | JSON.stringify({ observability: { otlpTracesUrl: " ", otlpMetricsUrl: "" } }), |
| 28 | ), |
| 38 | 29 | ).toEqual({ |
| 39 | | otlpTracesUrl: "http://localhost:4318/v1/traces", |
| 40 | | otlpMetricsUrl: "http://localhost:4318/v1/metrics", |
| 30 | otlpTracesUrl: undefined, |
| 31 | otlpMetricsUrl: undefined, |
| 41 | 32 | }); |
| 42 | 33 | }); |
| 43 | 34 | |
| 44 | | it("parses lenient persisted settings JSON", () => { |
| 35 | it("parses lenient persisted settings JSON and trims observability URLs", () => { |
| 45 | 36 | expect( |
| 46 | 37 | parsePersistedServerObservabilitySettings( |
| 47 | 38 | JSON.stringify({ |
| 48 | 39 | observability: { |
| 49 | | otlpTracesUrl: "http://localhost:4318/v1/traces", |
| 50 | | otlpMetricsUrl: "http://localhost:4318/v1/metrics", |
| 40 | otlpTracesUrl: " http://localhost:4318/v1/traces ", |
| 41 | otlpMetricsUrl: " http://localhost:4318/v1/metrics ", |
| 51 | 42 | }, |
| 52 | 43 | }), |
| 53 | 44 | ), |