Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

fix(api): canonicalize observation field-set SELECT column order (#17556)

Niklas Semmler407ceb476c24
diff --git a/packages/shared/src/server/queries/clickhouse-sql/event-query-builder.test.ts b/packages/shared/src/server/queries/clickhouse-sql/event-query-builder.test.ts
index 4c8ea2bae6..cd83d07f84 100644
--- a/packages/shared/src/server/queries/clickhouse-sql/event-query-builder.test.ts
+++ b/packages/shared/src/server/queries/clickhouse-sql/event-query-builder.test.ts
@@ -21,6 +21,34 @@ describe("EventsQueryBuilder public API v2 field groups", () => {
expect(query.includes('"is_root_observation"')).toBe(selected);
},
);
+
+ it.each([
+ {
+ name: "usage vs metadata",
+ orderA: ["core", "basic", "usage", "metadata"] as const,
+ orderB: ["core", "basic", "metadata", "usage"] as const,
+ },
+ {
+ name: "usage vs metrics",
+ orderA: ["core", "basic", "usage", "metrics"] as const,
+ orderB: ["core", "basic", "metrics", "usage"] as const,
+ },
+ {
+ name: "usage vs trace_context",
+ orderA: ["core", "basic", "usage", "trace_context"] as const,
+ orderB: ["core", "basic", "trace_context", "usage"] as const,
+ },
+ ])(
+ "emits identical SQL regardless of field-group order ($name)",
+ ({ orderA, orderB }) => {
+ const queryFor = (sets: typeof orderA | typeof orderB) =>
+ new EventsQueryBuilder({ projectId: "test-project" })
+ .selectFieldSet(...sets)
+ .buildWithParams().query;
+
+ expect(queryFor(orderA)).toBe(queryFor(orderB));
+ },
+ );
});
describe("EventsAggregationQueryBuilder", () => {
diff --git a/packages/shared/src/server/queries/clickhouse-sql/event-query-builder.ts b/packages/shared/src/server/queries/clickhouse-sql/event-query-builder.ts
index afaaccb62d..35e2f51790 100644
--- a/packages/shared/src/server/queries/clickhouse-sql/event-query-builder.ts
+++ b/packages/shared/src/server/queries/clickhouse-sql/event-query-builder.ts
@@ -208,6 +208,10 @@ const EVENTS_FIELDS = {
"if(isNull(e.completion_start_time), NULL, date_diff('millisecond', e.start_time, e.completion_start_time)) as \"time_to_first_token\"",
} as const;
+const EVENTS_FIELD_ORDER_INDEX = new Map(
+ Object.keys(EVENTS_FIELDS).map((key, index) => [key, index]),
+);
+
/**
* Predefined field sets for common query patterns
* Maps set names to arrays of field keys from EVENTS_FIELDS
@@ -1168,9 +1172,17 @@ export class EventsQueryBuilder extends BaseEventsQueryBuilder<
fieldsToExclude.push("metadata");
}
- const fieldsToProcess = [...this.selectFields].filter(
- (f) => !fieldsToExclude.includes(f),
- );
+ // Canonicalize by EVENTS_FIELDS declaration order so SELECT column order
+ // does not follow caller field-set order. Clustered ClickHouse reads align
+ // result blocks by position; incompatible Map types (cost_details vs
+ // metadata) 500 when those columns swap places.
+ const fieldsToProcess = [...this.selectFields]
+ .filter((f) => !fieldsToExclude.includes(f))
+ .sort(
+ (a, b) =>
+ (EVENTS_FIELD_ORDER_INDEX.get(a) ?? Number.MAX_SAFE_INTEGER) -
+ (EVENTS_FIELD_ORDER_INDEX.get(b) ?? Number.MAX_SAFE_INTEGER),
+ );
const fieldExpressions: string[] = fieldsToProcess.flatMap((fieldKey) => {
const fieldExpr = EVENTS_FIELDS[fieldKey as keyof typeof EVENTS_FIELDS];