@use-tusk/drift-node-sdk 0.1.20 → 0.1.22

package/dist/index.cjs

@@ -162,7 +162,8 @@ function warn(suppress, message) {
 *
 * This function automatically configures Next.js to work with Tusk Drift by:
 * - Enabling the Next.js instrumentation hook (for Next.js < 15.0.0-rc.1)
-* - Configuring webpack externals to prevent bundling of core instrumentation packages
+* - Configuring server external packages to prevent bundling of core instrumentation packages
+* - Supporting both webpack and Turbopack bundlers
 * - Preserving your existing Next.js configuration and webpack customizations
 *
 * @param nextConfig - Your existing Next.js configuration object (optional)
@@ -197,9 +198,12 @@ function warn(suppress, message) {
 * ```
 *
 * @remarks
-* The following webpack externals are added for server-side builds:
+* The following packages are added as server externals for both webpack and Turbopack:
 * - `require-in-the-middle` - Required for CommonJS module interception
 * - `jsonpath` - Required for schema manipulation
+* - Additional packages when TUSK_DRIFT_MODE is RECORD or REPLAY (e.g., database clients, etc.)
+*
+* Works with both webpack (default) and Turbopack (`next dev --turbo`).
 */
 function withTuskDrift(nextConfig = {}, options = {}) {
 	const config = nextConfig;
@@ -209,33 +213,34 @@ function withTuskDrift(nextConfig = {}, options = {}) {
 	if (nextjsVersion) debugLog(debug, `Detected Next.js version: ${nextjsVersion}`);
 	else warn(suppressAllWarnings || false, "Could not detect Next.js version. Some features may not work correctly. If you encounter issues, please ensure Next.js is properly installed.");
 	const needsInstrumentationHook = !options.disableInstrumentationHook && shouldSetInstrumentationHook(nextjsVersion);
+	const mode = process.env.TUSK_DRIFT_MODE?.toUpperCase();
+	const coreExternals = [
+		"require-in-the-middle",
+		"jsonpath",
+		...mode === "RECORD" || mode === "REPLAY" ? [
+			"@upstash/redis",
+			"ioredis",
+			"pg",
+			"postgres",
+			"mysql2",
+			"@prisma/client",
+			"@google-cloud/firestore",
+			"@grpc/grpc-js",
+			"graphql",
+			"jsonwebtoken",
+			"jwks-rsa"
+		] : []
+	];
 	const wrappedConfig = {
 		...config,
 		...needsInstrumentationHook ? { experimental: {
 			...config.experimental,
 			instrumentationHook: true
 		} } : { experimental: config.experimental },
+		serverExternalPackages: [...config.serverExternalPackages || [], ...coreExternals],
 		webpack: (webpackConfig, webpackOptions) => {
 			if (webpackOptions.isServer) {
 				const originalExternals = webpackConfig.externals;
-				const mode = process.env.TUSK_DRIFT_MODE?.toUpperCase();
-				const coreExternals = [
-					"require-in-the-middle",
-					"jsonpath",
-					...mode === "RECORD" || mode === "REPLAY" ? [
-						"@upstash/redis",
-						"ioredis",
-						"pg",
-						"postgres",
-						"mysql2",
-						"@prisma/client",
-						"@google-cloud/firestore",
-						"@grpc/grpc-js",
-						"graphql",
-						"jsonwebtoken",
-						"jwks-rsa"
-					] : []
-				];
 				const externalsMapping = {};
 				for (const pkg of coreExternals) {
 					externalsMapping[pkg] = `commonjs ${pkg}`;
@@ -4989,31 +4994,31 @@ var require_SamplingResult = /* @__PURE__ */ __commonJS({ "node_modules/@opentel
 var require_span_kind = /* @__PURE__ */ __commonJS({ "node_modules/@opentelemetry/api/build/src/trace/span_kind.js": ((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	exports.SpanKind = void 0;
-	(function(SpanKind$26) {
+	(function(SpanKind$27) {
 		/** Default value. Indicates that the span is used internally. */
-		SpanKind$26[SpanKind$26["INTERNAL"] = 0] = "INTERNAL";
+		SpanKind$27[SpanKind$27["INTERNAL"] = 0] = "INTERNAL";
 		/**
 		* Indicates that the span covers server-side handling of an RPC or other
 		* remote request.
 		*/
-		SpanKind$26[SpanKind$26["SERVER"] = 1] = "SERVER";
+		SpanKind$27[SpanKind$27["SERVER"] = 1] = "SERVER";
 		/**
 		* Indicates that the span covers the client-side wrapper around an RPC or
 		* other remote request.
 		*/
-		SpanKind$26[SpanKind$26["CLIENT"] = 2] = "CLIENT";
+		SpanKind$27[SpanKind$27["CLIENT"] = 2] = "CLIENT";
 		/**
 		* Indicates that the span describes producer sending a message to a
 		* broker. Unlike client and server, there is no direct critical path latency
 		* relationship between producer and consumer spans.
 		*/
-		SpanKind$26[SpanKind$26["PRODUCER"] = 3] = "PRODUCER";
+		SpanKind$27[SpanKind$27["PRODUCER"] = 3] = "PRODUCER";
 		/**
 		* Indicates that the span describes consumer receiving a message from a
 		* broker. Unlike client and server, there is no direct critical path latency
 		* relationship between producer and consumer spans.
 		*/
-		SpanKind$26[SpanKind$26["CONSUMER"] = 4] = "CONSUMER";
+		SpanKind$27[SpanKind$27["CONSUMER"] = 4] = "CONSUMER";
 	})(exports.SpanKind || (exports.SpanKind = {}));
 }) });
 
@@ -5022,20 +5027,20 @@ var require_span_kind = /* @__PURE__ */ __commonJS({ "node_modules/@opentelemetr
 var require_status = /* @__PURE__ */ __commonJS({ "node_modules/@opentelemetry/api/build/src/trace/status.js": ((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	exports.SpanStatusCode = void 0;
-	(function(SpanStatusCode$15) {
+	(function(SpanStatusCode$16) {
 		/**
 		* The default status.
 		*/
-		SpanStatusCode$15[SpanStatusCode$15["UNSET"] = 0] = "UNSET";
+		SpanStatusCode$16[SpanStatusCode$16["UNSET"] = 0] = "UNSET";
 		/**
 		* The operation has been validated by an Application developer or
 		* Operator to have completed successfully.
 		*/
-		SpanStatusCode$15[SpanStatusCode$15["OK"] = 1] = "OK";
+		SpanStatusCode$16[SpanStatusCode$16["OK"] = 1] = "OK";
 		/**
 		* The operation contains an error.
 		*/
-		SpanStatusCode$15[SpanStatusCode$15["ERROR"] = 2] = "ERROR";
+		SpanStatusCode$16[SpanStatusCode$16["ERROR"] = 2] = "ERROR";
 	})(exports.SpanStatusCode || (exports.SpanStatusCode = {}));
 }) });
 
@@ -5684,7 +5689,7 @@ var require_src$7 = /* @__PURE__ */ __commonJS({ "node_modules/@opentelemetry/ap
 
 //#endregion
 //#region node_modules/@use-tusk/drift-schemas/dist/duration-B3fwb4jB.js
-var import_src$35 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$37 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 var import_commonjs$9 = /* @__PURE__ */ __toESM(require_commonjs$2(), 1);
 var Duration$Type = class extends import_commonjs$9.MessageType {
 	constructor() {
@@ -6295,7 +6300,7 @@ let PackageType = /* @__PURE__ */ function(PackageType$1) {
 *
 * @generated from protobuf enum tusk.drift.core.v1.SpanKind
 */
-let SpanKind$1 = /* @__PURE__ */ function(SpanKind$1$1) {
+let SpanKind$2 = /* @__PURE__ */ function(SpanKind$1$1) {
 	/**
 	* @generated from protobuf enum value: SPAN_KIND_UNSPECIFIED = 0;
 	*/
@@ -6465,7 +6470,7 @@ var Span$Type = class extends import_commonjs$6.MessageType {
 				kind: "enum",
 				T: () => [
 					"tusk.drift.core.v1.SpanKind",
-					SpanKind$1,
+					SpanKind$2,
 					"SPAN_KIND_"
 				]
 			},
@@ -7008,12 +7013,12 @@ const Trace = new Trace$Type();
 const toStruct = (obj) => obj ? objectToProtobufStruct(obj) : void 0;
 const mapOtToPb = (k) => {
 	switch (k) {
-		case import_src$35.SpanKind.INTERNAL: return SpanKind$1.INTERNAL;
-		case import_src$35.SpanKind.SERVER: return SpanKind$1.SERVER;
-		case import_src$35.SpanKind.CLIENT: return SpanKind$1.CLIENT;
-		case import_src$35.SpanKind.PRODUCER: return SpanKind$1.PRODUCER;
-		case import_src$35.SpanKind.CONSUMER: return SpanKind$1.CONSUMER;
-		default: return SpanKind$1.UNSPECIFIED;
+		case import_src$37.SpanKind.INTERNAL: return SpanKind$2.INTERNAL;
+		case import_src$37.SpanKind.SERVER: return SpanKind$2.SERVER;
+		case import_src$37.SpanKind.CLIENT: return SpanKind$2.CLIENT;
+		case import_src$37.SpanKind.PRODUCER: return SpanKind$2.PRODUCER;
+		case import_src$37.SpanKind.CONSUMER: return SpanKind$2.CONSUMER;
+		default: return SpanKind$2.UNSPECIFIED;
 	}
 };
 /**
@@ -7416,13 +7421,13 @@ var TdInstrumentationNodeModule = class {
 
 //#endregion
 //#region src/core/types.ts
-var import_src$34 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$36 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 const TD_INSTRUMENTATION_LIBRARY_NAME = "tusk-drift-sdk";
-const REPLAY_TRACE_ID_CONTEXT_KEY = (0, import_src$34.createContextKey)("td.replayTraceId");
-const SPAN_KIND_CONTEXT_KEY = (0, import_src$34.createContextKey)("td.spanKind");
-const IS_PRE_APP_START_CONTEXT_KEY = (0, import_src$34.createContextKey)("td.isPreAppStart");
-const STOP_RECORDING_CHILD_SPANS_CONTEXT_KEY = (0, import_src$34.createContextKey)("td.stopRecordingChildSpans");
-const CALLING_LIBRARY_CONTEXT_KEY = (0, import_src$34.createContextKey)("td.callingLibrary");
+const REPLAY_TRACE_ID_CONTEXT_KEY = (0, import_src$36.createContextKey)("td.replayTraceId");
+const SPAN_KIND_CONTEXT_KEY = (0, import_src$36.createContextKey)("td.spanKind");
+const IS_PRE_APP_START_CONTEXT_KEY = (0, import_src$36.createContextKey)("td.isPreAppStart");
+const STOP_RECORDING_CHILD_SPANS_CONTEXT_KEY = (0, import_src$36.createContextKey)("td.stopRecordingChildSpans");
+const CALLING_LIBRARY_CONTEXT_KEY = (0, import_src$36.createContextKey)("td.callingLibrary");
 let TdSpanAttributes = /* @__PURE__ */ function(TdSpanAttributes$1) {
 	/**
 	* Presentational information:
@@ -7534,7 +7539,7 @@ TraceBlockingManager.instance = null;
 
 //#endregion
 //#region src/core/tracing/SpanUtils.ts
-var import_src$33 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$35 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 var SpanUtils = class SpanUtils {
 	/**
 	* Creates a new span and returns span info including trace ID and span ID
@@ -7542,8 +7547,8 @@ var SpanUtils = class SpanUtils {
 	static createSpan(options) {
 		try {
 			const tracer = TuskDriftCore.getInstance().getTracer();
-			const parentContext = options.parentContext || import_src$33.context.active();
-			const activeSpan = import_src$33.trace.getSpan(parentContext);
+			const parentContext = options.parentContext || import_src$35.context.active();
+			const activeSpan = import_src$35.trace.getSpan(parentContext);
 			if (activeSpan) {
 				const parentTraceId = activeSpan.spanContext().traceId;
 				if (TraceBlockingManager.getInstance().isTraceBlocked(parentTraceId)) {
@@ -7552,11 +7557,11 @@ var SpanUtils = class SpanUtils {
 				}
 			}
 			const span = tracer.startSpan(options.name, {
-				kind: options.kind || import_src$33.SpanKind.CLIENT,
+				kind: options.kind || import_src$35.SpanKind.CLIENT,
 				attributes: options.attributes || {}
 			}, parentContext);
 			const spanContext = span.spanContext();
-			const newContext = import_src$33.trace.setSpan(parentContext, span).setValue(SPAN_KIND_CONTEXT_KEY, options.kind).setValue(IS_PRE_APP_START_CONTEXT_KEY, options.isPreAppStart);
+			const newContext = import_src$35.trace.setSpan(parentContext, span).setValue(SPAN_KIND_CONTEXT_KEY, options.kind).setValue(IS_PRE_APP_START_CONTEXT_KEY, options.isPreAppStart);
 			return {
 				traceId: spanContext.traceId,
 				spanId: spanContext.spanId,
@@ -7573,7 +7578,7 @@ var SpanUtils = class SpanUtils {
 	* Executes a function within a span context
 	*/
 	static withSpan(spanInfo, fn) {
-		return import_src$33.context.with(spanInfo.context, fn);
+		return import_src$35.context.with(spanInfo.context, fn);
 	}
 	/**
 	* Execute a function within a properly configured span
@@ -7590,9 +7595,9 @@ var SpanUtils = class SpanUtils {
 	* @returns The result of the function execution
 	*/
 	static createAndExecuteSpan(mode, originalFunctionCall, options, fn) {
-		const spanContext = import_src$33.trace.getActiveSpan()?.spanContext();
+		const spanContext = import_src$35.trace.getActiveSpan()?.spanContext();
 		if (spanContext) {
-			if (import_src$33.context.active().getValue(STOP_RECORDING_CHILD_SPANS_CONTEXT_KEY)) {
+			if (import_src$35.context.active().getValue(STOP_RECORDING_CHILD_SPANS_CONTEXT_KEY)) {
 				logger.debug(`[SpanUtils] Stopping recording of child spans for span ${spanContext.spanId}, packageName: ${options.packageName}, instrumentationName: ${options.instrumentationName}`);
 				return originalFunctionCall();
 			}
@@ -7631,15 +7636,15 @@ var SpanUtils = class SpanUtils {
 	*/
 	static getCurrentSpanInfo() {
 		try {
-			const activeSpan = import_src$33.trace.getActiveSpan();
+			const activeSpan = import_src$35.trace.getActiveSpan();
 			if (!activeSpan) return null;
 			const spanContext = activeSpan.spanContext();
 			return {
 				traceId: spanContext.traceId,
 				spanId: spanContext.spanId,
 				span: activeSpan,
-				context: import_src$33.context.active(),
-				isPreAppStart: import_src$33.context.active().getValue(IS_PRE_APP_START_CONTEXT_KEY)
+				context: import_src$35.context.active(),
+				isPreAppStart: import_src$35.context.active().getValue(IS_PRE_APP_START_CONTEXT_KEY)
 			};
 		} catch (error) {
 			logger.error("SpanUtils error getting current span info:", error);
@@ -7703,7 +7708,7 @@ var SpanUtils = class SpanUtils {
 	}
 	static setCurrentReplayTraceId(replayTraceId) {
 		try {
-			return import_src$33.context.active().setValue(REPLAY_TRACE_ID_CONTEXT_KEY, replayTraceId);
+			return import_src$35.context.active().setValue(REPLAY_TRACE_ID_CONTEXT_KEY, replayTraceId);
 		} catch (error) {
 			logger.error("SpanUtils error setting current replay trace id:", error);
 			return null;
@@ -7714,7 +7719,7 @@ var SpanUtils = class SpanUtils {
 	*/
 	static getCurrentReplayTraceId() {
 		try {
-			return import_src$33.context.active().getValue(REPLAY_TRACE_ID_CONTEXT_KEY);
+			return import_src$35.context.active().getValue(REPLAY_TRACE_ID_CONTEXT_KEY);
 		} catch (error) {
 			logger.error("SpanUtils error getting current replay trace id:", error);
 			return null;
@@ -8363,7 +8368,7 @@ function findMockResponseSync({ mockRequestData, tuskDrift, inputValueSchemaMerg
 
 //#endregion
 //#region src/instrumentation/libraries/http/mocks/TdMockClientRequest.ts
-var import_src$32 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$34 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 let ClientRequest;
 /**
 * Mock ClientRequest implementation for Tusk Drift HTTP replay
@@ -8534,7 +8539,7 @@ var TdMockClientRequest = class TdMockClientRequest extends events.EventEmitter
 					instrumentationName: this.INSTRUMENTATION_NAME,
 					submoduleName: rawInputValue.method,
 					inputValue,
-					kind: import_src$32.SpanKind.CLIENT,
+					kind: import_src$34.SpanKind.CLIENT,
 					stackTrace: this.stackTrace
 				},
 				tuskDrift: this.tuskDrift,
@@ -8704,7 +8709,7 @@ var HttpReplayHooks = class {
 
 //#endregion
 //#region src/instrumentation/core/utils/modeUtils.ts
-var import_src$31 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$33 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 /**
 * Utility function that abstracts the common record mode pattern of checking for current span context
 * and deciding whether to execute record mode logic or just call the original function.
@@ -8725,7 +8730,7 @@ function handleRecordMode({ originalFunctionCall, recordModeHandler, spanKind })
 		return originalFunctionCall();
 	}
 	if (!isAppReady) return recordModeHandler({ isPreAppStart: true });
-	if (!currentSpanInfo && spanKind !== import_src$31.SpanKind.SERVER || currentSpanInfo?.isPreAppStart) return originalFunctionCall();
+	if (!currentSpanInfo && spanKind !== import_src$33.SpanKind.SERVER || currentSpanInfo?.isPreAppStart) return originalFunctionCall();
 	else return recordModeHandler({ isPreAppStart: false });
 }
 /**
@@ -10205,7 +10210,7 @@ function captureStackTrace(excludeClassNames = []) {
 
 //#endregion
 //#region src/instrumentation/libraries/http/HttpTransformEngine.ts
-var import_src$30 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$32 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 /**
 * Creates an empty HttpClientInputValue object for dropped spans
 */
@@ -10258,7 +10263,7 @@ var HttpTransformEngine = class {
 		const testSpan = {
 			traceId: "",
 			spanId: "",
-			kind: import_src$30.SpanKind.SERVER,
+			kind: import_src$32.SpanKind.SERVER,
 			protocol: "http",
 			inputValue: {
 				method,
@@ -10281,7 +10286,7 @@ var HttpTransformEngine = class {
 		const testSpan = {
 			traceId: "",
 			spanId: "",
-			kind: import_src$30.SpanKind.CLIENT,
+			kind: import_src$32.SpanKind.CLIENT,
 			protocol: inputValue.protocol || "http",
 			inputValue: clonedInputValue
 		};
@@ -10308,8 +10313,8 @@ var HttpTransformEngine = class {
 		const matcherFunction = this.compileMatcher(matcher);
 		if (action.type === "drop") return (span) => {
 			if (!matcherFunction(span)) return;
-			if (span.inputValue) span.inputValue = span.kind === import_src$30.SpanKind.CLIENT ? createEmptyClientInputValue(span.protocol) : createEmptyServerInputValue();
-			if (span.outputValue) span.outputValue = span.kind === import_src$30.SpanKind.CLIENT ? createEmptyClientOutputValue() : createEmptyServerOutputValue();
+			if (span.inputValue) span.inputValue = span.kind === import_src$32.SpanKind.CLIENT ? createEmptyClientInputValue(span.protocol) : createEmptyServerInputValue();
+			if (span.outputValue) span.outputValue = span.kind === import_src$32.SpanKind.CLIENT ? createEmptyClientOutputValue() : createEmptyServerOutputValue();
 			return {
 				type: "drop",
 				field: "entire_span",
@@ -10339,8 +10344,8 @@ var HttpTransformEngine = class {
 	}
 	compileMatcher(matcher) {
 		const checks = [];
-		if (matcher.direction === "outbound") checks.push((span) => span.kind === import_src$30.SpanKind.CLIENT);
-		else if (matcher.direction === "inbound") checks.push((span) => span.kind === import_src$30.SpanKind.SERVER);
+		if (matcher.direction === "outbound") checks.push((span) => span.kind === import_src$32.SpanKind.CLIENT);
+		else if (matcher.direction === "inbound") checks.push((span) => span.kind === import_src$32.SpanKind.SERVER);
 		if (matcher.method) if (matcher.method.length === 0) {} else {
 			const methods = matcher.method.map((method) => method.toUpperCase());
 			checks.push((span) => {
@@ -10568,7 +10573,7 @@ var HttpTransformEngine = class {
 
 //#endregion
 //#region src/instrumentation/libraries/http/Instrumentation.ts
-var import_src$29 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$31 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 var HttpInstrumentation = class extends TdInstrumentationBase {
 	constructor(config) {
 		super("http", config);
@@ -10655,10 +10660,10 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 				logger.debug(`[HttpInstrumentation] Setting replay trace id`, replayTraceId);
 				const ctxWithReplayTraceId = SpanUtils.setCurrentReplayTraceId(replayTraceId);
 				if (!ctxWithReplayTraceId) throw new Error("Error setting current replay trace id");
-				return import_src$29.context.with(ctxWithReplayTraceId, () => {
+				return import_src$31.context.with(ctxWithReplayTraceId, () => {
 					return SpanUtils.createAndExecuteSpan(this.mode, () => originalHandler.call(this), {
 						name: `${target}`,
-						kind: import_src$29.SpanKind.SERVER,
+						kind: import_src$31.SpanKind.SERVER,
 						packageName: spanProtocol,
 						submodule: method,
 						packageType: PackageType.HTTP,
@@ -10703,7 +10708,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 					logger.debug(`[HttpInstrumentation] Http inbound request arriving, inputValue: ${JSON.stringify(inputValue)}`);
 					return SpanUtils.createAndExecuteSpan(this.mode, () => originalHandler.call(this), {
 						name: `${target}`,
-						kind: import_src$29.SpanKind.SERVER,
+						kind: import_src$31.SpanKind.SERVER,
 						packageName: spanProtocol,
 						packageType: PackageType.HTTP,
 						submodule: method,
@@ -10723,7 +10728,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 						});
 					});
 				},
-				spanKind: import_src$29.SpanKind.SERVER
+				spanKind: import_src$31.SpanKind.SERVER
 			});
 		} else return originalHandler.call(this);
 	}
@@ -10740,8 +10745,8 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 	_handleInboundRequestInSpan({ req, res, originalHandler, spanInfo, inputValue, schemaMerges, protocol }) {
 		const self = this;
 		const spanProtocol = this._normalizeProtocol(protocol, "http");
-		import_src$29.context.bind(spanInfo.context, req);
-		import_src$29.context.bind(spanInfo.context, res);
+		import_src$31.context.bind(spanInfo.context, req);
+		import_src$31.context.bind(spanInfo.context, res);
 		let completeInputValue = inputValue;
 		this._captureServerRequestBody(req, spanInfo, inputValue, schemaMerges, (updatedInputValue) => {
 			completeInputValue = updatedInputValue;
@@ -10779,7 +10784,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 					const spanData = {
 						traceId: spanInfo.traceId,
 						spanId: spanInfo.spanId,
-						kind: import_src$29.SpanKind.SERVER,
+						kind: import_src$31.SpanKind.SERVER,
 						protocol: spanProtocol,
 						inputValue: completeInputValue,
 						outputValue
@@ -10798,9 +10803,9 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 						...spanData.transformMetadata && { transformMetadata: spanData.transformMetadata }
 					});
 					const status = statusCode >= 300 ? {
-						code: import_src$29.SpanStatusCode.ERROR,
+						code: import_src$31.SpanStatusCode.ERROR,
 						message: `HTTP ${statusCode}`
-					} : { code: import_src$29.SpanStatusCode.OK };
+					} : { code: import_src$31.SpanStatusCode.OK };
 					SpanUtils.setStatus(spanInfo.span, status);
 					const decodedType = getDecodedType(outputValue.headers?.["content-type"] || "");
 					if (decodedType && !ACCEPTABLE_CONTENT_TYPES.has(decodedType)) {
@@ -10850,7 +10855,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 						outputSchemaHash: JsonSchemaHelper.generateDeterministicHash(outputSchema),
 						inputValueHash,
 						outputValueHash,
-						kind: import_src$29.SpanKind.SERVER,
+						kind: import_src$31.SpanKind.SERVER,
 						packageType: PackageType.HTTP,
 						status: {
 							code: statusCode >= 300 ? StatusCode.ERROR : StatusCode.OK,
@@ -10879,7 +10884,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 			try {
 				logger.debug(`[HttpInstrumentation] Server request error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$29.SpanStatusCode.ERROR,
+					code: import_src$31.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch (error$1) {
@@ -10890,7 +10895,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 			try {
 				logger.debug(`[HttpInstrumentation] Server response error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$29.SpanStatusCode.ERROR,
+					code: import_src$31.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch (error$1) {
@@ -11095,7 +11100,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 					inputValue: completeInputValue
 				});
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$29.SpanStatusCode.ERROR,
+					code: import_src$31.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch (error$1) {
@@ -11112,7 +11117,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 		const spanData = {
 			traceId: spanInfo.traceId,
 			spanId: spanInfo.spanId,
-			kind: import_src$29.SpanKind.CLIENT,
+			kind: import_src$31.SpanKind.CLIENT,
 			protocol: normalizedProtocol,
 			inputValue,
 			outputValue
@@ -11125,9 +11130,9 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 			transformMetadata: spanData.transformMetadata ? spanData.transformMetadata : void 0
 		});
 		const status = statusCode >= 300 ? {
-			code: import_src$29.SpanStatusCode.ERROR,
+			code: import_src$31.SpanStatusCode.ERROR,
 			message: `HTTP ${statusCode}`
-		} : { code: import_src$29.SpanStatusCode.OK };
+		} : { code: import_src$31.SpanStatusCode.OK };
 		SpanUtils.endSpan(spanInfo.span, status);
 	}
 	_captureHeadersFromRawHeaders(rawHeaders) {
@@ -11145,13 +11150,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";
@@ -11181,7 +11196,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 							};
 							return SpanUtils.createAndExecuteSpan(self.mode, () => originalRequest.apply(this, args), {
 								name: requestOptions.path || `${requestProtocol.toUpperCase()} ${method}`,
-								kind: import_src$29.SpanKind.CLIENT,
+								kind: import_src$31.SpanKind.CLIENT,
 								packageName: requestProtocol,
 								packageType: PackageType.HTTP,
 								instrumentationName: self.INSTRUMENTATION_NAME,
@@ -11216,7 +11231,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 						};
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalRequest.apply(this, args), {
 							name: requestOptions.path || `${requestProtocol.toUpperCase()} ${method}`,
-							kind: import_src$29.SpanKind.CLIENT,
+							kind: import_src$31.SpanKind.CLIENT,
 							packageName: requestProtocol,
 							packageType: PackageType.HTTP,
 							instrumentationName: self.INSTRUMENTATION_NAME,
@@ -11228,7 +11243,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 							return self._handleOutboundRequestInSpan(originalRequest, args, spanInfo, inputValue, { headers: { matchImportance: 0 } });
 						});
 					},
-					spanKind: import_src$29.SpanKind.CLIENT
+					spanKind: import_src$31.SpanKind.CLIENT
 				});
 				else return originalRequest.apply(this, args);
 			};
@@ -11241,12 +11256,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";
@@ -11274,7 +11298,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 						};
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalGet.apply(this, args), {
 							name: requestOptions.path || `${requestProtocol.toUpperCase()} ${method}`,
-							kind: import_src$29.SpanKind.CLIENT,
+							kind: import_src$31.SpanKind.CLIENT,
 							packageName: requestProtocol,
 							packageType: PackageType.HTTP,
 							instrumentationName: self.INSTRUMENTATION_NAME,
@@ -11308,7 +11332,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 						};
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalGet.apply(this, args), {
 							name: requestOptions.path || `${requestProtocol.toUpperCase()} ${method}`,
-							kind: import_src$29.SpanKind.CLIENT,
+							kind: import_src$31.SpanKind.CLIENT,
 							packageName: requestProtocol,
 							packageType: PackageType.HTTP,
 							instrumentationName: self.INSTRUMENTATION_NAME,
@@ -11320,7 +11344,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 							return self._handleOutboundRequestInSpan(originalGet, args, spanInfo, inputValue, { headers: { matchImportance: 0 } });
 						});
 					},
-					spanKind: import_src$29.SpanKind.CLIENT
+					spanKind: import_src$31.SpanKind.CLIENT
 				});
 				else return originalGet.apply(this, args);
 			};
@@ -11352,6 +11376,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(/:$/, "");
@@ -11365,7 +11408,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 
 //#endregion
 //#region src/instrumentation/libraries/date/Instrumentation.ts
-var import_src$28 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$30 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 /**
 * Date instrumentation that provides consistent dates in replay mode.
 * In replay mode, new Date() calls return the latest mock response timestamp.
@@ -11404,7 +11447,7 @@ var DateInstrumentation = class DateInstrumentation extends TdInstrumentationBas
 		if (this.mode !== TuskDriftMode.REPLAY) return this._callOriginalDate(args, isConstructorCall);
 		const currentSpanInfo = SpanUtils.getCurrentSpanInfo();
 		if (!currentSpanInfo) return this._callOriginalDate(args, isConstructorCall);
-		if (currentSpanInfo.context.getValue(SPAN_KIND_CONTEXT_KEY) !== import_src$28.SpanKind.SERVER) return this._callOriginalDate(args, isConstructorCall);
+		if (currentSpanInfo.context.getValue(SPAN_KIND_CONTEXT_KEY) !== import_src$30.SpanKind.SERVER) return this._callOriginalDate(args, isConstructorCall);
 		this.isInPatchedCall = true;
 		try {
 			return this._handleReplayDate(args, isConstructorCall);
@@ -11650,7 +11693,7 @@ var TdPgClientMock = class extends events.EventEmitter {
 
 //#endregion
 //#region src/instrumentation/libraries/pg/Instrumentation.ts
-var import_src$27 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$29 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 var PgInstrumentation = class extends TdInstrumentationBase {
 	constructor(config = {}) {
 		super("pg", config);
@@ -11723,12 +11766,13 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 							const spanName = inputValue.clientType === "pool" ? "pg-pool.query" : "pg.query";
 							return SpanUtils.createAndExecuteSpan(self.mode, () => originalQuery.apply(this, args), {
 								name: spanName,
-								kind: import_src$27.SpanKind.CLIENT,
+								kind: import_src$29.SpanKind.CLIENT,
 								submodule: "query",
 								packageType: PackageType.PG,
 								packageName,
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { values: { matchImportance: 0 } },
 								isPreAppStart: false
 							}, (spanInfo) => {
 								return self.handleReplayQuery(queryConfig, inputValue, spanInfo, stackTrace);
@@ -11742,18 +11786,19 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 						const spanName = inputValue.clientType === "pool" ? "pg-pool.query" : "pg.query";
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalQuery.apply(this, args), {
 							name: spanName,
-							kind: import_src$27.SpanKind.CLIENT,
+							kind: import_src$29.SpanKind.CLIENT,
 							submodule: "query",
 							packageType: PackageType.PG,
 							instrumentationName: self.INSTRUMENTATION_NAME,
 							packageName,
 							inputValue,
+							inputSchemaMerges: { values: { matchImportance: 0 } },
 							isPreAppStart
 						}, (spanInfo) => {
 							return self._handleRecordQueryInSpan(spanInfo, originalQuery, queryConfig, args, this);
 						});
 					},
-					spanKind: import_src$27.SpanKind.CLIENT
+					spanKind: import_src$29.SpanKind.CLIENT
 				});
 				else return originalQuery.apply(this, args);
 			};
@@ -11775,7 +11820,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalConnect.apply(this, [callback]), {
 							name: `pg.connect`,
-							kind: import_src$27.SpanKind.CLIENT,
+							kind: import_src$29.SpanKind.CLIENT,
 							submodule: "connect",
 							packageName: "pg",
 							packageType: PackageType.PG,
@@ -11792,7 +11837,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalConnect.apply(this, [callback]), {
 							name: `pg.connect`,
-							kind: import_src$27.SpanKind.CLIENT,
+							kind: import_src$29.SpanKind.CLIENT,
 							submodule: "connect",
 							packageName: "pg",
 							packageType: PackageType.PG,
@@ -11803,7 +11848,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordConnectInSpan(spanInfo, originalConnect, callback, this);
 						});
 					},
-					spanKind: import_src$27.SpanKind.CLIENT
+					spanKind: import_src$29.SpanKind.CLIENT
 				});
 				else return originalConnect.apply(this, [callback]);
 			};
@@ -11843,7 +11888,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 					logger.debug(`[PgInstrumentation] PG query error (hasCallback): ${error.message} (${SpanUtils.getTraceInfo()})`);
 					try {
 						SpanUtils.endSpan(spanInfo.span, {
-							code: import_src$27.SpanStatusCode.ERROR,
+							code: import_src$29.SpanStatusCode.ERROR,
 							message: error.message
 						});
 					} catch (error$1) {
@@ -11853,7 +11898,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 					logger.debug(`[PgInstrumentation] PG query completed successfully (hasCallback) (${SpanUtils.getTraceInfo()})`);
 					try {
 						this._addOutputAttributesToSpan(spanInfo, result);
-						SpanUtils.endSpan(spanInfo.span, { code: import_src$27.SpanStatusCode.OK });
+						SpanUtils.endSpan(spanInfo.span, { code: import_src$29.SpanStatusCode.OK });
 					} catch (error$1) {
 						logger.error(`[PgInstrumentation] error processing response:`, error$1);
 					}
@@ -11880,7 +11925,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 			logger.debug(`[PgInstrumentation] PG query completed successfully (${SpanUtils.getTraceInfo()})`);
 			try {
 				this._addOutputAttributesToSpan(spanInfo, result);
-				SpanUtils.endSpan(spanInfo.span, { code: import_src$27.SpanStatusCode.OK });
+				SpanUtils.endSpan(spanInfo.span, { code: import_src$29.SpanStatusCode.OK });
 			} catch (error) {
 				logger.error(`[PgInstrumentation] error processing response:`, error);
 			}
@@ -11889,7 +11934,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 			logger.debug(`[PgInstrumentation] PG query error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 			try {
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$27.SpanStatusCode.ERROR,
+					code: import_src$29.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch (error$1) {
@@ -11921,10 +11966,11 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 				packageName,
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName: "query",
-				kind: import_src$27.SpanKind.CLIENT,
+				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";
@@ -12007,7 +12053,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 					logger.debug(`[PgInstrumentation] PG connect error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 					try {
 						SpanUtils.endSpan(spanInfo.span, {
-							code: import_src$27.SpanStatusCode.ERROR,
+							code: import_src$29.SpanStatusCode.ERROR,
 							message: error.message
 						});
 					} catch (error$1) {
@@ -12017,7 +12063,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 					logger.debug(`[PgInstrumentation] PG connect completed successfully (${SpanUtils.getTraceInfo()})`);
 					try {
 						SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: { connected: true } });
-						SpanUtils.endSpan(spanInfo.span, { code: import_src$27.SpanStatusCode.OK });
+						SpanUtils.endSpan(spanInfo.span, { code: import_src$29.SpanStatusCode.OK });
 					} catch (error$1) {
 						logger.error(`[PgInstrumentation] error processing connect response:`, error$1);
 					}
@@ -12029,7 +12075,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 			logger.debug(`[PgInstrumentation] PG connect completed successfully (${SpanUtils.getTraceInfo()})`);
 			try {
 				SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: { connected: true } });
-				SpanUtils.endSpan(spanInfo.span, { code: import_src$27.SpanStatusCode.OK });
+				SpanUtils.endSpan(spanInfo.span, { code: import_src$29.SpanStatusCode.OK });
 			} catch (error) {
 				logger.error(`[PgInstrumentation] error processing connect response:`, error);
 			}
@@ -12038,7 +12084,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 			logger.debug(`[PgInstrumentation] PG connect error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 			try {
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$27.SpanStatusCode.ERROR,
+					code: import_src$29.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch (error$1) {
@@ -12110,7 +12156,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalConnect.apply(this, [callback]), {
 							name: `pg-pool.connect`,
-							kind: import_src$27.SpanKind.CLIENT,
+							kind: import_src$29.SpanKind.CLIENT,
 							submodule: "connect",
 							packageName: "pg-pool",
 							packageType: PackageType.PG,
@@ -12127,7 +12173,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalConnect.apply(this, [callback]), {
 							name: `pg-pool.connect`,
-							kind: import_src$27.SpanKind.CLIENT,
+							kind: import_src$29.SpanKind.CLIENT,
 							submodule: "connect",
 							packageName: "pg-pool",
 							packageType: PackageType.PG,
@@ -12138,7 +12184,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordPoolConnectInSpan(spanInfo, originalConnect, callback, this);
 						});
 					},
-					spanKind: import_src$27.SpanKind.CLIENT
+					spanKind: import_src$29.SpanKind.CLIENT
 				});
 				else return originalConnect.apply(this, [callback]);
 			};
@@ -12151,7 +12197,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 					logger.debug(`[PgInstrumentation] PG Pool connect error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 					try {
 						SpanUtils.endSpan(spanInfo.span, {
-							code: import_src$27.SpanStatusCode.ERROR,
+							code: import_src$29.SpanStatusCode.ERROR,
 							message: error.message
 						});
 					} catch (error$1) {
@@ -12164,7 +12210,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 							connected: true,
 							hasClient: !!client
 						} });
-						SpanUtils.endSpan(spanInfo.span, { code: import_src$27.SpanStatusCode.OK });
+						SpanUtils.endSpan(spanInfo.span, { code: import_src$29.SpanStatusCode.OK });
 					} catch (error$1) {
 						logger.error(`[PgInstrumentation] error processing pool connect response:`, error$1);
 					}
@@ -12179,7 +12225,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 					connected: true,
 					hasClient: !!client
 				} });
-				SpanUtils.endSpan(spanInfo.span, { code: import_src$27.SpanStatusCode.OK });
+				SpanUtils.endSpan(spanInfo.span, { code: import_src$29.SpanStatusCode.OK });
 			} catch (error) {
 				logger.error(`[PgInstrumentation] error processing pool connect response:`, error);
 			}
@@ -12188,7 +12234,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 			logger.debug(`[PgInstrumentation] PG Pool connect error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 			try {
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$27.SpanStatusCode.ERROR,
+					code: import_src$29.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch (error$1) {
@@ -12313,7 +12359,7 @@ function reconstructQueryString(strings, values) {
 
 //#endregion
 //#region src/instrumentation/libraries/postgres/handlers/ConnectionHandler.ts
-var import_src$26 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$28 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 var ConnectionHandler = class {
 	constructor(mode, instrumentationName, isAppReady, wrapSqlInstance) {
 		this.mode = mode;
@@ -12357,7 +12403,7 @@ var ConnectionHandler = class {
 					return this.wrapSqlInstance(sqlInstance);
 				}, {
 					name: "postgres.connect",
-					kind: import_src$26.SpanKind.CLIENT,
+					kind: import_src$28.SpanKind.CLIENT,
 					submodule: "connect",
 					packageType: PackageType.PG,
 					packageName: "postgres",
@@ -12380,7 +12426,7 @@ var ConnectionHandler = class {
 					return this.wrapSqlInstance(sqlInstance);
 				}, {
 					name: "postgres.connect",
-					kind: import_src$26.SpanKind.CLIENT,
+					kind: import_src$28.SpanKind.CLIENT,
 					submodule: "connect",
 					packageType: PackageType.PG,
 					packageName: "postgres",
@@ -12391,7 +12437,7 @@ var ConnectionHandler = class {
 					return this.handleRecordConnect(spanInfo, originalFunction, args);
 				});
 			},
-			spanKind: import_src$26.SpanKind.CLIENT
+			spanKind: import_src$28.SpanKind.CLIENT
 		});
 		else return originalFunction(...args);
 	}
@@ -12401,7 +12447,7 @@ var ConnectionHandler = class {
 		try {
 			logger.debug(`[PostgresInstrumentation] Postgres connection created successfully (${SpanUtils.getTraceInfo()})`);
 			SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: { connected: true } });
-			SpanUtils.endSpan(spanInfo.span, { code: import_src$26.SpanStatusCode.OK });
+			SpanUtils.endSpan(spanInfo.span, { code: import_src$28.SpanStatusCode.OK });
 		} catch (error) {
 			logger.error(`[PostgresInstrumentation] error adding span attributes:`, error);
 		}
@@ -12421,7 +12467,7 @@ var ConnectionHandler = class {
 
 //#endregion
 //#region src/instrumentation/libraries/postgres/Instrumentation.ts
-var import_src$25 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$27 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 var PostgresInstrumentation = class extends TdInstrumentationBase {
 	constructor(config = {}) {
 		super("postgres", config);
@@ -12592,7 +12638,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 			recordModeHandler: ({ isPreAppStart }) => {
 				return SpanUtils.createAndExecuteSpan(this.mode, () => originalListen.call(sqlInstance, channelName, callback, onlisten), {
 					name: "postgres.listen",
-					kind: import_src$25.SpanKind.CLIENT,
+					kind: import_src$27.SpanKind.CLIENT,
 					submodule: "listen",
 					packageType: PackageType.PG,
 					packageName: "postgres",
@@ -12619,7 +12665,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 									state: result.state,
 									payloads: receivedPayloads
 								} });
-								SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
+								SpanUtils.endSpan(spanInfo.span, { code: import_src$27.SpanStatusCode.OK });
 							} catch (error) {
 								logger.error(`[PostgresInstrumentation] error adding span attributes:`, error);
 							}
@@ -12633,7 +12679,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 						logger.error(`[PostgresInstrumentation] RECORD listen error: ${error.message}`);
 						try {
 							SpanUtils.endSpan(spanInfo.span, {
-								code: import_src$25.SpanStatusCode.ERROR,
+								code: import_src$27.SpanStatusCode.ERROR,
 								message: error.message
 							});
 						} catch (error$1) {
@@ -12643,7 +12689,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 					}
 				});
 			},
-			spanKind: import_src$25.SpanKind.CLIENT
+			spanKind: import_src$27.SpanKind.CLIENT
 		});
 	}
 	async _handleReplayListen(channelName, callback, onlisten, inputValue) {
@@ -12661,7 +12707,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 					unlisten: async () => {}
 				}), {
 					name: "postgres.listen",
-					kind: import_src$25.SpanKind.CLIENT,
+					kind: import_src$27.SpanKind.CLIENT,
 					submodule: "listen",
 					packageType: PackageType.PG,
 					packageName: "postgres",
@@ -12689,7 +12735,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 							logger.debug(`[PostgresInstrumentation] REPLAY: Invoking callback with recorded payload: ${payload}`);
 							callback(payload);
 						}
-						SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
+						SpanUtils.endSpan(spanInfo.span, { code: import_src$27.SpanStatusCode.OK });
 						return {
 							state: recordedState,
 							unlisten: async () => {
@@ -12699,7 +12745,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 					} catch (error) {
 						logger.error(`[PostgresInstrumentation] REPLAY listen error: ${error.message}`);
 						SpanUtils.endSpan(spanInfo.span, {
-							code: import_src$25.SpanStatusCode.ERROR,
+							code: import_src$27.SpanStatusCode.ERROR,
 							message: error.message
 						});
 						throw error;
@@ -12718,7 +12764,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 	}
 	_handleSqlQuery(originalSql, strings, values) {
 		if (!strings || !Array.isArray(strings.raw)) return originalSql.call(this, strings, ...values);
-		const creationContext = import_src$25.context.active();
+		const creationContext = import_src$27.context.active();
 		const query = originalSql.call(this, strings, ...values);
 		const inputValue = {
 			query: reconstructQueryString(strings, values).trim(),
@@ -12741,7 +12787,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 			else if (parameters !== void 0) return originalUnsafe.call(sqlInstance, query, parameters);
 			else return originalUnsafe.call(sqlInstance, query);
 		})();
-		const creationContext = import_src$25.context.active();
+		const creationContext = import_src$27.context.active();
 		const originalThen = unsafeQuery.then.bind(unsafeQuery);
 		const inputValue = {
 			query: query.trim(),
@@ -12764,7 +12810,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 			else if (parameters !== void 0) return originalFile.call(sqlInstance, path$5, parameters);
 			else return originalFile.call(sqlInstance, path$5);
 		})();
-		const creationContext = import_src$25.context.active();
+		const creationContext = import_src$27.context.active();
 		const originalThen = fileQuery.then.bind(fileQuery);
 		const self = this;
 		const inputValue = {
@@ -12775,25 +12821,26 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 		fileQuery.then = function(onFulfilled, onRejected) {
 			if (fileQuery._tuskRecorded) return originalThen(onFulfilled, onRejected);
 			fileQuery._tuskRecorded = true;
-			return import_src$25.context.with(creationContext, () => {
+			return import_src$27.context.with(creationContext, () => {
 				if (self.mode === TuskDriftMode.RECORD) return handleRecordMode({
 					originalFunctionCall: () => originalThen(onFulfilled, onRejected),
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalThen(onFulfilled, onRejected), {
 							name: "postgres.file",
-							kind: import_src$25.SpanKind.CLIENT,
+							kind: import_src$27.SpanKind.CLIENT,
 							submodule: "file",
 							packageType: PackageType.PG,
 							packageName: "postgres",
 							instrumentationName: self.INSTRUMENTATION_NAME,
 							inputValue,
+							inputSchemaMerges: { parameters: { matchImportance: 0 } },
 							isPreAppStart
 						}, (spanInfo) => {
 							const wrappedOnFulfilled = (result) => {
 								try {
 									logger.debug(`[PostgresInstrumentation] Postgres file query completed successfully (${SpanUtils.getTraceInfo()})`);
 									addOutputAttributesToSpan(spanInfo, result);
-									SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
+									SpanUtils.endSpan(spanInfo.span, { code: import_src$27.SpanStatusCode.OK });
 								} catch (error) {
 									logger.error(`[PostgresInstrumentation] error processing file query response:`, error);
 								}
@@ -12803,7 +12850,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 								try {
 									logger.debug(`[PostgresInstrumentation] Postgres file query error: ${error.message}`);
 									SpanUtils.endSpan(spanInfo.span, {
-										code: import_src$25.SpanStatusCode.ERROR,
+										code: import_src$27.SpanStatusCode.ERROR,
 										message: error.message
 									});
 								} catch (spanError) {
@@ -12815,7 +12862,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 							return originalThen(wrappedOnFulfilled, wrappedOnRejected);
 						});
 					},
-					spanKind: import_src$25.SpanKind.CLIENT
+					spanKind: import_src$27.SpanKind.CLIENT
 				});
 				else if (self.mode === TuskDriftMode.REPLAY) {
 					const stackTrace = captureStackTrace(["PostgresInstrumentation"]);
@@ -12828,12 +12875,13 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 						replayModeHandler: () => {
 							return SpanUtils.createAndExecuteSpan(self.mode, () => originalThen(onFulfilled, onRejected), {
 								name: "postgres.file",
-								kind: import_src$25.SpanKind.CLIENT,
+								kind: import_src$27.SpanKind.CLIENT,
 								submodule: "file",
 								packageType: PackageType.PG,
 								packageName: "postgres",
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { parameters: { matchImportance: 0 } },
 								isPreAppStart: self.tuskDrift.isAppReady() ? false : true
 							}, async (spanInfo) => {
 								const mockedResult = await self._handleReplayQueryOperation({
@@ -12901,7 +12949,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 				replayModeHandler: () => {
 					return SpanUtils.createAndExecuteSpan(this.mode, () => executeBegin(), {
 						name: "postgres.begin",
-						kind: import_src$25.SpanKind.CLIENT,
+						kind: import_src$27.SpanKind.CLIENT,
 						submodule: "transaction",
 						packageType: PackageType.PG,
 						packageName: "postgres",
@@ -12918,7 +12966,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 			recordModeHandler: ({ isPreAppStart }) => {
 				return SpanUtils.createAndExecuteSpan(this.mode, executeBegin, {
 					name: "postgres.begin",
-					kind: import_src$25.SpanKind.CLIENT,
+					kind: import_src$27.SpanKind.CLIENT,
 					submodule: "transaction",
 					packageType: PackageType.PG,
 					packageName: "postgres",
@@ -12929,7 +12977,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 					return this._handleRecordBeginTransaction(spanInfo, executeBegin);
 				});
 			},
-			spanKind: import_src$25.SpanKind.CLIENT
+			spanKind: import_src$27.SpanKind.CLIENT
 		});
 		else return executeBegin();
 	}
@@ -12941,7 +12989,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 					status: "committed",
 					result
 				} });
-				SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
+				SpanUtils.endSpan(spanInfo.span, { code: import_src$27.SpanStatusCode.OK });
 			} catch (error) {
 				logger.error(`[PostgresInstrumentation] error processing transaction response:`, error);
 			}
@@ -12954,7 +13002,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 					error: error.message
 				} });
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$25.SpanStatusCode.ERROR,
+					code: import_src$27.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch (spanError) {
@@ -13033,10 +13081,11 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 				packageName: "postgres",
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName,
-				kind: import_src$25.SpanKind.CLIENT,
+				kind: import_src$27.SpanKind.CLIENT,
 				stackTrace
 			},
-			tuskDrift: this.tuskDrift
+			tuskDrift: this.tuskDrift,
+			inputValueSchemaMerges: { parameters: { matchImportance: 0 } }
 		});
 	}
 	/**
@@ -13050,7 +13099,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 			state: result?.state,
 			statement: result?.statement
 		}));
-		SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
+		SpanUtils.endSpan(spanInfo.span, { code: import_src$27.SpanStatusCode.OK });
 		logger.debug(`[PostgresInstrumentation] ${operation} completed, recorded ${allRows.length} rows`);
 	}
 	/**
@@ -13078,18 +13127,19 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 	}
 	_handleCursorCallbackRecord({ originalCursor, rows, inputValue, creationContext, userCallback }) {
 		const self = this;
-		return import_src$25.context.with(creationContext, () => {
+		return import_src$27.context.with(creationContext, () => {
 			return handleRecordMode({
 				originalFunctionCall: () => originalCursor(rows, userCallback),
 				recordModeHandler: ({ isPreAppStart }) => {
 					return SpanUtils.createAndExecuteSpan(self.mode, () => originalCursor(rows, userCallback), {
 						name: "postgres.cursor",
-						kind: import_src$25.SpanKind.CLIENT,
+						kind: import_src$27.SpanKind.CLIENT,
 						submodule: "cursor",
 						packageType: PackageType.PG,
 						packageName: "postgres",
 						instrumentationName: self.INSTRUMENTATION_NAME,
 						inputValue,
+						inputSchemaMerges: { parameters: { matchImportance: 0 } },
 						isPreAppStart
 					}, (spanInfo) => {
 						return self._executeAndRecordCursorCallback({
@@ -13100,7 +13150,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 						});
 					});
 				},
-				spanKind: import_src$25.SpanKind.CLIENT
+				spanKind: import_src$27.SpanKind.CLIENT
 			});
 		});
 	}
@@ -13123,7 +13173,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 			logger.debug(`[PostgresInstrumentation] Cursor callback error: ${error.message}`);
 			if (spanInfo) try {
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$25.SpanStatusCode.ERROR,
+					code: import_src$27.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch (error$1) {
@@ -13135,19 +13185,20 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 	_handleCursorCallbackReplay({ inputValue, creationContext, cursorBatchSize, userCallback }) {
 		const self = this;
 		const stackTrace = captureStackTrace(["PostgresInstrumentation"]);
-		return import_src$25.context.with(creationContext, () => {
+		return import_src$27.context.with(creationContext, () => {
 			return handleReplayMode({
 				noOpRequestHandler: () => Promise.resolve(),
 				isServerRequest: false,
 				replayModeHandler: () => {
 					return SpanUtils.createAndExecuteSpan(self.mode, () => Promise.resolve(), {
 						name: "postgres.cursor",
-						kind: import_src$25.SpanKind.CLIENT,
+						kind: import_src$27.SpanKind.CLIENT,
 						submodule: "cursor",
 						packageType: PackageType.PG,
 						packageName: "postgres",
 						instrumentationName: self.INSTRUMENTATION_NAME,
 						inputValue,
+						inputSchemaMerges: { parameters: { matchImportance: 0 } },
 						isPreAppStart: self.tuskDrift.isAppReady() ? false : true
 					}, async (spanInfo) => {
 						try {
@@ -13167,11 +13218,11 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 								logger.debug(`[PostgresInstrumentation] Cursor replay calling callback with batch of ${batch.length} rows`);
 								await userCallback(batch);
 							}
-							SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
+							SpanUtils.endSpan(spanInfo.span, { code: import_src$27.SpanStatusCode.OK });
 						} catch (error) {
 							logger.debug(`[PostgresInstrumentation] Cursor callback replay error: ${error.message}`);
 							SpanUtils.endSpan(spanInfo.span, {
-								code: import_src$25.SpanStatusCode.ERROR,
+								code: import_src$27.SpanStatusCode.ERROR,
 								message: error.message
 							});
 							throw error;
@@ -13191,7 +13242,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 			let spanStarted = false;
 			return {
 				async next() {
-					return import_src$25.context.with(creationContext, async () => {
+					return import_src$27.context.with(creationContext, async () => {
 						if (!spanStarted) {
 							spanStarted = true;
 							let spanInputValue;
@@ -13203,7 +13254,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 							}
 							spanInfo = SpanUtils.createSpan({
 								name: "postgres.cursor",
-								kind: import_src$25.SpanKind.CLIENT,
+								kind: import_src$27.SpanKind.CLIENT,
 								isPreAppStart: self.tuskDrift.isAppReady() ? false : true,
 								attributes: {
 									[TdSpanAttributes.NAME]: "postgres.cursor",
@@ -13238,7 +13289,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 						} catch (error) {
 							if (spanInfo) try {
 								SpanUtils.endSpan(spanInfo.span, {
-									code: import_src$25.SpanStatusCode.ERROR,
+									code: import_src$27.SpanStatusCode.ERROR,
 									message: error.message
 								});
 							} catch (error$1) {
@@ -13273,12 +13324,12 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 			let dataFetched = false;
 			return {
 				async next() {
-					return import_src$25.context.with(creationContext, async () => {
+					return import_src$27.context.with(creationContext, async () => {
 						if (!dataFetched) {
 							dataFetched = true;
 							spanInfo = SpanUtils.createSpan({
 								name: "postgres.cursor",
-								kind: import_src$25.SpanKind.CLIENT,
+								kind: import_src$27.SpanKind.CLIENT,
 								isPreAppStart: self.tuskDrift.isAppReady() ? false : true,
 								attributes: {
 									[TdSpanAttributes.NAME]: "postgres.cursor",
@@ -13300,7 +13351,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 							});
 							if (!mockData) {
 								SpanUtils.endSpan(spanInfo.span, {
-									code: import_src$25.SpanStatusCode.ERROR,
+									code: import_src$27.SpanStatusCode.ERROR,
 									message: "No mock data found"
 								});
 								throw new Error(`[PostgresInstrumentation] No matching mock found for cursor query: ${inputValue.query}`);
@@ -13310,7 +13361,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 							mockedData = Array.isArray(processedResult) ? processedResult : [];
 						}
 						if (currentIndex >= mockedData.length) {
-							if (spanInfo) SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
+							if (spanInfo) SpanUtils.endSpan(spanInfo.span, { code: import_src$27.SpanStatusCode.OK });
 							return {
 								done: true,
 								value: void 0
@@ -13326,7 +13377,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 					});
 				},
 				async return() {
-					if (spanInfo) SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
+					if (spanInfo) SpanUtils.endSpan(spanInfo.span, { code: import_src$27.SpanStatusCode.OK });
 					return {
 						done: true,
 						value: void 0
@@ -13337,18 +13388,19 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 	}
 	_handleForEachRecord({ originalForEach, inputValue, creationContext, userCallback }) {
 		const self = this;
-		return import_src$25.context.with(creationContext, () => {
+		return import_src$27.context.with(creationContext, () => {
 			return handleRecordMode({
 				originalFunctionCall: () => originalForEach(userCallback),
 				recordModeHandler: ({ isPreAppStart }) => {
 					return SpanUtils.createAndExecuteSpan(self.mode, () => originalForEach(userCallback), {
 						name: "postgres.query",
-						kind: import_src$25.SpanKind.CLIENT,
+						kind: import_src$27.SpanKind.CLIENT,
 						submodule: "query",
 						packageType: PackageType.PG,
 						packageName: "postgres",
 						instrumentationName: self.INSTRUMENTATION_NAME,
 						inputValue,
+						inputSchemaMerges: { parameters: { matchImportance: 0 } },
 						isPreAppStart
 					}, async (spanInfo) => {
 						const allRows = [];
@@ -13367,7 +13419,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 						} catch (error) {
 							try {
 								SpanUtils.endSpan(spanInfo.span, {
-									code: import_src$25.SpanStatusCode.ERROR,
+									code: import_src$27.SpanStatusCode.ERROR,
 									message: error.message
 								});
 							} catch (error$1) {
@@ -13377,14 +13429,14 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 						}
 					});
 				},
-				spanKind: import_src$25.SpanKind.CLIENT
+				spanKind: import_src$27.SpanKind.CLIENT
 			});
 		});
 	}
 	_handleForEachReplay({ inputValue, creationContext, userCallback }) {
 		const self = this;
 		const stackTrace = captureStackTrace(["PostgresInstrumentation"]);
-		return import_src$25.context.with(creationContext, () => {
+		return import_src$27.context.with(creationContext, () => {
 			return handleReplayMode({
 				noOpRequestHandler: () => Promise.resolve(Object.assign([], {
 					count: 0,
@@ -13397,12 +13449,13 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 						command: null
 					})), {
 						name: "postgres.query",
-						kind: import_src$25.SpanKind.CLIENT,
+						kind: import_src$27.SpanKind.CLIENT,
 						submodule: "query",
 						packageType: PackageType.PG,
 						packageName: "postgres",
 						instrumentationName: self.INSTRUMENTATION_NAME,
 						inputValue,
+						inputSchemaMerges: { parameters: { matchImportance: 0 } },
 						isPreAppStart: self.tuskDrift.isAppReady() ? false : true
 					}, async (spanInfo) => {
 						try {
@@ -13417,7 +13470,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 							const mockedRows = Array.isArray(mockedResult) ? mockedResult : [];
 							logger.debug(`[PostgresInstrumentation] forEach replay: calling callback with ${mockedRows.length} mocked rows`);
 							for (const row of mockedRows) userCallback(row, mockedResult);
-							SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
+							SpanUtils.endSpan(spanInfo.span, { code: import_src$27.SpanStatusCode.OK });
 							return Object.assign([], {
 								count: mockedRows.length,
 								command: null
@@ -13425,7 +13478,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 						} catch (error) {
 							logger.debug(`[PostgresInstrumentation] forEach replay error: ${error.message}`);
 							SpanUtils.endSpan(spanInfo.span, {
-								code: import_src$25.SpanStatusCode.ERROR,
+								code: import_src$27.SpanStatusCode.ERROR,
 								message: error.message
 							});
 							throw error;
@@ -13445,25 +13498,26 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 			if (query._forEachCalled) return originalThen(onFulfilled, onRejected);
 			if (query._tuskRecorded) return originalThen(onFulfilled, onRejected);
 			query._tuskRecorded = true;
-			return import_src$25.context.with(creationContext, () => {
+			return import_src$27.context.with(creationContext, () => {
 				if (self.mode === TuskDriftMode.RECORD) return handleRecordMode({
 					originalFunctionCall: () => originalThen(onFulfilled, onRejected),
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalThen(onFulfilled, onRejected), {
 							name: spanConfig.name,
-							kind: import_src$25.SpanKind.CLIENT,
+							kind: import_src$27.SpanKind.CLIENT,
 							submodule: spanConfig.submodule,
 							packageType: PackageType.PG,
 							packageName: "postgres",
 							instrumentationName: self.INSTRUMENTATION_NAME,
 							inputValue,
+							inputSchemaMerges: { parameters: { matchImportance: 0 } },
 							isPreAppStart
 						}, (spanInfo) => {
 							const wrappedOnFulfilled = (result) => {
 								try {
 									logger.debug(`[PostgresInstrumentation] Postgres ${spanConfig.operationType} query completed successfully (${SpanUtils.getTraceInfo()})`);
 									addOutputAttributesToSpan(spanInfo, result);
-									SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
+									SpanUtils.endSpan(spanInfo.span, { code: import_src$27.SpanStatusCode.OK });
 								} catch (error) {
 									logger.error(`[PostgresInstrumentation] error processing ${spanConfig.operationType} query response:`, error);
 								}
@@ -13473,7 +13527,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 								try {
 									logger.debug(`[PostgresInstrumentation] Postgres ${spanConfig.operationType} query error: ${error.message}`);
 									SpanUtils.endSpan(spanInfo.span, {
-										code: import_src$25.SpanStatusCode.ERROR,
+										code: import_src$27.SpanStatusCode.ERROR,
 										message: error.message
 									});
 								} catch (spanError) {
@@ -13485,7 +13539,7 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 							return originalThen(wrappedOnFulfilled, wrappedOnRejected);
 						});
 					},
-					spanKind: import_src$25.SpanKind.CLIENT
+					spanKind: import_src$27.SpanKind.CLIENT
 				});
 				else if (self.mode === TuskDriftMode.REPLAY) {
 					const stackTrace = captureStackTrace(["PostgresInstrumentation"]);
@@ -13498,12 +13552,13 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 						replayModeHandler: () => {
 							return SpanUtils.createAndExecuteSpan(self.mode, () => originalThen(onFulfilled, onRejected), {
 								name: spanConfig.name,
-								kind: import_src$25.SpanKind.CLIENT,
+								kind: import_src$27.SpanKind.CLIENT,
 								submodule: spanConfig.submodule,
 								packageType: PackageType.PG,
 								packageName: "postgres",
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { parameters: { matchImportance: 0 } },
 								isPreAppStart: self.tuskDrift.isAppReady() ? false : true
 							}, async (spanInfo) => {
 								const mockedResult = await self._handleReplayQueryOperation({
@@ -13779,7 +13834,7 @@ var TdMysqlConnectionMock = class extends events.EventEmitter {
 
 //#endregion
 //#region src/instrumentation/libraries/mysql/mocks/TdMysqlQueryMock.ts
-var import_src$24 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$26 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 /**
 * Handles replay mode for MySQL query operations
 * Returns EventEmitters synchronously to support both callback and streaming modes
@@ -13900,17 +13955,18 @@ var TdMysqlQueryMock = class {
 				packageName: "mysql",
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName: "query",
-				kind: import_src$24.SpanKind.CLIENT,
+				kind: import_src$26.SpanKind.CLIENT,
 				stackTrace
 			},
-			tuskDrift: this.tuskDrift
+			tuskDrift: this.tuskDrift,
+			inputValueSchemaMerges: { values: { matchImportance: 0 } }
 		});
 	}
 };
 
 //#endregion
 //#region src/instrumentation/libraries/mysql/Instrumentation.ts
-var import_src$23 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$25 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 var MysqlInstrumentation = class extends TdInstrumentationBase {
 	constructor(config = {}) {
 		super("mysql", config);
@@ -14153,12 +14209,13 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 						replayModeHandler: () => {
 							return SpanUtils.createAndExecuteSpan(self.mode, () => originalQuery.apply(this, args), {
 								name: "mysql.query",
-								kind: import_src$23.SpanKind.CLIENT,
+								kind: import_src$25.SpanKind.CLIENT,
 								submodule: "query",
 								packageType: PackageType.MYSQL,
 								packageName: "mysql",
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { values: { matchImportance: 0 } },
 								isPreAppStart: false
 							}, (spanInfo) => {
 								const queryEmitter = self.queryMock.handleReplayQuery({
@@ -14179,18 +14236,19 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalQuery.apply(this, args), {
 							name: "mysql.query",
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "query",
 							packageType: PackageType.MYSQL,
 							packageName: "mysql",
 							instrumentationName: self.INSTRUMENTATION_NAME,
 							inputValue,
+							inputSchemaMerges: { values: { matchImportance: 0 } },
 							isPreAppStart
 						}, (spanInfo) => {
 							return self._handleRecordQuery(spanInfo, originalQuery, this, args, callback, isEventEmitterMode);
 						});
 					},
-					spanKind: import_src$23.SpanKind.CLIENT
+					spanKind: import_src$25.SpanKind.CLIENT
 				});
 				else return originalQuery.apply(this, args);
 			};
@@ -14221,7 +14279,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return originalConnect.apply(this, arguments);
 					},
-					spanKind: import_src$23.SpanKind.CLIENT
+					spanKind: import_src$25.SpanKind.CLIENT
 				});
 				else return originalConnect.apply(this, arguments);
 			};
@@ -14246,7 +14304,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalBeginTransaction.apply(this, arguments), {
 							name: "mysql.beginTransaction",
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "transaction",
 							packageType: PackageType.MYSQL,
 							packageName: "mysql",
@@ -14263,7 +14321,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalBeginTransaction.apply(this, arguments), {
 							name: "mysql.beginTransaction",
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "transaction",
 							packageType: PackageType.MYSQL,
 							packageName: "mysql",
@@ -14274,7 +14332,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordTransaction(spanInfo, originalBeginTransaction, this, arguments, actualCallback);
 						});
 					},
-					spanKind: import_src$23.SpanKind.CLIENT
+					spanKind: import_src$25.SpanKind.CLIENT
 				});
 				else return originalBeginTransaction.apply(this, arguments);
 			};
@@ -14299,7 +14357,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalCommit.apply(this, arguments), {
 							name: "mysql.commit",
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "transaction",
 							packageType: PackageType.MYSQL,
 							packageName: "mysql",
@@ -14316,7 +14374,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalCommit.apply(this, arguments), {
 							name: "mysql.commit",
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "transaction",
 							packageType: PackageType.MYSQL,
 							packageName: "mysql",
@@ -14327,7 +14385,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordTransaction(spanInfo, originalCommit, this, arguments, actualCallback);
 						});
 					},
-					spanKind: import_src$23.SpanKind.CLIENT
+					spanKind: import_src$25.SpanKind.CLIENT
 				});
 				else return originalCommit.apply(this, arguments);
 			};
@@ -14352,7 +14410,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalRollback.apply(this, arguments), {
 							name: "mysql.rollback",
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "transaction",
 							packageType: PackageType.MYSQL,
 							packageName: "mysql",
@@ -14369,7 +14427,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalRollback.apply(this, arguments), {
 							name: "mysql.rollback",
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "transaction",
 							packageType: PackageType.MYSQL,
 							packageName: "mysql",
@@ -14380,7 +14438,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordTransaction(spanInfo, originalRollback, this, arguments, actualCallback);
 						});
 					},
-					spanKind: import_src$23.SpanKind.CLIENT
+					spanKind: import_src$25.SpanKind.CLIENT
 				});
 				else return originalRollback.apply(this, arguments);
 			};
@@ -14407,7 +14465,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return originalPing.apply(this, arguments);
 					},
-					spanKind: import_src$23.SpanKind.CLIENT
+					spanKind: import_src$25.SpanKind.CLIENT
 				});
 				else return originalPing.apply(this, arguments);
 			};
@@ -14436,7 +14494,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return originalEnd.apply(this, arguments);
 					},
-					spanKind: import_src$23.SpanKind.CLIENT
+					spanKind: import_src$25.SpanKind.CLIENT
 				});
 				else return originalEnd.apply(this, arguments);
 			};
@@ -14465,7 +14523,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return originalChangeUser.apply(this, arguments);
 					},
-					spanKind: import_src$23.SpanKind.CLIENT
+					spanKind: import_src$25.SpanKind.CLIENT
 				});
 				else return originalChangeUser.apply(this, arguments);
 			};
@@ -14531,7 +14589,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return originalEnd.apply(this, arguments);
 					},
-					spanKind: import_src$23.SpanKind.CLIENT
+					spanKind: import_src$25.SpanKind.CLIENT
 				});
 				else return originalEnd.apply(this, arguments);
 			};
@@ -14554,7 +14612,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalGetConnection.apply(this, [callback]), {
 							name: `mysql.pool.getConnection`,
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "getConnection",
 							packageName: "mysql",
 							packageType: PackageType.MYSQL,
@@ -14571,7 +14629,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalGetConnection.apply(this, [callback]), {
 							name: `mysql.pool.getConnection`,
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "getConnection",
 							packageName: "mysql",
 							packageType: PackageType.MYSQL,
@@ -14582,7 +14640,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordPoolGetConnectionInSpan(spanInfo, originalGetConnection, callback, this);
 						});
 					},
-					spanKind: import_src$23.SpanKind.CLIENT
+					spanKind: import_src$25.SpanKind.CLIENT
 				});
 				else return originalGetConnection.apply(this, [callback]);
 			};
@@ -14626,12 +14684,13 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 						replayModeHandler: () => {
 							return SpanUtils.createAndExecuteSpan(self.mode, () => originalQuery.apply(connection, args), {
 								name: "mysql.query",
-								kind: import_src$23.SpanKind.CLIENT,
+								kind: import_src$25.SpanKind.CLIENT,
 								submodule: "query",
 								packageType: PackageType.MYSQL,
 								packageName: "mysql",
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { values: { matchImportance: 0 } },
 								isPreAppStart: false
 							}, (spanInfo) => {
 								const queryEmitter = self.queryMock.handleReplayQuery({
@@ -14652,18 +14711,19 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalQuery.apply(connection, args), {
 							name: "mysql.query",
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "query",
 							packageType: PackageType.MYSQL,
 							packageName: "mysql",
 							instrumentationName: self.INSTRUMENTATION_NAME,
 							inputValue,
+							inputSchemaMerges: { values: { matchImportance: 0 } },
 							isPreAppStart
 						}, (spanInfo) => {
 							return self._handleRecordQuery(spanInfo, originalQuery, connection, args, callback, isEventEmitterMode);
 						});
 					},
-					spanKind: import_src$23.SpanKind.CLIENT
+					spanKind: import_src$25.SpanKind.CLIENT
 				});
 				else return originalQuery.apply(connection, args);
 			};
@@ -14701,7 +14761,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 				};
 				if (error) try {
 					SpanUtils.endSpan(spanInfo.span, {
-						code: import_src$23.SpanStatusCode.ERROR,
+						code: import_src$25.SpanStatusCode.ERROR,
 						message: error.message
 					});
 				} catch (error$1) {
@@ -14709,7 +14769,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 				}
 				else try {
 					SpanUtils.addSpanAttributes(spanInfo.span, { outputValue });
-					SpanUtils.endSpan(spanInfo.span, { code: import_src$23.SpanStatusCode.OK });
+					SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
 				} catch (error$1) {
 					logger.error(`[MysqlInstrumentation] error ending span:`, error$1);
 				}
@@ -14723,7 +14783,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 				queryObject._callback = function(err, results, fields) {
 					if (err) try {
 						SpanUtils.endSpan(spanInfo.span, {
-							code: import_src$23.SpanStatusCode.ERROR,
+							code: import_src$25.SpanStatusCode.ERROR,
 							message: err.message
 						});
 					} catch (error) {
@@ -14735,7 +14795,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 							fields
 						};
 						SpanUtils.addSpanAttributes(spanInfo.span, { outputValue });
-						SpanUtils.endSpan(spanInfo.span, { code: import_src$23.SpanStatusCode.OK });
+						SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
 					} catch (error) {
 						logger.error(`[MysqlInstrumentation] error ending span:`, error);
 					}
@@ -14749,7 +14809,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 			args[callbackIndex] = function(err, results, fields) {
 				if (err) try {
 					SpanUtils.endSpan(spanInfo.span, {
-						code: import_src$23.SpanStatusCode.ERROR,
+						code: import_src$25.SpanStatusCode.ERROR,
 						message: err.message
 					});
 				} catch (error) {
@@ -14761,7 +14821,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 						fields
 					};
 					SpanUtils.addSpanAttributes(spanInfo.span, { outputValue });
-					SpanUtils.endSpan(spanInfo.span, { code: import_src$23.SpanStatusCode.OK });
+					SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
 				} catch (error) {
 					logger.error(`[MysqlInstrumentation] error ending span:`, error);
 				}
@@ -14789,7 +14849,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return originalConnect.apply(connection, arguments);
 					},
-					spanKind: import_src$23.SpanKind.CLIENT
+					spanKind: import_src$25.SpanKind.CLIENT
 				});
 				else return originalConnect.apply(connection, arguments);
 			};
@@ -14811,7 +14871,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalBeginTransaction.apply(connection, arguments), {
 							name: "mysql.beginTransaction",
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "transaction",
 							packageType: PackageType.MYSQL,
 							packageName: "mysql",
@@ -14828,7 +14888,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalBeginTransaction.apply(connection, arguments), {
 							name: "mysql.beginTransaction",
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "transaction",
 							packageType: PackageType.MYSQL,
 							packageName: "mysql",
@@ -14839,7 +14899,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordTransaction(spanInfo, originalBeginTransaction, connection, arguments, actualCallback);
 						});
 					},
-					spanKind: import_src$23.SpanKind.CLIENT
+					spanKind: import_src$25.SpanKind.CLIENT
 				});
 				else return originalBeginTransaction.apply(connection, arguments);
 			};
@@ -14861,7 +14921,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalCommit.apply(connection, arguments), {
 							name: "mysql.commit",
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "transaction",
 							packageType: PackageType.MYSQL,
 							packageName: "mysql",
@@ -14878,7 +14938,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalCommit.apply(connection, arguments), {
 							name: "mysql.commit",
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "transaction",
 							packageType: PackageType.MYSQL,
 							packageName: "mysql",
@@ -14889,7 +14949,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordTransaction(spanInfo, originalCommit, connection, arguments, actualCallback);
 						});
 					},
-					spanKind: import_src$23.SpanKind.CLIENT
+					spanKind: import_src$25.SpanKind.CLIENT
 				});
 				else return originalCommit.apply(connection, arguments);
 			};
@@ -14911,7 +14971,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalRollback.apply(connection, arguments), {
 							name: "mysql.rollback",
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "transaction",
 							packageType: PackageType.MYSQL,
 							packageName: "mysql",
@@ -14928,7 +14988,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalRollback.apply(connection, arguments), {
 							name: "mysql.rollback",
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "transaction",
 							packageType: PackageType.MYSQL,
 							packageName: "mysql",
@@ -14939,7 +14999,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordTransaction(spanInfo, originalRollback, connection, arguments, actualCallback);
 						});
 					},
-					spanKind: import_src$23.SpanKind.CLIENT
+					spanKind: import_src$25.SpanKind.CLIENT
 				});
 				else return originalRollback.apply(connection, arguments);
 			};
@@ -14950,7 +15010,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 			const result = originalFunction.apply(connection, args);
 			try {
 				SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: { status: "success" } });
-				SpanUtils.endSpan(spanInfo.span, { code: import_src$23.SpanStatusCode.OK });
+				SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
 			} catch (error) {
 				logger.error(`[MysqlInstrumentation] error adding span attributes:`, error);
 			}
@@ -14958,7 +15018,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 		} catch (error) {
 			try {
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$23.SpanStatusCode.ERROR,
+					code: import_src$25.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch (error$1) {
@@ -14973,7 +15033,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 			argsArray[callbackIndex] = function(err) {
 				if (err) try {
 					SpanUtils.endSpan(spanInfo.span, {
-						code: import_src$23.SpanStatusCode.ERROR,
+						code: import_src$25.SpanStatusCode.ERROR,
 						message: err.message
 					});
 				} catch (error) {
@@ -14981,14 +15041,14 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 				}
 				else try {
 					SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: { status: "success" } });
-					SpanUtils.endSpan(spanInfo.span, { code: import_src$23.SpanStatusCode.OK });
+					SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
 				} catch (error) {
 					logger.error(`[MysqlInstrumentation] error ending span:`, error);
 				}
 				logger.debug(`[MysqlInstrumentation] Transaction completed`);
 				return originalCallback.apply(this, arguments);
 			};
-			argsArray[callbackIndex] = import_src$23.context.bind(spanInfo.context, argsArray[callbackIndex]);
+			argsArray[callbackIndex] = import_src$25.context.bind(spanInfo.context, argsArray[callbackIndex]);
 		}
 		return originalFunction.apply(connection, argsArray);
 	}
@@ -15005,7 +15065,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 				if (error) {
 					logger.debug(`[MysqlInstrumentation] MySQL Pool getConnection error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 					SpanUtils.endSpan(spanInfo.span, {
-						code: import_src$23.SpanStatusCode.ERROR,
+						code: import_src$25.SpanStatusCode.ERROR,
 						message: error.message
 					});
 				} else {
@@ -15021,9 +15081,9 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 						connected: true,
 						hasConnection: !!connection
 					} });
-					SpanUtils.endSpan(spanInfo.span, { code: import_src$23.SpanStatusCode.OK });
+					SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
 				}
-				return import_src$23.context.bind(spanInfo.context, callback)(error, connection);
+				return import_src$25.context.bind(spanInfo.context, callback)(error, connection);
 			};
 			return originalGetConnection.call(poolContext, wrappedCallback);
 		} else try {
@@ -15032,11 +15092,11 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 				connected: true,
 				hasConnection: true
 			} });
-			SpanUtils.endSpan(spanInfo.span, { code: import_src$23.SpanStatusCode.OK });
+			SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
 			return result;
 		} catch (error) {
 			SpanUtils.endSpan(spanInfo.span, {
-				code: import_src$23.SpanStatusCode.ERROR,
+				code: import_src$25.SpanStatusCode.ERROR,
 				message: error.message
 			});
 			throw error;
@@ -15113,12 +15173,13 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 						replayModeHandler: () => {
 							return SpanUtils.createAndExecuteSpan(self.mode, () => originalStream.apply(queryInstance, arguments), {
 								name: "mysql.stream",
-								kind: import_src$23.SpanKind.CLIENT,
+								kind: import_src$25.SpanKind.CLIENT,
 								submodule: "stream",
 								packageType: PackageType.MYSQL,
 								packageName: "mysql",
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { values: { matchImportance: 0 } },
 								isPreAppStart: false
 							}, (spanInfo) => {
 								return self._handleReplayStream(inputValue, spanInfo, stackTrace, queryInstance);
@@ -15130,18 +15191,19 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalStream.apply(queryInstance, arguments), {
 							name: "mysql.stream",
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "stream",
 							packageType: PackageType.MYSQL,
 							packageName: "mysql",
 							instrumentationName: self.INSTRUMENTATION_NAME,
 							inputValue,
+							inputSchemaMerges: { values: { matchImportance: 0 } },
 							isPreAppStart
 						}, (spanInfo) => {
 							return self._handleRecordStream(spanInfo, originalStream, queryInstance, streamOptions);
 						});
 					},
-					spanKind: import_src$23.SpanKind.CLIENT
+					spanKind: import_src$25.SpanKind.CLIENT
 				});
 				else return originalStream.apply(queryInstance, arguments);
 			};
@@ -15214,7 +15276,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 			const isMultiStatementQuery = queryCount > 1;
 			if (error) try {
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$23.SpanStatusCode.ERROR,
+					code: import_src$25.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch (err) {
@@ -15232,7 +15294,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					queryCount
 				};
 				SpanUtils.addSpanAttributes(spanInfo.span, { outputValue });
-				SpanUtils.endSpan(spanInfo.span, { code: import_src$23.SpanStatusCode.OK });
+				SpanUtils.endSpan(spanInfo.span, { code: import_src$25.SpanStatusCode.OK });
 			} catch (err) {
 				logger.error(`[MysqlInstrumentation] error ending span:`, err);
 			}
@@ -15341,12 +15403,13 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 						replayModeHandler: () => {
 							return SpanUtils.createAndExecuteSpan(self.mode, () => originalQuery.apply(this, args), {
 								name: "mysql.query",
-								kind: import_src$23.SpanKind.CLIENT,
+								kind: import_src$25.SpanKind.CLIENT,
 								submodule: "query",
 								packageType: PackageType.MYSQL,
 								packageName: "mysql",
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { values: { matchImportance: 0 } },
 								isPreAppStart: false
 							}, (spanInfo) => {
 								const queryEmitter = self.queryMock.handleReplayQuery({
@@ -15390,7 +15453,7 @@ var MysqlInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalGetConnection.apply(namespace, [callback]), {
 							name: `mysql.poolNamespace.getConnection`,
-							kind: import_src$23.SpanKind.CLIENT,
+							kind: import_src$25.SpanKind.CLIENT,
 							submodule: "getConnection",
 							packageName: "mysql",
 							packageType: PackageType.MYSQL,
@@ -15542,6 +15605,27 @@ var TdMysql2ConnectionMock = class extends events.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) {
@@ -15567,7 +15651,7 @@ var TdMysql2ConnectionMock = class extends events.EventEmitter {
 
 //#endregion
 //#region src/instrumentation/libraries/mysql2/mocks/TdMysql2QueryMock.ts
-var import_src$22 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$24 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 /**
 * Handles replay mode for MySQL2 query operations
 */
@@ -15598,6 +15682,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, [], []);
@@ -15624,6 +15712,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);
@@ -15664,13 +15756,51 @@ var TdMysql2QueryMock = class {
 				packageName: "mysql2",
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName,
-				kind: import_src$22.SpanKind.CLIENT,
+				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 stream.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
 	*/
 	_convertMysql2Types(result) {
@@ -15678,12 +15808,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: []
 		};
 	}
@@ -15691,7 +15826,7 @@ var TdMysql2QueryMock = class {
 
 //#endregion
 //#region src/instrumentation/libraries/mysql2/mocks/TdMysql2ConnectionEventMock.ts
-var import_src$21 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$23 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 /**
 * Mock for MySQL2 connection events (connect/error)
 * Handles replay of recorded connection establishment events in REPLAY mode
@@ -15720,7 +15855,7 @@ var TdMysql2ConnectionEventMock = class {
 					packageName: "mysql2",
 					instrumentationName: this.INSTRUMENTATION_NAME,
 					submoduleName: "connectEvent",
-					kind: import_src$21.SpanKind.CLIENT
+					kind: import_src$23.SpanKind.CLIENT
 				},
 				tuskDrift: this.tuskDrift
 			});
@@ -15738,7 +15873,7 @@ var TdMysql2ConnectionEventMock = class {
 
 //#endregion
 //#region src/instrumentation/libraries/mysql2/Instrumentation.ts
-var import_src$20 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$22 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 const COMPLETE_SUPPORTED_VERSIONS = ">=2.3.3 <4.0.0";
 const V2_3_3_TO_3_11_4 = ">=2.3.3 <3.11.5";
 const V3_11_5_TO_4_0 = ">=3.11.5 <4.0.0";
@@ -15828,6 +15963,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;
@@ -15879,6 +16026,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,12 +16125,13 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 							const spanName = `mysql2.${clientType}.query`;
 							return SpanUtils.createAndExecuteSpan(self.mode, () => originalQuery.apply(this, args), {
 								name: spanName,
-								kind: import_src$20.SpanKind.CLIENT,
+								kind: import_src$22.SpanKind.CLIENT,
 								submodule: "query",
 								packageType: PackageType.MYSQL,
 								packageName: "mysql2",
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { values: { matchImportance: 0 } },
 								isPreAppStart: false
 							}, (spanInfo) => {
 								return self.handleReplayQuery(queryConfig, inputValue, spanInfo, "query", stackTrace);
@@ -15984,18 +16144,19 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 						const spanName = `mysql2.${clientType}.query`;
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalQuery.apply(this, args), {
 							name: spanName,
-							kind: import_src$20.SpanKind.CLIENT,
+							kind: import_src$22.SpanKind.CLIENT,
 							submodule: "query",
 							packageType: PackageType.MYSQL,
 							instrumentationName: self.INSTRUMENTATION_NAME,
 							packageName: "mysql2",
 							inputValue,
+							inputSchemaMerges: { values: { matchImportance: 0 } },
 							isPreAppStart
 						}, (spanInfo) => {
 							return self._handleRecordQueryInSpan(spanInfo, originalQuery, queryConfig, args, this);
 						});
 					},
-					spanKind: import_src$20.SpanKind.CLIENT
+					spanKind: import_src$22.SpanKind.CLIENT
 				});
 				else return originalQuery.apply(this, args);
 			};
@@ -16031,12 +16192,13 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 							const spanName = `mysql2.${clientType}.execute`;
 							return SpanUtils.createAndExecuteSpan(self.mode, () => originalExecute.apply(this, args), {
 								name: spanName,
-								kind: import_src$20.SpanKind.CLIENT,
+								kind: import_src$22.SpanKind.CLIENT,
 								submodule: "execute",
 								packageType: PackageType.MYSQL,
 								packageName: "mysql2",
 								instrumentationName: self.INSTRUMENTATION_NAME,
 								inputValue,
+								inputSchemaMerges: { values: { matchImportance: 0 } },
 								isPreAppStart: false
 							}, (spanInfo) => {
 								return self.handleReplayQuery(queryConfig, inputValue, spanInfo, "execute", stackTrace);
@@ -16049,18 +16211,19 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 						const spanName = `mysql2.${clientType}.execute`;
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalExecute.apply(this, args), {
 							name: spanName,
-							kind: import_src$20.SpanKind.CLIENT,
+							kind: import_src$22.SpanKind.CLIENT,
 							submodule: "execute",
 							packageType: PackageType.MYSQL,
 							instrumentationName: self.INSTRUMENTATION_NAME,
 							packageName: "mysql2",
 							inputValue,
+							inputSchemaMerges: { values: { matchImportance: 0 } },
 							isPreAppStart
 						}, (spanInfo) => {
 							return self._handleRecordQueryInSpan(spanInfo, originalExecute, queryConfig, args, this);
 						});
 					},
-					spanKind: import_src$20.SpanKind.CLIENT
+					spanKind: import_src$22.SpanKind.CLIENT
 				});
 				else return originalExecute.apply(this, args);
 			};
@@ -16079,7 +16242,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalGetConnection.apply(this, [callback]), {
 							name: `mysql2.pool.getConnection`,
-							kind: import_src$20.SpanKind.CLIENT,
+							kind: import_src$22.SpanKind.CLIENT,
 							submodule: "getConnection",
 							packageName: "mysql2",
 							packageType: PackageType.MYSQL,
@@ -16096,7 +16259,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalGetConnection.apply(this, [callback]), {
 							name: `mysql2.pool.getConnection`,
-							kind: import_src$20.SpanKind.CLIENT,
+							kind: import_src$22.SpanKind.CLIENT,
 							submodule: "getConnection",
 							packageName: "mysql2",
 							packageType: PackageType.MYSQL,
@@ -16107,7 +16270,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordPoolGetConnectionInSpan(spanInfo, originalGetConnection, callback, this);
 						});
 					},
-					spanKind: import_src$20.SpanKind.CLIENT
+					spanKind: import_src$22.SpanKind.CLIENT
 				});
 				else return originalGetConnection.apply(this, [callback]);
 			};
@@ -16130,7 +16293,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalConnect.apply(this, [callback]), {
 							name: `mysql2.${clientType}.connect`,
-							kind: import_src$20.SpanKind.CLIENT,
+							kind: import_src$22.SpanKind.CLIENT,
 							submodule: "connect",
 							packageName: "mysql2",
 							packageType: PackageType.MYSQL,
@@ -16151,7 +16314,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalConnect.apply(this, [callback]), {
 							name: `mysql2.${clientType}.connect`,
-							kind: import_src$20.SpanKind.CLIENT,
+							kind: import_src$22.SpanKind.CLIENT,
 							submodule: "connect",
 							packageName: "mysql2",
 							packageType: PackageType.MYSQL,
@@ -16162,7 +16325,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 							return self._handleSimpleCallbackMethod(spanInfo, originalConnect, callback, this);
 						});
 					},
-					spanKind: import_src$20.SpanKind.CLIENT
+					spanKind: import_src$22.SpanKind.CLIENT
 				});
 				else return originalConnect.apply(this, [callback]);
 			};
@@ -16185,7 +16348,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalPing.apply(this, [callback]), {
 							name: `mysql2.${clientType}.ping`,
-							kind: import_src$20.SpanKind.CLIENT,
+							kind: import_src$22.SpanKind.CLIENT,
 							submodule: "ping",
 							packageName: "mysql2",
 							packageType: PackageType.MYSQL,
@@ -16206,7 +16369,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalPing.apply(this, [callback]), {
 							name: `mysql2.${clientType}.ping`,
-							kind: import_src$20.SpanKind.CLIENT,
+							kind: import_src$22.SpanKind.CLIENT,
 							submodule: "ping",
 							packageName: "mysql2",
 							packageType: PackageType.MYSQL,
@@ -16217,7 +16380,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 							return self._handleSimpleCallbackMethod(spanInfo, originalPing, callback, this);
 						});
 					},
-					spanKind: import_src$20.SpanKind.CLIENT
+					spanKind: import_src$22.SpanKind.CLIENT
 				});
 				else return originalPing.apply(this, [callback]);
 			};
@@ -16240,7 +16403,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalEnd.apply(this, [callback]), {
 							name: `mysql2.${clientType}.end`,
-							kind: import_src$20.SpanKind.CLIENT,
+							kind: import_src$22.SpanKind.CLIENT,
 							submodule: "end",
 							packageName: "mysql2",
 							packageType: PackageType.MYSQL,
@@ -16261,7 +16424,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalEnd.apply(this, [callback]), {
 							name: `mysql2.${clientType}.end`,
-							kind: import_src$20.SpanKind.CLIENT,
+							kind: import_src$22.SpanKind.CLIENT,
 							submodule: "end",
 							packageName: "mysql2",
 							packageType: PackageType.MYSQL,
@@ -16272,12 +16435,257 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 							return self._handleSimpleCallbackMethod(spanInfo, originalEnd, callback, this);
 						});
 					},
-					spanKind: import_src$20.SpanKind.CLIENT
+					spanKind: import_src$22.SpanKind.CLIENT
 				});
 				else return originalEnd.apply(this, [callback]);
 			};
 		};
 	}
+	_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) => {
@@ -16285,7 +16693,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 					logger.debug(`[Mysql2Instrumentation] MySQL2 method error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 					try {
 						SpanUtils.endSpan(spanInfo.span, {
-							code: import_src$20.SpanStatusCode.ERROR,
+							code: import_src$22.SpanStatusCode.ERROR,
 							message: error.message
 						});
 					} catch (error$1) {
@@ -16295,7 +16703,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 					logger.debug(`[Mysql2Instrumentation] MySQL2 method completed successfully (${SpanUtils.getTraceInfo()})`);
 					try {
 						SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: { success: true } });
-						SpanUtils.endSpan(spanInfo.span, { code: import_src$20.SpanStatusCode.OK });
+						SpanUtils.endSpan(spanInfo.span, { code: import_src$22.SpanStatusCode.OK });
 					} catch (error$1) {
 						logger.error(`[Mysql2Instrumentation] error processing response:`, error$1);
 					}
@@ -16309,7 +16717,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 				logger.debug(`[Mysql2Instrumentation] MySQL2 method completed successfully (${SpanUtils.getTraceInfo()})`);
 				try {
 					SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: { success: true } });
-					SpanUtils.endSpan(spanInfo.span, { code: import_src$20.SpanStatusCode.OK });
+					SpanUtils.endSpan(spanInfo.span, { code: import_src$22.SpanStatusCode.OK });
 				} catch (error) {
 					logger.error(`[Mysql2Instrumentation] error processing response:`, error);
 				}
@@ -16317,7 +16725,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 				logger.debug(`[Mysql2Instrumentation] MySQL2 method error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 				try {
 					SpanUtils.endSpan(spanInfo.span, {
-						code: import_src$20.SpanStatusCode.ERROR,
+						code: import_src$22.SpanStatusCode.ERROR,
 						message: error.message
 					});
 				} catch (error$1) {
@@ -16329,7 +16737,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 				logger.debug(`[Mysql2Instrumentation] MySQL2 method completed (non-promise) (${SpanUtils.getTraceInfo()})`);
 				try {
 					SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: { success: true } });
-					SpanUtils.endSpan(spanInfo.span, { code: import_src$20.SpanStatusCode.OK });
+					SpanUtils.endSpan(spanInfo.span, { code: import_src$22.SpanStatusCode.OK });
 				} catch (error) {
 					logger.error(`[Mysql2Instrumentation] error processing response:`, error);
 				}
@@ -16349,22 +16757,36 @@ 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) {
 					logger.debug(`[Mysql2Instrumentation] MySQL2 query error (hasCallback): ${error.message} (${SpanUtils.getTraceInfo()})`);
 					try {
 						SpanUtils.endSpan(spanInfo.span, {
-							code: import_src$20.SpanStatusCode.ERROR,
+							code: import_src$22.SpanStatusCode.ERROR,
 							message: error.message
 						});
 					} catch (error$1) {
@@ -16374,12 +16796,12 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 					logger.debug(`[Mysql2Instrumentation] MySQL2 query completed successfully (hasCallback) (${SpanUtils.getTraceInfo()})`);
 					try {
 						this._addOutputAttributesToSpan(spanInfo, results, fields);
-						SpanUtils.endSpan(spanInfo.span, { code: import_src$20.SpanStatusCode.OK });
+						SpanUtils.endSpan(spanInfo.span, { code: import_src$22.SpanStatusCode.OK });
 					} catch (error$1) {
 						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];
@@ -16394,9 +16816,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;
@@ -16404,7 +16826,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 					logger.debug(`[Mysql2Instrumentation] MySQL2 stream query error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 					try {
 						SpanUtils.endSpan(spanInfo.span, {
-							code: import_src$20.SpanStatusCode.ERROR,
+							code: import_src$22.SpanStatusCode.ERROR,
 							message: error.message
 						});
 					} catch (error$1) {
@@ -16418,7 +16840,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 					logger.debug(`[Mysql2Instrumentation] MySQL2 stream query completed (${SpanUtils.getTraceInfo()})`);
 					try {
 						this._addOutputAttributesToSpan(spanInfo, streamResults, streamFields);
-						SpanUtils.endSpan(spanInfo.span, { code: import_src$20.SpanStatusCode.OK });
+						SpanUtils.endSpan(spanInfo.span, { code: import_src$22.SpanStatusCode.OK });
 					} catch (error) {
 						logger.error(`[Mysql2Instrumentation] error ending span:`, error);
 					}
@@ -16440,7 +16862,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 					logger.debug(`[Mysql2Instrumentation] MySQL2 Pool getConnection error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 					try {
 						SpanUtils.endSpan(spanInfo.span, {
-							code: import_src$20.SpanStatusCode.ERROR,
+							code: import_src$22.SpanStatusCode.ERROR,
 							message: error.message
 						});
 					} catch (error$1) {
@@ -16453,7 +16875,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 							connected: true,
 							hasConnection: !!connection
 						} });
-						SpanUtils.endSpan(spanInfo.span, { code: import_src$20.SpanStatusCode.OK });
+						SpanUtils.endSpan(spanInfo.span, { code: import_src$22.SpanStatusCode.OK });
 					} catch (error$1) {
 						logger.error(`[Mysql2Instrumentation] error processing getConnection response:`, error$1);
 					}
@@ -16468,7 +16890,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 					connected: true,
 					hasConnection: !!connection
 				} });
-				SpanUtils.endSpan(spanInfo.span, { code: import_src$20.SpanStatusCode.OK });
+				SpanUtils.endSpan(spanInfo.span, { code: import_src$22.SpanStatusCode.OK });
 			} catch (error) {
 				logger.error(`[Mysql2Instrumentation] error processing getConnection response:`, error);
 			}
@@ -16477,7 +16899,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 			logger.debug(`[Mysql2Instrumentation] MySQL2 Pool getConnection error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 			try {
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$20.SpanStatusCode.ERROR,
+					code: import_src$22.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch (error$1) {
@@ -16520,7 +16942,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 				recordModeHandler: ({ isPreAppStart }) => {
 					return SpanUtils.createAndExecuteSpan(self.mode, () => new OriginalConnection(...args), {
 						name: `mysql2.connection.create`,
-						kind: import_src$20.SpanKind.CLIENT,
+						kind: import_src$22.SpanKind.CLIENT,
 						submodule: "connectEvent",
 						packageType: PackageType.MYSQL,
 						packageName: "mysql2",
@@ -16535,7 +16957,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 									connected: true,
 									connectionObj
 								} });
-								SpanUtils.endSpan(spanInfo.span, { code: import_src$20.SpanStatusCode.OK });
+								SpanUtils.endSpan(spanInfo.span, { code: import_src$22.SpanStatusCode.OK });
 							} catch {
 								logger.error(`[Mysql2Instrumentation] error adding span attributes:`);
 							}
@@ -16544,7 +16966,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 							try {
 								logger.debug(`[Mysql2Instrumentation] Connection error, recording: ${err.message}`);
 								SpanUtils.endSpan(spanInfo.span, {
-									code: import_src$20.SpanStatusCode.ERROR,
+									code: import_src$22.SpanStatusCode.ERROR,
 									message: err.message
 								});
 							} catch {
@@ -16554,7 +16976,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 						return connection;
 					});
 				},
-				spanKind: import_src$20.SpanKind.CLIENT
+				spanKind: import_src$22.SpanKind.CLIENT
 			});
 			if (self.mode === TuskDriftMode.REPLAY) return handleReplayMode({
 				noOpRequestHandler: () => {
@@ -16564,7 +16986,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 				replayModeHandler: () => {
 					return SpanUtils.createAndExecuteSpan(self.mode, () => new OriginalConnection(...args), {
 						name: `mysql2.connection.create`,
-						kind: import_src$20.SpanKind.CLIENT,
+						kind: import_src$22.SpanKind.CLIENT,
 						submodule: "connectEvent",
 						packageType: PackageType.MYSQL,
 						packageName: "mysql2",
@@ -16602,6 +17024,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) => {});
@@ -16629,9 +17079,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 });
@@ -16643,7 +17097,7 @@ var Mysql2Instrumentation = class extends TdInstrumentationBase {
 
 //#endregion
 //#region src/instrumentation/libraries/tcp/Instrumentation.ts
-var import_src$19 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$21 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 /**
 * TCP Instrumentation for Tusk Drift
 *
@@ -16730,7 +17184,7 @@ var TcpInstrumentation = class extends TdInstrumentationBase {
 		const currentSpanInfo = SpanUtils.getCurrentSpanInfo();
 		if (!currentSpanInfo) return originalMethod.apply(socketContext, args);
 		const callingLibrary = currentSpanInfo.context.getValue(CALLING_LIBRARY_CONTEXT_KEY);
-		if (currentSpanInfo.context.getValue(SPAN_KIND_CONTEXT_KEY) === import_src$19.SpanKind.SERVER && callingLibrary !== "ProtobufCommunicator") this._logUnpatchedDependency(methodName, currentSpanInfo, socketContext);
+		if (currentSpanInfo.context.getValue(SPAN_KIND_CONTEXT_KEY) === import_src$21.SpanKind.SERVER && callingLibrary !== "ProtobufCommunicator") this._logUnpatchedDependency(methodName, currentSpanInfo, socketContext);
 		return originalMethod.apply(socketContext, args);
 	}
 	_isHttpResponseSocket(socketContext) {
@@ -16740,7 +17194,7 @@ var TcpInstrumentation = class extends TdInstrumentationBase {
 
 //#endregion
 //#region src/instrumentation/libraries/jsonwebtoken/Instrumentation.ts
-var import_src$18 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$20 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 	constructor(config = {}) {
 		super("jsonwebtoken", config);
@@ -16820,7 +17274,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 						replayModeHandler: () => {
 							return SpanUtils.createAndExecuteSpan(self.mode, () => originalVerify.apply(this, args), {
 								name: "jsonwebtoken.verify",
-								kind: import_src$18.SpanKind.CLIENT,
+								kind: import_src$20.SpanKind.CLIENT,
 								submodule: "verify",
 								packageName: "jsonwebtoken",
 								instrumentationName: self.INSTRUMENTATION_NAME,
@@ -16836,7 +17290,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalVerify.apply(this, args), {
 							name: "jsonwebtoken.verify",
-							kind: import_src$18.SpanKind.CLIENT,
+							kind: import_src$20.SpanKind.CLIENT,
 							submodule: "verify",
 							packageName: "jsonwebtoken",
 							instrumentationName: self.INSTRUMENTATION_NAME,
@@ -16846,7 +17300,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordVerifyInSpan(spanInfo, originalVerify, verifyConfig, args, this);
 						});
 					},
-					spanKind: import_src$18.SpanKind.CLIENT
+					spanKind: import_src$20.SpanKind.CLIENT
 				});
 				else return originalVerify.apply(this, args);
 			};
@@ -16884,7 +17338,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 						replayModeHandler: () => {
 							return SpanUtils.createAndExecuteSpan(self.mode, () => originalSign.apply(this, args), {
 								name: "jsonwebtoken.sign",
-								kind: import_src$18.SpanKind.CLIENT,
+								kind: import_src$20.SpanKind.CLIENT,
 								submodule: "sign",
 								packageName: "jsonwebtoken",
 								instrumentationName: self.INSTRUMENTATION_NAME,
@@ -16900,7 +17354,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalSign.apply(this, args), {
 							name: "jsonwebtoken.sign",
-							kind: import_src$18.SpanKind.CLIENT,
+							kind: import_src$20.SpanKind.CLIENT,
 							submodule: "sign",
 							packageName: "jsonwebtoken",
 							instrumentationName: self.INSTRUMENTATION_NAME,
@@ -16910,7 +17364,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordSignInSpan(spanInfo, originalSign, signConfig, args, this);
 						});
 					},
-					spanKind: import_src$18.SpanKind.CLIENT
+					spanKind: import_src$20.SpanKind.CLIENT
 				});
 				else return originalSign.apply(this, args);
 			};
@@ -16949,7 +17403,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 					logger.debug(`[JsonwebtokenInstrumentation] JWT verify error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 					this._addErrorOutputAttributesToSpan(spanInfo, error);
 					SpanUtils.endSpan(spanInfo.span, {
-						code: import_src$18.SpanStatusCode.ERROR,
+						code: import_src$20.SpanStatusCode.ERROR,
 						message: error.message
 					});
 				} catch (error$1) {
@@ -16958,7 +17412,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 				else try {
 					logger.debug(`[JsonwebtokenInstrumentation] JWT verify completed successfully (${SpanUtils.getTraceInfo()})`);
 					this._addOutputAttributesToSpan(spanInfo, decoded);
-					SpanUtils.endSpan(spanInfo.span, { code: import_src$18.SpanStatusCode.OK });
+					SpanUtils.endSpan(spanInfo.span, { code: import_src$20.SpanStatusCode.OK });
 				} catch (error$1) {
 					logger.error(`[JsonwebtokenInstrumentation] error ending span:`, error$1);
 				}
@@ -16976,7 +17430,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 					logger.debug(`[JsonwebtokenInstrumentation] JWT verify sync error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 					this._addErrorOutputAttributesToSpan(spanInfo, error);
 					SpanUtils.endSpan(spanInfo.span, {
-						code: import_src$18.SpanStatusCode.ERROR,
+						code: import_src$20.SpanStatusCode.ERROR,
 						message: error.message
 					});
 				} catch (error$1) {
@@ -16989,7 +17443,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 			try {
 				logger.debug(`[JsonwebtokenInstrumentation] JWT verify completed successfully (${SpanUtils.getTraceInfo()})`);
 				this._addOutputAttributesToSpan(spanInfo, result);
-				SpanUtils.endSpan(spanInfo.span, { code: import_src$18.SpanStatusCode.OK });
+				SpanUtils.endSpan(spanInfo.span, { code: import_src$20.SpanStatusCode.OK });
 			} catch (error) {
 				logger.error(`[JsonwebtokenInstrumentation] error ending span:`, error);
 			}
@@ -16999,7 +17453,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 				logger.debug(`[JsonwebtokenInstrumentation] JWT verify error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 				this._addErrorOutputAttributesToSpan(spanInfo, error);
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$18.SpanStatusCode.ERROR,
+					code: import_src$20.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch (error$1) {
@@ -17016,7 +17470,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 					logger.debug(`[JsonwebtokenInstrumentation] JWT sign error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 					this._addErrorOutputAttributesToSpan(spanInfo, error);
 					SpanUtils.endSpan(spanInfo.span, {
-						code: import_src$18.SpanStatusCode.ERROR,
+						code: import_src$20.SpanStatusCode.ERROR,
 						message: error.message
 					});
 				} catch (error$1) {
@@ -17025,7 +17479,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 				else try {
 					logger.debug(`[JsonwebtokenInstrumentation] JWT sign completed successfully (${SpanUtils.getTraceInfo()})`);
 					this._addOutputAttributesToSpan(spanInfo, token);
-					SpanUtils.endSpan(spanInfo.span, { code: import_src$18.SpanStatusCode.OK });
+					SpanUtils.endSpan(spanInfo.span, { code: import_src$20.SpanStatusCode.OK });
 				} catch (error$1) {
 					logger.error(`[JsonwebtokenInstrumentation] error ending span:`, error$1);
 				}
@@ -17042,7 +17496,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 			try {
 				logger.debug(`[JsonwebtokenInstrumentation] JWT sign completed successfully (${SpanUtils.getTraceInfo()})`);
 				this._addOutputAttributesToSpan(spanInfo, result);
-				SpanUtils.endSpan(spanInfo.span, { code: import_src$18.SpanStatusCode.OK });
+				SpanUtils.endSpan(spanInfo.span, { code: import_src$20.SpanStatusCode.OK });
 			} catch (error) {
 				logger.error(`[JsonwebtokenInstrumentation] error ending span:`, error);
 			}
@@ -17052,7 +17506,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 				logger.debug(`[JsonwebtokenInstrumentation] JWT sign error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 				this._addErrorOutputAttributesToSpan(spanInfo, error);
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$18.SpanStatusCode.ERROR,
+					code: import_src$20.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch (error$1) {
@@ -17061,9 +17515,9 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 			throw error;
 		}
 	}
-	async handleReplayVerify(verifyConfig, inputValue, spanInfo, stackTrace) {
+	handleReplayVerify(verifyConfig, inputValue, spanInfo, stackTrace) {
 		logger.debug(`[JsonwebtokenInstrumentation] Replaying JWT verify`);
-		const mockData = await findMockResponseAsync({
+		const mockData = findMockResponseSync({
 			mockRequestData: {
 				traceId: spanInfo.traceId,
 				spanId: spanInfo.spanId,
@@ -17072,7 +17526,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName: "verify",
 				inputValue,
-				kind: import_src$18.SpanKind.CLIENT,
+				kind: import_src$20.SpanKind.CLIENT,
 				stackTrace
 			},
 			tuskDrift: this.tuskDrift
@@ -17104,9 +17558,9 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 			return;
 		} else return result;
 	}
-	async handleReplaySign(signConfig, inputValue, spanInfo, stackTrace) {
+	handleReplaySign(signConfig, inputValue, spanInfo, stackTrace) {
 		logger.debug(`[JsonwebtokenInstrumentation] Replaying JWT sign`);
-		const mockData = await findMockResponseAsync({
+		const mockData = findMockResponseSync({
 			mockRequestData: {
 				traceId: spanInfo?.traceId,
 				spanId: spanInfo?.spanId,
@@ -17115,7 +17569,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName: "sign",
 				inputValue,
-				kind: import_src$18.SpanKind.CLIENT,
+				kind: import_src$20.SpanKind.CLIENT,
 				stackTrace
 			},
 			tuskDrift: this.tuskDrift
@@ -17217,7 +17671,7 @@ var JwksRsaInstrumentation = class extends TdInstrumentationBase {
 
 //#endregion
 //#region src/instrumentation/libraries/fetch/FetchTransformEngine.ts
-var import_src$17 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$19 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 /**
 * Creates an empty FetchInputValue object for dropped spans
 */
@@ -17292,7 +17746,7 @@ var FetchTransformEngine = class {
 	}
 	compileMatcher(matcher) {
 		const checks = [];
-		checks.push((span) => span.kind === import_src$17.SpanKind.CLIENT);
+		checks.push((span) => span.kind === import_src$19.SpanKind.CLIENT);
 		if (matcher.method) if (matcher.method.length === 0) {} else {
 			const methods = matcher.method.map((method) => method.toUpperCase());
 			checks.push((span) => {
@@ -17488,7 +17942,7 @@ var FetchTransformEngine = class {
 
 //#endregion
 //#region src/instrumentation/libraries/fetch/Instrumentation.ts
-var import_src$16 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$18 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 /**
 * Fetch API instrumentation for capturing requests made via fetch()
 * This covers libraries like @octokit/rest, axios (when using fetch adapter), etc.
@@ -17550,7 +18004,7 @@ var FetchInstrumentation = class extends TdInstrumentationBase {
 			replayModeHandler: () => {
 				return SpanUtils.createAndExecuteSpan(this.mode, () => this.originalFetch(input, init), {
 					name: url,
-					kind: import_src$16.SpanKind.CLIENT,
+					kind: import_src$18.SpanKind.CLIENT,
 					packageName: "fetch",
 					packageType: PackageType.HTTP,
 					instrumentationName: this.INSTRUMENTATION_NAME,
@@ -17565,14 +18019,14 @@ var FetchInstrumentation = class extends TdInstrumentationBase {
 		else if (this.mode === TuskDriftMode.RECORD) return handleRecordMode({
 			originalFunctionCall: () => this.originalFetch(input, init),
 			recordModeHandler: ({ isPreAppStart }) => this._handleRecordFetch(input, inputValue, isPreAppStart, init),
-			spanKind: import_src$16.SpanKind.CLIENT
+			spanKind: import_src$18.SpanKind.CLIENT
 		});
 		else return this.originalFetch(input, init);
 	}
 	_handleRecordFetch(input, inputValue, isPreAppStart, init) {
 		return SpanUtils.createAndExecuteSpan(this.mode, () => this.originalFetch(input, init), {
 			name: inputValue.url,
-			kind: import_src$16.SpanKind.CLIENT,
+			kind: import_src$18.SpanKind.CLIENT,
 			packageName: "fetch",
 			packageType: PackageType.HTTP,
 			instrumentationName: this.INSTRUMENTATION_NAME,
@@ -17601,7 +18055,7 @@ var FetchInstrumentation = class extends TdInstrumentationBase {
 					const spanData = {
 						traceId: spanInfo.traceId,
 						spanId: spanInfo.spanId,
-						kind: import_src$16.SpanKind.CLIENT,
+						kind: import_src$18.SpanKind.CLIENT,
 						inputValue,
 						outputValue
 					};
@@ -17619,9 +18073,9 @@ var FetchInstrumentation = class extends TdInstrumentationBase {
 						...spanData.transformMetadata && { transformMetadata: spanData.transformMetadata }
 					});
 					const status = response.status >= 300 ? {
-						code: import_src$16.SpanStatusCode.ERROR,
+						code: import_src$18.SpanStatusCode.ERROR,
 						message: `HTTP ${response.status}`
-					} : { code: import_src$16.SpanStatusCode.OK };
+					} : { code: import_src$18.SpanStatusCode.OK };
 					SpanUtils.endSpan(spanInfo.span, status);
 				} catch (error) {
 					logger.error(`[FetchInstrumentation] error processing response body:`, error);
@@ -17630,7 +18084,7 @@ var FetchInstrumentation = class extends TdInstrumentationBase {
 			}).catch((error) => {
 				try {
 					SpanUtils.endSpan(spanInfo.span, {
-						code: import_src$16.SpanStatusCode.ERROR,
+						code: import_src$18.SpanStatusCode.ERROR,
 						message: error.message
 					});
 				} catch (error$1) {
@@ -17651,7 +18105,7 @@ var FetchInstrumentation = class extends TdInstrumentationBase {
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName: inputValue.method,
 				inputValue,
-				kind: import_src$16.SpanKind.CLIENT,
+				kind: import_src$18.SpanKind.CLIENT,
 				stackTrace
 			},
 			tuskDrift: this.tuskDrift,
@@ -17817,10 +18271,23 @@ function convertValueToJsonable(value) {
 		encoding: BufferEncoding.NONE
 	};
 }
+/**
+* Recursively deserialize Buffer objects from JSON representation.
+* Converts {"type":"Buffer","data":[...]} back to actual Buffer instances.
+* This handles the format produced by JSON.stringify(Buffer).
+*/
+function deserializeBufferValue(value) {
+	if (!value || typeof value !== "object") return value;
+	if (value.type === "Buffer" && Array.isArray(value.data)) return Buffer.from(value.data);
+	if (Array.isArray(value)) return value.map((item) => deserializeBufferValue(item));
+	const result = {};
+	for (const key of Object.keys(value)) result[key] = deserializeBufferValue(value[key]);
+	return result;
+}
 
 //#endregion
 //#region src/instrumentation/libraries/ioredis/Instrumentation.ts
-var import_src$15 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$17 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 const SUPPORTED_VERSIONS$1 = [">=4.11.0 <5", "5.*"];
 var IORedisInstrumentation = class extends TdInstrumentationBase {
 	constructor(config = {}) {
@@ -17938,7 +18405,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 						replayModeHandler: () => {
 							return SpanUtils.createAndExecuteSpan(self.mode, () => originalSendCommand.apply(this, arguments), {
 								name: `ioredis.${commandName}`,
-								kind: import_src$15.SpanKind.CLIENT,
+								kind: import_src$17.SpanKind.CLIENT,
 								submodule: commandName,
 								packageType: PackageType.REDIS,
 								packageName: "ioredis",
@@ -17955,7 +18422,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalSendCommand.apply(this, arguments), {
 							name: `ioredis.${commandName}`,
-							kind: import_src$15.SpanKind.CLIENT,
+							kind: import_src$17.SpanKind.CLIENT,
 							submodule: commandName,
 							packageType: PackageType.REDIS,
 							packageName: "ioredis",
@@ -17966,7 +18433,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordSendCommand(spanInfo, originalSendCommand, cmd, this);
 						});
 					},
-					spanKind: import_src$15.SpanKind.CLIENT
+					spanKind: import_src$17.SpanKind.CLIENT
 				});
 				else return originalSendCommand.apply(this, arguments);
 			};
@@ -17991,7 +18458,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalConnect.apply(this, arguments), {
 							name: "ioredis.connect",
-							kind: import_src$15.SpanKind.CLIENT,
+							kind: import_src$17.SpanKind.CLIENT,
 							submodule: "connect",
 							packageType: PackageType.REDIS,
 							packageName: "ioredis",
@@ -18008,7 +18475,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalConnect.apply(this, arguments), {
 							name: "ioredis.connect",
-							kind: import_src$15.SpanKind.CLIENT,
+							kind: import_src$17.SpanKind.CLIENT,
 							submodule: "connect",
 							packageType: PackageType.REDIS,
 							packageName: "ioredis",
@@ -18019,7 +18486,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordConnect(spanInfo, originalConnect, this);
 						});
 					},
-					spanKind: import_src$15.SpanKind.CLIENT
+					spanKind: import_src$17.SpanKind.CLIENT
 				});
 				else return originalConnect.apply(this, arguments);
 			};
@@ -18067,7 +18534,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalExec.apply(this, args), {
 							name: "ioredis.pipeline.exec",
-							kind: import_src$15.SpanKind.CLIENT,
+							kind: import_src$17.SpanKind.CLIENT,
 							submodule: "pipeline-exec",
 							packageType: PackageType.REDIS,
 							packageName: "ioredis",
@@ -18084,7 +18551,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalExec.apply(this, args), {
 							name: "ioredis.pipeline.exec",
-							kind: import_src$15.SpanKind.CLIENT,
+							kind: import_src$17.SpanKind.CLIENT,
 							submodule: "pipeline-exec",
 							packageType: PackageType.REDIS,
 							packageName: "ioredis",
@@ -18095,7 +18562,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordPipelineExec(spanInfo, originalExec, this, args);
 						});
 					},
-					spanKind: import_src$15.SpanKind.CLIENT
+					spanKind: import_src$17.SpanKind.CLIENT
 				});
 				else return originalExec.apply(this, args);
 			};
@@ -18108,7 +18575,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 				logger.debug(`[IORedisInstrumentation] IORedis command ${cmd.name} completed successfully (${SpanUtils.getTraceInfo()})`);
 				const outputValue = this._serializeOutput(result);
 				SpanUtils.addSpanAttributes(spanInfo.span, { outputValue });
-				SpanUtils.endSpan(spanInfo.span, { code: import_src$15.SpanStatusCode.OK });
+				SpanUtils.endSpan(spanInfo.span, { code: import_src$17.SpanStatusCode.OK });
 			} catch (error) {
 				logger.error(`[IORedisInstrumentation] error processing command response:`, error);
 			}
@@ -18117,7 +18584,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 			try {
 				logger.debug(`[IORedisInstrumentation] IORedis command ${cmd.name} error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$15.SpanStatusCode.ERROR,
+					code: import_src$17.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch (spanError) {
@@ -18138,7 +18605,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 				packageName: "ioredis",
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName: cmd.name,
-				kind: import_src$15.SpanKind.CLIENT,
+				kind: import_src$17.SpanKind.CLIENT,
 				stackTrace
 			},
 			tuskDrift: this.tuskDrift
@@ -18160,7 +18627,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 			try {
 				logger.debug(`[IORedisInstrumentation] IORedis connect completed successfully (${SpanUtils.getTraceInfo()})`);
 				SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: { connected: true } });
-				SpanUtils.endSpan(spanInfo.span, { code: import_src$15.SpanStatusCode.OK });
+				SpanUtils.endSpan(spanInfo.span, { code: import_src$17.SpanStatusCode.OK });
 			} catch {
 				logger.error(`[IORedisInstrumentation] error adding span attributes`);
 			}
@@ -18169,7 +18636,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 			try {
 				logger.debug(`[IORedisInstrumentation] IORedis connect error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$15.SpanStatusCode.ERROR,
+					code: import_src$17.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch {
@@ -18180,7 +18647,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 		try {
 			logger.debug(`[IORedisInstrumentation] IORedis connect completed (synchronous) (${SpanUtils.getTraceInfo()})`);
 			SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: { connected: true } });
-			SpanUtils.endSpan(spanInfo.span, { code: import_src$15.SpanStatusCode.OK });
+			SpanUtils.endSpan(spanInfo.span, { code: import_src$17.SpanStatusCode.OK });
 		} catch {
 			logger.error(`[IORedisInstrumentation] error adding span attributes`);
 		}
@@ -18200,7 +18667,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 				logger.debug(`[IORedisInstrumentation] Pipeline exec completed successfully (${SpanUtils.getTraceInfo()})`);
 				const outputValue = this._serializePipelineOutput(results);
 				SpanUtils.addSpanAttributes(spanInfo.span, { outputValue });
-				SpanUtils.endSpan(spanInfo.span, { code: import_src$15.SpanStatusCode.OK });
+				SpanUtils.endSpan(spanInfo.span, { code: import_src$17.SpanStatusCode.OK });
 			} catch {
 				logger.error(`[IORedisInstrumentation] error adding span attributes`);
 			}
@@ -18209,7 +18676,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 			try {
 				logger.debug(`[IORedisInstrumentation] Pipeline exec error: ${error.message} (${SpanUtils.getTraceInfo()})`);
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$15.SpanStatusCode.ERROR,
+					code: import_src$17.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch {
@@ -18230,7 +18697,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 				packageName: "ioredis",
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName: "pipeline-exec",
-				kind: import_src$15.SpanKind.CLIENT
+				kind: import_src$17.SpanKind.CLIENT
 			},
 			tuskDrift: this.tuskDrift
 		});
@@ -18270,12 +18737,12 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 	}
 	_deserializePipelineOutput(outputValue) {
 		if (!outputValue) return [];
-		return outputValue.value || outputValue;
+		return deserializeBufferValue(outputValue.value || outputValue);
 	}
 	_deserializeOutput(outputValue) {
 		if (!outputValue) return;
-		if (typeof outputValue !== "object" || !("value" in outputValue)) return outputValue;
-		return outputValue.value;
+		if (typeof outputValue !== "object" || !("value" in outputValue)) return deserializeBufferValue(outputValue);
+		return deserializeBufferValue(outputValue.value);
 	}
 	_wrap(target, propertyName, wrapper) {
 		wrap(target, propertyName, wrapper);
@@ -18284,7 +18751,7 @@ var IORedisInstrumentation = class extends TdInstrumentationBase {
 
 //#endregion
 //#region src/instrumentation/libraries/upstash-redis-js/Instrumentation.ts
-var import_src$14 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$16 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 const SUPPORTED_VERSIONS = [">=1.0.0"];
 const REDIS_COMMANDS = [
 	"get",
@@ -18541,7 +19008,7 @@ var UpstashRedisInstrumentation = class extends TdInstrumentationBase {
 							replayModeHandler: () => {
 								return SpanUtils.createAndExecuteSpan(self.mode, () => originalValue.apply(this === receiver ? target : this, args), {
 									name: operationName,
-									kind: import_src$14.SpanKind.CLIENT,
+									kind: import_src$16.SpanKind.CLIENT,
 									submodule: submoduleName,
 									packageType: PackageType.REDIS,
 									packageName: "@upstash/redis",
@@ -18558,7 +19025,7 @@ var UpstashRedisInstrumentation = class extends TdInstrumentationBase {
 						recordModeHandler: ({ isPreAppStart }) => {
 							return SpanUtils.createAndExecuteSpan(self.mode, () => originalValue.apply(this === receiver ? target : this, args), {
 								name: operationName,
-								kind: import_src$14.SpanKind.CLIENT,
+								kind: import_src$16.SpanKind.CLIENT,
 								submodule: submoduleName,
 								packageType: PackageType.REDIS,
 								packageName: "@upstash/redis",
@@ -18570,7 +19037,7 @@ var UpstashRedisInstrumentation = class extends TdInstrumentationBase {
 								return self._handleRecordCommand(spanInfo, originalValue, this === receiver ? target : this, args);
 							});
 						},
-						spanKind: import_src$14.SpanKind.CLIENT
+						spanKind: import_src$16.SpanKind.CLIENT
 					});
 					else return originalValue.apply(this === receiver ? target : this, args);
 				};
@@ -18585,7 +19052,7 @@ var UpstashRedisInstrumentation = class extends TdInstrumentationBase {
 			const outputValue = { result };
 			try {
 				SpanUtils.addSpanAttributes(spanInfo.span, { outputValue });
-				SpanUtils.endSpan(spanInfo.span, { code: import_src$14.SpanStatusCode.OK });
+				SpanUtils.endSpan(spanInfo.span, { code: import_src$16.SpanStatusCode.OK });
 			} catch (error) {
 				logger.error(`[UpstashRedisInstrumentation] Error adding span attributes: ${error}`);
 			}
@@ -18593,7 +19060,7 @@ var UpstashRedisInstrumentation = class extends TdInstrumentationBase {
 		} catch (error) {
 			logger.debug(`[UpstashRedisInstrumentation] Command error: ${error}`);
 			try {
-				SpanUtils.endSpan(spanInfo.span, { code: import_src$14.SpanStatusCode.ERROR });
+				SpanUtils.endSpan(spanInfo.span, { code: import_src$16.SpanStatusCode.ERROR });
 			} catch (error$1) {
 				logger.error(`[UpstashRedisInstrumentation] Error ending span: ${error$1}`);
 			}
@@ -18611,7 +19078,7 @@ var UpstashRedisInstrumentation = class extends TdInstrumentationBase {
 				packageName: "@upstash/redis",
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName,
-				kind: import_src$14.SpanKind.CLIENT,
+				kind: import_src$16.SpanKind.CLIENT,
 				stackTrace
 			},
 			tuskDrift: this.tuskDrift
@@ -18784,7 +19251,7 @@ function deepClone(obj) {
 
 //#endregion
 //#region src/instrumentation/libraries/grpc/Instrumentation.ts
-var import_src$13 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$15 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 const GRPC_MODULE_NAME = "@grpc/grpc-js";
 var GrpcInstrumentation = class GrpcInstrumentation extends TdInstrumentationBase {
 	constructor(config = {}) {
@@ -18846,16 +19313,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,
@@ -18935,7 +19414,7 @@ var GrpcInstrumentation = class GrpcInstrumentation extends TdInstrumentationBas
 						replayModeHandler: () => {
 							return SpanUtils.createAndExecuteSpan(self.mode, () => original.apply(this, args), {
 								name: "grpc.client.unary",
-								kind: import_src$13.SpanKind.CLIENT,
+								kind: import_src$15.SpanKind.CLIENT,
 								submodule: "client",
 								packageType: PackageType.GRPC,
 								packageName: GRPC_MODULE_NAME,
@@ -18952,7 +19431,7 @@ var GrpcInstrumentation = class GrpcInstrumentation extends TdInstrumentationBas
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => original.apply(this, args), {
 							name: "grpc.client.unary",
-							kind: import_src$13.SpanKind.CLIENT,
+							kind: import_src$15.SpanKind.CLIENT,
 							submodule: "client",
 							packageType: PackageType.GRPC,
 							packageName: GRPC_MODULE_NAME,
@@ -18963,7 +19442,7 @@ var GrpcInstrumentation = class GrpcInstrumentation extends TdInstrumentationBas
 							return self._handleRecordUnaryRequest(spanInfo, original, this, parsedParams, callback);
 						});
 					},
-					spanKind: import_src$13.SpanKind.CLIENT
+					spanKind: import_src$15.SpanKind.CLIENT
 				});
 				else return original.apply(this, args);
 			};
@@ -19029,7 +19508,7 @@ var GrpcInstrumentation = class GrpcInstrumentation extends TdInstrumentationBas
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => original.apply(this, args), {
 							name: "grpc.client.server_stream",
-							kind: import_src$13.SpanKind.CLIENT,
+							kind: import_src$15.SpanKind.CLIENT,
 							submodule: "client",
 							packageType: PackageType.GRPC,
 							packageName: GRPC_MODULE_NAME,
@@ -19046,7 +19525,7 @@ var GrpcInstrumentation = class GrpcInstrumentation extends TdInstrumentationBas
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => original.apply(this, args), {
 							name: "grpc.client.server_stream",
-							kind: import_src$13.SpanKind.CLIENT,
+							kind: import_src$15.SpanKind.CLIENT,
 							submodule: "client",
 							packageType: PackageType.GRPC,
 							packageName: GRPC_MODULE_NAME,
@@ -19057,7 +19536,7 @@ var GrpcInstrumentation = class GrpcInstrumentation extends TdInstrumentationBas
 							return self._handleRecordServerStreamRequest(spanInfo, original, this, parsedParams);
 						});
 					},
-					spanKind: import_src$13.SpanKind.CLIENT
+					spanKind: import_src$15.SpanKind.CLIENT
 				});
 				else return original.apply(this, args);
 			};
@@ -19140,7 +19619,7 @@ var GrpcInstrumentation = class GrpcInstrumentation extends TdInstrumentationBas
 					status,
 					bufferMap: responseBufferMap,
 					jsonableStringMap: responseJsonableStringMap
-				}, import_src$13.SpanStatusCode.OK);
+				}, import_src$15.SpanStatusCode.OK);
 				else if (isStatusEmitted && hasErrorOccurred) completeSpan({
 					error: {
 						message: serviceError.message,
@@ -19149,7 +19628,7 @@ var GrpcInstrumentation = class GrpcInstrumentation extends TdInstrumentationBas
 					},
 					status,
 					metadata: responseMetadataInitial
-				}, import_src$13.SpanStatusCode.ERROR, serviceError.message);
+				}, import_src$15.SpanStatusCode.ERROR, serviceError.message);
 			} catch (e) {
 				logger.error(`[GrpcInstrumentation] Error in patchedCallback:`, e);
 			}
@@ -19181,7 +19660,7 @@ var GrpcInstrumentation = class GrpcInstrumentation extends TdInstrumentationBas
 				status,
 				bufferMap: responseBufferMap,
 				jsonableStringMap: responseJsonableStringMap
-			}, import_src$13.SpanStatusCode.OK);
+			}, import_src$15.SpanStatusCode.OK);
 			else if (hasErrorOccurred) completeSpan({
 				error: {
 					message: serviceError.message,
@@ -19190,7 +19669,7 @@ var GrpcInstrumentation = class GrpcInstrumentation extends TdInstrumentationBas
 				},
 				status,
 				metadata: responseMetadataInitial
-			}, import_src$13.SpanStatusCode.ERROR, serviceError.message);
+			}, import_src$15.SpanStatusCode.ERROR, serviceError.message);
 		});
 		return result;
 	}
@@ -19214,7 +19693,7 @@ var GrpcInstrumentation = class GrpcInstrumentation extends TdInstrumentationBas
 				packageType: PackageType.GRPC,
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName: "client",
-				kind: import_src$13.SpanKind.CLIENT,
+				kind: import_src$15.SpanKind.CLIENT,
 				stackTrace
 			},
 			tuskDrift: this.tuskDrift
@@ -19318,14 +19797,14 @@ var GrpcInstrumentation = class GrpcInstrumentation extends TdInstrumentationBas
 				status,
 				bufferMap: {},
 				jsonableStringMap: {}
-			}, import_src$13.SpanStatusCode.OK);
+			}, import_src$15.SpanStatusCode.OK);
 			else if (!hasErrorOccurred && streamResponses.length === 0) completeSpan({
 				body: [],
 				metadata: responseMetadataInitial,
 				status,
 				bufferMap: {},
 				jsonableStringMap: {}
-			}, import_src$13.SpanStatusCode.OK);
+			}, import_src$15.SpanStatusCode.OK);
 			else if (hasErrorOccurred) completeSpan({
 				error: {
 					message: serviceError.message,
@@ -19334,7 +19813,7 @@ var GrpcInstrumentation = class GrpcInstrumentation extends TdInstrumentationBas
 				},
 				status,
 				metadata: responseMetadataInitial
-			}, import_src$13.SpanStatusCode.ERROR, serviceError.message);
+			}, import_src$15.SpanStatusCode.ERROR, serviceError.message);
 		});
 		return stream$1;
 	}
@@ -19359,7 +19838,7 @@ var GrpcInstrumentation = class GrpcInstrumentation extends TdInstrumentationBas
 				packageType: PackageType.GRPC,
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName: "client",
-				kind: import_src$13.SpanKind.CLIENT
+				kind: import_src$15.SpanKind.CLIENT
 			},
 			tuskDrift: this.tuskDrift
 		}).then((mockData) => {
@@ -19631,7 +20110,7 @@ var TdFirestoreWriteResultMock = class {
 
 //#endregion
 //#region src/instrumentation/libraries/firestore/Instrumentation.ts
-var import_src$12 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$14 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 const FIRESTORE_VERSION = "7.*";
 const PACKAGE_NAME = "@google-cloud/firestore";
 var FirestoreInstrumentation = class extends TdInstrumentationBase {
@@ -19739,7 +20218,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalGet.call(this), {
 							name: "firestore.document.get",
-							kind: import_src$12.SpanKind.CLIENT,
+							kind: import_src$14.SpanKind.CLIENT,
 							submodule: "document",
 							packageType: PackageType.FIRESTORE,
 							packageName: PACKAGE_NAME,
@@ -19757,7 +20236,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalGet.call(this), {
 							name: "firestore.document.get",
-							kind: import_src$12.SpanKind.CLIENT,
+							kind: import_src$14.SpanKind.CLIENT,
 							submodule: "document",
 							packageType: PackageType.FIRESTORE,
 							packageName: PACKAGE_NAME,
@@ -19769,7 +20248,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordDocumentGet(spanInfo, originalGet, this);
 						});
 					},
-					spanKind: import_src$12.SpanKind.CLIENT
+					spanKind: import_src$14.SpanKind.CLIENT
 				});
 				else return originalGet.call(this);
 			};
@@ -19797,7 +20276,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 		};
 		try {
 			SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: documentResult });
-			SpanUtils.endSpan(spanInfo.span, { code: import_src$12.SpanStatusCode.OK });
+			SpanUtils.endSpan(spanInfo.span, { code: import_src$14.SpanStatusCode.OK });
 		} catch {
 			logger.error(`[FirestoreInstrumentation] Error updating span attributes for document.get`);
 		}
@@ -19814,7 +20293,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 				packageName: PACKAGE_NAME,
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName: "document",
-				kind: import_src$12.SpanKind.CLIENT
+				kind: import_src$14.SpanKind.CLIENT
 			},
 			tuskDrift: this.tuskDrift
 		});
@@ -19846,7 +20325,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalCreate.call(this, data), {
 							name: "firestore.document.create",
-							kind: import_src$12.SpanKind.CLIENT,
+							kind: import_src$14.SpanKind.CLIENT,
 							submodule: "document",
 							packageType: PackageType.FIRESTORE,
 							packageName: PACKAGE_NAME,
@@ -19864,7 +20343,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalCreate.call(this, data), {
 							name: "firestore.document.create",
-							kind: import_src$12.SpanKind.CLIENT,
+							kind: import_src$14.SpanKind.CLIENT,
 							submodule: "document",
 							packageType: PackageType.FIRESTORE,
 							packageName: PACKAGE_NAME,
@@ -19876,7 +20355,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordDocumentWrite(spanInfo, originalCreate, this, data);
 						});
 					},
-					spanKind: import_src$12.SpanKind.CLIENT
+					spanKind: import_src$14.SpanKind.CLIENT
 				});
 				else return originalCreate.call(this, data);
 			};
@@ -19904,7 +20383,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalSet.call(this, data, options), {
 							name: "firestore.document.set",
-							kind: import_src$12.SpanKind.CLIENT,
+							kind: import_src$14.SpanKind.CLIENT,
 							submodule: "document",
 							packageType: PackageType.FIRESTORE,
 							packageName: PACKAGE_NAME,
@@ -19922,7 +20401,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalSet.call(this, data, options), {
 							name: "firestore.document.set",
-							kind: import_src$12.SpanKind.CLIENT,
+							kind: import_src$14.SpanKind.CLIENT,
 							submodule: "document",
 							packageType: PackageType.FIRESTORE,
 							packageName: PACKAGE_NAME,
@@ -19934,7 +20413,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordDocumentWrite(spanInfo, originalSet, this, data, options);
 						});
 					},
-					spanKind: import_src$12.SpanKind.CLIENT
+					spanKind: import_src$14.SpanKind.CLIENT
 				});
 				else return originalSet.call(this, data, options);
 			};
@@ -19961,7 +20440,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalUpdate.apply(this, args), {
 							name: "firestore.document.update",
-							kind: import_src$12.SpanKind.CLIENT,
+							kind: import_src$14.SpanKind.CLIENT,
 							submodule: "document",
 							packageType: PackageType.FIRESTORE,
 							packageName: PACKAGE_NAME,
@@ -19979,7 +20458,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalUpdate.apply(this, args), {
 							name: "firestore.document.update",
-							kind: import_src$12.SpanKind.CLIENT,
+							kind: import_src$14.SpanKind.CLIENT,
 							submodule: "document",
 							packageType: PackageType.FIRESTORE,
 							packageName: PACKAGE_NAME,
@@ -19991,7 +20470,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordDocumentWrite(spanInfo, originalUpdate, this, ...args);
 						});
 					},
-					spanKind: import_src$12.SpanKind.CLIENT
+					spanKind: import_src$14.SpanKind.CLIENT
 				});
 				else return originalUpdate.apply(this, args);
 			};
@@ -20018,7 +20497,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalDelete.call(this, precondition), {
 							name: "firestore.document.delete",
-							kind: import_src$12.SpanKind.CLIENT,
+							kind: import_src$14.SpanKind.CLIENT,
 							submodule: "document",
 							packageType: PackageType.FIRESTORE,
 							packageName: PACKAGE_NAME,
@@ -20036,7 +20515,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalDelete.call(this, precondition), {
 							name: "firestore.document.delete",
-							kind: import_src$12.SpanKind.CLIENT,
+							kind: import_src$14.SpanKind.CLIENT,
 							submodule: "document",
 							packageType: PackageType.FIRESTORE,
 							packageName: PACKAGE_NAME,
@@ -20048,7 +20527,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordDocumentWrite(spanInfo, originalDelete, this, precondition);
 						});
 					},
-					spanKind: import_src$12.SpanKind.CLIENT
+					spanKind: import_src$14.SpanKind.CLIENT
 				});
 				else return originalDelete.call(this, precondition);
 			};
@@ -20062,7 +20541,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 		} : void 0 };
 		try {
 			SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: result });
-			SpanUtils.endSpan(spanInfo.span, { code: import_src$12.SpanStatusCode.OK });
+			SpanUtils.endSpan(spanInfo.span, { code: import_src$14.SpanStatusCode.OK });
 		} catch {
 			logger.error(`[FirestoreInstrumentation] Error updating span attributes for document.write`);
 		}
@@ -20079,7 +20558,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 				packageName: PACKAGE_NAME,
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName: "document",
-				kind: import_src$12.SpanKind.CLIENT
+				kind: import_src$14.SpanKind.CLIENT
 			},
 			tuskDrift: this.tuskDrift
 		});
@@ -20111,7 +20590,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalAdd.call(this, data), {
 							name: "firestore.collection.add",
-							kind: import_src$12.SpanKind.CLIENT,
+							kind: import_src$14.SpanKind.CLIENT,
 							submodule: "collection",
 							packageType: PackageType.FIRESTORE,
 							packageName: PACKAGE_NAME,
@@ -20129,7 +20608,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalAdd.call(this, data), {
 							name: "firestore.collection.add",
-							kind: import_src$12.SpanKind.CLIENT,
+							kind: import_src$14.SpanKind.CLIENT,
 							submodule: "collection",
 							packageType: PackageType.FIRESTORE,
 							packageName: PACKAGE_NAME,
@@ -20141,7 +20620,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordCollectionAdd(spanInfo, originalAdd, this, data);
 						});
 					},
-					spanKind: import_src$12.SpanKind.CLIENT
+					spanKind: import_src$14.SpanKind.CLIENT
 				});
 				else return originalAdd.call(this, data);
 			};
@@ -20155,7 +20634,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 		};
 		try {
 			SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: result });
-			SpanUtils.endSpan(spanInfo.span, { code: import_src$12.SpanStatusCode.OK });
+			SpanUtils.endSpan(spanInfo.span, { code: import_src$14.SpanStatusCode.OK });
 		} catch {
 			logger.error(`[FirestoreInstrumentation] Error updating span attributes for collection.add`);
 		}
@@ -20172,7 +20651,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 				packageName: PACKAGE_NAME,
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName: "collection",
-				kind: import_src$12.SpanKind.CLIENT
+				kind: import_src$14.SpanKind.CLIENT
 			},
 			tuskDrift: this.tuskDrift
 		});
@@ -20205,7 +20684,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => documentPath ? originalDoc.call(this, documentPath) : originalDoc.call(this), {
 							name: "firestore.collection.doc",
-							kind: import_src$12.SpanKind.CLIENT,
+							kind: import_src$14.SpanKind.CLIENT,
 							submodule: "collection",
 							packageType: PackageType.FIRESTORE,
 							packageName: PACKAGE_NAME,
@@ -20223,7 +20702,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 									packageName: PACKAGE_NAME,
 									instrumentationName: self.INSTRUMENTATION_NAME,
 									submoduleName: "collection",
-									kind: import_src$12.SpanKind.CLIENT
+									kind: import_src$14.SpanKind.CLIENT
 								},
 								tuskDrift: self.tuskDrift
 							});
@@ -20244,7 +20723,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => documentPath ? originalDoc.call(this, documentPath) : originalDoc.call(this), {
 							name: "firestore.collection.doc",
-							kind: import_src$12.SpanKind.CLIENT,
+							kind: import_src$14.SpanKind.CLIENT,
 							submodule: "collection",
 							packageType: PackageType.FIRESTORE,
 							packageName: PACKAGE_NAME,
@@ -20260,14 +20739,14 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 							};
 							try {
 								SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: result });
-								SpanUtils.endSpan(spanInfo.span, { code: import_src$12.SpanStatusCode.OK });
+								SpanUtils.endSpan(spanInfo.span, { code: import_src$14.SpanStatusCode.OK });
 							} catch {
 								logger.error(`[FirestoreInstrumentation] Error updating span attributes for collection.doc`);
 							}
 							return docRef;
 						});
 					},
-					spanKind: import_src$12.SpanKind.CLIENT
+					spanKind: import_src$14.SpanKind.CLIENT
 				});
 				else return documentPath ? originalDoc.call(this, documentPath) : originalDoc.call(this);
 			};
@@ -20293,7 +20772,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 					replayModeHandler: () => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalGet.call(this), {
 							name: "firestore.query.get",
-							kind: import_src$12.SpanKind.CLIENT,
+							kind: import_src$14.SpanKind.CLIENT,
 							submodule: "query",
 							packageType: PackageType.FIRESTORE,
 							packageName: PACKAGE_NAME,
@@ -20311,7 +20790,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 					recordModeHandler: ({ isPreAppStart }) => {
 						return SpanUtils.createAndExecuteSpan(self.mode, () => originalGet.call(this), {
 							name: "firestore.query.get",
-							kind: import_src$12.SpanKind.CLIENT,
+							kind: import_src$14.SpanKind.CLIENT,
 							submodule: "query",
 							packageType: PackageType.FIRESTORE,
 							packageName: PACKAGE_NAME,
@@ -20323,7 +20802,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 							return self._handleRecordQueryGet(spanInfo, originalGet, this);
 						});
 					},
-					spanKind: import_src$12.SpanKind.CLIENT
+					spanKind: import_src$14.SpanKind.CLIENT
 				});
 				else return originalGet.call(this);
 			};
@@ -20359,7 +20838,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 		};
 		try {
 			SpanUtils.addSpanAttributes(spanInfo.span, { outputValue: queryResult });
-			SpanUtils.endSpan(spanInfo.span, { code: import_src$12.SpanStatusCode.OK });
+			SpanUtils.endSpan(spanInfo.span, { code: import_src$14.SpanStatusCode.OK });
 		} catch {
 			logger.error(`[FirestoreInstrumentation] Error updating span attributes for query.get`);
 		}
@@ -20376,7 +20855,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 				packageName: PACKAGE_NAME,
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName: "query",
-				kind: import_src$12.SpanKind.CLIENT
+				kind: import_src$14.SpanKind.CLIENT
 			},
 			tuskDrift: this.tuskDrift
 		});
@@ -20399,7 +20878,7 @@ var FirestoreInstrumentation = class extends TdInstrumentationBase {
 
 //#endregion
 //#region src/instrumentation/libraries/nextjs/Instrumentation.ts
-var import_src$11 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$13 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 var NextjsInstrumentation = class extends TdInstrumentationBase {
 	constructor(config = {}) {
 		super("nextjs", config);
@@ -20485,10 +20964,10 @@ var NextjsInstrumentation = class extends TdInstrumentationBase {
 						logger.debug(`[NextjsInstrumentation] Setting replay trace id`, replayTraceId);
 						const ctxWithReplayTraceId = SpanUtils.setCurrentReplayTraceId(replayTraceId);
 						if (!ctxWithReplayTraceId) throw new Error("Error setting current replay trace id");
-						return import_src$11.context.with(ctxWithReplayTraceId, () => {
+						return import_src$13.context.with(ctxWithReplayTraceId, () => {
 							return SpanUtils.createAndExecuteSpan(self.mode, () => originalHandleRequest.call(this, req, res, parsedUrl), {
 								name: url,
-								kind: import_src$11.SpanKind.SERVER,
+								kind: import_src$13.SpanKind.SERVER,
 								packageName: "nextjs",
 								submodule: method,
 								packageType: PackageType.HTTP,
@@ -20524,7 +21003,7 @@ var NextjsInstrumentation = class extends TdInstrumentationBase {
 							};
 							return SpanUtils.createAndExecuteSpan(self.mode, () => originalHandleRequest.call(this, req, res, parsedUrl), {
 								name: url,
-								kind: import_src$11.SpanKind.SERVER,
+								kind: import_src$13.SpanKind.SERVER,
 								packageName: "nextjs",
 								packageType: PackageType.HTTP,
 								submodule: method,
@@ -20544,7 +21023,7 @@ var NextjsInstrumentation = class extends TdInstrumentationBase {
 								});
 							});
 						},
-						spanKind: import_src$11.SpanKind.SERVER
+						spanKind: import_src$13.SpanKind.SERVER
 					});
 				} else return originalHandleRequest.call(this, req, res, parsedUrl);
 			};
@@ -20552,8 +21031,8 @@ var NextjsInstrumentation = class extends TdInstrumentationBase {
 	}
 	async _handleNextjsRequestInSpan({ req, res, parsedUrl, originalHandleRequest, spanInfo, inputValue, thisContext }) {
 		const self = this;
-		import_src$11.context.bind(spanInfo.context, req);
-		import_src$11.context.bind(spanInfo.context, res);
+		import_src$13.context.bind(spanInfo.context, req);
+		import_src$13.context.bind(spanInfo.context, res);
 		let completeInputValue = inputValue;
 		this._captureRequestBody(req, spanInfo, inputValue, (updatedInputValue) => {
 			completeInputValue = updatedInputValue;
@@ -20594,7 +21073,7 @@ var NextjsInstrumentation = class extends TdInstrumentationBase {
 			logger.error(`[NextjsInstrumentation] Error in Next.js request: ${error instanceof Error ? error.message : "Unknown error"}`);
 			try {
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$11.SpanStatusCode.ERROR,
+					code: import_src$13.SpanStatusCode.ERROR,
 					message: error instanceof Error ? error.message : "Unknown error"
 				});
 			} catch (e) {
@@ -20640,9 +21119,9 @@ var NextjsInstrumentation = class extends TdInstrumentationBase {
 				}
 			});
 			const status = (capturedStatusCode || 200) >= 300 ? {
-				code: import_src$11.SpanStatusCode.ERROR,
+				code: import_src$13.SpanStatusCode.ERROR,
 				message: `HTTP ${capturedStatusCode}`
-			} : { code: import_src$11.SpanStatusCode.OK };
+			} : { code: import_src$13.SpanStatusCode.OK };
 			SpanUtils.setStatus(spanInfo.span, status);
 			const decodedType = getDecodedType(outputValue.headers?.["content-type"] || "");
 			if (decodedType && !ACCEPTABLE_CONTENT_TYPES.has(decodedType)) {
@@ -20684,7 +21163,7 @@ var NextjsInstrumentation = class extends TdInstrumentationBase {
 					outputSchemaHash: JsonSchemaHelper.generateDeterministicHash(outputSchema),
 					inputValueHash,
 					outputValueHash,
-					kind: import_src$11.SpanKind.SERVER,
+					kind: import_src$13.SpanKind.SERVER,
 					packageType: PackageType.HTTP,
 					status: {
 						code: (capturedStatusCode || 200) >= 300 ? StatusCode.ERROR : StatusCode.OK,
@@ -20710,7 +21189,7 @@ var NextjsInstrumentation = class extends TdInstrumentationBase {
 			logger.error(`[NextjsInstrumentation] Error in Next.js request: ${error instanceof Error ? error.message : "Unknown error"}`);
 			try {
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$11.SpanStatusCode.ERROR,
+					code: import_src$13.SpanStatusCode.ERROR,
 					message: error instanceof Error ? error.message : "Unknown error"
 				});
 			} catch (e) {
@@ -20804,7 +21283,7 @@ let PrismaErrorClassName = /* @__PURE__ */ function(PrismaErrorClassName$1) {
 
 //#endregion
 //#region src/instrumentation/libraries/prisma/Instrumentation.ts
-var import_src$10 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$12 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 var PrismaInstrumentation = class extends TdInstrumentationBase {
 	constructor(config = {}) {
 		super("@prisma/client", config);
@@ -20890,7 +21369,7 @@ var PrismaInstrumentation = class extends TdInstrumentationBase {
 			recordModeHandler: ({ isPreAppStart }) => {
 				return SpanUtils.createAndExecuteSpan(this.mode, () => query(args), {
 					name: `prisma.${operation}`,
-					kind: import_src$10.SpanKind.CLIENT,
+					kind: import_src$12.SpanKind.CLIENT,
 					submodule: model,
 					packageType: PackageType.PRISMA,
 					packageName: "@prisma/client",
@@ -20901,7 +21380,7 @@ var PrismaInstrumentation = class extends TdInstrumentationBase {
 					return this._handleRecordPrismaOperation(spanInfo, query, args);
 				});
 			},
-			spanKind: import_src$10.SpanKind.CLIENT
+			spanKind: import_src$12.SpanKind.CLIENT
 		});
 		else if (this.mode === TuskDriftMode.REPLAY) {
 			const stackTrace = captureStackTrace(["PrismaInstrumentation"]);
@@ -20911,7 +21390,7 @@ var PrismaInstrumentation = class extends TdInstrumentationBase {
 				replayModeHandler: () => {
 					return SpanUtils.createAndExecuteSpan(this.mode, () => query(args), {
 						name: `prisma.${operation}`,
-						kind: import_src$10.SpanKind.CLIENT,
+						kind: import_src$12.SpanKind.CLIENT,
 						submodule: model,
 						packageType: PackageType.PRISMA,
 						packageName: "@prisma/client",
@@ -20935,7 +21414,7 @@ var PrismaInstrumentation = class extends TdInstrumentationBase {
 			};
 			try {
 				SpanUtils.addSpanAttributes(spanInfo.span, { outputValue });
-				SpanUtils.endSpan(spanInfo.span, { code: import_src$10.SpanStatusCode.OK });
+				SpanUtils.endSpan(spanInfo.span, { code: import_src$12.SpanStatusCode.OK });
 			} catch (spanError) {
 				logger.error(`[PrismaInstrumentation] error adding span attributes:`, spanError);
 			}
@@ -20952,7 +21431,7 @@ var PrismaInstrumentation = class extends TdInstrumentationBase {
 				};
 				SpanUtils.addSpanAttributes(spanInfo.span, { outputValue });
 				SpanUtils.endSpan(spanInfo.span, {
-					code: import_src$10.SpanStatusCode.ERROR,
+					code: import_src$12.SpanStatusCode.ERROR,
 					message: error.message
 				});
 			} catch (spanError) {
@@ -20971,7 +21450,7 @@ var PrismaInstrumentation = class extends TdInstrumentationBase {
 				packageName: "@prisma/client",
 				instrumentationName: this.INSTRUMENTATION_NAME,
 				submoduleName: inputValue.model,
-				kind: import_src$10.SpanKind.CLIENT,
+				kind: import_src$12.SpanKind.CLIENT,
 				stackTrace
 			},
 			tuskDrift: this.tuskDrift
@@ -20989,12 +21468,12 @@ var PrismaInstrumentation = class extends TdInstrumentationBase {
 				if (errorClass) Object.setPrototypeOf(errorObj, errorClass.prototype);
 			}
 			SpanUtils.endSpan(spanInfo.span, {
-				code: import_src$10.SpanStatusCode.ERROR,
+				code: import_src$12.SpanStatusCode.ERROR,
 				message: errorObj.message || "Prisma error"
 			});
 			throw errorObj;
 		}
-		SpanUtils.endSpan(spanInfo.span, { code: import_src$10.SpanStatusCode.OK });
+		SpanUtils.endSpan(spanInfo.span, { code: import_src$12.SpanStatusCode.OK });
 		return outputValue.prismaResult;
 	}
 	_getPrismaErrorClassName(error) {
@@ -25155,8 +25634,8 @@ var require_src$6 = /* @__PURE__ */ __commonJS({ "node_modules/@opentelemetry/co
 
 //#endregion
 //#region src/core/tracing/SpanTransformer.ts
-var import_src$8 = /* @__PURE__ */ __toESM(require_src$6(), 1);
-var import_src$9 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$10 = /* @__PURE__ */ __toESM(require_src$6(), 1);
+var import_src$11 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 /**
 * Utility class for transforming OpenTelemetry spans to CleanSpanData
 */
@@ -25167,7 +25646,7 @@ var SpanTransformer = class SpanTransformer {
 	* We use JSON because serialized protobuf is extremely verbose and not readable.
 	*/
 	static transformSpanToCleanJSON(span, environment) {
-		const isRootSpan = !span.parentSpanId || span.kind === import_src$9.SpanKind.SERVER;
+		const isRootSpan = span.kind === import_src$11.SpanKind.SERVER;
 		const attributes = span.attributes;
 		const packageName = SpanTransformer.extractPackageName(attributes);
 		const instrumentationName = SpanTransformer.extractInstrumentationName(span, attributes);
@@ -25287,11 +25766,11 @@ var FilesystemSpanAdapter = class {
 				fs.appendFileSync(filePath, jsonLine, "utf8");
 			}
 			logger.debug(`Exported ${spans.length} span(s) to trace-specific files in ${this.baseDirectory}`);
-			return { code: import_src$8.ExportResultCode.SUCCESS };
+			return { code: import_src$10.ExportResultCode.SUCCESS };
 		} catch (error) {
 			logger.error(`Failed to export spans to local files:`, error);
 			return {
-				code: import_src$8.ExportResultCode.FAILED,
+				code: import_src$10.ExportResultCode.FAILED,
 				error: error instanceof Error ? error : /* @__PURE__ */ new Error("Filesystem export failed")
 			};
 		}
@@ -25646,9 +26125,9 @@ var require_commonjs = /* @__PURE__ */ __commonJS({ "node_modules/@protobuf-ts/t
 
 //#endregion
 //#region src/core/tracing/adapters/ApiSpanAdapter.ts
-var import_src$6 = /* @__PURE__ */ __toESM(require_src$6(), 1);
+var import_src$8 = /* @__PURE__ */ __toESM(require_src$6(), 1);
 var import_commonjs$2 = /* @__PURE__ */ __toESM(require_commonjs(), 1);
-var import_src$7 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$9 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 const DRIFT_API_PATH = "/api/drift";
 /**
 * Exports spans to Tusk backend API via protobuf
@@ -25682,11 +26161,11 @@ var ApiSpanAdapter = class {
 			const response = await this.spanExportClient.exportSpans(request);
 			if (!response.response.success) throw new Error(`Remote export failed: ${response.response.message}`);
 			logger.debug(`Successfully exported ${spans.length} spans to remote endpoint`);
-			return { code: import_src$6.ExportResultCode.SUCCESS };
+			return { code: import_src$8.ExportResultCode.SUCCESS };
 		} catch (error) {
 			logger.error(`Failed to export spans to remote:`, error);
 			return {
-				code: import_src$6.ExportResultCode.FAILED,
+				code: import_src$8.ExportResultCode.FAILED,
 				error: error instanceof Error ? error : /* @__PURE__ */ new Error("API export failed")
 			};
 		}
@@ -25727,12 +26206,12 @@ var ApiSpanAdapter = class {
 	}
 	mapSpanKind(kind) {
 		switch (kind) {
-			case import_src$7.SpanKind.CLIENT: return SpanKind$1.CLIENT;
-			case import_src$7.SpanKind.SERVER: return SpanKind$1.SERVER;
-			case import_src$7.SpanKind.PRODUCER: return SpanKind$1.PRODUCER;
-			case import_src$7.SpanKind.CONSUMER: return SpanKind$1.CONSUMER;
-			case import_src$7.SpanKind.INTERNAL: return SpanKind$1.INTERNAL;
-			default: return SpanKind$1.UNSPECIFIED;
+			case import_src$9.SpanKind.CLIENT: return SpanKind$2.CLIENT;
+			case import_src$9.SpanKind.SERVER: return SpanKind$2.SERVER;
+			case import_src$9.SpanKind.PRODUCER: return SpanKind$2.PRODUCER;
+			case import_src$9.SpanKind.CONSUMER: return SpanKind$2.CONSUMER;
+			case import_src$9.SpanKind.INTERNAL: return SpanKind$2.INTERNAL;
+			default: return SpanKind$2.UNSPECIFIED;
 		}
 	}
 	async shutdown() {
@@ -25743,6 +26222,8 @@ var ApiSpanAdapter = class {
 //#endregion
 //#region src/core/tracing/TdSpanExporter.ts
 var import_src$5 = /* @__PURE__ */ __toESM(require_src$6(), 1);
+var import_src$6 = /* @__PURE__ */ __toESM(require_src$7(), 1);
+var import_src$7 = /* @__PURE__ */ __toESM(require_src$7(), 1);
 var TdSpanExporter = class {
 	constructor(config) {
 		this.adapters = [];
@@ -25795,15 +26276,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) => {
@@ -25819,6 +26298,11 @@ var TdSpanExporter = class {
 				logger.debug(`Skipping span '${span.name}' (${span.spanContext().spanId}) - trace ${traceId} is blocked`);
 				return false;
 			}
+			if (span.kind === import_src$7.SpanKind.SERVER && span.status.code === import_src$6.SpanStatusCode.ERROR) {
+				traceBlockingManager.blockTrace(traceId);
+				logger.debug(`Blocking trace ${traceId} - server span has error status`);
+				return false;
+			}
 			const inputValueString = span.attributes[TdSpanAttributes.INPUT_VALUE] || "";
 			const outputValueString = span.attributes[TdSpanAttributes.OUTPUT_VALUE] || "";
 			const estimatedTotalSize = Buffer.byteLength(inputValueString, "utf8") + Buffer.byteLength(outputValueString, "utf8") + 5e4;
@@ -25837,21 +26321,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
 	*/
@@ -32982,7 +33461,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.20";
+var version = "0.1.22";
 
 //#endregion
 //#region src/version.ts
@@ -34881,14 +35360,8 @@ var TuskDriftCore = class TuskDriftCore {
 				logger.debug(`Using TCP connection to CLI: ${mockHost}:${mockPort}`);
 			} else {
 				const socketPath = mockSocket || path.default.join(os.default.tmpdir(), "tusk-connect.sock");
-				try {
-					fs.default.accessSync(socketPath, fs.default.constants.F_OK);
-					if (!fs.default.statSync(socketPath).isSocket()) throw new Error(`Path exists but is not a socket: ${socketPath}`);
-					logger.debug("Socket found and verified at", socketPath);
-				} catch (error) {
-					if (error instanceof Error && "code" in error && error.code === "ENOENT") throw new Error(`Socket not found at ${socketPath}. Make sure Tusk CLI is running.`);
-					throw new Error(`Socket check failed: ${error instanceof Error ? error.message : "Unknown error"}`);
-				}
+				if (!fs.default.existsSync(socketPath)) throw new Error(`Socket not found at ${socketPath}. Make sure Tusk CLI is running.`);
+				logger.debug("Socket found at", socketPath);
 				connectionInfo = { socketPath };
 			}
 			this.cliConnectionPromise = this.communicator.connect(connectionInfo, this.config.service?.id || "unknown").then(() => {