Skip to content

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

perf(dashboards): aggregate scores views in one level when no join is needed (#19320)

Niklas Semmlerd8e9e44a4267
diff --git a/packages/shared/src/features/query/dataModel.ts b/packages/shared/src/features/query/dataModel.ts
index 35416085b7..d03536cacb 100644
--- a/packages/shared/src/features/query/dataModel.ts
+++ b/packages/shared/src/features/query/dataModel.ts
@@ -1054,14 +1054,16 @@ function scoresNumericViewBase(version: "v1" | "v2"): ViewDeclarationType {
},
measures: {
count: {
- sql: "count(*)",
+ sql: "@@AGG1@@(1)",
+ aggs: { agg1: "count" },
alias: "count",
type: "integer",
description: "Total number of scores.",
unit: "scores",
},
value: {
- sql: "any(value)",
+ sql: "@@AGG1@@(value)",
+ aggs: { agg1: "any" },
alias: "value",
type: "number",
description: "Value of the score.",
@@ -1103,7 +1105,8 @@ function scoresCategoricalViewBase(version: "v1" | "v2"): ViewDeclarationType {
},
measures: {
count: {
- sql: "count(*)",
+ sql: "@@AGG1@@(1)",
+ aggs: { agg1: "count" },
alias: "count",
type: "integer",
description: "Total number of scores.",
@@ -1143,14 +1146,16 @@ function scoresBooleanViewBase(version: "v1" | "v2"): ViewDeclarationType {
},
measures: {
count: {
- sql: "count(*)",
+ sql: "@@AGG1@@(1)",
+ aggs: { agg1: "count" },
alias: "count",
type: "integer",
description: "Total number of scores.",
unit: "scores",
},
value: {
- sql: "any(value)",
+ sql: "@@AGG1@@(value)",
+ aggs: { agg1: "any" },
alias: "value",
type: "number",
description:
@@ -1217,7 +1222,8 @@ function scoresListableCountViewBase(
},
measures: {
count: {
- sql: "count(*)",
+ sql: "@@AGG1@@(1)",
+ aggs: { agg1: "count" },
alias: "count",
type: "integer",
description: "Total number of scores across every listable score type.",
diff --git a/packages/shared/src/features/query/server/queryBuilder.scoresListableCountView.test.ts b/packages/shared/src/features/query/server/queryBuilder.scoresListableCountView.test.ts
index ece720f632..7b381893a1 100644
--- a/packages/shared/src/features/query/server/queryBuilder.scoresListableCountView.test.ts
+++ b/packages/shared/src/features/query/server/queryBuilder.scoresListableCountView.test.ts
@@ -54,13 +54,14 @@ describe("scores-listable-count view (internal-only, powers ScoresOutlierStrip's
expect(Object.keys(view.measures)).toEqual(["count"]);
});
- it("compiles a query whose count(*) is unguarded (covers every listable type)", async () => {
+ it("compiles a query whose count is unguarded (covers every listable type)", async () => {
const { query: compiledQuery, parameters } = await new QueryBuilder(
undefined,
"v1",
).build(baseQuery, "test-project");
- expect(compiledQuery).toContain("count(*)");
+ expect(compiledQuery).toMatch(/count\(\(1\)\) as count_count/);
+ expect(compiledQuery).not.toContain("countIf");
expect(compiledQuery).toContain("scores_listable_count.data_type IN");
// The segment's data_type allow-list is a bound parameter, not inlined SQL.
const dataTypeParam = Object.values(parameters).find(
@@ -97,3 +98,75 @@ describe("scores views for projects that skip scores dedup", () => {
},
);
});
+
+describe("scores views without relation joins", () => {
+ // dataModel.ts declares a separate count measure for each of these views.
+ it.each([
+ "scores-numeric",
+ "scores-categorical",
+ "scores-boolean",
+ SCORES_LISTABLE_COUNT_VIEW,
+ ] as const)(
+ "%s aggregates per time bucket without a per-id subquery",
+ async (view) => {
+ const { query: compiledQuery } = await new QueryBuilder(
+ undefined,
+ "v2",
+ ).build({ ...baseQuery, view }, "test-project");
+
+ expect(compiledQuery).not.toMatch(/FROM\s*\(/);
+ expect(compiledQuery).not.toMatch(/GROUP BY\s+\w+\.project_id/);
+ expect(compiledQuery).toContain("GROUP BY time_dimension");
+ },
+ );
+
+ it.each(["v1", "v2"] as const)(
+ "%s scores-numeric aggregates score values directly",
+ async (version) => {
+ const { query: compiledQuery } = await new QueryBuilder(
+ undefined,
+ version,
+ ).build(
+ {
+ ...baseQuery,
+ view: "scores-numeric",
+ metrics: [
+ { measure: "value", aggregation: "avg" },
+ { measure: "value", aggregation: "min" },
+ { measure: "value", aggregation: "max" },
+ ],
+ } as QueryType,
+ "test-project",
+ );
+
+ expect(compiledQuery).not.toMatch(/FROM\s*\(/);
+ expect(compiledQuery).not.toContain("any(");
+ expect(compiledQuery).toMatch(/avg\(\(?value\)?\) as avg_value/);
+ expect(compiledQuery).toMatch(/min\(\(?value\)?\) as min_value/);
+ expect(compiledQuery).toMatch(/max\(\(?value\)?\) as max_value/);
+ },
+ );
+
+ // A join can match several rows per score (events_core is read without
+ // FINAL), so the per-id subquery has to stay to count each score once.
+ it.each(["v1", "v2"] as const)(
+ "%s keeps the per-id subquery when a dimension joins a trace table",
+ async (version) => {
+ const { query: compiledQuery } = await new QueryBuilder(
+ undefined,
+ version,
+ ).build(
+ {
+ ...baseQuery,
+ view: "scores-numeric",
+ dimensions: [{ field: "traceName" }],
+ } as QueryType,
+ "test-project",
+ );
+
+ expect(compiledQuery).toContain("INNER JOIN");
+ expect(compiledQuery).toMatch(/FROM\s*\(/);
+ expect(compiledQuery).toMatch(/GROUP BY\s+\w+\.project_id, \w+\.id/);
+ },
+ );
+});
diff --git a/packages/shared/src/features/query/server/queryBuilder.ts b/packages/shared/src/features/query/server/queryBuilder.ts
index 3e57c4d141..5b5f9a2c78 100644
--- a/packages/shared/src/features/query/server/queryBuilder.ts
+++ b/packages/shared/src/features/query/server/queryBuilder.ts
@@ -1730,8 +1730,13 @@ export class QueryBuilder {
// Check if single-level optimization is applicable
// Note: Relation tables are OK as long as measures have aggs configuration
+ // A join can match several rows per score, so scores views with relation
+ // tables need the per-id inner GROUP BY to count each score once.
+ const isScoresView = this.actualTableName(view) === "scores";
const canOptimize =
- enableSingleLevelOptimization &&
+ (isScoresView
+ ? relationTables.size === 0
+ : enableSingleLevelOptimization) &&
this.canUseSingleLevelQuery(appliedDimensions, appliedMetrics);
// Build GROUP BY clause (used by both single-level and two-level queries)