@mastra/pg 1.26.0 → 1.27.0-alpha.0

package/dist/index.js

@@ -17511,27 +17511,39 @@ function compileThreadPredicate(predicate, parameterOffset) {
 		values: compiled.values
 	};
 }
-function compilePostgresTraceScope(schema, selection, relationCollections, deltaWindow) {
+function compilePostgresTraceScope(schema, selection, relationCollections, scope, deltaWindow) {
 	const spanTable = qualifiedTable(schema, TABLE_SPAN_EVENTS);
 	const scoreTable = qualifiedTable(schema, TABLE_SCORE_EVENTS);
 	const feedbackTable = qualifiedTable(schema, TABLE_FEEDBACK_EVENTS);
 	const values = [selection.timeRange.from, selection.timeRange.to];
-	const rootConditions = [
-		`r."parentSpanId" IS NULL`,
-		latestRootPredicate$1(spanTable),
-		`NOT r."isPending"`,
-		`r."endedAt" IS NOT NULL`,
-		`r."startedAt" >= $1`,
-		`r."startedAt" < $2`
-	];
+	const deltaConditions = [];
 	if (deltaWindow) {
 		values.push(deltaWindow.xactId, deltaWindow.cursorId, deltaWindow.safeHorizon);
-		rootConditions.push(`(r."xactId", r."cursorId") > ($3::xid8, $4::bigint)`, `r."xactId" < $5::xid8`);
+		deltaConditions.push(`(r."xactId", r."cursorId") > ($3::xid8, $4::bigint)`, `r."xactId" < $5::xid8`);
 	}
+	const scopeConditions = [];
+	if (scope) {
+		values.push(scope.organizationId);
+		scopeConditions.push(`"organizationId" = $${values.length}`);
+		if (scope.resourceId !== void 0) {
+			values.push(scope.resourceId);
+			scopeConditions.push(`"resourceId" = $${values.length}`);
+		}
+	}
+	const scopeSql = (alias) => scopeConditions.map((condition) => `\n      AND ${alias}.${condition}`).join("");
 	const ctes = [`root_scope AS MATERIALIZED (
     SELECT *
     FROM ${spanTable} r
-    WHERE ${rootConditions.join("\n      AND ")}
+    WHERE ${[
+		`r."parentSpanId" IS NULL`,
+		latestRootPredicate$1(spanTable),
+		`NOT r."isPending"`,
+		`r."endedAt" IS NOT NULL`,
+		`r."startedAt" >= $1`,
+		`r."startedAt" < $2`,
+		...deltaConditions,
+		...scopeConditions.map((condition) => `r.${condition}`)
+	].join("\n      AND ")}
   )`];
 	if (relationCollections.has("spans")) ctes.push(`current_spans AS MATERIALIZED (
     SELECT
@@ -17557,7 +17569,7 @@ function compilePostgresTraceScope(schema, selection, relationCollections, delta
     FROM ${spanTable} s
     WHERE s."traceId" IS NOT NULL
       AND s."traceId" IN (SELECT "traceId" FROM root_scope)
-      AND ${latestSpanPredicate$1(spanTable)}
+      AND ${latestSpanPredicate$1(spanTable)}${scopeSql("s")}
   )`);
 	if (relationCollections.has("scores")) ctes.push(`current_scores AS MATERIALIZED (
     SELECT
@@ -17574,7 +17586,7 @@ function compilePostgresTraceScope(schema, selection, relationCollections, delta
     FROM ${scoreTable} s
     WHERE s."traceId" IS NOT NULL
       AND s."traceId" IN (SELECT "traceId" FROM root_scope)
-      AND ${latestScorePredicate(scoreTable)}
+      AND ${latestScorePredicate(scoreTable)}${scopeSql("s")}
   )`);
 	if (relationCollections.has("feedback")) ctes.push(`current_feedback AS MATERIALIZED (
     SELECT
@@ -17593,7 +17605,7 @@ function compilePostgresTraceScope(schema, selection, relationCollections, delta
     FROM ${feedbackTable} s
     WHERE s."traceId" IS NOT NULL
       AND s."traceId" IN (SELECT "traceId" FROM root_scope)
-      AND ${latestFeedbackPredicate(feedbackTable)}
+      AND ${latestFeedbackPredicate(feedbackTable)}${scopeSql("s")}
   )`);
 	return {
 		ctes,
@@ -17611,7 +17623,7 @@ function compilePostgresTraceQuery(schema, plan, mode = "data", safeHorizon) {
 			safeHorizon
 		};
 	}
-	const { ctes, values } = compilePostgresTraceScope(schema, plan, relationCollections, deltaWindow);
+	const { ctes, values } = compilePostgresTraceScope(schema, plan, relationCollections, plan.scope, deltaWindow);
 	let predicateSql = "TRUE";
 	if (plan.where) {
 		const predicate = compilePredicate(plan.where, values.length + 1);
@@ -17689,7 +17701,7 @@ LIMIT $${values.length}`,
 function compilePostgresThreadQuery(schema, plan) {
 	const relationCollections = collectRelationCollections(plan.traces.where);
 	collectThreadRelationCollections(plan.where, relationCollections);
-	const { ctes, values } = compilePostgresTraceScope(schema, plan.traces, relationCollections);
+	const { ctes, values } = compilePostgresTraceScope(schema, plan.traces, relationCollections, plan.scope);
 	let eligibilitySql = "TRUE";
 	if (plan.traces.where) {
 		const eligibility = compilePredicate(plan.traces.where, values.length + 1);
@@ -17747,7 +17759,7 @@ function discoveryCollections(scope) {
 	return scope === "trace" ? /* @__PURE__ */ new Set() : /* @__PURE__ */ new Set([scope]);
 }
 function compilePostgresTraceQueryObservedFields(schema, plan) {
-	const { ctes, values } = compilePostgresTraceScope(schema, plan, /* @__PURE__ */ new Set());
+	const { ctes, values } = compilePostgresTraceScope(schema, plan, /* @__PURE__ */ new Set(), plan.scope);
 	const searchParameter = values.length + 1;
 	const search = plan.search ? `AND strpos(lower('metadata.' || entry.key), lower($${searchParameter})) > 0` : "";
 	if (plan.search) values.push(plan.search);
@@ -17771,7 +17783,7 @@ LIMIT $${values.length}`,
 	};
 }
 function compilePostgresTraceQueryValues(schema, plan) {
-	const { ctes, values } = compilePostgresTraceScope(schema, plan, discoveryCollections(plan.predicateScope));
+	const { ctes, values } = compilePostgresTraceScope(schema, plan, discoveryCollections(plan.predicateScope), plan.scope);
 	let field;
 	if (plan.predicateScope === "trace" && plan.path.startsWith("metadata.")) {
 		const keyParameter = `$${values.length + 1}`;
@@ -18886,7 +18898,8 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 			"logs",
 			"trace-query",
 			"trace-query-discovery",
-			"thread-query"
+			"thread-query",
+			"trace-query-tenant-scope"
 		];
 		return [
 			"metrics",
@@ -18894,7 +18907,8 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 			"delta-polling",
 			"trace-query",
 			"trace-query-discovery",
-			"thread-query"
+			"thread-query",
+			"trace-query-tenant-scope"
 		];
 	}
 	async #run(op, fn, details) {