@mastra/duckdb 1.10.0 → 1.11.0-alpha.0

package/dist/{observability-D3311DPa.js → observability-DyP55NQC.js}

@@ -3073,7 +3073,14 @@ function collectThreadRelatedCollections(predicate, collections) {
 	else collectThreadRelatedCollections(predicate.arg, collections);
 	return collections;
 }
-function compileDuckDBTraceScope(relatedCollections) {
+function compileDuckDBTraceScope(relatedCollections, scope) {
+	const tenantConditions = (alias) => scope ? [`${alias}.organizationId = ?`, ...scope.resourceId === void 0 ? [] : [`${alias}.resourceId = ?`]] : [];
+	const tenantValues = scope ? scope.resourceId === void 0 ? [scope.organizationId] : [scope.organizationId, scope.resourceId] : [];
+	const tenantWhere = (alias) => {
+		const conditions = tenantConditions(alias);
+		return conditions.length ? `\n      WHERE ${conditions.join(" AND ")}` : "";
+	};
+	const values = [...tenantValues];
 	const ctes = [
 		`root_events AS (
       SELECT
@@ -3096,12 +3103,16 @@ function compileDuckDBTraceScope(relatedCollections) {
 		`root_scope AS (
       SELECT *
       FROM current_roots r
-      WHERE r.endedAt IS NOT NULL
-        AND r.startedAt >= CAST(? AS TIMESTAMP)
-        AND r.startedAt < CAST(? AS TIMESTAMP)
+      WHERE ${[
+			"r.endedAt IS NOT NULL",
+			"r.startedAt >= CAST(? AS TIMESTAMP)",
+			"r.startedAt < CAST(? AS TIMESTAMP)",
+			...tenantConditions("r")
+		].join("\n        AND ")}
     )`
 	];
-	if (relatedCollections.has("spans")) ctes.push(`current_span_rows AS (
+	if (relatedCollections.has("spans")) {
+		ctes.push(`current_span_rows AS (
       SELECT
         e.*,
         coalesce(
@@ -3113,7 +3124,7 @@ function compileDuckDBTraceScope(relatedCollections) {
           ORDER BY CASE WHEN e.endedAt IS NULL THEN 1 ELSE 0 END ASC, e.cursorId DESC
         ) AS currentRank
       FROM span_events e
-      INNER JOIN root_scope roots ON roots.traceId = e.traceId
+      INNER JOIN root_scope roots ON roots.traceId = e.traceId${tenantWhere("e")}
     ),
     current_spans AS (
       SELECT
@@ -3140,20 +3151,36 @@ function compileDuckDBTraceScope(relatedCollections) {
       FROM current_span_rows
       WHERE currentRank = 1
     )`);
-	if (relatedCollections.has("scores")) ctes.push(`current_scores AS (
+		values.push(...tenantValues);
+	}
+	if (relatedCollections.has("scores")) {
+		ctes.push(`current_scores AS (
       SELECT s.*
       FROM score_events s
-      INNER JOIN root_scope roots ON roots.traceId = s.traceId
+      INNER JOIN root_scope roots ON roots.traceId = s.traceId${tenantWhere("s")}
     )`);
-	if (relatedCollections.has("feedback")) ctes.push(`current_feedback AS (
+		values.push(...tenantValues);
+	}
+	if (relatedCollections.has("feedback")) {
+		ctes.push(`current_feedback AS (
       SELECT f.*
       FROM feedback_events f
-      INNER JOIN root_scope roots ON roots.traceId = f.traceId
+      INNER JOIN root_scope roots ON roots.traceId = f.traceId${tenantWhere("f")}
     )`);
-	return ctes;
+		values.push(...tenantValues);
+	}
+	return {
+		ctes,
+		values
+	};
 }
 function compileDuckDBTraceQuery(plan) {
-	const values = [plan.timeRange.from, plan.timeRange.to];
+	const { ctes, values: scopeValues } = compileDuckDBTraceScope(collectRelatedCollections(plan.where), plan.scope);
+	const values = [
+		plan.timeRange.from,
+		plan.timeRange.to,
+		...scopeValues
+	];
 	const conditions = [
 		`r.endedAt IS NOT NULL`,
 		`r.startedAt >= CAST(? AS TIMESTAMP)`,
@@ -3164,7 +3191,6 @@ function compileDuckDBTraceQuery(plan) {
 		conditions.push(`(${predicate.sql})`);
 		values.push(...predicate.values);
 	}
-	const ctes = compileDuckDBTraceScope(collectRelatedCollections(plan.where));
 	ctes.push(`candidates AS (
     SELECT ${TRACE_SELECT}${plan.paginationMode === "delta" ? ", r.cursorId AS deltaWatermark" : ""}
     FROM root_scope r
@@ -3246,10 +3272,14 @@ LIMIT ?`,
 	};
 }
 function compileDuckDBThreadQuery(plan) {
-	const values = [plan.traces.timeRange.from, plan.traces.timeRange.to];
 	const relatedCollections = collectRelatedCollections(plan.traces.where);
 	collectThreadRelatedCollections(plan.where, relatedCollections);
-	const ctes = compileDuckDBTraceScope(relatedCollections);
+	const { ctes, values: scopeValues } = compileDuckDBTraceScope(relatedCollections, plan.scope);
+	const values = [
+		plan.traces.timeRange.from,
+		plan.traces.timeRange.to,
+		...scopeValues
+	];
 	let eligibilitySql = "TRUE";
 	if (plan.traces.where) {
 		const eligibility = compilePredicate(plan.traces.where);
@@ -3307,12 +3337,17 @@ function discoveryCollections(scope) {
 	return scope === "trace" ? /* @__PURE__ */ new Set() : /* @__PURE__ */ new Set([scope]);
 }
 function compileDuckDBTraceQueryObservedFields(plan) {
-	const values = [plan.timeRange.from, plan.timeRange.to];
+	const { ctes, values: scopeValues } = compileDuckDBTraceScope(/* @__PURE__ */ new Set(), plan.scope);
+	const values = [
+		plan.timeRange.from,
+		plan.timeRange.to,
+		...scopeValues
+	];
 	if (plan.search) values.push(plan.search);
 	values.push(plan.limit + 1);
 	const search = plan.search ? `AND strpos(lower('metadata.' || entry.key), lower(?)) > 0` : "";
 	return {
-		sql: `WITH ${compileDuckDBTraceScope(/* @__PURE__ */ new Set()).join(",\n  ")}
+		sql: `WITH ${ctes.join(",\n  ")}
 SELECT 'metadata.' || entry.key AS path, count(*) AS occurrences
 FROM root_scope r, LATERAL json_each(r.metadata) entry
 WHERE entry.type = 'VARCHAR'
@@ -3329,8 +3364,12 @@ LIMIT ?`,
 	};
 }
 function compileDuckDBTraceQueryValues(plan) {
-	const values = [plan.timeRange.from, plan.timeRange.to];
-	const ctes = compileDuckDBTraceScope(discoveryCollections(plan.predicateScope));
+	const { ctes, values: scopeValues } = compileDuckDBTraceScope(discoveryCollections(plan.predicateScope), plan.scope);
+	const values = [
+		plan.timeRange.from,
+		plan.timeRange.to,
+		...scopeValues
+	];
 	let fieldSql;
 	if (plan.predicateScope === "trace" && plan.path.startsWith("metadata.")) {
 		const jsonPath = `$.${JSON.stringify(plan.path.slice(9))}`;
@@ -4782,7 +4821,8 @@ var ObservabilityStorageDuckDB = class ObservabilityStorageDuckDB extends Observ
 			"logs",
 			"trace-query",
 			"trace-query-discovery",
-			"thread-query"
+			"thread-query",
+			"trace-query-tenant-scope"
 		];
 		return [
 			"metrics",
@@ -4790,7 +4830,8 @@ var ObservabilityStorageDuckDB = class ObservabilityStorageDuckDB extends Observ
 			"delta-polling",
 			"trace-query",
 			"trace-query-discovery",
-			"thread-query"
+			"thread-query",
+			"trace-query-tenant-scope"
 		];
 	}
 	async createSpan(args) {
@@ -4945,4 +4986,4 @@ var ObservabilityStorageDuckDB = class ObservabilityStorageDuckDB extends Observ
 //#endregion
 export { ObservabilityStorageDuckDB };
 
-//# sourceMappingURL=observability-D3311DPa.js.map
+//# sourceMappingURL=observability-DyP55NQC.js.map