@use-tusk/drift-node-sdk 0.1.16 → 0.1.18

package/dist/index.cjs

@@ -4989,31 +4989,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$24) {
+	(function(SpanKind$25) {
 		/** Default value. Indicates that the span is used internally. */
-		SpanKind$24[SpanKind$24["INTERNAL"] = 0] = "INTERNAL";
+		SpanKind$25[SpanKind$25["INTERNAL"] = 0] = "INTERNAL";
 		/**
 		* Indicates that the span covers server-side handling of an RPC or other
 		* remote request.
 		*/
-		SpanKind$24[SpanKind$24["SERVER"] = 1] = "SERVER";
+		SpanKind$25[SpanKind$25["SERVER"] = 1] = "SERVER";
 		/**
 		* Indicates that the span covers the client-side wrapper around an RPC or
 		* other remote request.
 		*/
-		SpanKind$24[SpanKind$24["CLIENT"] = 2] = "CLIENT";
+		SpanKind$25[SpanKind$25["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$24[SpanKind$24["PRODUCER"] = 3] = "PRODUCER";
+		SpanKind$25[SpanKind$25["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$24[SpanKind$24["CONSUMER"] = 4] = "CONSUMER";
+		SpanKind$25[SpanKind$25["CONSUMER"] = 4] = "CONSUMER";
 	})(exports.SpanKind || (exports.SpanKind = {}));
 }) });
 
@@ -5022,20 +5022,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$13) {
+	(function(SpanStatusCode$14) {
 		/**
 		* The default status.
 		*/
-		SpanStatusCode$13[SpanStatusCode$13["UNSET"] = 0] = "UNSET";
+		SpanStatusCode$14[SpanStatusCode$14["UNSET"] = 0] = "UNSET";
 		/**
 		* The operation has been validated by an Application developer or
 		* Operator to have completed successfully.
 		*/
-		SpanStatusCode$13[SpanStatusCode$13["OK"] = 1] = "OK";
+		SpanStatusCode$14[SpanStatusCode$14["OK"] = 1] = "OK";
 		/**
 		* The operation contains an error.
 		*/
-		SpanStatusCode$13[SpanStatusCode$13["ERROR"] = 2] = "ERROR";
+		SpanStatusCode$14[SpanStatusCode$14["ERROR"] = 2] = "ERROR";
 	})(exports.SpanStatusCode || (exports.SpanStatusCode = {}));
 }) });
 
@@ -6209,7 +6209,7 @@ var JsonSchema$Type = class extends import_commonjs$7.MessageType {
 const JsonSchema = new JsonSchema$Type();
 
 //#endregion
-//#region node_modules/@use-tusk/drift-schemas/dist/span-BZ89ct3l.js
+//#region node_modules/@use-tusk/drift-schemas/dist/span-CsBrzhI_.js
 var import_commonjs$6 = /* @__PURE__ */ __toESM(require_commonjs$2(), 1);
 /**
 * Package type classification enum
@@ -6295,7 +6295,7 @@ let PackageType = /* @__PURE__ */ function(PackageType$1) {
 *
 * @generated from protobuf enum tusk.drift.core.v1.SpanKind
 */
-let SpanKind = /* @__PURE__ */ function(SpanKind$1$1) {
+let SpanKind$1 = /* @__PURE__ */ function(SpanKind$1$1) {
 	/**
 	* @generated from protobuf enum value: SPAN_KIND_UNSPECIFIED = 0;
 	*/
@@ -6465,7 +6465,7 @@ var Span$Type = class extends import_commonjs$6.MessageType {
 				kind: "enum",
 				T: () => [
 					"tusk.drift.core.v1.SpanKind",
-					SpanKind,
+					SpanKind$1,
 					"SPAN_KIND_"
 				]
 			},
@@ -6504,6 +6504,13 @@ var Span$Type = class extends import_commonjs$6.MessageType {
 				name: "metadata",
 				kind: "message",
 				T: () => Struct
+			},
+			{
+				no: 24,
+				name: "environment",
+				kind: "scalar",
+				opt: true,
+				T: 9
 			}
 		]);
 	}
@@ -6601,6 +6608,9 @@ var Span$Type = class extends import_commonjs$6.MessageType {
 				case 23:
 					message.metadata = Struct.internalBinaryRead(reader, reader.uint32(), options, message.metadata);
 					break;
+				case 24:
+					message.environment = reader.string();
+					break;
 				default:
 					let u = options.readUnknownField;
 					if (u === "throw") throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
@@ -6634,6 +6644,7 @@ var Span$Type = class extends import_commonjs$6.MessageType {
 		if (message.duration) Duration.internalBinaryWrite(message.duration, writer.tag(21, import_commonjs$6.WireType.LengthDelimited).fork(), options).join();
 		if (message.isRootSpan !== false) writer.tag(22, import_commonjs$6.WireType.Varint).bool(message.isRootSpan);
 		if (message.metadata) Struct.internalBinaryWrite(message.metadata, writer.tag(23, import_commonjs$6.WireType.LengthDelimited).fork(), options).join();
+		if (message.environment !== void 0) writer.tag(24, import_commonjs$6.WireType.LengthDelimited).string(message.environment);
 		let u = options.writeUnknownFields;
 		if (u !== false) (u == true ? import_commonjs$6.UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
 		return writer;
@@ -6997,12 +7008,12 @@ const Trace = new Trace$Type();
 const toStruct = (obj) => obj ? objectToProtobufStruct(obj) : void 0;
 const mapOtToPb = (k) => {
 	switch (k) {
-		case import_src$34.SpanKind.INTERNAL: return SpanKind.INTERNAL;
-		case import_src$34.SpanKind.SERVER: return SpanKind.SERVER;
-		case import_src$34.SpanKind.CLIENT: return SpanKind.CLIENT;
-		case import_src$34.SpanKind.PRODUCER: return SpanKind.PRODUCER;
-		case import_src$34.SpanKind.CONSUMER: return SpanKind.CONSUMER;
-		default: return SpanKind.UNSPECIFIED;
+		case import_src$34.SpanKind.INTERNAL: return SpanKind$1.INTERNAL;
+		case import_src$34.SpanKind.SERVER: return SpanKind$1.SERVER;
+		case import_src$34.SpanKind.CLIENT: return SpanKind$1.CLIENT;
+		case import_src$34.SpanKind.PRODUCER: return SpanKind$1.PRODUCER;
+		case import_src$34.SpanKind.CONSUMER: return SpanKind$1.CONSUMER;
+		default: return SpanKind$1.UNSPECIFIED;
 	}
 };
 /**
@@ -7586,7 +7597,7 @@ var SpanUtils = class SpanUtils {
 				return originalFunctionCall();
 			}
 		}
-		const { name, kind, packageName, instrumentationName, packageType, submodule, inputValue, inputSchemaMerges, isPreAppStart, metadata, stopRecordingChildSpans } = options;
+		const { name, kind, packageName, instrumentationName, packageType, submodule, inputValue, outputValue, inputSchemaMerges, isPreAppStart, metadata, stopRecordingChildSpans } = options;
 		let spanInfo = null;
 		try {
 			spanInfo = SpanUtils.createSpan({
@@ -7600,6 +7611,7 @@ var SpanUtils = class SpanUtils {
 					[TdSpanAttributes.INSTRUMENTATION_NAME]: instrumentationName,
 					[TdSpanAttributes.PACKAGE_TYPE]: packageType,
 					[TdSpanAttributes.INPUT_VALUE]: createSpanInputValue(inputValue),
+					...outputValue && { [TdSpanAttributes.OUTPUT_VALUE]: JSON.stringify(outputValue) },
 					[TdSpanAttributes.IS_PRE_APP_START]: isPreAppStart,
 					...inputSchemaMerges && { [TdSpanAttributes.INPUT_SCHEMA_MERGES]: JSON.stringify(inputSchemaMerges) },
 					...metadata && { [TdSpanAttributes.METADATA]: JSON.stringify(metadata) }
@@ -7864,7 +7876,10 @@ function getDecodedType(contentType) {
 		logger.debug(`Invalid Content-Type header: ${contentType}`);
 		return;
 	}
-	return CONTENT_TYPE_MAPPING[contentTypeString.toLowerCase().split(";")[0].trim()];
+	const mainType = contentTypeString.toLowerCase().split(";")[0].trim();
+	const decodedType = CONTENT_TYPE_MAPPING[mainType];
+	if (decodedType !== void 0) return decodedType;
+	if (mainType.includes("json")) return DecodedType.JSON;
 }
 const ACCEPTABLE_CONTENT_TYPES = new Set([DecodedType.JSON, DecodedType.PLAIN_TEXT]);
 
@@ -7963,30 +7978,6 @@ var TdHttpMockSocket = class extends events.EventEmitter {
 	}
 };
 
-//#endregion
-//#region src/instrumentation/core/trackers/EnvVarTracker.ts
-var EnvVarTracker = class {
-	static setEnvVar({ traceId, key, value }) {
-		this.envVars.set(traceId, {
-			...this.envVars.get(traceId) || {},
-			[key]: value
-		});
-	}
-	static setEnvVars(traceId, envVars) {
-		this.envVars.set(traceId, envVars);
-	}
-	static getEnvVar(traceId, key) {
-		return this.envVars.get(traceId)?.[key];
-	}
-	static getEnvVars(traceId) {
-		return this.envVars.get(traceId);
-	}
-	static clearEnvVars(traceId) {
-		this.envVars.delete(traceId);
-	}
-};
-EnvVarTracker.envVars = /* @__PURE__ */ new Map();
-
 //#endregion
 //#region src/instrumentation/core/trackers/DateTracker.ts
 /**
@@ -8209,10 +8200,17 @@ var JsonSchemaHelper = class JsonSchemaHelper {
 	static decodeDataWithMerges(data, schemaMerges) {
 		if (!schemaMerges) return data;
 		const decodedData = { ...data };
-		for (const [key, schema] of Object.entries(schemaMerges)) if (schema.encoding && schema.decodedType && data[key] !== void 0) try {
+		for (const [key, schema] of Object.entries(schemaMerges)) if (schema.encoding && data[key] !== void 0) try {
 			let decodedValue = data[key];
-			if (schema.encoding === EncodingType.BASE64 && typeof decodedValue === "string") decodedValue = Buffer.from(decodedValue, "base64").toString("utf8");
-			if (schema.decodedType === DecodedType.JSON && typeof decodedValue === "string") decodedValue = JSON.parse(decodedValue);
+			if (typeof decodedValue === "string") {
+				if (schema.encoding === EncodingType.BASE64) decodedValue = Buffer.from(decodedValue, "base64").toString("utf8");
+				if (schema.decodedType === DecodedType.JSON) decodedValue = JSON.parse(decodedValue);
+				else if (!schema.decodedType) try {
+					decodedValue = JSON.parse(decodedValue);
+				} catch {
+					logger.debug(`[JsonSchemaHelper] Failed to parse JSON for key: ${key}, no decodedType specified`);
+				}
+			}
 			decodedData[key] = decodedValue;
 		} catch (error) {
 			logger.debug(`[JsonSchemaHelper] Failed to decode ${key}:`, error);
@@ -8280,6 +8278,7 @@ function convertMockRequestDataToCleanSpanData(mockRequestData, tuskDrift, input
 	return {
 		...mockRequestData,
 		parentSpanId: "",
+		environment: tuskDrift.getEnvironment(),
 		inputValueHash,
 		inputSchema,
 		inputSchemaHash,
@@ -8676,13 +8675,6 @@ var HttpReplayHooks = class {
 		return traceIdHeader ? String(traceIdHeader) : null;
 	}
 	/**
-	* Check if we should fetch env vars from CLI
-	*/
-	extractShouldFetchEnvVars(req) {
-		const fetchHeader = req.headers["x-td-fetch-env-vars"] || req.headers["X-TD-FETCH-ENV-VARS"];
-		return fetchHeader === "true" || fetchHeader === true;
-	}
-	/**
 	* Handle outbound HTTP requests in replay mode
 	* Uses TdMockClientRequest for simplified mocking approach
 	*/
@@ -9971,7 +9963,7 @@ var require_commonjs$1 = /* @__PURE__ */ __commonJS({ "node_modules/@protobuf-ts
 }) });
 
 //#endregion
-//#region node_modules/@use-tusk/drift-schemas/dist/span_export_service-XwF6hpEK.js
+//#region node_modules/@use-tusk/drift-schemas/dist/span_export_service-CmkFvTqD.js
 var import_commonjs$4 = /* @__PURE__ */ __toESM(require_commonjs$1(), 1);
 var import_commonjs$5 = /* @__PURE__ */ __toESM(require_commonjs$2(), 1);
 var ExportSpansRequest$Type = class extends import_commonjs$5.MessageType {
@@ -10661,13 +10653,6 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 					return originalHandler.call(this);
 				}
 				logger.debug(`[HttpInstrumentation] Setting replay trace id`, replayTraceId);
-				if (this.replayHooks.extractShouldFetchEnvVars(req)) try {
-					const envVars = this.tuskDrift.requestEnvVarsSync(replayTraceId);
-					EnvVarTracker.setEnvVars(replayTraceId, envVars);
-					logger.debug(`[HttpInstrumentation] Fetched env vars from CLI for trace ${replayTraceId}`);
-				} catch (error) {
-					logger.error(`[HttpInstrumentation] Failed to fetch env vars from CLI:`, error);
-				}
 				const ctxWithReplayTraceId = SpanUtils.setCurrentReplayTraceId(replayTraceId);
 				if (!ctxWithReplayTraceId) throw new Error("Error setting current replay trace id");
 				return import_src$28.context.with(ctxWithReplayTraceId, () => {
@@ -10810,10 +10795,8 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 							},
 							headers: { matchImportance: 0 }
 						},
-						metadata: { ENV_VARS: EnvVarTracker.getEnvVars(spanInfo.traceId) },
 						...spanData.transformMetadata && { transformMetadata: spanData.transformMetadata }
 					});
-					EnvVarTracker.clearEnvVars(spanInfo.traceId);
 					const status = statusCode >= 400 ? {
 						code: import_src$28.SpanStatusCode.ERROR,
 						message: `HTTP ${statusCode}`
@@ -10859,6 +10842,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 						instrumentationName: "HttpInstrumentation",
 						submoduleName: completeInputValue.method || inputValue.method,
 						inputValue: completeInputValue,
+						environment: self.tuskDrift.getEnvironment(),
 						outputValue,
 						inputSchema,
 						outputSchema,
@@ -11379,96 +11363,6 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 	}
 };
 
-//#endregion
-//#region src/instrumentation/libraries/env/Instrumentation.ts
-/**
-* Environment variable instrumentation that records and replays process.env access.
-* In record mode, captures environment variable values.
-* In replay mode, returns previously recorded values for deterministic behavior.
-*/
-var EnvInstrumentation = class extends TdInstrumentationBase {
-	constructor(config = {}) {
-		super("env", config);
-		this.isInPatchedCall = false;
-		this.mode = config.mode || TuskDriftMode.DISABLED;
-	}
-	init() {
-		this.patchProcessEnv();
-		return [];
-	}
-	patchProcessEnv() {
-		if (this.mode === TuskDriftMode.DISABLED || !this._config.enabled) return;
-		this.originalProcessEnv = process.env;
-		const envProxy = new Proxy(this.originalProcessEnv, {
-			get: (target, property, receiver) => {
-				return this._handleEnvAccess(target, property);
-			},
-			set: (target, property, value, receiver) => {
-				target[property] = value;
-				return true;
-			},
-			deleteProperty: (target, property) => {
-				delete target[property];
-				return true;
-			},
-			ownKeys: (target) => {
-				return Reflect.ownKeys(target);
-			},
-			getOwnPropertyDescriptor: (target, property) => {
-				return Reflect.getOwnPropertyDescriptor(target, property);
-			},
-			has: (target, property) => {
-				return Reflect.has(target, property);
-			}
-		});
-		process.env = envProxy;
-	}
-	_handleEnvAccess(target, key) {
-		if (this.isInPatchedCall) return target[key];
-		if (!TuskDriftCore.getInstance().isAppReady()) return target[key];
-		this.isInPatchedCall = true;
-		try {
-			return this._handleEnvAccessInMode(target, key);
-		} finally {
-			this.isInPatchedCall = false;
-		}
-	}
-	_handleEnvAccessInMode(target, key) {
-		let currentSpanInfo = null;
-		try {
-			currentSpanInfo = SpanUtils.getCurrentSpanInfo();
-		} catch (error) {
-			logger.error(`EnvInstrumentation error getting current span info:`, error);
-		}
-		if (!currentSpanInfo) return target[key];
-		if (this.mode === TuskDriftMode.REPLAY) return this._handleReplayMode(target, key);
-		else if (this.mode === TuskDriftMode.RECORD) return this._handleRecordMode(currentSpanInfo, target, key);
-		else return target[key];
-	}
-	_handleReplayMode(target, key) {
-		const replayTraceId = SpanUtils.getCurrentReplayTraceId();
-		if (!replayTraceId) return target[key];
-		const envVar = EnvVarTracker.getEnvVar(replayTraceId, key);
-		if (envVar) {
-			logger.debug(`Returning env var ${key} for trace ${replayTraceId}: ${envVar}`);
-			return envVar;
-		}
-		return target[key];
-	}
-	_handleRecordMode(spanInfo, target, key) {
-		try {
-			EnvVarTracker.setEnvVar({
-				traceId: spanInfo.traceId,
-				key,
-				value: target[key] || void 0
-			});
-		} catch (error) {
-			logger.error(`EnvInstrumentation error storing env var:`, error);
-		}
-		return target[key];
-	}
-};
-
 //#endregion
 //#region src/instrumentation/libraries/date/Instrumentation.ts
 var import_src$27 = /* @__PURE__ */ __toESM(require_src$7(), 1);
@@ -19553,13 +19447,6 @@ var NextjsInstrumentation = class extends TdInstrumentationBase {
 							return originalHandleRequest.call(this, req, res, parsedUrl);
 						}
 						logger.debug(`[NextjsInstrumentation] Setting replay trace id`, replayTraceId);
-						if (self.replayHooks.extractShouldFetchEnvVars(req)) try {
-							const envVars = self.tuskDrift.requestEnvVarsSync(replayTraceId);
-							EnvVarTracker.setEnvVars(replayTraceId, envVars);
-							logger.debug(`[NextjsInstrumentation] Fetched env vars from CLI for trace ${replayTraceId}`);
-						} catch (error) {
-							logger.error(`[NextjsInstrumentation] Failed to fetch env vars from CLI:`, error);
-						}
 						const ctxWithReplayTraceId = SpanUtils.setCurrentReplayTraceId(replayTraceId);
 						if (!ctxWithReplayTraceId) throw new Error("Error setting current replay trace id");
 						return import_src$11.context.with(ctxWithReplayTraceId, () => {
@@ -19714,10 +19601,8 @@ var NextjsInstrumentation = class extends TdInstrumentationBase {
 						decodedType: getDecodedType(outputValue.headers?.["content-type"] || "")
 					},
 					headers: { matchImportance: 0 }
-				},
-				metadata: { ENV_VARS: EnvVarTracker.getEnvVars(spanInfo.traceId) }
+				}
 			});
-			EnvVarTracker.clearEnvVars(spanInfo.traceId);
 			const status = (capturedStatusCode || 200) >= 400 ? {
 				code: import_src$11.SpanStatusCode.ERROR,
 				message: `HTTP ${capturedStatusCode}`
@@ -19755,6 +19640,7 @@ var NextjsInstrumentation = class extends TdInstrumentationBase {
 					instrumentationName: self.INSTRUMENTATION_NAME,
 					submoduleName: completeInputValue.method,
 					inputValue: completeInputValue,
+					environment: self.tuskDrift.getEnvironment(),
 					outputValue,
 					inputSchema,
 					outputSchema,
@@ -24244,7 +24130,7 @@ var SpanTransformer = class SpanTransformer {
 	* Return type is derived from protobuf schema but uses clean JSON.
 	* We use JSON because serialized protobuf is extremely verbose and not readable.
 	*/
-	static transformSpanToCleanJSON(span) {
+	static transformSpanToCleanJSON(span, environment) {
 		const isRootSpan = !span.parentSpanId || span.kind === import_src$9.SpanKind.SERVER;
 		const attributes = span.attributes;
 		const packageName = SpanTransformer.extractPackageName(attributes);
@@ -24288,6 +24174,7 @@ var SpanTransformer = class SpanTransformer {
 			instrumentationName,
 			submoduleName: submoduleName || "",
 			packageType: attributes[TdSpanAttributes.PACKAGE_TYPE] || void 0,
+			environment,
 			inputValue: inputData,
 			outputValue: outputData,
 			inputSchema,
@@ -24751,7 +24638,7 @@ var ApiSpanAdapter = class {
 			const protoSpans = spans.map((span) => this.transformSpanToProtobuf(span));
 			const request = {
 				observableServiceId: this.observableServiceId,
-				environment: this.environment,
+				environment: this.environment || "",
 				sdkVersion: this.sdkVersion,
 				sdkInstanceId: this.sdkInstanceId,
 				spans: protoSpans
@@ -24778,6 +24665,7 @@ var ApiSpanAdapter = class {
 			instrumentationName: cleanSpan.instrumentationName,
 			submoduleName: cleanSpan.submoduleName,
 			packageType: cleanSpan.packageType || PackageType.UNSPECIFIED,
+			environment: this.environment,
 			inputValue: toStruct(cleanSpan.inputValue),
 			outputValue: toStruct(cleanSpan.outputValue),
 			inputSchema: cleanSpan.inputSchema,
@@ -24803,12 +24691,12 @@ var ApiSpanAdapter = class {
 	}
 	mapSpanKind(kind) {
 		switch (kind) {
-			case import_src$7.SpanKind.CLIENT: return SpanKind.CLIENT;
-			case import_src$7.SpanKind.SERVER: return SpanKind.SERVER;
-			case import_src$7.SpanKind.PRODUCER: return SpanKind.PRODUCER;
-			case import_src$7.SpanKind.CONSUMER: return SpanKind.CONSUMER;
-			case import_src$7.SpanKind.INTERNAL: return SpanKind.INTERNAL;
-			default: return SpanKind.UNSPECIFIED;
+			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;
 		}
 	}
 	async shutdown() {
@@ -24823,6 +24711,7 @@ var TdSpanExporter = class {
 	constructor(config) {
 		this.adapters = [];
 		this.mode = config.mode;
+		this.environment = config.environment;
 		this.setupDefaultAdapters(config);
 		logger.debug(`TdSpanExporter initialized with ${this.adapters.length} adapter(s)`);
 	}
@@ -24906,7 +24795,7 @@ var TdSpanExporter = class {
 			return true;
 		});
 		logger.debug(`Filtered ${filteredSpansBasedOnLibraryName.length - filteredBlockedSpans.length} blocked/oversized span(s), ${filteredBlockedSpans.length} remaining`);
-		const cleanSpans = filteredBlockedSpans.map((span) => SpanTransformer.transformSpanToCleanJSON(span));
+		const cleanSpans = filteredBlockedSpans.map((span) => SpanTransformer.transformSpanToCleanJSON(span, this.environment));
 		if (this.adapters.length === 0) {
 			logger.debug("No adapters configured");
 			resultCallback({ code: import_src$5.ExportResultCode.SUCCESS });
@@ -32057,7 +31946,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.16";
+var version = "0.1.18";
 
 //#endregion
 //#region src/version.ts
@@ -32065,7 +31954,7 @@ const SDK_VERSION = version;
 const MIN_CLI_VERSION = "0.1.0";
 
 //#endregion
-//#region node_modules/@use-tusk/drift-schemas/dist/communication-D4zqMBSI.js
+//#region node_modules/@use-tusk/drift-schemas/dist/communication-BY2KZhrg.js
 var import_commonjs = /* @__PURE__ */ __toESM(require_commonjs$1(), 1);
 var import_commonjs$1 = /* @__PURE__ */ __toESM(require_commonjs$2(), 1);
 /**
@@ -33209,12 +33098,6 @@ var ProtobufCommunicator = class ProtobufCommunicator {
 		});
 		await this.sendProtobufMessage(sdkMessage);
 	}
-	getStackTrace() {
-		Error.stackTraceLimit = 100;
-		const s = (/* @__PURE__ */ new Error()).stack || "";
-		Error.stackTraceLimit = 10;
-		return s.split("\n").slice(2).filter((l) => !l.includes("ProtobufCommunicator")).join("\n");
-	}
 	async requestMockAsync(mockRequest) {
 		const requestId = this.generateRequestId();
 		const cleanSpan = mockRequest.outboundSpan ? this.cleanSpan(mockRequest.outboundSpan) : void 0;
@@ -33247,7 +33130,7 @@ var ProtobufCommunicator = class ProtobufCommunicator {
 	/**
 	* Generic synchronous request handler that spawns a child process.
 	* @param sdkMessage The SDK message to send
-	* @param filePrefix Prefix for temporary files (e.g., 'envvar', 'mock')
+	* @param filePrefix Prefix for temporary files (e.g., 'mock')
 	* @param responseHandler Function to extract and return the desired response
 	*/
 	executeSyncRequest(sdkMessage, filePrefix, responseHandler) {
@@ -33316,35 +33199,6 @@ var ProtobufCommunicator = class ProtobufCommunicator {
 		}
 	}
 	/**
-	* Request environment variables from CLI synchronously using a child process.
-	* This blocks the main thread, so it should be used carefully.
-	* Similar to requestMockSync but for environment variables.
-	*/
-	requestEnvVarsSync(traceTestServerSpanId) {
-		const requestId = this.generateRequestId();
-		const envVarRequest = EnvVarRequest.create({ traceTestServerSpanId });
-		const sdkMessage = SDKMessage.create({
-			type: MessageType$1.ENV_VAR_REQUEST,
-			requestId,
-			payload: {
-				oneofKind: "envVarRequest",
-				envVarRequest
-			}
-		});
-		logger.debug(`[ProtobufCommunicator] Requesting env vars (sync) for trace: ${traceTestServerSpanId}`);
-		return this.executeSyncRequest(sdkMessage, "envvar", (cliMessage) => {
-			if (cliMessage.payload.oneofKind !== "envVarResponse") throw new Error(`Unexpected response type: ${cliMessage.type}`);
-			const envVarResponse = cliMessage.payload.envVarResponse;
-			if (!envVarResponse) throw new Error("No env var response received");
-			const envVars = {};
-			if (envVarResponse.envVars) Object.entries(envVarResponse.envVars).forEach(([key, value]) => {
-				envVars[key] = value;
-			});
-			logger.debug(`[ProtobufCommunicator] Received env vars (sync), count: ${Object.keys(envVars).length}`);
-			return envVars;
-		});
-	}
-	/**
 	* This function uses a separate Node.js child process to communicate with the CLI over a socket.
 	* The child process creates its own connection and event loop, allowing proper async socket handling.
 	* The parent process blocks synchronously waiting for the child to complete.
@@ -33555,22 +33409,6 @@ var ProtobufCommunicator = class ProtobufCommunicator {
 				error: mockResponse.error || "Mock not found"
 			});
 		}
-		if (message.payload.oneofKind === "envVarResponse") {
-			const envVarResponse = message.payload.envVarResponse;
-			logger.debug(`[ProtobufCommunicator] Received env var response for requestId: ${requestId}`);
-			const pendingRequest = this.pendingRequests.get(requestId);
-			if (!pendingRequest) {
-				logger.warn("[ProtobufCommunicator] received env var response for unknown request:", requestId);
-				return;
-			}
-			this.pendingRequests.delete(requestId);
-			const envVars = {};
-			if (envVarResponse?.envVars) Object.entries(envVarResponse.envVars).forEach(([key, value]) => {
-				envVars[key] = value;
-			});
-			pendingRequest.resolve(envVars);
-			return;
-		}
 	}
 	/**
 	* Extract response data from MockResponse
@@ -33870,10 +33708,6 @@ var TuskDriftCore = class TuskDriftCore {
 			enabled: true,
 			mode: this.mode
 		});
-		new EnvInstrumentation({
-			enabled: this.config.recording?.enable_env_var_recording || false,
-			mode: this.mode
-		});
 		new PostgresInstrumentation({
 			enabled: true,
 			mode: this.mode
@@ -33921,7 +33755,7 @@ var TuskDriftCore = class TuskDriftCore {
 			observableServiceId: this.config.service?.id,
 			apiKey: this.initParams.apiKey,
 			tuskBackendBaseUrl: this.config.tusk_api?.url || "https://api.usetusk.ai",
-			environment: this.initParams.env || "unknown",
+			environment: this.initParams.env,
 			sdkVersion: SDK_VERSION,
 			sdkInstanceId: this.generateSdkInstanceId()
 		});
@@ -33939,6 +33773,34 @@ var TuskDriftCore = class TuskDriftCore {
 	generateSdkInstanceId() {
 		return `sdk-${OriginalGlobalUtils.getOriginalDate().getTime()}-${Math.random().toString(36).substr(2, 9)}`;
 	}
+	/**
+	* Creates a pre-app-start span containing a snapshot of all environment variables.
+	* Only runs in RECORD mode when env var recording is enabled.
+	*/
+	createEnvVarsSnapshot() {
+		if (this.mode !== TuskDriftMode.RECORD || !this.config.recording?.enable_env_var_recording) return;
+		try {
+			const envVarsSnapshot = {};
+			for (const key of Object.keys(process.env)) envVarsSnapshot[key] = process.env[key];
+			logger.debug(`Creating env vars snapshot with ${Object.keys(envVarsSnapshot).length} variables`);
+			SpanUtils.createAndExecuteSpan(this.mode, () => {}, {
+				name: "ENV_VARS_SNAPSHOT",
+				kind: import_src.SpanKind.INTERNAL,
+				packageName: "process.env",
+				packageType: PackageType.UNSPECIFIED,
+				instrumentationName: "TuskDriftCore",
+				submodule: "env",
+				inputValue: {},
+				outputValue: { ENV_VARS: envVarsSnapshot },
+				isPreAppStart: true
+			}, (spanInfo) => {
+				SpanUtils.endSpan(spanInfo.span, { code: import_src.SpanStatusCode.OK });
+				logger.debug(`Env vars snapshot span created: ${spanInfo.spanId}`);
+			});
+		} catch (error) {
+			logger.error("Failed to create env vars snapshot:", error);
+		}
+	}
 	initialize(initParams) {
 		initializeGlobalLogger({
 			logLevel: initParams.logLevel || "info",
@@ -34015,6 +33877,7 @@ var TuskDriftCore = class TuskDriftCore {
 		logger.debug(`Base directory: ${baseDirectory}`);
 		this.registerDefaultInstrumentations();
 		this.initializeTracing({ baseDirectory });
+		this.createEnvVarsSnapshot();
 		this.initialized = true;
 		logger.info("SDK initialized successfully");
 	}
@@ -34078,30 +33941,6 @@ var TuskDriftCore = class TuskDriftCore {
 			};
 		}
 	}
-	/**
-	* Request environment variables from CLI for a specific trace (synchronously).
-	* This blocks the main thread, so it should be used carefully.
-	*/
-	requestEnvVarsSync(traceTestServerSpanId) {
-		if (!this.isConnectedWithCLI) {
-			logger.error("Requesting sync env vars but CLI is not ready yet");
-			throw new Error("Requesting sync env vars but CLI is not ready yet");
-		}
-		if (!this.communicator || this.mode !== TuskDriftMode.REPLAY) {
-			logger.debug("Cannot request env vars: not in replay mode or no CLI connection");
-			return {};
-		}
-		try {
-			logger.debug(`Requesting env vars (sync) for trace: ${traceTestServerSpanId}`);
-			const envVars = this.communicator.requestEnvVarsSync(traceTestServerSpanId);
-			logger.debug(`Received env vars from CLI, count: ${Object.keys(envVars).length}`);
-			logger.debug(`First 10 env vars: ${JSON.stringify(Object.keys(envVars).slice(0, 10), null, 2)}`);
-			return envVars;
-		} catch (error) {
-			logger.error(`[TuskDrift] Error requesting env vars from CLI:`, error);
-			return {};
-		}
-	}
 	requestMockSync(mockRequest) {
 		if (!this.isConnectedWithCLI) {
 			logger.error("Requesting sync mock but CLI is not ready yet");
@@ -34153,6 +33992,9 @@ var TuskDriftCore = class TuskDriftCore {
 	getInitParams() {
 		return this.initParams;
 	}
+	getEnvironment() {
+		return this.initParams.env;
+	}
 	getTracer() {
 		return import_src.trace.getTracer(TD_INSTRUMENTATION_LIBRARY_NAME);
 	}