@use-tusk/drift-node-sdk 0.1.21 → 0.1.23

package/dist/index.js

@@ -11139,13 +11139,23 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 				let requestOptions;
 				if (typeof args[0] === "string") {
 					const url = new URL(args[0]);
+					const additionalOptions = typeof args[1] === "function" ? void 0 : args[1];
 					requestOptions = {
 						protocol: url.protocol,
 						hostname: url.hostname,
 						port: url.port ? parseInt(url.port) : void 0,
 						path: url.pathname + url.search,
-						method: args[1]?.method || "GET",
-						headers: args[1]?.headers || {}
+						method: additionalOptions?.method || "GET",
+						headers: additionalOptions?.headers || {}
+					};
+				} else if (self._isURLObject(args[0])) {
+					const url = args[0];
+					const additionalOptions = typeof args[1] === "function" ? void 0 : args[1];
+					requestOptions = {
+						...self._urlToRequestOptions(url),
+						method: additionalOptions?.method || "GET",
+						headers: additionalOptions?.headers || {},
+						...additionalOptions
 					};
 				} else requestOptions = args[0] || {};
 				const method = requestOptions.method || "GET";
@@ -11235,12 +11245,21 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 				let requestOptions;
 				if (typeof args[0] === "string") {
 					const url = new URL(args[0]);
+					const additionalOptions = typeof args[1] === "function" ? void 0 : args[1];
 					requestOptions = {
 						protocol: url.protocol,
 						hostname: url.hostname,
 						port: url.port ? parseInt(url.port) : void 0,
 						path: url.pathname + url.search,
-						headers: args[1]?.headers || {}
+						headers: additionalOptions?.headers || {}
+					};
+				} else if (self._isURLObject(args[0])) {
+					const url = args[0];
+					const additionalOptions = typeof args[1] === "function" ? void 0 : args[1];
+					requestOptions = {
+						...self._urlToRequestOptions(url),
+						headers: additionalOptions?.headers || {},
+						...additionalOptions
 					};
 				} else requestOptions = args[0] || {};
 				const method = "GET";
@@ -11346,6 +11365,25 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 			};
 		};
 	}
+	/**
+	* Check if the input is a URL object (WHATWG URL API)
+	* This is used to detect when a URL object is passed to http.get/request
+	*/
+	_isURLObject(input) {
+		return input instanceof URL || input && typeof input.href === "string" && typeof input.pathname === "string";
+	}
+	/**
+	* Convert a URL object to RequestOptions
+	* Similar to Node.js's internal urlToHttpOptions function
+	*/
+	_urlToRequestOptions(url) {
+		return {
+			protocol: url.protocol,
+			hostname: url.hostname,
+			port: url.port ? parseInt(url.port) : void 0,
+			path: url.pathname + (url.search || "")
+		};
+	}
 	_normalizeProtocol(protocol, fallback) {
 		if (!protocol) return fallback;
 		const normalized = protocol.toLowerCase().replace(/:$/, "");
@@ -11723,6 +11761,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 								packageName,
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { values: { matchImportance: 0 } },
 								isPreAppStart: false
 							}, (spanInfo) => {
 								return self.handleReplayQuery(queryConfig, inputValue, spanInfo, stackTrace);
@@ -11742,6 +11781,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 							instrumentationName: self.INSTRUMENTATION_NAME,
 							packageName,
 							inputValue,
+							inputSchemaMerges: { values: { matchImportance: 0 } },
 							isPreAppStart
 						}, (spanInfo) => {
 							return self._handleRecordQueryInSpan(spanInfo, originalQuery, queryConfig, args, this);
@@ -11918,7 +11958,8 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 				kind: import_src$29.SpanKind.CLIENT,
 				stackTrace
 			},
-			tuskDrift: this.tuskDrift
+			tuskDrift: this.tuskDrift,
+			inputValueSchemaMerges: { values: { matchImportance: 0 } }
 		});
 		if (!mockData) {
 			const queryText = queryConfig.text || inputValue.text || "UNKNOWN_QUERY";
@@ -12781,6 +12822,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 							packageName: "postgres",
 							instrumentationName: self.INSTRUMENTATION_NAME,
 							inputValue,
+							inputSchemaMerges: { parameters: { matchImportance: 0 } },
 							isPreAppStart
 						}, (spanInfo) => {
 							const wrappedOnFulfilled = (result) => {
@@ -12828,6 +12870,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 								packageName: "postgres",
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { parameters: { matchImportance: 0 } },
 								isPreAppStart: self.tuskDrift.isAppReady() ? false : true
 							}, async (spanInfo) => {
 								const mockedResult = await self._handleReplayQueryOperation({
@@ -13030,7 +13073,8 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 				kind: import_src$27.SpanKind.CLIENT,
 				stackTrace
 			},
-			tuskDrift: this.tuskDrift
+			tuskDrift: this.tuskDrift,
+			inputValueSchemaMerges: { parameters: { matchImportance: 0 } }
 		});
 	}
 	/**
@@ -13084,6 +13128,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 						packageName: "postgres",
 						instrumentationName: self.INSTRUMENTATION_NAME,
 						inputValue,
+						inputSchemaMerges: { parameters: { matchImportance: 0 } },
 						isPreAppStart
 					}, (spanInfo) => {
 						return self._executeAndRecordCursorCallback({
@@ -13142,6 +13187,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 						packageName: "postgres",
 						instrumentationName: self.INSTRUMENTATION_NAME,
 						inputValue,
+						inputSchemaMerges: { parameters: { matchImportance: 0 } },
 						isPreAppStart: self.tuskDrift.isAppReady() ? false : true
 					}, async (spanInfo) => {
 						try {
@@ -13343,6 +13389,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 						packageName: "postgres",
 						instrumentationName: self.INSTRUMENTATION_NAME,
 						inputValue,
+						inputSchemaMerges: { parameters: { matchImportance: 0 } },
 						isPreAppStart
 					}, async (spanInfo) => {
 						const allRows = [];
@@ -13397,6 +13444,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 						packageName: "postgres",
 						instrumentationName: self.INSTRUMENTATION_NAME,
 						inputValue,
+						inputSchemaMerges: { parameters: { matchImportance: 0 } },
 						isPreAppStart: self.tuskDrift.isAppReady() ? false : true
 					}, async (spanInfo) => {
 						try {
@@ -13451,6 +13499,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 							packageName: "postgres",
 							instrumentationName: self.INSTRUMENTATION_NAME,
 							inputValue,
+							inputSchemaMerges: { parameters: { matchImportance: 0 } },
 							isPreAppStart
 						}, (spanInfo) => {
 							const wrappedOnFulfilled = (result) => {
@@ -13498,6 +13547,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 								packageName: "postgres",
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { parameters: { matchImportance: 0 } },
 								isPreAppStart: self.tuskDrift.isAppReady() ? false : true
 							}, async (spanInfo) => {
 								const mockedResult = await self._handleReplayQueryOperation({
@@ -13897,7 +13947,8 @@ var TdMysqlQueryMock = class {
 				kind: import_src$26.SpanKind.CLIENT,
 				stackTrace
 			},
-			tuskDrift: this.tuskDrift
+			tuskDrift: this.tuskDrift,
+			inputValueSchemaMerges: { values: { matchImportance: 0 } }
 		});
 	}
 };
@@ -14153,6 +14204,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 								packageName: "mysql",
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { values: { matchImportance: 0 } },
 								isPreAppStart: false
 							}, (spanInfo) => {
 								const queryEmitter = self.queryMock.handleReplayQuery({
@@ -14179,6 +14231,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 							packageName: "mysql",
 							instrumentationName: self.INSTRUMENTATION_NAME,
 							inputValue,
+							inputSchemaMerges: { values: { matchImportance: 0 } },
 							isPreAppStart
 						}, (spanInfo) => {
 							return self._handleRecordQuery(spanInfo, originalQuery, this, args, callback, isEventEmitterMode);
@@ -14201,11 +14254,13 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					const connectionContext = this;
 					return handleReplayMode({
 						noOpRequestHandler: () => {
+							connectionContext.state = "authenticated";
 							if (callback) setImmediate(() => callback(null));
 							setImmediate(() => connectionContext.emit("connect"));
 						},
 						isServerRequest: false,
 						replayModeHandler: () => {
+							connectionContext.state = "authenticated";
 							if (callback) setImmediate(() => callback(null));
 							setImmediate(() => connectionContext.emit("connect"));
 						}
@@ -14626,6 +14681,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 								packageName: "mysql",
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { values: { matchImportance: 0 } },
 								isPreAppStart: false
 							}, (spanInfo) => {
 								const queryEmitter = self.queryMock.handleReplayQuery({
@@ -14652,6 +14708,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 							packageName: "mysql",
 							instrumentationName: self.INSTRUMENTATION_NAME,
 							inputValue,
+							inputSchemaMerges: { values: { matchImportance: 0 } },
 							isPreAppStart
 						}, (spanInfo) => {
 							return self._handleRecordQuery(spanInfo, originalQuery, connection, args, callback, isEventEmitterMode);
@@ -14771,10 +14828,12 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 			return function connect(callback) {
 				if (self.mode === TuskDriftMode.REPLAY) return handleReplayMode({
 					noOpRequestHandler: () => {
+						connection.state = "authenticated";
 						if (callback) setImmediate(() => callback(null));
 					},
 					isServerRequest: false,
 					replayModeHandler: () => {
+						connection.state = "authenticated";
 						if (callback) setImmediate(() => callback(null));
 					}
 				});
@@ -15113,6 +15172,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 								packageName: "mysql",
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { values: { matchImportance: 0 } },
 								isPreAppStart: false
 							}, (spanInfo) => {
 								return self._handleReplayStream(inputValue, spanInfo, stackTrace, queryInstance);
@@ -15130,6 +15190,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 							packageName: "mysql",
 							instrumentationName: self.INSTRUMENTATION_NAME,
 							inputValue,
+							inputSchemaMerges: { values: { matchImportance: 0 } },
 							isPreAppStart
 						}, (spanInfo) => {
 							return self._handleRecordStream(spanInfo, originalStream, queryInstance, streamOptions);
@@ -15341,6 +15402,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 								packageName: "mysql",
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { values: { matchImportance: 0 } },
 								isPreAppStart: false
 							}, (spanInfo) => {
 								const queryEmitter = self.queryMock.handleReplayQuery({
@@ -15536,6 +15598,27 @@ var TdMysql2ConnectionMock = class extends EventEmitter {
 		}
 		return Promise.resolve();
 	}
+	prepare(sql, callback) {
+		const sqlStr = typeof sql === "string" ? sql : sql.sql;
+		const self = this;
+		const mockStatement = {
+			query: sqlStr,
+			id: 1,
+			columns: [],
+			parameters: [],
+			execute: (...args) => {
+				const values = Array.isArray(args[0]) ? args[0] : [];
+				const execCallback = typeof args[args.length - 1] === "function" ? args[args.length - 1] : void 0;
+				return self.mysql2Instrumentation.handleNoOpReplayQuery({
+					sql: sqlStr,
+					values,
+					callback: execCallback
+				});
+			},
+			close: () => {}
+		};
+		if (callback) process.nextTick(() => callback(null, mockStatement));
+	}
 	pause() {}
 	resume() {}
 	escape(value) {
@@ -15592,6 +15675,10 @@ var TdMysql2QueryMock = class {
 				});
 			}).then(onResolve, onReject);
 		};
+		const self = this;
+		emitter.stream = function(streamOptions) {
+			return self._createReplayStreamForQuery(emitter, streamOptions);
+		};
 		process.nextTick(() => {
 			const callback = queryConfig.callback;
 			if (callback) callback(null, [], []);
@@ -15618,6 +15705,10 @@ var TdMysql2QueryMock = class {
 				});
 			}).then(onResolve, onReject);
 		};
+		const self = this;
+		emitter.stream = function(streamOptions) {
+			return self._createReplayStreamForQuery(emitter, streamOptions);
+		};
 		(async () => {
 			try {
 				const mockData = await this._fetchMockData(inputValue, spanInfo, spanName, submoduleName, stackTrace);
@@ -15661,8 +15752,46 @@ var TdMysql2QueryMock = class {
 				kind: import_src$24.SpanKind.CLIENT,
 				stackTrace
 			},
-			tuskDrift: this.tuskDrift
+			tuskDrift: this.tuskDrift,
+			inputValueSchemaMerges: { values: { matchImportance: 0 } }
+		});
+	}
+	/**
+	* Create a replay stream for query.stream() calls
+	* This is called when user calls query.stream() on a query object
+	*/
+	_createReplayStreamForQuery(queryEmitter, streamOptions) {
+		logger.debug(`[Mysql2Instrumentation] Creating replay stream for query.stream()`);
+		const readableStream = new Readable({
+			objectMode: true,
+			read() {}
+		});
+		queryEmitter.on("result", (row) => {
+			readableStream.push(row);
+		});
+		queryEmitter.on("error", (err) => {
+			readableStream.destroy(err);
+		});
+		queryEmitter.on("end", () => {
+			readableStream.push(null);
 		});
+		return readableStream;
+	}
+	/**
+	* Recursively restore Buffer objects from their JSON serialized form.
+	* JSON.stringify converts Buffer to {"type":"Buffer","data":[...]}
+	* This function converts them back to actual Buffer instances.
+	*/
+	_restoreBuffers(obj) {
+		if (obj === null || obj === void 0) return obj;
+		if (typeof obj === "object" && obj.type === "Buffer" && Array.isArray(obj.data)) return Buffer.from(obj.data);
+		if (Array.isArray(obj)) return obj.map((item) => this._restoreBuffers(item));
+		if (typeof obj === "object") {
+			const result = {};
+			for (const key of Object.keys(obj)) result[key] = this._restoreBuffers(obj[key]);
+			return result;
+		}
+		return obj;
 	}
 	/**
 	* Convert stored MySQL2 values back to appropriate JavaScript types
@@ -15672,12 +15801,17 @@ var TdMysql2QueryMock = class {
 			rows: [],
 			fields: []
 		};
-		if (result.rows !== void 0 && result.fields !== void 0) return {
-			rows: result.rows,
-			fields: result.fields
+		const restoredResult = this._restoreBuffers(result);
+		if (restoredResult.rows !== void 0 && restoredResult.fields !== void 0) return {
+			rows: restoredResult.rows,
+			fields: restoredResult.fields
+		};
+		if (restoredResult.affectedRows !== void 0) return {
+			rows: restoredResult,
+			fields: []
 		};
 		return {
-			rows: result,
+			rows: restoredResult,
 			fields: []
 		};
 	}
@@ -15822,6 +15956,18 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 				logger.debug(`[Mysql2Instrumentation] Wrapped BaseConnection.prototype.end`);
 			}
 		}
+		if (BaseConnectionClass.prototype && BaseConnectionClass.prototype.prepare) {
+			if (!isWrapped$1(BaseConnectionClass.prototype.prepare)) {
+				this._wrap(BaseConnectionClass.prototype, "prepare", this._getPreparePatchFn("connection"));
+				logger.debug(`[Mysql2Instrumentation] Wrapped BaseConnection.prototype.prepare`);
+			}
+		}
+		if (BaseConnectionClass.prototype && BaseConnectionClass.prototype.changeUser) {
+			if (!isWrapped$1(BaseConnectionClass.prototype.changeUser)) {
+				this._wrap(BaseConnectionClass.prototype, "changeUser", this._getChangeUserPatchFn("connection"));
+				logger.debug(`[Mysql2Instrumentation] Wrapped BaseConnection.prototype.changeUser`);
+			}
+		}
 		this.markModuleAsPatched(BaseConnectionClass);
 		logger.debug(`[Mysql2Instrumentation] BaseConnection class patching complete`);
 		return BaseConnectionClass;
@@ -15873,6 +16019,18 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 				logger.debug(`[Mysql2Instrumentation] Wrapped Connection.prototype.end`);
 			}
 		}
+		if (ConnectionClass.prototype && ConnectionClass.prototype.prepare) {
+			if (!isWrapped$1(ConnectionClass.prototype.prepare)) {
+				this._wrap(ConnectionClass.prototype, "prepare", this._getPreparePatchFn("connection"));
+				logger.debug(`[Mysql2Instrumentation] Wrapped Connection.prototype.prepare`);
+			}
+		}
+		if (ConnectionClass.prototype && ConnectionClass.prototype.changeUser) {
+			if (!isWrapped$1(ConnectionClass.prototype.changeUser)) {
+				this._wrap(ConnectionClass.prototype, "changeUser", this._getChangeUserPatchFn("connection"));
+				logger.debug(`[Mysql2Instrumentation] Wrapped Connection.prototype.changeUser`);
+			}
+		}
 	}
 	_patchPoolV2(PoolClass) {
 		logger.debug(`[Mysql2Instrumentation] Patching Pool class (v2)`);
@@ -15966,6 +16124,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 								packageName: "mysql2",
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { values: { matchImportance: 0 } },
 								isPreAppStart: false
 							}, (spanInfo) => {
 								return self.handleReplayQuery(queryConfig, inputValue, spanInfo, "query", stackTrace);
@@ -15984,6 +16143,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 							instrumentationName: self.INSTRUMENTATION_NAME,
 							packageName: "mysql2",
 							inputValue,
+							inputSchemaMerges: { values: { matchImportance: 0 } },
 							isPreAppStart
 						}, (spanInfo) => {
 							return self._handleRecordQueryInSpan(spanInfo, originalQuery, queryConfig, args, this);
@@ -16031,6 +16191,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 								packageName: "mysql2",
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { values: { matchImportance: 0 } },
 								isPreAppStart: false
 							}, (spanInfo) => {
 								return self.handleReplayQuery(queryConfig, inputValue, spanInfo, "execute", stackTrace);
@@ -16049,6 +16210,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 							instrumentationName: self.INSTRUMENTATION_NAME,
 							packageName: "mysql2",
 							inputValue,
+							inputSchemaMerges: { values: { matchImportance: 0 } },
 							isPreAppStart
 						}, (spanInfo) => {
 							return self._handleRecordQueryInSpan(spanInfo, originalExecute, queryConfig, args, this);
@@ -16272,6 +16434,251 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 			};
 		};
 	}
+	_getChangeUserPatchFn(clientType) {
+		const self = this;
+		return (originalChangeUser) => {
+			return function changeUser(options, callback) {
+				if (typeof options === "function") {
+					callback = options;
+					options = {};
+				}
+				const inputValue = { clientType };
+				if (self.mode === TuskDriftMode.REPLAY) return handleReplayMode({
+					noOpRequestHandler: () => {
+						if (callback) {
+							process.nextTick(() => callback(null));
+							return;
+						}
+						return Promise.resolve();
+					},
+					isServerRequest: false,
+					replayModeHandler: () => {
+						return SpanUtils.createAndExecuteSpan(self.mode, () => originalChangeUser.apply(this, [options, callback]), {
+							name: `mysql2.${clientType}.changeUser`,
+							kind: import_src$22.SpanKind.CLIENT,
+							submodule: "changeUser",
+							packageName: "mysql2",
+							packageType: PackageType.MYSQL,
+							instrumentationName: self.INSTRUMENTATION_NAME,
+							inputValue,
+							isPreAppStart: false
+						}, (spanInfo) => {
+							if (callback) {
+								process.nextTick(() => callback(null));
+								return;
+							}
+							return Promise.resolve();
+						});
+					}
+				});
+				else if (self.mode === TuskDriftMode.RECORD) return handleRecordMode({
+					originalFunctionCall: () => originalChangeUser.apply(this, [options, callback]),
+					recordModeHandler: ({ isPreAppStart }) => {
+						return SpanUtils.createAndExecuteSpan(self.mode, () => originalChangeUser.apply(this, [options, callback]), {
+							name: `mysql2.${clientType}.changeUser`,
+							kind: import_src$22.SpanKind.CLIENT,
+							submodule: "changeUser",
+							packageName: "mysql2",
+							packageType: PackageType.MYSQL,
+							instrumentationName: self.INSTRUMENTATION_NAME,
+							inputValue,
+							isPreAppStart
+						}, (spanInfo) => {
+							return self._handleSimpleCallbackMethod(spanInfo, originalChangeUser.bind(this, options), callback, this);
+						});
+					},
+					spanKind: import_src$22.SpanKind.CLIENT
+				});
+				else return originalChangeUser.apply(this, [options, callback]);
+			};
+		};
+	}
+	_getPreparePatchFn(clientType) {
+		const self = this;
+		return (originalPrepare) => {
+			return function prepare(...args) {
+				const firstArg = args[0];
+				const sql = typeof firstArg === "string" ? firstArg : firstArg?.sql;
+				const originalCallback = typeof args[args.length - 1] === "function" ? args[args.length - 1] : void 0;
+				if (self.mode === TuskDriftMode.REPLAY) return handleReplayMode({
+					noOpRequestHandler: () => self._handleNoOpReplayPrepare(sql, originalCallback),
+					isServerRequest: false,
+					replayModeHandler: () => self._handleReplayPrepare(sql, originalCallback, clientType)
+				});
+				else if (self.mode === TuskDriftMode.RECORD) return handleRecordMode({
+					originalFunctionCall: () => originalPrepare.apply(this, args),
+					recordModeHandler: ({ isPreAppStart }) => self._handleRecordPrepare(originalPrepare, args, sql, originalCallback, this, clientType, isPreAppStart),
+					spanKind: import_src$22.SpanKind.CLIENT
+				});
+				return originalPrepare.apply(this, args);
+			};
+		};
+	}
+	_handleRecordPrepare(originalPrepare, args, sql, originalCallback, context$6, clientType, isPreAppStart) {
+		const self = this;
+		return SpanUtils.createAndExecuteSpan(this.mode, () => originalPrepare.apply(context$6, args), {
+			name: `mysql2.${clientType}.prepare`,
+			kind: import_src$22.SpanKind.CLIENT,
+			submodule: "prepare",
+			packageType: PackageType.MYSQL,
+			packageName: "mysql2",
+			instrumentationName: this.INSTRUMENTATION_NAME,
+			inputValue: {
+				sql,
+				clientType
+			},
+			isPreAppStart
+		}, (spanInfo) => {
+			const wrappedCallback = (err, statement) => {
+				if (err) {
+					logger.debug(`[Mysql2Instrumentation] MySQL2 prepare error: ${err.message} (${SpanUtils.getTraceInfo()})`);
+					try {
+						SpanUtils.endSpan(spanInfo.span, {
+							code: import_src$22.SpanStatusCode.ERROR,
+							message: err.message
+						});
+					} catch (error) {
+						logger.error(`[Mysql2Instrumentation] error ending span:`, error);
+					}
+				} else {
+					logger.debug(`[Mysql2Instrumentation] MySQL2 prepare completed successfully (${SpanUtils.getTraceInfo()})`);
+					try {
+						SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: {
+							prepared: true,
+							statementId: statement?.id
+						} });
+						SpanUtils.endSpan(spanInfo.span, { code: import_src$22.SpanStatusCode.OK });
+					} catch (error) {
+						logger.error(`[Mysql2Instrumentation] error processing prepare response:`, error);
+					}
+					if (statement && statement.execute) {
+						const originalExecute = statement.execute.bind(statement);
+						statement.execute = self._getPreparedStatementExecuteWrapper(originalExecute, sql, clientType);
+					}
+				}
+				if (originalCallback) originalCallback(err, statement);
+			};
+			const newArgs = [...args];
+			const callbackIndex = newArgs.findIndex((a) => typeof a === "function");
+			if (callbackIndex >= 0) newArgs[callbackIndex] = wrappedCallback;
+			else newArgs.push(wrappedCallback);
+			return originalPrepare.apply(context$6, newArgs);
+		});
+	}
+	_getPreparedStatementExecuteWrapper(originalExecute, sql, clientType) {
+		const self = this;
+		return function execute(...args) {
+			let values = [];
+			let callback;
+			for (const arg of args) if (typeof arg === "function") callback = arg;
+			else if (Array.isArray(arg)) values = arg;
+			else if (arg !== void 0) values = [arg];
+			const inputValue = {
+				sql,
+				values,
+				clientType
+			};
+			const queryConfig = {
+				sql,
+				values,
+				callback
+			};
+			const stackTrace = captureStackTrace(["Mysql2Instrumentation"]);
+			if (self.mode === TuskDriftMode.REPLAY) return handleReplayMode({
+				noOpRequestHandler: () => self.queryMock.handleNoOpReplayQuery(queryConfig),
+				isServerRequest: false,
+				replayModeHandler: () => {
+					const spanName = `mysql2.${clientType}.preparedExecute`;
+					return SpanUtils.createAndExecuteSpan(self.mode, () => originalExecute(...args), {
+						name: spanName,
+						kind: import_src$22.SpanKind.CLIENT,
+						submodule: "preparedExecute",
+						packageType: PackageType.MYSQL,
+						packageName: "mysql2",
+						instrumentationName: self.INSTRUMENTATION_NAME,
+						inputValue,
+						inputSchemaMerges: { values: { matchImportance: 0 } },
+						isPreAppStart: false
+					}, (spanInfo) => {
+						return self.handleReplayQuery(queryConfig, inputValue, spanInfo, "preparedExecute", stackTrace);
+					});
+				}
+			});
+			else if (self.mode === TuskDriftMode.RECORD) return handleRecordMode({
+				originalFunctionCall: () => originalExecute(...args),
+				recordModeHandler: ({ isPreAppStart }) => {
+					const spanName = `mysql2.${clientType}.preparedExecute`;
+					return SpanUtils.createAndExecuteSpan(self.mode, () => originalExecute(...args), {
+						name: spanName,
+						kind: import_src$22.SpanKind.CLIENT,
+						submodule: "preparedExecute",
+						packageType: PackageType.MYSQL,
+						packageName: "mysql2",
+						instrumentationName: self.INSTRUMENTATION_NAME,
+						inputValue,
+						inputSchemaMerges: { values: { matchImportance: 0 } },
+						isPreAppStart
+					}, (spanInfo) => {
+						return self._handleRecordQueryInSpan(spanInfo, originalExecute, queryConfig, args, void 0);
+					});
+				},
+				spanKind: import_src$22.SpanKind.CLIENT
+			});
+			return originalExecute(...args);
+		};
+	}
+	_handleReplayPrepare(sql, originalCallback, clientType) {
+		const self = this;
+		return SpanUtils.createAndExecuteSpan(this.mode, () => {}, {
+			name: `mysql2.${clientType}.prepare`,
+			kind: import_src$22.SpanKind.CLIENT,
+			submodule: "prepare",
+			packageType: PackageType.MYSQL,
+			packageName: "mysql2",
+			instrumentationName: this.INSTRUMENTATION_NAME,
+			inputValue: {
+				sql,
+				clientType
+			},
+			isPreAppStart: false
+		}, (spanInfo) => {
+			const mockStatement = {
+				query: sql,
+				id: 1,
+				columns: [],
+				parameters: [],
+				execute: self._getPreparedStatementExecuteWrapper(() => {}, sql, clientType),
+				close: () => {}
+			};
+			try {
+				SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: { prepared: true } });
+				SpanUtils.endSpan(spanInfo.span, { code: import_src$22.SpanStatusCode.OK });
+			} catch (error) {
+				logger.error(`[Mysql2Instrumentation] error ending prepare span:`, error);
+			}
+			if (originalCallback) process.nextTick(() => originalCallback(null, mockStatement));
+		});
+	}
+	_handleNoOpReplayPrepare(sql, originalCallback) {
+		const self = this;
+		const mockStatement = {
+			query: sql,
+			id: 1,
+			columns: [],
+			parameters: [],
+			execute: (...args) => {
+				const values = Array.isArray(args[0]) ? args[0] : [];
+				const callback = typeof args[args.length - 1] === "function" ? args[args.length - 1] : void 0;
+				return self.queryMock.handleNoOpReplayQuery({
+					sql,
+					values,
+					callback
+				});
+			},
+			close: () => {}
+		};
+		if (originalCallback) process.nextTick(() => originalCallback(null, mockStatement));
+	}
 	_handleSimpleCallbackMethod(spanInfo, originalMethod, callback, context$6) {
 		if (callback) {
 			const wrappedCallback = (error) => {
@@ -16343,15 +16750,29 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 			else if (args.length > 1 && typeof args[1] !== "function") config.values = [args[1]];
 			return config;
 		}
-		if (typeof firstArg === "object" && firstArg.sql) return {
-			sql: firstArg.sql,
-			values: firstArg.values,
-			callback: firstArg.callback || (typeof args[1] === "function" ? args[1] : void 0)
-		};
+		if (typeof firstArg === "object" && firstArg.sql) {
+			let values = firstArg.values;
+			let callback = firstArg.callback;
+			if (typeof args[1] === "function") callback = args[1];
+			else {
+				if (args[1] !== void 0) values = Array.isArray(args[1]) ? args[1] : [args[1]];
+				if (typeof args[2] === "function") callback = args[2];
+			}
+			return {
+				sql: firstArg.sql,
+				values,
+				callback
+			};
+		}
 		return null;
 	}
 	_handleRecordQueryInSpan(spanInfo, originalQuery, queryConfig, args, context$6) {
-		if (!!queryConfig.callback) {
+		const hasCallback = !!queryConfig.callback;
+		const invokeOriginal = (invokeArgs) => {
+			return context$6 ? originalQuery.apply(context$6, invokeArgs) : originalQuery(...invokeArgs);
+		};
+		if (hasCallback) {
+			const parentContext = import_src$22.context.active();
 			const originalCallback = queryConfig.callback;
 			const wrappedCallback = (error, results, fields) => {
 				if (error) {
@@ -16373,7 +16794,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 						logger.error(`[Mysql2Instrumentation] error processing response:`, error$1);
 					}
 				}
-				return originalCallback(error, results, fields);
+				return import_src$22.context.with(parentContext, () => originalCallback(error, results, fields));
 			};
 			try {
 				const firstArg = args[0];
@@ -16388,9 +16809,9 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 			} catch (error) {
 				logger.error(`[Mysql2Instrumentation] error replacing callback:`, error, args);
 			}
-			return originalQuery.apply(context$6, args);
+			return invokeOriginal(args);
 		} else {
-			const result = originalQuery.apply(context$6, args);
+			const result = invokeOriginal(args);
 			if (result && typeof result.on === "function") {
 				const streamResults = [];
 				let streamFields = null;
@@ -16596,6 +17017,34 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 								if (event === "error" && !this._isConnectOrErrorEmitted) return this;
 								return super.on(event, listener);
 							}
+							once(event, listener) {
+								if (!this._connectEventMock) return super.once(event, listener);
+								if (event === "connect" && !this._isConnectOrErrorEmitted) {
+									this._connectEventMock.getReplayedConnectionEvent(inputValue).then(({ output }) => {
+										if (output !== void 0) process.nextTick(() => {
+											listener.call(this, output);
+											this._isConnectOrErrorEmitted = true;
+										});
+									}).catch((err) => {
+										logger.error(`[Mysql2Instrumentation] Error replaying connection event:`, err);
+									});
+									return this;
+								}
+								if (event === "error" && !this._isConnectOrErrorEmitted) return this;
+								return super.once(event, listener);
+							}
+							connect(callback) {
+								if (!callback) return;
+								this._connectEventMock.getReplayedConnectionEvent(inputValue).then(({ output }) => {
+									if (output !== void 0) process.nextTick(() => {
+										this._isConnectOrErrorEmitted = true;
+										callback(null);
+									});
+								}).catch((err) => {
+									logger.error(`[Mysql2Instrumentation] Error replaying connection event in connect():`, err);
+									process.nextTick(() => callback(err));
+								});
+							}
 						}
 						const mockConnection = new MockConnection(...args);
 						mockConnection.addListener("error", (_err) => {});
@@ -16623,9 +17072,13 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 			fields: fields || []
 		};
 		else if (result.affectedRows !== void 0) outputValue = {
+			fieldCount: result.fieldCount,
 			affectedRows: result.affectedRows,
 			insertId: result.insertId,
-			warningCount: result.warningCount
+			info: result.info ?? "",
+			serverStatus: result.serverStatus ?? 0,
+			warningStatus: result.warningStatus ?? 0,
+			changedRows: result.changedRows ?? 0
 		};
 		else outputValue = result;
 		SpanUtils.addSpanAttributes(spanInfo.span, { outputValue });
@@ -18853,16 +19306,28 @@ var GrpcInstrumentation = class GrpcInstrumentation extends TdInstrumentationBas
 	/**
 	* Helper method to parse optional unary response arguments
 	*
-	* Handles the following cases:
-	* 1. (metadata: Metadata, callback: Function) - no options
-	* 2. (metadata: Metadata, options: Object, callback: Function) - with options
+	* Handles the following cases (matching grpc-node's checkOptionalUnaryResponseArguments):
+	* 1. (callback: Function) - callback only, no metadata or options
+	* 2. (metadata: Metadata, callback: Function) - metadata + callback, no options
+	* 3. (options: Object, callback: Function) - options + callback, no metadata
+	* 4. (metadata: Metadata, options: Object, callback: Function) - full signature
 	*/
 	parseUnaryCallArguments(MetadataConstructor, arg1, arg2, arg3) {
+		if (typeof arg1 === "function") return {
+			metadata: new MetadataConstructor(),
+			options: {},
+			callback: arg1
+		};
 		if (arg1 instanceof MetadataConstructor && typeof arg2 === "function") return {
 			metadata: arg1,
 			options: {},
 			callback: arg2
 		};
+		if (!(arg1 instanceof MetadataConstructor) && typeof arg1 === "object" && arg1 !== null && typeof arg2 === "function") return {
+			metadata: new MetadataConstructor(),
+			options: arg1,
+			callback: arg2
+		};
 		if (arg1 instanceof MetadataConstructor && arg2 instanceof Object && typeof arg3 === "function") return {
 			metadata: arg1,
 			options: arg2,
@@ -25207,7 +25672,6 @@ var SpanTransformer = class SpanTransformer {
 		} catch (error) {
 			logger.warn("[SpanTransformer] Failed to parse transform metadata", error);
 		}
-		const originalDate = OriginalGlobalUtils.getOriginalDate();
 		return {
 			traceId: span.spanContext().traceId,
 			spanId: span.spanContext().spanId,
@@ -25233,8 +25697,8 @@ var SpanTransformer = class SpanTransformer {
 			},
 			isPreAppStart: attributes[TdSpanAttributes.IS_PRE_APP_START] === true,
 			timestamp: {
-				seconds: Math.floor(originalDate.getTime() / 1e3),
-				nanos: originalDate.getTime() % 1e3 * 1e6
+				seconds: span.startTime[0],
+				nanos: span.startTime[1]
 			},
 			duration: {
 				seconds: span.duration[0],
@@ -25804,15 +26268,13 @@ var TdSpanExporter = class {
 		logger.debug("All adapters cleared");
 	}
 	/**
-	* Set the mode for determining which adapters to run
-	*/
-	setMode(mode) {
-		this.mode = mode;
-	}
-	/**
 	* Export spans using all configured adapters
 	*/
 	export(spans, resultCallback) {
+		if (this.mode !== TuskDriftMode.RECORD) {
+			resultCallback({ code: import_src$5.ExportResultCode.SUCCESS });
+			return;
+		}
 		logger.debug(`TdSpanExporter.export() called with ${spans.length} span(s)`);
 		const traceBlockingManager = TraceBlockingManager.getInstance();
 		const filteredSpansBasedOnLibraryName = spans.filter((span) => {
@@ -25851,21 +26313,16 @@ var TdSpanExporter = class {
 			resultCallback({ code: import_src$5.ExportResultCode.SUCCESS });
 			return;
 		}
-		const activeAdapters = this.getActiveAdapters();
-		if (activeAdapters.length === 0) {
+		if (this.adapters.length === 0) {
 			logger.debug(`No active adapters for mode: ${this.mode}`);
 			resultCallback({ code: import_src$5.ExportResultCode.SUCCESS });
 			return;
 		}
-		Promise.all(activeAdapters.map((adapter) => adapter.exportSpans(cleanSpans))).then(() => resultCallback({ code: import_src$5.ExportResultCode.SUCCESS })).catch((error) => resultCallback({
+		Promise.all(this.adapters.map((adapter) => adapter.exportSpans(cleanSpans))).then(() => resultCallback({ code: import_src$5.ExportResultCode.SUCCESS })).catch((error) => resultCallback({
 			code: import_src$5.ExportResultCode.FAILED,
 			error
 		}));
 	}
-	getActiveAdapters() {
-		if (this.mode !== TuskDriftMode.RECORD) return this.adapters.filter((adapter) => adapter.name === "in-memory" || adapter.name === "callback");
-		return this.adapters;
-	}
 	/**
 	* Shutdown all adapters
 	*/
@@ -32996,7 +33453,7 @@ var require_src = /* @__PURE__ */ __commonJS({ "node_modules/@opentelemetry/sdk-
 //#endregion
 //#region package.json
 var import_src$1 = /* @__PURE__ */ __toESM(require_src(), 1);
-var version = "0.1.21";
+var version = "0.1.23";
 
 //#endregion
 //#region src/version.ts