autotel 6.5.0 → 7.0.0

package/dist/{logger-CN4xpzMd.d.ts → logger-S1Fgl0g3.d.ts}

@@ -49,26 +49,6 @@ interface BuiltinLoggerOptions {
   /** Pretty print for development. Default: false (JSON output) */
   pretty?: boolean;
 }
-/**
- * Create a lightweight structured logger
- *
- * @param service - Service name for logging
- * @param options - Optional configuration
- *
- * @example
- * ```typescript
- * const log = createBuiltinLogger('user-service');
- *
- * log.info('Creating user', { email: 'test@example.com' });
- * // Output: {"level":"info","service":"user-service","msg":"Creating user",
- * //          "email":"test@example.com","traceId":"...","spanId":"..."}
- *
- * // Dynamic log level control per-request
- * runWithLogLevel('debug', () => {
- *   log.debug('This will be logged even if logger was created with level: "info"');
- * });
- * ```
- */
 declare function createBuiltinLogger(service: string, options?: BuiltinLoggerOptions): Logger;
 /**
  * Pino-like factory function for creating an autotel logger

package/dist/{logger-thMPLpOG.cjs → logger-Sm66cjKl.cjs}

@@ -1,3 +1,4 @@
+const require_values = require('./values-DApyq53y.cjs');
 const require_config = require('./config.cjs');
 let _opentelemetry_api = require("@opentelemetry/api");
 
@@ -121,20 +122,47 @@ function getTraceContext() {
 * });
 * ```
 */
+/**
+* The fields a log line carries for its error, following Pino's `err`
+* convention: an Error is spread into message/stack/name, anything else is
+* kept as it was given.
+*/
+function errorFields(extra) {
+	if (!extra) return {};
+	const { err, ...rest } = extra;
+	if (err instanceof Error) return {
+		error: err.message,
+		stack: err.stack,
+		name: err.name,
+		...rest
+	};
+	return err === void 0 ? rest : {
+		err,
+		...rest
+	};
+}
+/**
+* Warn once per call about a Winston-style invocation, in development only -
+* the arguments are swapped either way, so this is guidance, not an error.
+*/
+function warnLegacyPattern(level, secondArg, recommended) {
+	if (process.env.NODE_ENV === "production") return;
+	console.warn(`[autotel] Legacy logger pattern detected: logger.${level}('message', ${secondArg}). Autotel recommends Pino signature: logger.${level}(${recommended}, 'message'). Auto-swapping arguments for compatibility.`);
+}
 function createBuiltinLogger(service, options) {
 	const defaultLevel = options?.level || "info";
 	const pretty = options?.pretty || false;
-	const levelPriority = {
-		none: -1,
-		debug: 0,
-		info: 1,
-		warn: 2,
-		error: 3
-	};
+	const levelPriority = /* @__PURE__ */ new Map([
+		["none", -1],
+		["debug", 0],
+		["info", 1],
+		["warn", 2],
+		["error", 3]
+	]);
 	const shouldLog = (level) => {
 		const activeLevel = getActiveLogLevel() ?? defaultLevel;
 		if (activeLevel === "none") return false;
-		return levelPriority[level] >= levelPriority[activeLevel];
+		return (levelPriority.get(level) ?? 0) >= (levelPriority.get(activeLevel) ?? 0);
 	};
 	const log = (level, msg, attrs) => {
 		if (!shouldLog(level)) return;
@@ -154,11 +182,18 @@ function createBuiltinLogger(service, options) {
 	};
 	const createLogMethod = (level) => {
 		return (extraOrMessage, message) => {
-			if (typeof extraOrMessage === "string") if (message !== void 0 && typeof message === "object") {
-				if (process.env.NODE_ENV !== "production") console.warn(`[autotel] Legacy logger pattern detected: logger.${level}('message', metadata). Autotel recommends Pino signature: logger.${level}({ ...metadata }, 'message'). Auto-swapping arguments for compatibility.`);
-				log(level, extraOrMessage, message);
-			} else log(level, extraOrMessage);
-			else log(level, message || "", extraOrMessage);
+			const firstAsMessage = require_values.asString(extraOrMessage);
+			if (firstAsMessage === void 0) {
+				log(level, require_values.asString(message) ?? "", require_values.asRecord(extraOrMessage));
+				return;
+			}
+			const legacyExtra = require_values.asRecord(message);
+			if (!legacyExtra) {
+				log(level, firstAsMessage);
+				return;
+			}
+			warnLegacyPattern(level, "metadata", "{ ...metadata }");
+			log(level, firstAsMessage, legacyExtra);
 		};
 	};
 	return {
@@ -166,49 +201,23 @@ function createBuiltinLogger(service, options) {
 		warn: createLogMethod("warn"),
 		debug: createLogMethod("debug"),
 		error: (extraOrMessage, message) => {
-			if (typeof extraOrMessage === "string") {
-				if (message instanceof Error) {
-					if (process.env.NODE_ENV !== "production") console.warn("[autotel] Legacy logger pattern detected: logger.error('message', error). Autotel recommends Pino signature: logger.error({ err: error }, 'message'). Auto-swapping arguments for compatibility.");
-					log("error", extraOrMessage, {
-						error: message.message,
-						stack: message.stack,
-						name: message.name
-					});
-					return;
-				}
-				if (message !== void 0 && typeof message === "object") {
-					if (process.env.NODE_ENV !== "production") console.warn("[autotel] Legacy logger pattern detected: logger.error('message', metadata). Autotel recommends Pino signature: logger.error({ ...metadata }, 'message'). Auto-swapping arguments for compatibility.");
-					const { err, ...rest } = message;
-					let errorAttrs = rest;
-					if (err instanceof Error) errorAttrs = {
-						error: err.message,
-						stack: err.stack,
-						name: err.name,
-						...rest
-					};
-					else if (err !== void 0) errorAttrs = {
-						err,
-						...rest
-					};
-					log("error", extraOrMessage, errorAttrs);
-					return;
-				}
-				log("error", extraOrMessage);
+			const firstAsMessage = require_values.asString(extraOrMessage);
+			if (firstAsMessage === void 0) {
+				log("error", require_values.asString(message) ?? "", errorFields(require_values.asRecord(extraOrMessage)));
+				return;
+			}
+			if (message instanceof Error) {
+				warnLegacyPattern("error", "error", "{ err: error }");
+				log("error", firstAsMessage, errorFields({ err: message }));
+				return;
+			}
+			const legacyExtra = require_values.asRecord(message);
+			if (legacyExtra) {
+				warnLegacyPattern("error", "metadata", "{ ...metadata }");
+				log("error", firstAsMessage, errorFields(legacyExtra));
 				return;
 			}
-			const { err, ...rest } = extraOrMessage;
-			let errorAttrs = rest;
-			if (err instanceof Error) errorAttrs = {
-				error: err.message,
-				stack: err.stack,
-				name: err.name,
-				...rest
-			};
-			else if (err !== void 0) errorAttrs = {
-				err,
-				...rest
-			};
-			log("error", message || "", errorAttrs);
+			log("error", firstAsMessage);
 		}
 	};
 }

package/dist/logger.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_logger = require('./logger-thMPLpOG.cjs');
+const require_logger = require('./logger-Sm66cjKl.cjs');
 
 exports.LOG_LEVEL = require_logger.LOG_LEVEL;
 exports.LoggedOperation = require_logger.LoggedOperation;

package/dist/logger.d.cts

@@ -1,2 +1,2 @@
-import { a as LoggedOperation, c as LoggerConfig, d as BuiltinLoggerOptions, f as autotelLogger, g as runWithLogLevel, h as getTraceContext, i as LogLevel, l as PinoLogger, m as getActiveLogLevel, n as LOG_LEVEL, o as LoggedOperationOptions, p as createBuiltinLogger, r as LogFn, s as Logger, t as ILogger, u as BuiltinLogLevel } from "./logger-CN4xpzMd.cjs";
+import { a as LoggedOperation, c as LoggerConfig, d as BuiltinLoggerOptions, f as autotelLogger, g as runWithLogLevel, h as getTraceContext, i as LogLevel, l as PinoLogger, m as getActiveLogLevel, n as LOG_LEVEL, o as LoggedOperationOptions, p as createBuiltinLogger, r as LogFn, s as Logger, t as ILogger, u as BuiltinLogLevel } from "./logger-S1Fgl0g3.cjs";
 export { type BuiltinLogLevel, type BuiltinLoggerOptions, ILogger, LOG_LEVEL, LogFn, LogLevel, LoggedOperation, LoggedOperationOptions, Logger, LoggerConfig, type PinoLogger, autotelLogger, createBuiltinLogger, getActiveLogLevel, getTraceContext, runWithLogLevel };

package/dist/logger.d.ts

@@ -1,2 +1,2 @@
-import { a as LoggedOperation, c as LoggerConfig, d as BuiltinLoggerOptions, f as autotelLogger, g as runWithLogLevel, h as getTraceContext, i as LogLevel, l as PinoLogger, m as getActiveLogLevel, n as LOG_LEVEL, o as LoggedOperationOptions, p as createBuiltinLogger, r as LogFn, s as Logger, t as ILogger, u as BuiltinLogLevel } from "./logger-CN4xpzMd.js";
+import { a as LoggedOperation, c as LoggerConfig, d as BuiltinLoggerOptions, f as autotelLogger, g as runWithLogLevel, h as getTraceContext, i as LogLevel, l as PinoLogger, m as getActiveLogLevel, n as LOG_LEVEL, o as LoggedOperationOptions, p as createBuiltinLogger, r as LogFn, s as Logger, t as ILogger, u as BuiltinLogLevel } from "./logger-S1Fgl0g3.js";
 export { type BuiltinLogLevel, type BuiltinLoggerOptions, ILogger, LOG_LEVEL, LogFn, LogLevel, LoggedOperation, LoggedOperationOptions, Logger, LoggerConfig, type PinoLogger, autotelLogger, createBuiltinLogger, getActiveLogLevel, getTraceContext, runWithLogLevel };

package/dist/logger.js

@@ -1,3 +1,3 @@
-import { a as getActiveLogLevel, i as createBuiltinLogger, n as LoggedOperation, o as getTraceContext, r as autotelLogger, s as runWithLogLevel, t as LOG_LEVEL } from "./logger-D3Ej3DII.js";
+import { a as getActiveLogLevel, i as createBuiltinLogger, n as LoggedOperation, o as getTraceContext, r as autotelLogger, s as runWithLogLevel, t as LOG_LEVEL } from "./logger-DdPp__xW.js";
 
 export { LOG_LEVEL, LoggedOperation, autotelLogger, createBuiltinLogger, getActiveLogLevel, getTraceContext, runWithLogLevel };

package/dist/messaging-adapters.cjs

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_values = require('./values-DApyq53y.cjs');
 let _opentelemetry_api = require("@opentelemetry/api");
 
 //#region src/messaging-adapters.ts
@@ -32,24 +33,31 @@ let _opentelemetry_api = require("@opentelemetry/api");
 * });
 * ```
 */
+/** Set an attribute when the value is a string worth recording. */
+function setIfString(attrs, key, value) {
+	const text = require_values.asString(value);
+	if (text) attrs[key] = text;
+}
 const natsAdapter = {
 	producer: { customAttributes: (_ctx, args) => {
-		const msg = args[0];
+		const msg = require_values.asRecord(args[0]);
 		const attrs = {};
-		if (msg?.subject) attrs["nats.subject"] = msg.subject;
-		if (msg?.replyTo) attrs["nats.reply_to"] = msg.replyTo;
-		if (msg?.stream) attrs["nats.stream"] = msg.stream;
+		setIfString(attrs, "nats.subject", msg?.subject);
+		setIfString(attrs, "nats.reply_to", msg?.replyTo);
+		setIfString(attrs, "nats.stream", msg?.stream);
 		return attrs;
 	} },
 	consumer: {
 		headersFrom: (msg) => {
-			const headers = msg.headers;
+			const headers = require_values.asRecord(require_values.readProperty(msg, "headers"));
 			if (!headers) return;
-			if (typeof headers.toJSON === "function") {
-				const json = headers.toJSON();
-				if (json && typeof json === "object") return json;
+			const toJSON = require_values.asFunction(headers.toJSON);
+			if (toJSON) {
+				const json = require_values.asRecord(toJSON.call(headers));
+				if (json) return json;
 			}
-			if (typeof headers.get === "function") {
+			const get = require_values.asFunction(headers.get);
+			if (get) {
 				const result = {};
 				for (const key of [
 					"traceparent",
@@ -60,14 +68,20 @@ const natsAdapter = {
 					"x-b3-sampled",
 					"b3"
 				]) {
-					const value = headers.get(key);
+					const value = require_values.asString(get.call(headers, key));
 					if (value) result[key] = value;
 				}
 				if (Object.keys(result).length > 0) return result;
 			}
-			if (typeof headers.entries === "function") {
+			const entries = require_values.asFunction(headers.entries);
+			if (entries) {
 				const result = {};
-				for (const [key, value] of headers.entries()) if (typeof key === "string" && typeof value === "string") result[key] = value;
+				const pairs = entries.call(headers);
+				for (const [key, value] of pairs) {
+					const name = require_values.asString(key);
+					const text = require_values.asString(value);
+					if (name !== void 0 && text !== void 0) result[name] = text;
+				}
 				if (Object.keys(result).length > 0) return result;
 			}
 		},

package/dist/messaging-adapters.d.cts

@@ -38,36 +38,6 @@ interface MessagingAdapter {
   producer?: ProducerAdapter;
   consumer?: ConsumerAdapter;
 }
-/**
- * NATS JetStream adapter
- *
- * Captures NATS-specific attributes following NATS observability conventions.
- *
- * @example Producer
- * ```typescript
- * const publishOrder = traceProducer({
- *   system: 'nats',
- *   destination: 'orders.created',
- *   ...natsAdapter.producer,
- * })(ctx => async (subject, payload, opts) => {
- *   const headers = ctx.getTraceHeaders();
- *   await nc.publish(subject, payload, { headers });
- * });
- * ```
- *
- * @example Consumer
- * ```typescript
- * const processOrder = traceConsumer({
- *   system: 'nats',
- *   destination: 'orders.created',
- *   consumerGroup: 'order-processor',
- *   ...natsAdapter.consumer,
- * })(ctx => async (msg: JsMsg) => {
- *   await handleOrder(msg.data);
- *   msg.ack();
- * });
- * ```
- */
 declare const natsAdapter: MessagingAdapter;
 /**
  * Temporal adapter

package/dist/messaging-adapters.d.ts

@@ -38,36 +38,6 @@ interface MessagingAdapter {
   producer?: ProducerAdapter;
   consumer?: ConsumerAdapter;
 }
-/**
- * NATS JetStream adapter
- *
- * Captures NATS-specific attributes following NATS observability conventions.
- *
- * @example Producer
- * ```typescript
- * const publishOrder = traceProducer({
- *   system: 'nats',
- *   destination: 'orders.created',
- *   ...natsAdapter.producer,
- * })(ctx => async (subject, payload, opts) => {
- *   const headers = ctx.getTraceHeaders();
- *   await nc.publish(subject, payload, { headers });
- * });
- * ```
- *
- * @example Consumer
- * ```typescript
- * const processOrder = traceConsumer({
- *   system: 'nats',
- *   destination: 'orders.created',
- *   consumerGroup: 'order-processor',
- *   ...natsAdapter.consumer,
- * })(ctx => async (msg: JsMsg) => {
- *   await handleOrder(msg.data);
- *   msg.ack();
- * });
- * ```
- */
 declare const natsAdapter: MessagingAdapter;
 /**
  * Temporal adapter

package/dist/messaging-adapters.js

@@ -1,3 +1,4 @@
+import { _ as readProperty, l as asString, r as asFunction, s as asRecord } from "./values-BenyvWKz.js";
 import { TraceFlags } from "@opentelemetry/api";
 
 //#region src/messaging-adapters.ts
@@ -31,24 +32,31 @@ import { TraceFlags } from "@opentelemetry/api";
 * });
 * ```
 */
+/** Set an attribute when the value is a string worth recording. */
+function setIfString(attrs, key, value) {
+	const text = asString(value);
+	if (text) attrs[key] = text;
+}
 const natsAdapter = {
 	producer: { customAttributes: (_ctx, args) => {
-		const msg = args[0];
+		const msg = asRecord(args[0]);
 		const attrs = {};
-		if (msg?.subject) attrs["nats.subject"] = msg.subject;
-		if (msg?.replyTo) attrs["nats.reply_to"] = msg.replyTo;
-		if (msg?.stream) attrs["nats.stream"] = msg.stream;
+		setIfString(attrs, "nats.subject", msg?.subject);
+		setIfString(attrs, "nats.reply_to", msg?.replyTo);
+		setIfString(attrs, "nats.stream", msg?.stream);
 		return attrs;
 	} },
 	consumer: {
 		headersFrom: (msg) => {
-			const headers = msg.headers;
+			const headers = asRecord(readProperty(msg, "headers"));
 			if (!headers) return;
-			if (typeof headers.toJSON === "function") {
-				const json = headers.toJSON();
-				if (json && typeof json === "object") return json;
+			const toJSON = asFunction(headers.toJSON);
+			if (toJSON) {
+				const json = asRecord(toJSON.call(headers));
+				if (json) return json;
 			}
-			if (typeof headers.get === "function") {
+			const get = asFunction(headers.get);
+			if (get) {
 				const result = {};
 				for (const key of [
 					"traceparent",
@@ -59,14 +67,20 @@ const natsAdapter = {
 					"x-b3-sampled",
 					"b3"
 				]) {
-					const value = headers.get(key);
+					const value = asString(get.call(headers, key));
 					if (value) result[key] = value;
 				}
 				if (Object.keys(result).length > 0) return result;
 			}
-			if (typeof headers.entries === "function") {
+			const entries = asFunction(headers.entries);
+			if (entries) {
 				const result = {};
-				for (const [key, value] of headers.entries()) if (typeof key === "string" && typeof value === "string") result[key] = value;
+				const pairs = entries.call(headers);
+				for (const [key, value] of pairs) {
+					const name = asString(key);
+					const text = asString(value);
+					if (name !== void 0 && text !== void 0) result[name] = text;
+				}
 				if (Object.keys(result).length > 0) return result;
 			}
 		},

package/dist/messaging.cjs

@@ -1,7 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_values = require('./values-DApyq53y.cjs');
 const require_sampling = require('./sampling.cjs');
-const require_functional = require('./functional-C0uAZq2X.cjs');
-const require_correlated_events = require('./correlated-events-kSwLo3mi.cjs');
+const require_functional = require('./functional-Da6Yv64r.cjs');
+const require_correlated_events = require('./correlated-events-CcuknWnU.cjs');
 const require_trace_factory_validation = require('./trace-factory-validation-Dc8epn87.cjs');
 let _opentelemetry_api = require("@opentelemetry/api");
 
@@ -91,10 +92,22 @@ let _opentelemetry_api = require("@opentelemetry/api");
 * });
 * ```
 */
+/** The Error an onError callback expects, wrapping a non-Error rejection. */
+function toError(cause) {
+	return cause instanceof Error ? cause : new Error(String(cause));
+}
+/**
+* Check a config a JavaScript caller may have built by hand. TypeScript has
+* already checked it for everyone else, so this only has to catch the shapes
+* that reach here untyped.
+*/
+function assertMessagingConfig(fn, config) {
+	const record = require_values.asRecord(config);
+	if (!record) throw new TypeError(`${fn}: config must be an object`);
+	for (const field of ["system", "destination"]) if (require_values.nonEmptyString(record[field]) === void 0) throw new TypeError(`${fn}: config.${field} must be a non-empty string`);
+}
 function traceProducer(config) {
-	if (!config || typeof config !== "object") throw new TypeError("traceProducer: config must be an object");
-	if (typeof config.system !== "string" || config.system.trim() === "") throw new TypeError("traceProducer: config.system must be a non-empty string");
-	if (typeof config.destination !== "string" || config.destination.trim() === "") throw new TypeError("traceProducer: config.destination must be a non-empty string");
+	assertMessagingConfig("traceProducer", config);
 	const spanName = `publish ${config.destination}`;
 	return (fnFactory) => {
 		require_trace_factory_validation.assertTraceFactory("traceProducer", fnFactory);
@@ -114,7 +127,7 @@ function traceProducer(config) {
 				const userFn = fnFactory(ctx);
 				require_trace_factory_validation.assertTraceFactory("traceProducer", userFn, "result");
 				return Promise.resolve(userFn(...args)).catch((error) => {
-					if (config.onError) config.onError(error, ctx);
+					if (config.onError) config.onError(toError(error), ctx);
 					throw error;
 				});
 			};
@@ -189,10 +202,9 @@ function traceProducer(config) {
 * });
 * ```
 */
-function traceConsumer(config) {
-	if (!config || typeof config !== "object") throw new TypeError("traceConsumer: config must be an object");
-	if (typeof config.system !== "string" || config.system.trim() === "") throw new TypeError("traceConsumer: config.system must be a non-empty string");
-	if (typeof config.destination !== "string" || config.destination.trim() === "") throw new TypeError("traceConsumer: config.destination must be a non-empty string");
+function traceConsumer(typedConfig) {
+	const config = typedConfig;
+	assertMessagingConfig("traceConsumer", config);
 	const spanName = `${config.batchMode ? "receive" : "process"} ${config.destination}`;
 	return (fnFactory) => {
 		require_trace_factory_validation.assertTraceFactory("traceConsumer", fnFactory);
@@ -209,15 +221,16 @@ function traceConsumer(config) {
 				outOfOrderInfo: null
 			};
 			const groupTracking = config.consumerGroupTracking;
-			const ctx = extendContextForConsumer(baseCtx, config, linkStorage, orderingState, {
-				memberId: typeof groupTracking?.memberId === "function" ? groupTracking.memberId() ?? null : groupTracking?.memberId ?? null,
-				groupInstanceId: typeof groupTracking?.groupInstanceId === "function" ? groupTracking.groupInstanceId() ?? null : groupTracking?.groupInstanceId ?? null,
+			const groupState = {
+				memberId: require_values.resolveValue(groupTracking?.memberId) ?? null,
+				groupInstanceId: require_values.resolveValue(groupTracking?.groupInstanceId) ?? null,
 				assignedPartitions: [],
 				generation: null,
 				isActive: true,
 				lastHeartbeat: null,
 				state: null
-			});
+			};
+			const ctx = extendContextForConsumer(baseCtx, config, linkStorage, orderingState, groupState);
 			setConsumerAttributes(ctx, config);
 			return async (...args) => {
 				await extractAndAddLinks(ctx, config, args, linkStorage);
@@ -234,7 +247,7 @@ function traceConsumer(config) {
 				const userFn = fnFactory(ctx);
 				require_trace_factory_validation.assertTraceFactory("traceConsumer", userFn, "result");
 				return Promise.resolve(userFn(...args)).catch((error) => {
-					if (config.onError) config.onError(error, ctx);
+					if (config.onError) config.onError(toError(error), ctx);
 					throw error;
 				});
 			};
@@ -307,12 +320,8 @@ function extendContextForConsumer(baseCtx, config, linkStorage, orderingState, g
 	const consumerCtx = {
 		...baseCtx,
 		recordDLQ(reason, dlqNameOrOptions, optionsParam) {
-			let dlqName;
-			let options;
-			if (typeof dlqNameOrOptions === "string") {
-				dlqName = dlqNameOrOptions;
-				options = optionsParam;
-			} else if (typeof dlqNameOrOptions === "object") options = dlqNameOrOptions;
+			const { name: dlqName, options: inlineOptions } = require_values.splitNameOrOptions(dlqNameOrOptions);
+			const options = dlqName === void 0 ? inlineOptions : optionsParam;
 			const linkToProducer = options?.linkToProducer ?? true;
 			baseCtx.setAttribute("messaging.dlq.reason", reason);
 			if (dlqName) baseCtx.setAttribute("messaging.dlq.name", dlqName);
@@ -605,29 +614,23 @@ async function extractLagMetrics(ctx, lagConfig, args) {
 * Extract headers from message using config
 */
 function extractHeaders(headersFrom, msg) {
-	if (typeof headersFrom === "function") return headersFrom(msg);
-	if (typeof msg === "object" && msg !== null) {
-		const value = msg[headersFrom];
-		if (typeof value === "object" && value !== null) return value;
-	}
+	if (require_values.isFunction(headersFrom)) return headersFrom(msg);
+	return require_values.asRecord(require_values.readProperty(msg, headersFrom));
 }
 /**
 * Extract value from arguments using config
 */
 function extractValue(extractor, args) {
-	if (typeof extractor === "function") return extractor(args);
-	const firstArg = args[0];
-	if (typeof firstArg === "object" && firstArg !== null) return firstArg[extractor];
+	return require_values.isFunction(extractor) ? extractor(args) : require_values.asScalar(require_values.readProperty(args[0], extractor));
 }
 /**
 * Set custom attributes on context, handling non-primitive values
 */
 function setCustomAttributes(ctx, attributes) {
-	for (const [key, value] of Object.entries(attributes)) if (value !== void 0 && value !== null) if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") ctx.setAttribute(key, value);
-	else if (Array.isArray(value)) {
-		const cleanArray = value.filter((v) => v !== null && v !== void 0 && (typeof v === "string" || typeof v === "number" || typeof v === "boolean"));
-		if (cleanArray.length > 0) ctx.setAttribute(key, cleanArray);
-	} else ctx.setAttribute(key, JSON.stringify(value));
+	for (const [key, value] of Object.entries(attributes)) {
+		const attribute = require_values.toAttributeValue(value);
+		if (attribute !== void 0) ctx.setAttribute(key, attribute);
+	}
 }
 /**
 * Extract and process ordering information from message