Skip to content

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

perf(sessions): let callers choose which session aggregates to compute (#18784)

Niklas Semmlerabb396e691b2
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 9d923e57a4..53e03f7aee 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
@@ -114,6 +114,18 @@ describe("EventsSessionAggregationQueryBuilder", () => {
expect(query).not.toContain("tool_calls");
});
+ it("selects only the session fields the caller lists", () => {
+ const { query } = new EventsSessionAggregationQueryBuilder({
+ projectId: "test-project",
+ })
+ .selectSessionFields(["session_id", "trace_count"])
+ .buildWithParams();
+
+ expect(query).toContain("uniq(trace_id) AS trace_count");
+ expect(query).not.toContain("trace_ids");
+ expect(query).not.toContain("sumMap");
+ });
+
it("selects tool aggregates only when requested", () => {
const { query } = new EventsSessionAggregationQueryBuilder({
projectId: "test-project",
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 e85aa4898b..91275a2479 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
@@ -1489,6 +1489,35 @@ export type SessionEventsMetricsRow = {
session_total_usage: string;
};
+export type SessionEventsField = keyof SessionEventsMetricsRow;
+
+/**
+ * ClickHouse returns the UInt64 counts as strings.
+ */
+export const normalizeSessionCounts = <T extends object>(row: T): T => {
+ const counts = row as Partial<
+ Pick<SessionEventsMetricsRow, "trace_count" | "total_observations">
+ >;
+ return {
+ ...row,
+ ...(counts.trace_count !== undefined && {
+ trace_count: Number(counts.trace_count),
+ }),
+ ...(counts.total_observations !== undefined && {
+ total_observations: Number(counts.total_observations),
+ }),
+ };
+};
+
+/**
+ * Callers list the session fields they read, so no aggregate is computed and
+ * shipped only to be dropped.
+ */
+export type SessionEventsFields<F extends SessionEventsField> = readonly [
+ F,
+ ...F[],
+];
+
/**
* Aggregation fields for session-level queries.
* These fields use ClickHouse aggregation functions and require GROUP BY session_id.
@@ -1547,6 +1576,13 @@ export const SESSION_AGGREGATION_FIELD_SETS = {
tools: ["tool_names", "called_tool_names", "tool_calls_count"],
} as const;
+/**
+ * Every session field. Only for a CTE whose outer SELECT picks the columns;
+ * ClickHouse drops the aggregates the outer query does not read.
+ */
+export const ALL_SESSION_EVENTS_FIELDS =
+ SESSION_AGGREGATION_FIELD_SETS.base as unknown as SessionEventsFields<SessionEventsField>;
+
/**
* EventsSessionAggregationQueryBuilder - A fluent query builder for session-level
* aggregated events table queries.
@@ -1581,6 +1617,11 @@ export class EventsSessionAggregationQueryBuilder extends BaseEventsQueryBuilder
return this;
}
+ selectSessionFields(fields: readonly SessionEventsField[]): this {
+ fields.forEach((field) => this.selectFields.add(field));
+ return this;
+ }
+
/**
* Add session ID filter
*/
diff --git a/packages/shared/src/server/queries/clickhouse-sql/query-fragments.ts b/packages/shared/src/server/queries/clickhouse-sql/query-fragments.ts
index 3411a1c298..3184035a59 100644
--- a/packages/shared/src/server/queries/clickhouse-sql/query-fragments.ts
+++ b/packages/shared/src/server/queries/clickhouse-sql/query-fragments.ts
@@ -7,6 +7,8 @@ import {
EventsAggQueryBuilder,
EventsQueryBuilder,
EventsSessionAggregationQueryBuilder,
+ type SessionEventsField,
+ type SessionEventsFields,
ExperimentsAggregationFieldSetName,
ExperimentsAggregationQueryBuilder,
type CTEWithSchema,
@@ -307,6 +309,7 @@ export const eventsTracesScoresAggregationFromObservationStart = (
*/
export const eventsSessionsAggregation = (params: {
projectId: string;
+ fields: SessionEventsFields<SessionEventsField>;
sessionIds?: string[];
startTimeFrom?: string | null;
includeMetadata?: boolean;
@@ -315,7 +318,7 @@ export const eventsSessionsAggregation = (params: {
return new EventsSessionAggregationQueryBuilder({
projectId: params.projectId,
})
- .selectFieldSet("base")
+ .selectSessionFields(params.fields)
.when(Boolean(params.includeMetadata), (builder) =>
builder.selectFieldSet("metadata"),
)
diff --git a/packages/shared/src/server/queries/index.ts b/packages/shared/src/server/queries/index.ts
index aa2d9e3c0a..450a88d4e4 100644
--- a/packages/shared/src/server/queries/index.ts
+++ b/packages/shared/src/server/queries/index.ts
@@ -57,6 +57,7 @@ export {
type ApiColumnMapping,
} from "./public-api-filter-builder";
export {
+ ALL_SESSION_EVENTS_FIELDS,
CTEQueryBuilder,
EventsAggQueryBuilder,
EventsAggregationQueryBuilder,
@@ -65,10 +66,13 @@ export {
ExperimentsAggregationQueryBuilder,
OBSERVATION_FIELD_GROUP_FIELD_NAMES,
buildEventsFullTableSplitQuery,
+ normalizeSessionCounts,
type CTESchema,
type CTEWithSchema,
type QueryWithParams,
type ExperimentsAggregationFieldSetName,
+ type SessionEventsField,
+ type SessionEventsFields,
type SessionEventsMetricsRow,
type SplitQueryBuilder,
} from "./clickhouse-sql/event-query-builder";
diff --git a/packages/shared/src/server/repositories/__snapshots__/events.golden.test.ts.snap b/packages/shared/src/server/repositories/__snapshots__/events.golden.test.ts.snap
index 260acbcc1c..3eba719374 100644
--- a/packages/shared/src/server/repositories/__snapshots__/events.golden.test.ts.snap
+++ b/packages/shared/src/server/repositories/__snapshots__/events.golden.test.ts.snap
@@ -1845,31 +1845,7 @@ exports[`golden: events simple aggregates family > getSessionMetricsFromEvents s
"route": "unknown",
"sql": "SELECT
session_id,
- max(start_time) AS max_timestamp,
- min(start_time) AS min_timestamp,
- groupUniqArray(trace_id) AS trace_ids,
- groupUniqArrayIf(user_id, (user_id IS NOT NULL) AND (user_id != '')) AS user_ids,
- uniq(trace_id) AS trace_count,
- groupUniqArrayArrayIf(tags, notEmpty(tags)) AS trace_tags,
- argMaxIf(environment, event_ts, environment != '') AS environment,
- uniqIf(span_id, parent_span_id != '') AS total_observations,
- dateDiff('second', min(start_time), max(if(isNull(end_time), start_time, end_time))) AS duration,
- sumMap(usage_details) AS session_usage_details,
- sumMap(cost_details) AS session_cost_details,
- arraySum(
- mapValues(mapFilter(x -> (positionCaseInsensitive(x.1, 'input') > 0), sumMap(cost_details)))
- ) AS session_input_cost,
- arraySum(
- mapValues(mapFilter(x -> (positionCaseInsensitive(x.1, 'output') > 0), sumMap(cost_details)))
- ) AS session_output_cost,
- sumMap(cost_details)['total'] AS session_total_cost,
- arraySum(
- mapValues(mapFilter(x -> (positionCaseInsensitive(x.1, 'input') > 0), sumMap(usage_details)))
- ) AS session_input_usage,
- arraySum(
- mapValues(mapFilter(x -> (positionCaseInsensitive(x.1, 'output') > 0), sumMap(usage_details)))
- ) AS session_output_usage,
- sumMap(usage_details)['total'] AS session_total_usage
+ uniq(trace_id) AS trace_count
FROM events_core AS e
WHERE (e.project_id = {param1:String}) AND (session_id IN ({param2:Array(String)})) AND (session_id != {param3:String})
GROUP BY session_id
@@ -1895,31 +1871,7 @@ exports[`golden: events simple aggregates family > getSessionMetricsFromEvents s
"route": "unknown",
"sql": "SELECT
session_id,
- max(start_time) AS max_timestamp,
- min(start_time) AS min_timestamp,
- groupUniqArray(trace_id) AS trace_ids,
- groupUniqArrayIf(user_id, (user_id IS NOT NULL) AND (user_id != '')) AS user_ids,
- uniq(trace_id) AS trace_count,
- groupUniqArrayArrayIf(tags, notEmpty(tags)) AS trace_tags,
- argMaxIf(environment, event_ts, environment != '') AS environment,
- uniqIf(span_id, parent_span_id != '') AS total_observations,
- dateDiff('second', min(start_time), max(if(isNull(end_time), start_time, end_time))) AS duration,
- sumMap(usage_details) AS session_usage_details,
- sumMap(cost_details) AS session_cost_details,
- arraySum(
- mapValues(mapFilter(x -> (positionCaseInsensitive(x.1, 'input') > 0), sumMap(cost_details)))
- ) AS session_input_cost,
- arraySum(
- mapValues(mapFilter(x -> (positionCaseInsensitive(x.1, 'output') > 0), sumMap(cost_details)))
- ) AS session_output_cost,
- sumMap(cost_details)['total'] AS session_total_cost,
- arraySum(
- mapValues(mapFilter(x -> (positionCaseInsensitive(x.1, 'input') > 0), sumMap(usage_details)))
- ) AS session_input_usage,
- arraySum(
- mapValues(mapFilter(x -> (positionCaseInsensitive(x.1, 'output') > 0), sumMap(usage_details)))
- ) AS session_output_usage,
- sumMap(usage_details)['total'] AS session_total_usage
+ uniq(trace_id) AS trace_count
FROM events_core AS e
WHERE (e.project_id = {param1:String}) AND (session_id IN ({param2:Array(String)})) AND (start_time >= {param3:DateTime64(6)}) AND (session_id != {param4:String})
GROUP BY session_id
diff --git a/packages/shared/src/server/repositories/events.golden.test.ts b/packages/shared/src/server/repositories/events.golden.test.ts
index e24a59e7ef..a48fccad68 100644
--- a/packages/shared/src/server/repositories/events.golden.test.ts
+++ b/packages/shared/src/server/repositories/events.golden.test.ts
@@ -329,6 +329,7 @@ describeWithClickhouse("golden: events simple aggregates family", () => {
await getSessionMetricsFromEvents({
projectId: FIXED_PROJECT_ID,
sessionIds: [],
+ fields: ["session_id", "trace_count"],
});
expect(normalizeCapturedQueries(capturedQueries)).toMatchSnapshot();
});
@@ -337,6 +338,7 @@ describeWithClickhouse("golden: events simple aggregates family", () => {
await getSessionMetricsFromEvents({
projectId: FIXED_PROJECT_ID,
sessionIds: FIXED_SESSION_IDS,
+ fields: ["session_id", "trace_count"],
});
expect(normalizeCapturedQueries(capturedQueries)).toMatchSnapshot();
});
@@ -345,6 +347,7 @@ describeWithClickhouse("golden: events simple aggregates family", () => {
await getSessionMetricsFromEvents({
projectId: FIXED_PROJECT_ID,
sessionIds: FIXED_SESSION_IDS,
+ fields: ["session_id", "trace_count"],
queryFromTimestamp: FIXED_FROM_TIMESTAMP,
});
expect(normalizeCapturedQueries(capturedQueries)).toMatchSnapshot();
diff --git a/packages/shared/src/server/repositories/events.ts b/packages/shared/src/server/repositories/events.ts
index 6175e0f13b..eb574d06fe 100644
--- a/packages/shared/src/server/repositories/events.ts
+++ b/packages/shared/src/server/repositories/events.ts
@@ -141,9 +141,11 @@ import {
buildEventsFullTableSplitQuery,
EVENTS_AGGREGATION_FIELDS,
EVENTS_SESSION_AGGREGATION_FIELDS,
- SESSION_AGGREGATION_FIELD_SETS,
eventsFieldSetSelectExpressions,
type QueryWithParams,
+ normalizeSessionCounts,
+ type SessionEventsField,
+ type SessionEventsFields,
type SessionEventsMetricsRow,
OrderByEntry,
} from "../queries/clickhouse-sql/event-query-builder";
@@ -3893,18 +3895,21 @@ export const getEvaluatorExecutionSummaries = async (
}));
};
-export const getSessionMetricsFromEvents = async (props: {
+export const getSessionMetricsFromEvents = async <
+ F extends SessionEventsField,
+>(props: {
projectId: string;
sessionIds: string[];
+ fields: SessionEventsFields<F>;
queryFromTimestamp?: Date;
}) => {
if (props.sessionIds.length === 0) return [];
- const { projectId, sessionIds, queryFromTimestamp } = props;
+ const { projectId, sessionIds, fields, queryFromTimestamp } = props;
const builder = getClickhouseKysely()
.selectFrom("events_core as e")
.select(
- SESSION_AGGREGATION_FIELD_SETS.base.map((field) =>
+ fields.map((field) =>
sql.raw(EVENTS_SESSION_AGGREGATION_FIELDS[field]),
) as never,
)
@@ -3921,18 +3926,14 @@ export const getSessionMetricsFromEvents = async (props: {
.limit(sessionIds.length);
const { sql: query, params } = compileClickhouseQuery(builder, { projectId });
- const rows = await queryClickhouse<SessionEventsMetricsRow>({
+ const rows = await queryClickhouse<Pick<SessionEventsMetricsRow, F>>({
query,
params,
tags: { projectId },
preferredClickhouseService: "EventsReadOnly",
});
- return rows.map((row) => ({
- ...row,
- trace_count: Number(row.trace_count),
- total_observations: Number(row.total_observations),
- }));
+ return rows.map(normalizeSessionCounts);
};
/**
diff --git a/packages/shared/src/server/services/sessions-ui-table-events-service.ts b/packages/shared/src/server/services/sessions-ui-table-events-service.ts
index 23bbd815ec..0e86b9e24d 100644
--- a/packages/shared/src/server/services/sessions-ui-table-events-service.ts
+++ b/packages/shared/src/server/services/sessions-ui-table-events-service.ts
@@ -5,11 +5,15 @@ import { OrderByState } from "../../interfaces/orderBy";
import { FilterState } from "../../types";
import { convertDateToClickhouseDateTime } from "../clickhouse/client";
import {
+ ALL_SESSION_EVENTS_FIELDS,
CTEQueryBuilder,
+ normalizeSessionCounts,
DateTimeFilter,
FilterList,
StringOptionsFilter,
orderByToClickhouseSql,
+ type SessionEventsField,
+ type SessionEventsFields,
type SessionEventsMetricsRow,
} from "../queries";
import { createFilterFromFilterState } from "../queries/clickhouse-sql/factory";
@@ -29,26 +33,6 @@ import { sessionsEventsViewCols } from "../../tableDefinitions/sessionsView";
import { findUiColumnMapping } from "../../tableDefinitions";
import { parseClickhouseUTCDateTimeFormat } from "../repositories/clickhouse";
-type SessionEventsBaseReturnType = {
- session_id: string;
- max_timestamp: string;
- min_timestamp: string;
- trace_ids: string[];
- user_ids: string[];
- trace_count: number;
- trace_tags: string[];
- environment?: string;
-};
-
-type SessionScoreFields = {
- scores_avg?: Array<Array<[string, number]>>;
- score_categories?: Array<Array<string>>;
- score_booleans?: Array<Array<string>>;
-};
-
-export type SessionEventsDataReturnType = SessionEventsBaseReturnType &
- SessionScoreFields;
-
export type SessionTraceFromEvents = {
id: string;
name: string | null;
@@ -121,62 +105,34 @@ export const getSessionsTableCountFromEvents = async (props: {
return rows.length > 0 ? Number(rows[0].count) : 0;
};
-export const getSessionsTableFromEvents = async (props: {
- projectId: string;
- filter: FilterState;
- orderBy?: OrderByState;
- limit?: number;
- page?: number;
-}) => {
- const rows =
- await getSessionsTableFromEventsGeneric<SessionEventsDataReturnType>({
- select: "rows",
- projectId: props.projectId,
- filter: props.filter,
- orderBy: props.orderBy,
- limit: props.limit,
- page: props.page,
- });
-
- return rows.map((row) => ({
- ...row,
- trace_count: Number(row.trace_count),
- }));
-};
-
-// Single-query equivalent of getSessionsTableFromEvents + getSessionMetricsFromEvents,
-// mirroring the legacy getSessionsWithMetrics. Used by batch export so the metrics
-// aggregation inherits the same filter (incl. the createdAt cutoff) and clickhouseConfigs
-// (extended HTTP timeouts) as the row query, in a single round-trip.
-export const getSessionsWithMetricsFromEvents = async (props: {
+export const getSessionsTableFromEvents = async <
+ F extends SessionEventsField,
+>(props: {
projectId: string;
filter: FilterState;
+ fields: SessionEventsFields<F>;
orderBy?: OrderByState;
limit?: number;
page?: number;
clickhouseConfigs?: ClickHouseClientConfigOptions | undefined;
}) => {
- const rows = await getSessionsTableFromEventsGeneric<SessionEventsMetricsRow>(
- {
- select: "metrics",
- projectId: props.projectId,
- filter: props.filter,
- orderBy: props.orderBy,
- limit: props.limit,
- page: props.page,
- clickhouseConfigs: props.clickhouseConfigs,
- },
- );
+ const rows = await getSessionsTableFromEventsGeneric<
+ Pick<SessionEventsMetricsRow, F>
+ >({
+ select: { fields: props.fields },
+ projectId: props.projectId,
+ filter: props.filter,
+ orderBy: props.orderBy,
+ limit: props.limit,
+ page: props.page,
+ clickhouseConfigs: props.clickhouseConfigs,
+ });
- return rows.map((row) => ({
- ...row,
- trace_count: Number(row.trace_count),
- total_observations: Number(row.total_observations),
- }));
+ return rows.map(normalizeSessionCounts);
};
export type FetchSessionsTableFromEventsProps = {
- select: "count" | "rows" | "metrics";
+ select: "count" | { fields: SessionEventsFields<SessionEventsField> };
projectId: string;
filter: FilterState;
searchQuery?: string;
@@ -246,6 +202,7 @@ const getSessionsTableFromEventsGeneric = async <T>(
// Build session_data CTE
const sessionsBuilder = eventsSessionsAggregation({
projectId,
+ fields: ALL_SESSION_EVENTS_FIELDS,
sessionIds: sessionIdFilter?.values,
startTimeFrom: traceTimestampFilter
? convertDateToClickhouseDateTime(traceTimestampFilter.value)
@@ -260,7 +217,7 @@ const getSessionsTableFromEventsGeneric = async <T>(
.from("session_data", "s");
// Conditionally add scores CTE
- if (select === "metrics" || requiresScoresJoin) {
+ if (requiresScoresJoin) {
queryBuilder = queryBuilder
.withCTE("scores_agg", eventsSessionScoresAggregation({ projectId }))
.leftJoin(
@@ -270,51 +227,12 @@ const getSessionsTableFromEventsGeneric = async <T>(
);
}
- // Select fields based on query type
- switch (select) {
- case "count":
- queryBuilder.select("count(s.session_id) as count");
- break;
- case "rows":
- queryBuilder.selectColumns(
- "s.session_id",
- "s.max_timestamp",
- "s.min_timestamp",
- "s.trace_ids",
- "s.user_ids",
- "s.trace_count",
- "s.trace_tags",
- "s.environment",
- );
- break;
- case "metrics":
- queryBuilder
- .selectColumns(
- "s.session_id",
- "s.max_timestamp",
- "s.min_timestamp",
- "s.trace_ids",
- "s.user_ids",
- "s.trace_count",
- "s.trace_tags",
- "s.environment",
- "s.total_observations",
- "s.duration",
- "s.session_usage_details",
- "s.session_cost_details",
- "s.session_input_cost",
- "s.session_output_cost",
- "s.session_total_cost",
- "s.session_input_usage",
- "s.session_output_usage",
- "s.session_total_usage",
- )
- .select("sc.scores_avg", "sc.score_categories", "sc.score_booleans");
- break;
- default: {
- const exhaustiveCheckDefault: never = select;
- throw new Error(`Unknown select type: ${exhaustiveCheckDefault}`);
- }
+ if (select === "count") {
+ queryBuilder.select("count(s.session_id) as count");
+ } else {
+ queryBuilder.selectColumns(
+ ...select.fields.map((field) => `s.${field}` as const),
+ );
}
// Apply filters, ordering, and pagination
diff --git a/web/src/__tests__/server/sessions-trpc-events-only.servertest.ts b/web/src/__tests__/server/sessions-trpc-events-only.servertest.ts
index d0d006c22f..1c5af0b105 100644
--- a/web/src/__tests__/server/sessions-trpc-events-only.servertest.ts
+++ b/web/src/__tests__/server/sessions-trpc-events-only.servertest.ts
@@ -119,6 +119,7 @@ maybe("sessions trpc (events_only write mode)", () => {
const rows = await getSessionMetricsFromEvents({
projectId,
sessionIds: [sessionId],
+ fields: ["session_id"],
});
expect(rows[0]?.session_id).toBe(sessionId);
});
diff --git a/web/src/__tests__/server/sessions-ui-table.servertest.ts b/web/src/__tests__/server/sessions-ui-table.servertest.ts
index cc767c0227..bd36ea9183 100644
--- a/web/src/__tests__/server/sessions-ui-table.servertest.ts
+++ b/web/src/__tests__/server/sessions-ui-table.servertest.ts
@@ -8,7 +8,6 @@ import {
createSessionScore,
createTracesCh,
getSessionsWithMetrics,
- getSessionsWithMetricsFromEvents,
getSessionMetricsFromEvents,
getSessionsTable,
getSessionsTableFromEvents,
@@ -24,10 +23,31 @@ import { env } from "@/src/env.mjs";
const isEventsPath = env.LANGFUSE_MIGRATION_V4_ALLOW_PREVIEW_OPT_IN === "true";
+const metricsFields = [
+ "session_id",
+ "trace_count",
+ "user_ids",
+ "trace_tags",
+ "total_observations",
+ "duration",
+ "session_input_cost",
+ "session_output_cost",
+ "session_total_cost",
+ "session_input_usage",
+ "session_output_usage",
+ "session_total_usage",
+] as const;
+
// Pick the right listing function based on env flag
-const sessionsTable = isEventsPath
- ? getSessionsTableFromEvents
- : getSessionsTable;
+async function sessionsTable(props: Parameters<typeof getSessionsTable>[0]) {
+ if (!isEventsPath) {
+ return getSessionsTable(props);
+ }
+ return getSessionsTableFromEvents({
+ ...props,
+ fields: ["session_id", "trace_count", "user_ids", "trace_tags"],
+ });
+}
// Adapter for metrics: legacy takes filter/orderBy, events-based takes sessionIds
async function sessionsWithMetrics(props: {
@@ -43,6 +63,7 @@ async function sessionsWithMetrics(props: {
return getSessionMetricsFromEvents({
projectId: props.projectId,
sessionIds,
+ fields: metricsFields,
});
}
@@ -744,7 +765,7 @@ maybeEventsTable("parity: sessions metrics from events vs legacy", () => {
const [legacy, fromEvents] = await Promise.all([
getSessionsWithMetrics({ projectId, filter }),
- getSessionsWithMetricsFromEvents({ projectId, filter }),
+ getSessionsTableFromEvents({ projectId, filter, fields: metricsFields }),
]);
expect(legacy).toHaveLength(1);
@@ -755,7 +776,6 @@ maybeEventsTable("parity: sessions metrics from events vs legacy", () => {
expect(e.session_id).toBe(l.session_id);
expect(e.trace_count).toBe(l.trace_count);
- expect([...e.trace_ids].sort()).toEqual([...l.trace_ids].sort());
expect([...e.user_ids].sort()).toEqual([...l.user_ids].sort());
expect(e.total_observations).toBe(l.total_observations);
@@ -847,6 +867,7 @@ maybeEventsTable("parity: sessions metrics from events vs legacy", () => {
const tableRows = await getSessionsTableFromEvents({
projectId,
filter: filterState,
+ fields: ["session_id"],
orderBy: null,
limit: 10,
page: 0,
@@ -887,7 +908,7 @@ maybeEventsTable("parity: sessions metrics from events vs legacy", () => {
const [legacy, fromEvents] = await Promise.all([
getSessionsWithMetrics({ projectId, filter }),
- getSessionsWithMetricsFromEvents({ projectId, filter }),
+ getSessionsTableFromEvents({ projectId, filter, fields: metricsFields }),
]);
expect(legacy).toHaveLength(1);
diff --git a/web/src/server/api/routers/sessions.ts b/web/src/server/api/routers/sessions.ts
index c099707c04..9d73d29005 100644
--- a/web/src/server/api/routers/sessions.ts
+++ b/web/src/server/api/routers/sessions.ts
@@ -291,6 +291,14 @@ export const sessionRouter = createTRPCRouter({
const sessions = await getSessionsTableFromEvents({
projectId: input.projectId,
filter: finalFilter,
+ fields: [
+ "session_id",
+ "user_ids",
+ "trace_count",
+ "trace_tags",
+ "min_timestamp",
+ "environment",
+ ],
orderBy: normalizedOrderBy,
page: input.page,
limit: input.limit,
@@ -482,6 +490,22 @@ export const sessionRouter = createTRPCRouter({
const sessions = await getSessionMetricsFromEvents({
projectId: input.projectId,
sessionIds: input.sessionIds,
+ fields: [
+ "session_id",
+ "user_ids",
+ "trace_count",
+ "trace_tags",
+ "min_timestamp",
+ "environment",
+ "total_observations",
+ "duration",
+ "session_input_cost",
+ "session_output_cost",
+ "session_total_cost",
+ "session_input_usage",
+ "session_output_usage",
+ "session_total_usage",
+ ],
queryFromTimestamp: input.queryFromTimestamp ?? undefined,
});
@@ -728,6 +752,17 @@ export const sessionRouter = createTRPCRouter({
getSessionMetricsFromEvents({
projectId: input.projectId,
sessionIds: [input.sessionId],
+ fields: [
+ "user_ids",
+ "trace_count",
+ "session_total_cost",
+ "session_input_usage",
+ "session_output_usage",
+ "session_total_usage",
+ "min_timestamp",
+ "max_timestamp",
+ "environment",
+ ],
}).then((rows) => rows[0]),
isStorableTraceSessionId(input.sessionId)
? ctx.prisma.traceSession.findFirst({
diff --git a/worker/src/features/database-read-stream/getDatabaseReadStream.ts b/worker/src/features/database-read-stream/getDatabaseReadStream.ts
index e0fe7712dd..29e81902b8 100644
--- a/worker/src/features/database-read-stream/getDatabaseReadStream.ts
+++ b/worker/src/features/database-read-stream/getDatabaseReadStream.ts
@@ -17,7 +17,7 @@ import {
getTraceMetadataByIdsFromEvents,
getPublicSessionsFilter,
getSessionsWithMetrics,
- getSessionsWithMetricsFromEvents,
+ getSessionsTableFromEvents,
getDistinctScoreNames,
getObservationsTableWithModelData,
getScoresForObservations,
@@ -360,9 +360,21 @@ export const getDatabaseReadStreamPaginated = async ({
// same filter (incl. the createdAt cutoff) and clickhouseConfigs, and
// expose the same field names, so the row mapping below is shared.
const sessions = useEventsTable
- ? await getSessionsWithMetricsFromEvents({
+ ? await getSessionsTableFromEvents({
projectId: projectId,
filter: sessionsFilter,
+ fields: [
+ "session_id",
+ "user_ids",
+ "trace_count",
+ "duration",
+ "session_input_cost",
+ "session_output_cost",
+ "session_total_cost",
+ "session_total_usage",
+ "trace_tags",
+ "min_timestamp",
+ ],
orderBy: orderBy,
limit: pageSize,
page: Math.floor(offset / pageSize),
@@ -395,7 +407,7 @@ export const getDatabaseReadStreamPaginated = async ({
const row: BatchExportSessionsRow = {
id: s.session_id,
userIds: s.user_ids,
- countTraces: s.trace_ids.length,
+ countTraces: s.trace_count,
sessionDuration: Number(s.duration) / 1000,
inputCost: new Decimal(s.session_input_cost),
outputCost: new Decimal(s.session_output_cost),