autotel-drizzle 0.2.6 → 0.3.0

package/README.md

@@ -156,8 +156,8 @@ individually slow. Group a trace's spans by it:
 
 | `db.statement.hash` | `db.collection.name` | Spans |
 | ------------------- | -------------------- | ----: |
-| `6b863b41773053ba`  | `comments`           |   200 |
-| `53ee56739d371a4b`  | `posts`              |     1 |
+| `16f2c9a04be7d1`    | `comments`           |   200 |
+| `0a5e83d1c96b47`    | `posts`              |     1 |
 
 One statement, run 200 times. Asking which span was slowest gives you a 1.7%
 answer and sends you off to index a table that was never the problem. The
@@ -205,24 +205,28 @@ instrumentDrizzleClient(db, {
 
 The same query, before and after `CREATE INDEX`:
 
-| Attribute                | Before             | After                            |
-| ------------------------ | ------------------ | -------------------------------- |
-| `db.statement.hash`      | `372269a8881e921a` | `372269a8881e921a`               |
-| `db.plan.hash`           | `0b50591ce9f68f51` | `eb8765b8d1c4af5a`               |
-| `db.plan.node`           | `Seq Scan`         | `Bitmap Heap Scan`               |
-| `db.plan.indexes`        |                    | `idx_comments_post_id`           |
-| `db.plan.seq_scan`       | `true`             | `false`                          |
-| `db.plan.rows_examined`  | `200199`           | `1001`                           |
-| `db.plan.rows_returned`  | `1001`             | `1001`                           |
-| `db.plan.blocks`         | `1861`             | `1005`                           |
-| `db.plan.cost`           |                    | planner's total cost estimate    |
-| `db.plan.rows_estimated` |                    | rows the planner expected        |
-| `db.plan.execution_ms`   |                    | measured time (`'analyze'` only) |
+| Attribute                | Before           | After                            |
+| ------------------------ | ---------------- | -------------------------------- |
+| `db.statement.hash`      | `0c4a9f1e2b7d33` | `0c4a9f1e2b7d33`                 |
+| `db.plan.hash`           | `1d07e5a9c4b2f8` | `08f3b6e1a7c5d2`                 |
+| `db.plan.node`           | `Seq Scan`       | `Bitmap Heap Scan`               |
+| `db.plan.indexes`        |                  | `idx_comments_post_id`           |
+| `db.plan.full_scan`      | `true`           | `false`                          |
+| `db.plan.rows_examined`  | `200199`         | `1001`                           |
+| `db.plan.rows_returned`  | `1001`           | `1001`                           |
+| `db.plan.blocks`         | `1861`           | `1005`                           |
+| `db.plan.cost`           |                  | planner's total cost estimate    |
+| `db.plan.rows_estimated` |                  | rows the planner expected        |
+| `db.plan.execution_ms`   |                  | measured time (`'analyze'` only) |
 
 An unchanged statement hash beside a changed plan hash is a planner decision.
 Grouping `db.plan.indexes` by `db.statement.hash` answers which queries an index
 is serving.
 
+The attribute names and the hash come from `autotel-db`, which `autotel-mongodb`
+uses too, so a Postgres `Seq Scan` and a MongoDB `COLLSCAN` both read as
+`db.plan.full_scan: true` and one query can group them.
+
 `rows_examined` counts at the leaves of the plan, and counts the rows a scan
 read and discarded. A parent node reports the rows its children handed up, so
 summing every level counts one row per level; and the rows an index saves you
@@ -237,15 +241,50 @@ second time to measure it. Both are off by default. Use them in development, in
 CI, or behind a sample of production traffic.
 
 - `'analyze'` runs on read-only statements only, so a traced insert never runs
-  twice. A leading `WITH` qualifies only when no writing keyword appears
-  anywhere in the statement, because `WITH gone AS (DELETE ... RETURNING *)
-SELECT` opens exactly like a read.
-- The plan is collected before the span opens, so the extra round trip stays out
-  of the duration the span reports.
-- A failed `EXPLAIN` is swallowed. The query still runs and still gets its span.
-- Ignored unless `dbSystem` is `'postgresql'`.
-- Inside a transaction the plan is taken on the transaction's own connection, so
-  it sees the rows the query will see.
+  twice. A write is planned with a plain `EXPLAIN` instead, which runs nothing,
+  and its span records `db.plan.mode: plan`. A leading `WITH` counts as a read
+  only when no writing keyword appears anywhere in the statement, because
+  `WITH gone AS (DELETE ... RETURNING *) SELECT` opens exactly like a read.
+- Outside a transaction, the plan is collected before the span opens, so the
+  extra round trip stays out of the duration the span reports.
+- Only statements Postgres can explain are sent (`SELECT`, `WITH`, `INSERT`,
+  `UPDATE`, `DELETE`, `MERGE`, `VALUES`, `TABLE`). DDL and the rest record
+  `db.plan.status: unsupported` and send nothing.
+- **Inside `db.transaction()`, nothing is ever sent on the transaction's own
+  connection, and nothing the application sends is held back.** An `EXPLAIN`
+  there could abort the transaction, and waiting for a plan before a
+  statement reorders the transaction's statements against each other and
+  against its `COMMIT` or `ROLLBACK`. So each statement goes out exactly when
+  it would without instrumentation, and its plan is fetched alongside it from
+  a separate pooled connection, inside a transaction that is always rolled
+  back, with a 100ms lock timeout (the application's transaction may hold
+  locks the `EXPLAIN` needs). The span ends at the statement's own end time.
+  - `drizzle(pool)` (node-postgres `Pool`): plans are captured this way. A
+    statement whose table the transaction has locked records
+    `db.plan.status: failed` with the lock timeout, and is not slowed.
+  - `drizzle(client)`, an embedded database, or any other driver: there is no
+    separate connection, so statements inside a transaction record
+    `db.plan.status: unsupported`. The same statements outside a transaction
+    are planned as usual.
+  - A transaction is recognised by its connection, not by which session issued
+    the statement, so this holds for `drizzle(client)` (where the transaction
+    reuses the session it was given) and for nested transactions. Open
+    transactions through `db.transaction()` when explain is on.
+- Explains outside a transaction through a node-postgres `Pool` check a
+  connection out and hand it back clean, so a failing `EXPLAIN` (a missing
+  privilege) never costs a pooled connection.
+- A failed `EXPLAIN` never fails the query. The span records
+  `db.plan.status: failed` and the reason in `db.plan.error`, with any quoted
+  values, documents and key details stripped from it.
+- Postgres only. With another `dbSystem`, spans record
+  `db.plan.status: unsupported` rather than reading as if explain were off.
+- Plans also carry `db.plan.stages`, `db.plan.mode`, and
+  `db.plan.blocking_sort` (a `Sort` node).
+- Inside a transaction the plan comes from a separate pooled connection, so it
+  cannot see the transaction's uncommitted changes: rows it has inserted or
+  deleted, tables it has created. The plan describes the query against the
+  committed data, and a statement on a table the transaction created records
+  `db.plan.status: failed`.
 
 ## Security Considerations
 

package/dist/{drizzle-BiA8DdAa.js → drizzle-BAxEDkHv.js}

@@ -1,6 +1,6 @@
-import { createHash } from "node:crypto";
-import { SpanKind, trace } from "@opentelemetry/api";
+import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { finalizeSpan, runWithSpan } from "autotel/trace-helpers";
+import { hashStatement, planAttributes, planUnavailableAttributes } from "autotel-db";
 //#region src/common/constants.ts
 const SEMATTRS_DB_SYSTEM = "db.system";
 const SEMATTRS_DB_SYSTEM_NAME = "db.system.name";
@@ -37,6 +37,32 @@ function hasMethod(target, name) {
 function asFunction(value) {
 	return typeof value === "function" ? value : void 0;
 }
+function isPgPool(value) {
+	return asFunction(value.connect) !== void 0 && typeof value.totalCount === "number";
+}
+function isolatedExplainClient(value) {
+	if (!isDriverObject(value) || !isPgPool(value)) return void 0;
+	const connect = asFunction(value.connect);
+	return { query: async (statement, params) => {
+		const connection = asDriverObject(await connect.call(value));
+		const run = connection && asFunction(connection.query);
+		if (connection === void 0 || run === void 0) throw new Error("the pool handed back no client");
+		const release = asFunction(connection.release);
+		try {
+			await run.call(connection, "BEGIN", []);
+			await run.call(connection, "SET LOCAL lock_timeout = '100ms'", []);
+			await run.call(connection, "SET LOCAL statement_timeout = '5s'", []);
+			return await run.call(connection, statement, params);
+		} finally {
+			try {
+				await run.call(connection, "ROLLBACK", []);
+				release?.call(connection);
+			} catch (error) {
+				release?.call(connection, error instanceof Error ? error.message : String(error));
+			}
+		}
+	} };
+}
 function isDriverObject(value) {
 	return value !== null && typeof value === "object";
 }
@@ -74,6 +100,17 @@ function asQueryClient(value) {
 	if (!isDriverObject(value)) return;
 	const run = asFunction(value.query);
 	if (run === void 0) return;
+	const connect = asFunction(value.connect);
+	if (connect !== void 0 && isPgPool(value)) return { query: async (statement, params) => {
+		const connection = asDriverObject(await connect.call(value));
+		const checkedOut = connection && asFunction(connection.query);
+		if (connection === void 0 || checkedOut === void 0) throw new Error("the pool handed back no client");
+		try {
+			return await checkedOut.call(connection, statement, params);
+		} finally {
+			asFunction(connection.release)?.call(connection);
+		}
+	} };
 	return { query: async (statement, params) => run.call(value, statement, params) };
 }
 function toCount(value) {
@@ -130,16 +167,6 @@ function parseExplainResponse(result) {
 }
 //#endregion
 //#region src/drizzle/index.ts
-const SEMATTRS_DB_PLAN_NODE = "db.plan.node";
-const SEMATTRS_DB_PLAN_INDEXES = "db.plan.indexes";
-const SEMATTRS_DB_PLAN_COST = "db.plan.cost";
-const SEMATTRS_DB_PLAN_ROWS_ESTIMATED = "db.plan.rows_estimated";
-const SEMATTRS_DB_PLAN_ROWS_EXAMINED = "db.plan.rows_examined";
-const SEMATTRS_DB_PLAN_ROWS_RETURNED = "db.plan.rows_returned";
-const SEMATTRS_DB_PLAN_BLOCKS = "db.plan.blocks";
-const SEMATTRS_DB_PLAN_EXECUTION_MS = "db.plan.execution_ms";
-const SEMATTRS_DB_PLAN_SEQ_SCAN = "db.plan.seq_scan";
-const SEMATTRS_DB_PLAN_HASH = "db.plan.hash";
 const TRANSACTION_ATTRIBUTE = "db.transaction";
 const REENTRY_FLAG = `__autotelDrizzleInstrumented:running`;
 const DEFAULT_TRACER_NAME = "autotel-plugins/drizzle";
@@ -190,7 +217,8 @@ function resolveConfig(config) {
 		semconv: config?.semconv ?? semconvFromEnvironment(),
 		spanNaming: config?.spanNaming ?? "drizzle",
 		traceTransactions: config?.traceTransactions ?? true,
-		explain: (config?.dbSystem ?? DEFAULT_DB_SYSTEM) === "postgresql" ? config?.explain ?? false : false
+		explain: (config?.dbSystem ?? DEFAULT_DB_SYSTEM) === "postgresql" ? config?.explain ?? false : false,
+		explainRequested: config?.explain ?? false
 	};
 }
 function getState(config) {
@@ -235,9 +263,6 @@ function sanitizeQueryText(queryText, maxLength) {
 	if (queryText.length <= maxLength) return queryText;
 	return `${queryText.slice(0, Math.max(0, maxLength))}...`;
 }
-function hashQueryText(queryText) {
-	return createHash("sha1").update(queryText).digest("hex").slice(0, 16);
-}
 function extractOperation(queryText) {
 	const trimmed = queryText.trimStart();
 	return /^(?<operation>\w+)/u.exec(trimmed)?.groups?.operation?.toUpperCase();
@@ -252,21 +277,28 @@ const WRITE_KEYWORDS = /\b(?:INSERT|UPDATE|DELETE|MERGE|TRUNCATE|DROP|ALTER|CREA
 function buildExplainStatement(mode, queryText) {
 	return `EXPLAIN (${mode === "analyze" ? "ANALYZE, BUFFERS, FORMAT JSON" : "FORMAT JSON"}) ${queryText}`;
 }
-function planAttributes(payload, mode) {
-	const attributes = {};
+const SORT_NODES = new Set(["Sort", "Incremental Sort"]);
+function planAttributes$1(payload, mode) {
 	const [root] = payload.nodes;
-	if (root === void 0) return attributes;
-	const nodeTypes = [];
-	const indexes = [];
+	if (root === void 0) return {};
+	const plan = {
+		nodes: [],
+		fullScan: false,
+		blockingSort: false,
+		mode,
+		indexes: [],
+		cost: root.totalCost,
+		rowsEstimated: root.planRows
+	};
 	let rowsExamined = 0;
 	let blocks = 0;
-	let sawSeqScan = false;
 	for (const node of payload.nodes) {
 		if (node.nodeType !== void 0) {
-			nodeTypes.push(node.nodeType);
-			sawSeqScan ||= node.nodeType === "Seq Scan";
+			plan.nodes.push(node.nodeType);
+			plan.fullScan ||= node.nodeType === "Seq Scan";
+			plan.blockingSort ||= SORT_NODES.has(node.nodeType);
 		}
-		if (node.indexName !== void 0 && !indexes.includes(node.indexName)) indexes.push(node.indexName);
+		if (node.indexName !== void 0 && !plan.indexes.includes(node.indexName)) plan.indexes.push(node.indexName);
 		if (node.isLeaf) {
 			rowsExamined += node.actualRows;
 			rowsExamined += node.rowsRemovedByFilter;
@@ -275,33 +307,86 @@ function planAttributes(payload, mode) {
 		blocks += node.sharedHitBlocks;
 		blocks += node.sharedReadBlocks;
 	}
-	if (root.nodeType !== void 0) attributes[SEMATTRS_DB_PLAN_NODE] = root.nodeType;
-	if (root.totalCost !== void 0) attributes[SEMATTRS_DB_PLAN_COST] = root.totalCost;
-	if (root.planRows !== void 0) attributes[SEMATTRS_DB_PLAN_ROWS_ESTIMATED] = root.planRows;
-	if (indexes.length > 0) attributes[SEMATTRS_DB_PLAN_INDEXES] = indexes.join(",");
-	attributes[SEMATTRS_DB_PLAN_SEQ_SCAN] = sawSeqScan;
-	attributes[SEMATTRS_DB_PLAN_HASH] = hashQueryText(nodeTypes.join(">"));
 	if (mode === "analyze") {
-		attributes[SEMATTRS_DB_PLAN_ROWS_EXAMINED] = rowsExamined;
-		attributes[SEMATTRS_DB_PLAN_ROWS_RETURNED] = root.actualRows;
-		attributes[SEMATTRS_DB_PLAN_BLOCKS] = blocks;
-		if (payload.executionMs !== void 0) attributes[SEMATTRS_DB_PLAN_EXECUTION_MS] = payload.executionMs;
+		plan.rowsExamined = rowsExamined;
+		plan.rowsReturned = root.actualRows;
+		plan.blocks = blocks;
+		plan.executionMs = payload.executionMs;
 	}
-	return attributes;
+	return planAttributes(plan);
 }
 function resolveExplainClient(target, state) {
-	return readQueryClient(target) ?? state.explainClient;
+	const own = readQueryClient(target);
+	if (own && isDriverObject(target)) return {
+		client: own,
+		connection: readObject(target, "client")
+	};
+	return state.explainClient ? { client: state.explainClient } : void 0;
 }
-async function collectPlan(state, client, queryText, params) {
-	const mode = state.config.explain;
-	if (!mode || client === void 0) return;
-	if (mode === "analyze" && !isReadOnlyStatement(queryText)) return;
+const openTransactions = new WeakMap();
+function transactionConnections(tx) {
+	if (!isDriverObject(tx)) return [];
+	const found = [];
+	for (const holder of [tx, ...readSessions(tx)]) {
+		const connection = readObject(holder, "client");
+		if (connection !== void 0 && !found.includes(connection)) found.push(connection);
+	}
+	return found;
+}
+function openTransaction(connections) {
+	for (const connection of connections) openTransactions.set(connection, (openTransactions.get(connection) ?? 0) + 1);
+	return () => {
+		for (const connection of connections) {
+			const depth = (openTransactions.get(connection) ?? 1) - 1;
+			if (depth > 0) openTransactions.set(connection, depth);
+			else openTransactions.delete(connection);
+		}
+	};
+}
+function thenAfter(run, after) {
+	let result;
+	try {
+		result = run();
+	} catch (error) {
+		after();
+		throw error;
+	}
+	if (isThenable(result)) return Promise.resolve(result).finally(after);
+	after();
+	return result;
+}
+const EXPLAINABLE = new Set([
+	"SELECT",
+	"WITH",
+	"INSERT",
+	"UPDATE",
+	"DELETE",
+	"MERGE",
+	"VALUES",
+	"TABLE"
+]);
+async function collectPlan(state, explainClient, queryText, params, inTransaction) {
+	const requested = state.config.explain;
+	if (!requested) return;
+	if (!EXPLAINABLE.has(extractOperation(queryText) ?? "")) return planUnavailableAttributes("unsupported", { mode: requested });
+	const mode = requested === "analyze" && !isReadOnlyStatement(queryText) ? "plan" : requested;
+	const client = inTransaction ? state.isolatedExplainClient : explainClient?.client;
+	if (client === void 0) return inTransaction ? planUnavailableAttributes("unsupported", { mode }) : planUnavailableAttributes("failed", {
+		mode,
+		error: "no client to run EXPLAIN on"
+	});
 	try {
 		const payload = parseExplainResponse(await client.query(buildExplainStatement(mode, queryText), readParams(params)));
-		if (payload === void 0) return;
-		return planAttributes(payload, mode);
-	} catch {
-		return;
+		if (payload === void 0) return planUnavailableAttributes("failed", {
+			mode,
+			error: "EXPLAIN returned no plan autotel-drizzle reads"
+		});
+		return planAttributes$1(payload, mode);
+	} catch (error) {
+		return planUnavailableAttributes("failed", {
+			mode,
+			error: error instanceof Error ? error.message : String(error)
+		});
 	}
 }
 function buildSpanName(mode, operation, table) {
@@ -327,7 +412,7 @@ function buildSpan(state, queryText, extraAttributes) {
 	if (operation) setRenamed(SEMATTRS_DB_OPERATION, SEMATTRS_DB_OPERATION_NAME, operation);
 	if (state.config.dbName !== void 0) setRenamed(SEMATTRS_DB_NAME, SEMATTRS_DB_NAMESPACE, state.config.dbName);
 	if (queryText !== void 0) {
-		span.setAttribute(SEMATTRS_DB_STATEMENT_HASH, hashQueryText(queryText));
+		span.setAttribute(SEMATTRS_DB_STATEMENT_HASH, hashStatement(queryText));
 		if (table !== void 0) span.setAttribute(SEMATTRS_DB_COLLECTION_NAME, table);
 	}
 	if (state.config.captureQueryText && queryText !== void 0) {
@@ -339,6 +424,37 @@ function buildSpan(state, queryText, extraAttributes) {
 	if (extraAttributes) for (const [key, value] of Object.entries(extraAttributes)) span.setAttribute(key, value);
 	return span;
 }
+function runAlongsidePlan(span, planned, fn) {
+	const end = (error) => {
+		const endTime = performance.timeOrigin + performance.now();
+		planned.then((attributes) => {
+			if (attributes) span.setAttributes(attributes);
+		}).finally(() => {
+			if (error) {
+				span.recordException(error instanceof Error ? error : new Error(String(error)));
+				span.setStatus({ code: SpanStatusCode.ERROR });
+			} else span.setStatus({ code: SpanStatusCode.OK });
+			span.end(endTime);
+		});
+	};
+	return runWithSpan(span, () => {
+		try {
+			const result = fn();
+			if (isThenable(result)) return result.then((value) => {
+				end();
+				return value;
+			}, (error) => {
+				end(error);
+				throw error;
+			});
+			end();
+			return result;
+		} catch (error) {
+			end(error);
+			throw error;
+		}
+	});
+}
 function executeWithSpan(span, fn) {
 	return runWithSpan(span, () => {
 		try {
@@ -369,11 +485,20 @@ function instrumentMethod(target, methodName, state, options) {
 		const callback = trailing === void 0 ? void 0 : (args.pop(), trailing);
 		if (options.guardReentry && target[REENTRY_FLAG]) return originalMethod.call(this, ...incomingArgs);
 		const queryText = options.queryText(args);
-		if (state.config.explain && queryText !== void 0 && !callback) return collectPlan(state, resolveExplainClient(readSelf(this), state), queryText, options.explainParams?.(args)).then((planAttributes) => executeWithSpan(buildSpan(state, queryText, {
+		if (state.config.explain && queryText !== void 0 && !callback) {
+			const explainClient = resolveExplainClient(readSelf(this), state);
+			const inTransaction = options.extraAttributes?.[TRANSACTION_ATTRIBUTE] === true || explainClient?.connection !== void 0 && openTransactions.has(explainClient.connection);
+			if (inTransaction) return runAlongsidePlan(buildSpan(state, queryText, options.extraAttributes), collectPlan(state, explainClient, queryText, options.explainParams?.(args), true), () => originalMethod.call(this, ...args));
+			return collectPlan(state, explainClient, queryText, options.explainParams?.(args), inTransaction).then((planAttributes) => executeWithSpan(buildSpan(state, queryText, {
+				...options.extraAttributes,
+				...planAttributes
+			}), () => originalMethod.call(this, ...args)));
+		}
+		const unexplained = state.config.explainRequested && queryText !== void 0 ? planUnavailableAttributes("unsupported", { mode: state.config.explainRequested }) : void 0;
+		const span = buildSpan(state, queryText, {
 			...options.extraAttributes,
-			...planAttributes
-		}), () => originalMethod.call(this, ...args)));
-		const span = buildSpan(state, queryText, options.extraAttributes);
+			...unexplained
+		});
 		if (callback) return runWithSpan(span, () => {
 			const wrappedCallback = (error, result) => {
 				finalizeSpan(span, error);
@@ -479,11 +604,15 @@ function instrumentSession(session, state, allowDirectMethods = true) {
 				const [rawCallback, ...restArgs] = transactionArgs;
 				const callback = asFunction(rawCallback);
 				if (callback === void 0) return originalTransaction.call(this, ...transactionArgs);
+				const closers = [];
 				const wrappedCallback = (tx, ...callbackArgs) => {
 					instrumentTransactionTarget(tx, state);
+					closers.push(openTransaction(transactionConnections(tx)));
 					return callback.call(this, tx, ...callbackArgs);
 				};
-				const runTransaction = () => originalTransaction.call(this, wrappedCallback, ...restArgs);
+				const runTransaction = () => thenAfter(() => originalTransaction.call(this, wrappedCallback, ...restArgs), () => {
+					for (const close of closers) close();
+				});
 				if (!state.config.traceTransactions) return runTransaction();
 				const span = state.tracer.startSpan("drizzle.transaction", { kind: SpanKind.CLIENT });
 				span.setAttribute(TRANSACTION_ATTRIBUTE, true);
@@ -523,6 +652,7 @@ function instrumentDrizzleClient(db, config) {
 	if (readFlag(target, INSTRUMENTED_FLAG)) return db;
 	const state = getState(config);
 	state.explainClient = asQueryClient(target.$client);
+	state.isolatedExplainClient = isolatedExplainClient(target.$client);
 	let instrumented = false;
 	let sessionInstrumented = false;
 	for (const session of readSessions(target)) {

package/dist/{drizzle-BK9eu10E.cjs → drizzle-BeUip3cx.cjs}

@@ -1,6 +1,6 @@
-let node_crypto = require("node:crypto");
 let _opentelemetry_api = require("@opentelemetry/api");
 let autotel_trace_helpers = require("autotel/trace-helpers");
+let autotel_db = require("autotel-db");
 //#region src/common/constants.ts
 const SEMATTRS_DB_SYSTEM = "db.system";
 const SEMATTRS_DB_SYSTEM_NAME = "db.system.name";
@@ -37,6 +37,32 @@ function hasMethod(target, name) {
 function asFunction(value) {
 	return typeof value === "function" ? value : void 0;
 }
+function isPgPool(value) {
+	return asFunction(value.connect) !== void 0 && typeof value.totalCount === "number";
+}
+function isolatedExplainClient(value) {
+	if (!isDriverObject(value) || !isPgPool(value)) return void 0;
+	const connect = asFunction(value.connect);
+	return { query: async (statement, params) => {
+		const connection = asDriverObject(await connect.call(value));
+		const run = connection && asFunction(connection.query);
+		if (connection === void 0 || run === void 0) throw new Error("the pool handed back no client");
+		const release = asFunction(connection.release);
+		try {
+			await run.call(connection, "BEGIN", []);
+			await run.call(connection, "SET LOCAL lock_timeout = '100ms'", []);
+			await run.call(connection, "SET LOCAL statement_timeout = '5s'", []);
+			return await run.call(connection, statement, params);
+		} finally {
+			try {
+				await run.call(connection, "ROLLBACK", []);
+				release?.call(connection);
+			} catch (error) {
+				release?.call(connection, error instanceof Error ? error.message : String(error));
+			}
+		}
+	} };
+}
 function isDriverObject(value) {
 	return value !== null && typeof value === "object";
 }
@@ -74,6 +100,17 @@ function asQueryClient(value) {
 	if (!isDriverObject(value)) return;
 	const run = asFunction(value.query);
 	if (run === void 0) return;
+	const connect = asFunction(value.connect);
+	if (connect !== void 0 && isPgPool(value)) return { query: async (statement, params) => {
+		const connection = asDriverObject(await connect.call(value));
+		const checkedOut = connection && asFunction(connection.query);
+		if (connection === void 0 || checkedOut === void 0) throw new Error("the pool handed back no client");
+		try {
+			return await checkedOut.call(connection, statement, params);
+		} finally {
+			asFunction(connection.release)?.call(connection);
+		}
+	} };
 	return { query: async (statement, params) => run.call(value, statement, params) };
 }
 function toCount(value) {
@@ -130,16 +167,6 @@ function parseExplainResponse(result) {
 }
 //#endregion
 //#region src/drizzle/index.ts
-const SEMATTRS_DB_PLAN_NODE = "db.plan.node";
-const SEMATTRS_DB_PLAN_INDEXES = "db.plan.indexes";
-const SEMATTRS_DB_PLAN_COST = "db.plan.cost";
-const SEMATTRS_DB_PLAN_ROWS_ESTIMATED = "db.plan.rows_estimated";
-const SEMATTRS_DB_PLAN_ROWS_EXAMINED = "db.plan.rows_examined";
-const SEMATTRS_DB_PLAN_ROWS_RETURNED = "db.plan.rows_returned";
-const SEMATTRS_DB_PLAN_BLOCKS = "db.plan.blocks";
-const SEMATTRS_DB_PLAN_EXECUTION_MS = "db.plan.execution_ms";
-const SEMATTRS_DB_PLAN_SEQ_SCAN = "db.plan.seq_scan";
-const SEMATTRS_DB_PLAN_HASH = "db.plan.hash";
 const TRANSACTION_ATTRIBUTE = "db.transaction";
 const REENTRY_FLAG = `__autotelDrizzleInstrumented:running`;
 const DEFAULT_TRACER_NAME = "autotel-plugins/drizzle";
@@ -190,7 +217,8 @@ function resolveConfig(config) {
 		semconv: config?.semconv ?? semconvFromEnvironment(),
 		spanNaming: config?.spanNaming ?? "drizzle",
 		traceTransactions: config?.traceTransactions ?? true,
-		explain: (config?.dbSystem ?? DEFAULT_DB_SYSTEM) === "postgresql" ? config?.explain ?? false : false
+		explain: (config?.dbSystem ?? DEFAULT_DB_SYSTEM) === "postgresql" ? config?.explain ?? false : false,
+		explainRequested: config?.explain ?? false
 	};
 }
 function getState(config) {
@@ -235,9 +263,6 @@ function sanitizeQueryText(queryText, maxLength) {
 	if (queryText.length <= maxLength) return queryText;
 	return `${queryText.slice(0, Math.max(0, maxLength))}...`;
 }
-function hashQueryText(queryText) {
-	return (0, node_crypto.createHash)("sha1").update(queryText).digest("hex").slice(0, 16);
-}
 function extractOperation(queryText) {
 	const trimmed = queryText.trimStart();
 	return /^(?<operation>\w+)/u.exec(trimmed)?.groups?.operation?.toUpperCase();
@@ -252,21 +277,28 @@ const WRITE_KEYWORDS = /\b(?:INSERT|UPDATE|DELETE|MERGE|TRUNCATE|DROP|ALTER|CREA
 function buildExplainStatement(mode, queryText) {
 	return `EXPLAIN (${mode === "analyze" ? "ANALYZE, BUFFERS, FORMAT JSON" : "FORMAT JSON"}) ${queryText}`;
 }
+const SORT_NODES = new Set(["Sort", "Incremental Sort"]);
 function planAttributes(payload, mode) {
-	const attributes = {};
 	const [root] = payload.nodes;
-	if (root === void 0) return attributes;
-	const nodeTypes = [];
-	const indexes = [];
+	if (root === void 0) return {};
+	const plan = {
+		nodes: [],
+		fullScan: false,
+		blockingSort: false,
+		mode,
+		indexes: [],
+		cost: root.totalCost,
+		rowsEstimated: root.planRows
+	};
 	let rowsExamined = 0;
 	let blocks = 0;
-	let sawSeqScan = false;
 	for (const node of payload.nodes) {
 		if (node.nodeType !== void 0) {
-			nodeTypes.push(node.nodeType);
-			sawSeqScan ||= node.nodeType === "Seq Scan";
+			plan.nodes.push(node.nodeType);
+			plan.fullScan ||= node.nodeType === "Seq Scan";
+			plan.blockingSort ||= SORT_NODES.has(node.nodeType);
 		}
-		if (node.indexName !== void 0 && !indexes.includes(node.indexName)) indexes.push(node.indexName);
+		if (node.indexName !== void 0 && !plan.indexes.includes(node.indexName)) plan.indexes.push(node.indexName);
 		if (node.isLeaf) {
 			rowsExamined += node.actualRows;
 			rowsExamined += node.rowsRemovedByFilter;
@@ -275,33 +307,86 @@ function planAttributes(payload, mode) {
 		blocks += node.sharedHitBlocks;
 		blocks += node.sharedReadBlocks;
 	}
-	if (root.nodeType !== void 0) attributes[SEMATTRS_DB_PLAN_NODE] = root.nodeType;
-	if (root.totalCost !== void 0) attributes[SEMATTRS_DB_PLAN_COST] = root.totalCost;
-	if (root.planRows !== void 0) attributes[SEMATTRS_DB_PLAN_ROWS_ESTIMATED] = root.planRows;
-	if (indexes.length > 0) attributes[SEMATTRS_DB_PLAN_INDEXES] = indexes.join(",");
-	attributes[SEMATTRS_DB_PLAN_SEQ_SCAN] = sawSeqScan;
-	attributes[SEMATTRS_DB_PLAN_HASH] = hashQueryText(nodeTypes.join(">"));
 	if (mode === "analyze") {
-		attributes[SEMATTRS_DB_PLAN_ROWS_EXAMINED] = rowsExamined;
-		attributes[SEMATTRS_DB_PLAN_ROWS_RETURNED] = root.actualRows;
-		attributes[SEMATTRS_DB_PLAN_BLOCKS] = blocks;
-		if (payload.executionMs !== void 0) attributes[SEMATTRS_DB_PLAN_EXECUTION_MS] = payload.executionMs;
+		plan.rowsExamined = rowsExamined;
+		plan.rowsReturned = root.actualRows;
+		plan.blocks = blocks;
+		plan.executionMs = payload.executionMs;
 	}
-	return attributes;
+	return (0, autotel_db.planAttributes)(plan);
 }
 function resolveExplainClient(target, state) {
-	return readQueryClient(target) ?? state.explainClient;
+	const own = readQueryClient(target);
+	if (own && isDriverObject(target)) return {
+		client: own,
+		connection: readObject(target, "client")
+	};
+	return state.explainClient ? { client: state.explainClient } : void 0;
 }
-async function collectPlan(state, client, queryText, params) {
-	const mode = state.config.explain;
-	if (!mode || client === void 0) return;
-	if (mode === "analyze" && !isReadOnlyStatement(queryText)) return;
+const openTransactions = new WeakMap();
+function transactionConnections(tx) {
+	if (!isDriverObject(tx)) return [];
+	const found = [];
+	for (const holder of [tx, ...readSessions(tx)]) {
+		const connection = readObject(holder, "client");
+		if (connection !== void 0 && !found.includes(connection)) found.push(connection);
+	}
+	return found;
+}
+function openTransaction(connections) {
+	for (const connection of connections) openTransactions.set(connection, (openTransactions.get(connection) ?? 0) + 1);
+	return () => {
+		for (const connection of connections) {
+			const depth = (openTransactions.get(connection) ?? 1) - 1;
+			if (depth > 0) openTransactions.set(connection, depth);
+			else openTransactions.delete(connection);
+		}
+	};
+}
+function thenAfter(run, after) {
+	let result;
+	try {
+		result = run();
+	} catch (error) {
+		after();
+		throw error;
+	}
+	if (isThenable(result)) return Promise.resolve(result).finally(after);
+	after();
+	return result;
+}
+const EXPLAINABLE = new Set([
+	"SELECT",
+	"WITH",
+	"INSERT",
+	"UPDATE",
+	"DELETE",
+	"MERGE",
+	"VALUES",
+	"TABLE"
+]);
+async function collectPlan(state, explainClient, queryText, params, inTransaction) {
+	const requested = state.config.explain;
+	if (!requested) return;
+	if (!EXPLAINABLE.has(extractOperation(queryText) ?? "")) return (0, autotel_db.planUnavailableAttributes)("unsupported", { mode: requested });
+	const mode = requested === "analyze" && !isReadOnlyStatement(queryText) ? "plan" : requested;
+	const client = inTransaction ? state.isolatedExplainClient : explainClient?.client;
+	if (client === void 0) return inTransaction ? (0, autotel_db.planUnavailableAttributes)("unsupported", { mode }) : (0, autotel_db.planUnavailableAttributes)("failed", {
+		mode,
+		error: "no client to run EXPLAIN on"
+	});
 	try {
 		const payload = parseExplainResponse(await client.query(buildExplainStatement(mode, queryText), readParams(params)));
-		if (payload === void 0) return;
+		if (payload === void 0) return (0, autotel_db.planUnavailableAttributes)("failed", {
+			mode,
+			error: "EXPLAIN returned no plan autotel-drizzle reads"
+		});
 		return planAttributes(payload, mode);
-	} catch {
-		return;
+	} catch (error) {
+		return (0, autotel_db.planUnavailableAttributes)("failed", {
+			mode,
+			error: error instanceof Error ? error.message : String(error)
+		});
 	}
 }
 function buildSpanName(mode, operation, table) {
@@ -327,7 +412,7 @@ function buildSpan(state, queryText, extraAttributes) {
 	if (operation) setRenamed(SEMATTRS_DB_OPERATION, SEMATTRS_DB_OPERATION_NAME, operation);
 	if (state.config.dbName !== void 0) setRenamed(SEMATTRS_DB_NAME, SEMATTRS_DB_NAMESPACE, state.config.dbName);
 	if (queryText !== void 0) {
-		span.setAttribute(SEMATTRS_DB_STATEMENT_HASH, hashQueryText(queryText));
+		span.setAttribute(SEMATTRS_DB_STATEMENT_HASH, (0, autotel_db.hashStatement)(queryText));
 		if (table !== void 0) span.setAttribute(SEMATTRS_DB_COLLECTION_NAME, table);
 	}
 	if (state.config.captureQueryText && queryText !== void 0) {
@@ -339,6 +424,37 @@ function buildSpan(state, queryText, extraAttributes) {
 	if (extraAttributes) for (const [key, value] of Object.entries(extraAttributes)) span.setAttribute(key, value);
 	return span;
 }
+function runAlongsidePlan(span, planned, fn) {
+	const end = (error) => {
+		const endTime = performance.timeOrigin + performance.now();
+		planned.then((attributes) => {
+			if (attributes) span.setAttributes(attributes);
+		}).finally(() => {
+			if (error) {
+				span.recordException(error instanceof Error ? error : new Error(String(error)));
+				span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
+			} else span.setStatus({ code: _opentelemetry_api.SpanStatusCode.OK });
+			span.end(endTime);
+		});
+	};
+	return (0, autotel_trace_helpers.runWithSpan)(span, () => {
+		try {
+			const result = fn();
+			if (isThenable(result)) return result.then((value) => {
+				end();
+				return value;
+			}, (error) => {
+				end(error);
+				throw error;
+			});
+			end();
+			return result;
+		} catch (error) {
+			end(error);
+			throw error;
+		}
+	});
+}
 function executeWithSpan(span, fn) {
 	return (0, autotel_trace_helpers.runWithSpan)(span, () => {
 		try {
@@ -369,11 +485,20 @@ function instrumentMethod(target, methodName, state, options) {
 		const callback = trailing === void 0 ? void 0 : (args.pop(), trailing);
 		if (options.guardReentry && target[REENTRY_FLAG]) return originalMethod.call(this, ...incomingArgs);
 		const queryText = options.queryText(args);
-		if (state.config.explain && queryText !== void 0 && !callback) return collectPlan(state, resolveExplainClient(readSelf(this), state), queryText, options.explainParams?.(args)).then((planAttributes) => executeWithSpan(buildSpan(state, queryText, {
+		if (state.config.explain && queryText !== void 0 && !callback) {
+			const explainClient = resolveExplainClient(readSelf(this), state);
+			const inTransaction = options.extraAttributes?.[TRANSACTION_ATTRIBUTE] === true || explainClient?.connection !== void 0 && openTransactions.has(explainClient.connection);
+			if (inTransaction) return runAlongsidePlan(buildSpan(state, queryText, options.extraAttributes), collectPlan(state, explainClient, queryText, options.explainParams?.(args), true), () => originalMethod.call(this, ...args));
+			return collectPlan(state, explainClient, queryText, options.explainParams?.(args), inTransaction).then((planAttributes) => executeWithSpan(buildSpan(state, queryText, {
+				...options.extraAttributes,
+				...planAttributes
+			}), () => originalMethod.call(this, ...args)));
+		}
+		const unexplained = state.config.explainRequested && queryText !== void 0 ? (0, autotel_db.planUnavailableAttributes)("unsupported", { mode: state.config.explainRequested }) : void 0;
+		const span = buildSpan(state, queryText, {
 			...options.extraAttributes,
-			...planAttributes
-		}), () => originalMethod.call(this, ...args)));
-		const span = buildSpan(state, queryText, options.extraAttributes);
+			...unexplained
+		});
 		if (callback) return (0, autotel_trace_helpers.runWithSpan)(span, () => {
 			const wrappedCallback = (error, result) => {
 				(0, autotel_trace_helpers.finalizeSpan)(span, error);
@@ -479,11 +604,15 @@ function instrumentSession(session, state, allowDirectMethods = true) {
 				const [rawCallback, ...restArgs] = transactionArgs;
 				const callback = asFunction(rawCallback);
 				if (callback === void 0) return originalTransaction.call(this, ...transactionArgs);
+				const closers = [];
 				const wrappedCallback = (tx, ...callbackArgs) => {
 					instrumentTransactionTarget(tx, state);
+					closers.push(openTransaction(transactionConnections(tx)));
 					return callback.call(this, tx, ...callbackArgs);
 				};
-				const runTransaction = () => originalTransaction.call(this, wrappedCallback, ...restArgs);
+				const runTransaction = () => thenAfter(() => originalTransaction.call(this, wrappedCallback, ...restArgs), () => {
+					for (const close of closers) close();
+				});
 				if (!state.config.traceTransactions) return runTransaction();
 				const span = state.tracer.startSpan("drizzle.transaction", { kind: _opentelemetry_api.SpanKind.CLIENT });
 				span.setAttribute(TRANSACTION_ATTRIBUTE, true);
@@ -523,6 +652,7 @@ function instrumentDrizzleClient(db, config) {
 	if (readFlag(target, INSTRUMENTED_FLAG)) return db;
 	const state = getState(config);
 	state.explainClient = asQueryClient(target.$client);
+	state.isolatedExplainClient = isolatedExplainClient(target.$client);
 	let instrumented = false;
 	let sessionInstrumented = false;
 	for (const session of readSessions(target)) {

package/dist/drizzle.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_drizzle = require("./drizzle-BK9eu10E.cjs");
+const require_drizzle = require("./drizzle-BeUip3cx.cjs");
 exports.instrumentDrizzle = require_drizzle.instrumentDrizzle;
 exports.instrumentDrizzleClient = require_drizzle.instrumentDrizzleClient;

package/dist/drizzle.d.cts

@@ -13,7 +13,7 @@ import { TracerProvider } from "@opentelemetry/api";
  * Both modes double the round trips to the database. Turn them on in
  * development, in CI, or behind a sample of production traffic.
  */
-type ExplainMode = 'plan' | 'analyze';
+export type ExplainMode = 'plan' | 'analyze';
 /**
  * Which OpenTelemetry database attribute names to emit.
  *
@@ -29,7 +29,7 @@ type ExplainMode = 'plan' | 'analyze';
  * `OTEL_SEMCONV_STABILITY_OPT_IN`: `database` selects `'stable'` and
  * `database/dup` selects `'dup'`.
  */
-type SemconvMode = 'legacy' | 'stable' | 'dup';
+export type SemconvMode = 'legacy' | 'stable' | 'dup';
 /**
  * How a query span is named.
  *
@@ -37,8 +37,8 @@ type SemconvMode = 'legacy' | 'stable' | 'dup';
  * - `'semconv'` follows OpenTelemetry's database span convention,
  *   `{db.operation.name} {target}`, so `SELECT comments`.
  */
-type SpanNamingMode = 'drizzle' | 'semconv';
-interface InstrumentDrizzleConfig {
+export type SpanNamingMode = 'drizzle' | 'semconv';
+export interface InstrumentDrizzleConfig {
   tracerName?: string;
   dbSystem?: string;
   dbName?: string;
@@ -78,7 +78,6 @@ interface InstrumentDrizzleConfig {
    */
   traceTransactions?: boolean;
 }
-declare function instrumentDrizzle<TClient>(client: TClient, config?: InstrumentDrizzleConfig): TClient;
-declare function instrumentDrizzleClient<TDb>(db: TDb, config?: InstrumentDrizzleConfig): TDb;
-//#endregion
-export { ExplainMode, InstrumentDrizzleConfig, SemconvMode, SpanNamingMode, instrumentDrizzle, instrumentDrizzleClient };
+export declare function instrumentDrizzle<TClient>(client: TClient, config?: InstrumentDrizzleConfig): TClient;
+export declare function instrumentDrizzleClient<TDb>(db: TDb, config?: InstrumentDrizzleConfig): TDb;
+//#endregion

package/dist/drizzle.d.ts

@@ -13,7 +13,7 @@ import { TracerProvider } from "@opentelemetry/api";
  * Both modes double the round trips to the database. Turn them on in
  * development, in CI, or behind a sample of production traffic.
  */
-type ExplainMode = 'plan' | 'analyze';
+export type ExplainMode = 'plan' | 'analyze';
 /**
  * Which OpenTelemetry database attribute names to emit.
  *
@@ -29,7 +29,7 @@ type ExplainMode = 'plan' | 'analyze';
  * `OTEL_SEMCONV_STABILITY_OPT_IN`: `database` selects `'stable'` and
  * `database/dup` selects `'dup'`.
  */
-type SemconvMode = 'legacy' | 'stable' | 'dup';
+export type SemconvMode = 'legacy' | 'stable' | 'dup';
 /**
  * How a query span is named.
  *
@@ -37,8 +37,8 @@ type SemconvMode = 'legacy' | 'stable' | 'dup';
  * - `'semconv'` follows OpenTelemetry's database span convention,
  *   `{db.operation.name} {target}`, so `SELECT comments`.
  */
-type SpanNamingMode = 'drizzle' | 'semconv';
-interface InstrumentDrizzleConfig {
+export type SpanNamingMode = 'drizzle' | 'semconv';
+export interface InstrumentDrizzleConfig {
   tracerName?: string;
   dbSystem?: string;
   dbName?: string;
@@ -78,7 +78,6 @@ interface InstrumentDrizzleConfig {
    */
   traceTransactions?: boolean;
 }
-declare function instrumentDrizzle<TClient>(client: TClient, config?: InstrumentDrizzleConfig): TClient;
-declare function instrumentDrizzleClient<TDb>(db: TDb, config?: InstrumentDrizzleConfig): TDb;
-//#endregion
-export { ExplainMode, InstrumentDrizzleConfig, SemconvMode, SpanNamingMode, instrumentDrizzle, instrumentDrizzleClient };
+export declare function instrumentDrizzle<TClient>(client: TClient, config?: InstrumentDrizzleConfig): TClient;
+export declare function instrumentDrizzleClient<TDb>(db: TDb, config?: InstrumentDrizzleConfig): TDb;
+//#endregion

package/dist/drizzle.js

@@ -1,2 +1,2 @@
-import { n as instrumentDrizzleClient, t as instrumentDrizzle } from "./drizzle-BiA8DdAa.js";
+import { n as instrumentDrizzleClient, t as instrumentDrizzle } from "./drizzle-BAxEDkHv.js";
 export { instrumentDrizzle, instrumentDrizzleClient };

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_drizzle = require("./drizzle-BK9eu10E.cjs");
+const require_drizzle = require("./drizzle-BeUip3cx.cjs");
 exports.SEMATTRS_DB_COLLECTION_NAME = require_drizzle.SEMATTRS_DB_COLLECTION_NAME;
 exports.SEMATTRS_DB_NAME = require_drizzle.SEMATTRS_DB_NAME;
 exports.SEMATTRS_DB_NAMESPACE = require_drizzle.SEMATTRS_DB_NAMESPACE;

package/dist/index.d.cts

@@ -4,27 +4,27 @@ import { ExplainMode, InstrumentDrizzleConfig, instrumentDrizzle, instrumentDriz
  * OpenTelemetry semantic conventions for database operations.
  * These constants are shared across all plugins.
  */
-declare const SEMATTRS_DB_SYSTEM: "db.system";
-declare const SEMATTRS_DB_SYSTEM_NAME: "db.system.name";
-declare const SEMATTRS_DB_OPERATION: "db.operation";
-declare const SEMATTRS_DB_STATEMENT: "db.statement";
-declare const SEMATTRS_DB_NAME: "db.name";
-declare const SEMATTRS_DB_NAMESPACE: "db.namespace";
-declare const SEMATTRS_DB_COLLECTION_NAME: "db.collection.name";
-declare const SEMATTRS_DB_OPERATION_NAME: "db.operation.name";
-declare const SEMATTRS_DB_QUERY_TEXT: "db.query.text";
-declare const SEMATTRS_DB_QUERY_SUMMARY: "db.query.summary";
-declare const SEMATTRS_NET_PEER_NAME: "net.peer.name";
-declare const SEMATTRS_NET_PEER_PORT: "net.peer.port";
-declare const SEMATTRS_GCP_BIGQUERY_JOB_ID: "gcp.bigquery.job.id";
-declare const SEMATTRS_GCP_BIGQUERY_JOB_LOCATION: "gcp.bigquery.job.location";
-declare const SEMATTRS_GCP_BIGQUERY_PROJECT_ID: "gcp.bigquery.project.id";
-declare const SEMATTRS_GCP_BIGQUERY_DESTINATION_TABLE: "gcp.bigquery.destination.table";
-declare const SEMATTRS_GCP_BIGQUERY_SOURCE_TABLES: "gcp.bigquery.source.tables";
-declare const SEMATTRS_GCP_BIGQUERY_STATEMENT_TYPE: "gcp.bigquery.statement_type";
-declare const SEMATTRS_GCP_BIGQUERY_QUERY_HASH: "gcp.bigquery.query.hash";
-declare const SEMATTRS_GCP_BIGQUERY_ROWS_AFFECTED: "gcp.bigquery.rows.affected";
-declare const SEMATTRS_GCP_BIGQUERY_ROWS_RETURNED: "gcp.bigquery.rows.returned";
-declare const SEMATTRS_GCP_BIGQUERY_SCHEMA_FIELDS: "gcp.bigquery.schema.fields";
+export declare const SEMATTRS_DB_SYSTEM: 'db.system';
+export declare const SEMATTRS_DB_SYSTEM_NAME: 'db.system.name';
+export declare const SEMATTRS_DB_OPERATION: 'db.operation';
+export declare const SEMATTRS_DB_STATEMENT: 'db.statement';
+export declare const SEMATTRS_DB_NAME: 'db.name';
+export declare const SEMATTRS_DB_NAMESPACE: 'db.namespace';
+export declare const SEMATTRS_DB_COLLECTION_NAME: 'db.collection.name';
+export declare const SEMATTRS_DB_OPERATION_NAME: 'db.operation.name';
+export declare const SEMATTRS_DB_QUERY_TEXT: 'db.query.text';
+export declare const SEMATTRS_DB_QUERY_SUMMARY: 'db.query.summary';
+export declare const SEMATTRS_NET_PEER_NAME: 'net.peer.name';
+export declare const SEMATTRS_NET_PEER_PORT: 'net.peer.port';
+export declare const SEMATTRS_GCP_BIGQUERY_JOB_ID: 'gcp.bigquery.job.id';
+export declare const SEMATTRS_GCP_BIGQUERY_JOB_LOCATION: 'gcp.bigquery.job.location';
+export declare const SEMATTRS_GCP_BIGQUERY_PROJECT_ID: 'gcp.bigquery.project.id';
+export declare const SEMATTRS_GCP_BIGQUERY_DESTINATION_TABLE: 'gcp.bigquery.destination.table';
+export declare const SEMATTRS_GCP_BIGQUERY_SOURCE_TABLES: 'gcp.bigquery.source.tables';
+export declare const SEMATTRS_GCP_BIGQUERY_STATEMENT_TYPE: 'gcp.bigquery.statement_type';
+export declare const SEMATTRS_GCP_BIGQUERY_QUERY_HASH: 'gcp.bigquery.query.hash';
+export declare const SEMATTRS_GCP_BIGQUERY_ROWS_AFFECTED: 'gcp.bigquery.rows.affected';
+export declare const SEMATTRS_GCP_BIGQUERY_ROWS_RETURNED: 'gcp.bigquery.rows.returned';
+export declare const SEMATTRS_GCP_BIGQUERY_SCHEMA_FIELDS: 'gcp.bigquery.schema.fields';
 //#endregion
-export { type ExplainMode, type InstrumentDrizzleConfig, SEMATTRS_DB_COLLECTION_NAME, SEMATTRS_DB_NAME, SEMATTRS_DB_NAMESPACE, SEMATTRS_DB_OPERATION, SEMATTRS_DB_OPERATION_NAME, SEMATTRS_DB_QUERY_SUMMARY, SEMATTRS_DB_QUERY_TEXT, SEMATTRS_DB_STATEMENT, SEMATTRS_DB_SYSTEM, SEMATTRS_DB_SYSTEM_NAME, SEMATTRS_GCP_BIGQUERY_DESTINATION_TABLE, SEMATTRS_GCP_BIGQUERY_JOB_ID, SEMATTRS_GCP_BIGQUERY_JOB_LOCATION, SEMATTRS_GCP_BIGQUERY_PROJECT_ID, SEMATTRS_GCP_BIGQUERY_QUERY_HASH, SEMATTRS_GCP_BIGQUERY_ROWS_AFFECTED, SEMATTRS_GCP_BIGQUERY_ROWS_RETURNED, SEMATTRS_GCP_BIGQUERY_SCHEMA_FIELDS, SEMATTRS_GCP_BIGQUERY_SOURCE_TABLES, SEMATTRS_GCP_BIGQUERY_STATEMENT_TYPE, SEMATTRS_NET_PEER_NAME, SEMATTRS_NET_PEER_PORT, instrumentDrizzle, instrumentDrizzleClient };
+export { type ExplainMode, type InstrumentDrizzleConfig, instrumentDrizzle, instrumentDrizzleClient };

package/dist/index.d.ts

@@ -4,27 +4,27 @@ import { ExplainMode, InstrumentDrizzleConfig, instrumentDrizzle, instrumentDriz
  * OpenTelemetry semantic conventions for database operations.
  * These constants are shared across all plugins.
  */
-declare const SEMATTRS_DB_SYSTEM: "db.system";
-declare const SEMATTRS_DB_SYSTEM_NAME: "db.system.name";
-declare const SEMATTRS_DB_OPERATION: "db.operation";
-declare const SEMATTRS_DB_STATEMENT: "db.statement";
-declare const SEMATTRS_DB_NAME: "db.name";
-declare const SEMATTRS_DB_NAMESPACE: "db.namespace";
-declare const SEMATTRS_DB_COLLECTION_NAME: "db.collection.name";
-declare const SEMATTRS_DB_OPERATION_NAME: "db.operation.name";
-declare const SEMATTRS_DB_QUERY_TEXT: "db.query.text";
-declare const SEMATTRS_DB_QUERY_SUMMARY: "db.query.summary";
-declare const SEMATTRS_NET_PEER_NAME: "net.peer.name";
-declare const SEMATTRS_NET_PEER_PORT: "net.peer.port";
-declare const SEMATTRS_GCP_BIGQUERY_JOB_ID: "gcp.bigquery.job.id";
-declare const SEMATTRS_GCP_BIGQUERY_JOB_LOCATION: "gcp.bigquery.job.location";
-declare const SEMATTRS_GCP_BIGQUERY_PROJECT_ID: "gcp.bigquery.project.id";
-declare const SEMATTRS_GCP_BIGQUERY_DESTINATION_TABLE: "gcp.bigquery.destination.table";
-declare const SEMATTRS_GCP_BIGQUERY_SOURCE_TABLES: "gcp.bigquery.source.tables";
-declare const SEMATTRS_GCP_BIGQUERY_STATEMENT_TYPE: "gcp.bigquery.statement_type";
-declare const SEMATTRS_GCP_BIGQUERY_QUERY_HASH: "gcp.bigquery.query.hash";
-declare const SEMATTRS_GCP_BIGQUERY_ROWS_AFFECTED: "gcp.bigquery.rows.affected";
-declare const SEMATTRS_GCP_BIGQUERY_ROWS_RETURNED: "gcp.bigquery.rows.returned";
-declare const SEMATTRS_GCP_BIGQUERY_SCHEMA_FIELDS: "gcp.bigquery.schema.fields";
+export declare const SEMATTRS_DB_SYSTEM: 'db.system';
+export declare const SEMATTRS_DB_SYSTEM_NAME: 'db.system.name';
+export declare const SEMATTRS_DB_OPERATION: 'db.operation';
+export declare const SEMATTRS_DB_STATEMENT: 'db.statement';
+export declare const SEMATTRS_DB_NAME: 'db.name';
+export declare const SEMATTRS_DB_NAMESPACE: 'db.namespace';
+export declare const SEMATTRS_DB_COLLECTION_NAME: 'db.collection.name';
+export declare const SEMATTRS_DB_OPERATION_NAME: 'db.operation.name';
+export declare const SEMATTRS_DB_QUERY_TEXT: 'db.query.text';
+export declare const SEMATTRS_DB_QUERY_SUMMARY: 'db.query.summary';
+export declare const SEMATTRS_NET_PEER_NAME: 'net.peer.name';
+export declare const SEMATTRS_NET_PEER_PORT: 'net.peer.port';
+export declare const SEMATTRS_GCP_BIGQUERY_JOB_ID: 'gcp.bigquery.job.id';
+export declare const SEMATTRS_GCP_BIGQUERY_JOB_LOCATION: 'gcp.bigquery.job.location';
+export declare const SEMATTRS_GCP_BIGQUERY_PROJECT_ID: 'gcp.bigquery.project.id';
+export declare const SEMATTRS_GCP_BIGQUERY_DESTINATION_TABLE: 'gcp.bigquery.destination.table';
+export declare const SEMATTRS_GCP_BIGQUERY_SOURCE_TABLES: 'gcp.bigquery.source.tables';
+export declare const SEMATTRS_GCP_BIGQUERY_STATEMENT_TYPE: 'gcp.bigquery.statement_type';
+export declare const SEMATTRS_GCP_BIGQUERY_QUERY_HASH: 'gcp.bigquery.query.hash';
+export declare const SEMATTRS_GCP_BIGQUERY_ROWS_AFFECTED: 'gcp.bigquery.rows.affected';
+export declare const SEMATTRS_GCP_BIGQUERY_ROWS_RETURNED: 'gcp.bigquery.rows.returned';
+export declare const SEMATTRS_GCP_BIGQUERY_SCHEMA_FIELDS: 'gcp.bigquery.schema.fields';
 //#endregion
-export { type ExplainMode, type InstrumentDrizzleConfig, SEMATTRS_DB_COLLECTION_NAME, SEMATTRS_DB_NAME, SEMATTRS_DB_NAMESPACE, SEMATTRS_DB_OPERATION, SEMATTRS_DB_OPERATION_NAME, SEMATTRS_DB_QUERY_SUMMARY, SEMATTRS_DB_QUERY_TEXT, SEMATTRS_DB_STATEMENT, SEMATTRS_DB_SYSTEM, SEMATTRS_DB_SYSTEM_NAME, SEMATTRS_GCP_BIGQUERY_DESTINATION_TABLE, SEMATTRS_GCP_BIGQUERY_JOB_ID, SEMATTRS_GCP_BIGQUERY_JOB_LOCATION, SEMATTRS_GCP_BIGQUERY_PROJECT_ID, SEMATTRS_GCP_BIGQUERY_QUERY_HASH, SEMATTRS_GCP_BIGQUERY_ROWS_AFFECTED, SEMATTRS_GCP_BIGQUERY_ROWS_RETURNED, SEMATTRS_GCP_BIGQUERY_SCHEMA_FIELDS, SEMATTRS_GCP_BIGQUERY_SOURCE_TABLES, SEMATTRS_GCP_BIGQUERY_STATEMENT_TYPE, SEMATTRS_NET_PEER_NAME, SEMATTRS_NET_PEER_PORT, instrumentDrizzle, instrumentDrizzleClient };
+export { type ExplainMode, type InstrumentDrizzleConfig, instrumentDrizzle, instrumentDrizzleClient };

package/dist/index.js

@@ -1,2 +1,2 @@
-import { C as SEMATTRS_NET_PEER_NAME, S as SEMATTRS_GCP_BIGQUERY_STATEMENT_TYPE, _ as SEMATTRS_GCP_BIGQUERY_QUERY_HASH, a as SEMATTRS_DB_NAMESPACE, b as SEMATTRS_GCP_BIGQUERY_SCHEMA_FIELDS, c as SEMATTRS_DB_QUERY_SUMMARY, d as SEMATTRS_DB_SYSTEM, f as SEMATTRS_DB_SYSTEM_NAME, g as SEMATTRS_GCP_BIGQUERY_PROJECT_ID, h as SEMATTRS_GCP_BIGQUERY_JOB_LOCATION, i as SEMATTRS_DB_NAME, l as SEMATTRS_DB_QUERY_TEXT, m as SEMATTRS_GCP_BIGQUERY_JOB_ID, n as instrumentDrizzleClient, o as SEMATTRS_DB_OPERATION, p as SEMATTRS_GCP_BIGQUERY_DESTINATION_TABLE, r as SEMATTRS_DB_COLLECTION_NAME, s as SEMATTRS_DB_OPERATION_NAME, t as instrumentDrizzle, u as SEMATTRS_DB_STATEMENT, v as SEMATTRS_GCP_BIGQUERY_ROWS_AFFECTED, w as SEMATTRS_NET_PEER_PORT, x as SEMATTRS_GCP_BIGQUERY_SOURCE_TABLES, y as SEMATTRS_GCP_BIGQUERY_ROWS_RETURNED } from "./drizzle-BiA8DdAa.js";
+import { C as SEMATTRS_NET_PEER_NAME, S as SEMATTRS_GCP_BIGQUERY_STATEMENT_TYPE, _ as SEMATTRS_GCP_BIGQUERY_QUERY_HASH, a as SEMATTRS_DB_NAMESPACE, b as SEMATTRS_GCP_BIGQUERY_SCHEMA_FIELDS, c as SEMATTRS_DB_QUERY_SUMMARY, d as SEMATTRS_DB_SYSTEM, f as SEMATTRS_DB_SYSTEM_NAME, g as SEMATTRS_GCP_BIGQUERY_PROJECT_ID, h as SEMATTRS_GCP_BIGQUERY_JOB_LOCATION, i as SEMATTRS_DB_NAME, l as SEMATTRS_DB_QUERY_TEXT, m as SEMATTRS_GCP_BIGQUERY_JOB_ID, n as instrumentDrizzleClient, o as SEMATTRS_DB_OPERATION, p as SEMATTRS_GCP_BIGQUERY_DESTINATION_TABLE, r as SEMATTRS_DB_COLLECTION_NAME, s as SEMATTRS_DB_OPERATION_NAME, t as instrumentDrizzle, u as SEMATTRS_DB_STATEMENT, v as SEMATTRS_GCP_BIGQUERY_ROWS_AFFECTED, w as SEMATTRS_NET_PEER_PORT, x as SEMATTRS_GCP_BIGQUERY_SOURCE_TABLES, y as SEMATTRS_GCP_BIGQUERY_ROWS_RETURNED } from "./drizzle-BAxEDkHv.js";
 export { SEMATTRS_DB_COLLECTION_NAME, SEMATTRS_DB_NAME, SEMATTRS_DB_NAMESPACE, SEMATTRS_DB_OPERATION, SEMATTRS_DB_OPERATION_NAME, SEMATTRS_DB_QUERY_SUMMARY, SEMATTRS_DB_QUERY_TEXT, SEMATTRS_DB_STATEMENT, SEMATTRS_DB_SYSTEM, SEMATTRS_DB_SYSTEM_NAME, SEMATTRS_GCP_BIGQUERY_DESTINATION_TABLE, SEMATTRS_GCP_BIGQUERY_JOB_ID, SEMATTRS_GCP_BIGQUERY_JOB_LOCATION, SEMATTRS_GCP_BIGQUERY_PROJECT_ID, SEMATTRS_GCP_BIGQUERY_QUERY_HASH, SEMATTRS_GCP_BIGQUERY_ROWS_AFFECTED, SEMATTRS_GCP_BIGQUERY_ROWS_RETURNED, SEMATTRS_GCP_BIGQUERY_SCHEMA_FIELDS, SEMATTRS_GCP_BIGQUERY_SOURCE_TABLES, SEMATTRS_GCP_BIGQUERY_STATEMENT_TYPE, SEMATTRS_NET_PEER_NAME, SEMATTRS_NET_PEER_PORT, instrumentDrizzle, instrumentDrizzleClient };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autotel-drizzle",
-  "version": "0.2.6",
+  "version": "0.3.0",
   "description": "OpenTelemetry instrumentation for Drizzle ORM",
   "type": "module",
   "main": "./dist/drizzle.js",
@@ -37,23 +37,20 @@
     "@opentelemetry/api": "^1.9.1",
     "@opentelemetry/instrumentation": "^0.222.0",
     "@opentelemetry/semantic-conventions": "^1.43.0",
-    "autotel": "7.9.0"
+    "autotel": "7.10.0",
+    "autotel-db": "0.1.0"
   },
   "peerDependencies": {
-    "drizzle-orm": ">=0.45.2"
+    "drizzle-orm": ">=0.45.3"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.18.5",
     "@opentelemetry/core": "^2.11.0",
-    "@types/node": "^26.1.2",
-    "@typescript-eslint/eslint-plugin": "^8.65.0",
-    "@typescript-eslint/parser": "^8.65.0",
-    "drizzle-orm": "^0.45.2",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-unicorn": "^64.0.0",
-    "tsdown": "^0.22.14",
-    "typescript": "^6.0.3",
-    "vitest": "^4.1.10"
+    "@types/node": "^26.6.3",
+    "drizzle-orm": "^0.45.3",
+    "tsdown": "^0.23.0",
+    "typescript": "^7.0.2",
+    "vitest": "^5.0.2"
   },
   "repository": {
     "type": "git",
@@ -68,8 +65,8 @@
     "build": "tsdown",
     "ci": "npm run build && npm run check-format && npm run check-exports && npm run lint && npm run test",
     "dev": "tsdown --watch",
-    "lint": "eslint src/**/*.ts",
-    "lint:fix": "eslint src/**/*.ts --fix",
+    "lint": "oxlint -c oxlint.json --disable-nested-config src",
+    "lint:fix": "pnpm lint --fix",
     "format:check": "prettier --check src/**/*.ts",
     "type-check": "tsc --noEmit",
     "test": "vitest run --config vitest.unit.config.ts",