autotel 6.4.1 → 7.0.0

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-qZxRcIBp.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

package/dist/messaging.d.cts

@@ -1,4 +1,4 @@
-import { n as TraceContext } from "./trace-context-IuyoPyNq.cjs";
+import { n as TraceContext } from "./trace-context-C1Cn1q0y.cjs";
 import { Attributes, Link, SpanContext } from "@opentelemetry/api";
 //#region src/messaging.d.ts
 /**
@@ -83,7 +83,7 @@ interface ProducerConfig {
 /**
  * Configuration for consumer tracing
  */
-interface ConsumerConfig {
+interface ConsumerConfig<TMessage = unknown> {
   /** Messaging system (kafka, rabbitmq, sqs, etc.) */
   system: MessagingSystem;
   /** Destination name (topic/queue) */
@@ -91,7 +91,7 @@ interface ConsumerConfig {
   /** Consumer group name */
   consumerGroup?: string;
   /** Extract headers from message for link creation */
-  headersFrom?: string | ((msg: unknown) => Record<string, string> | undefined);
+  headersFrom?: string | ((msg: TMessage) => Record<string, string> | undefined);
   /** Enable batch mode - extract links from all messages */
   batchMode?: boolean;
   /** Extract baggage from message headers */
@@ -99,7 +99,7 @@ interface ConsumerConfig {
   /** Additional attributes to set on span */
   attributes?: Attributes;
   /** Consumer lag metrics extraction */
-  lagMetrics?: LagMetricsConfig;
+  lagMetrics?: LagMetricsConfig<TMessage>;
   /** Callback when message goes to DLQ */
   onDLQ?: (ctx: ConsumerContext, reason: string) => void;
   /** Callback on error */
@@ -121,7 +121,7 @@ interface ConsumerConfig {
    * }
    * ```
    */
-  ordering?: OrderingConfig;
+  ordering?: OrderingConfig<TMessage>;
   /**
    * Consumer group tracking configuration
    *
@@ -168,7 +168,7 @@ interface ConsumerConfig {
    * })
    * ```
    */
-  customAttributes?: (ctx: ConsumerContext, msg: unknown) => Attributes;
+  customAttributes?: (ctx: ConsumerContext, msg: TMessage) => Attributes;
   /**
    * Hook for custom context extraction (beyond W3C traceparent)
    *
@@ -209,20 +209,20 @@ interface ConsumerConfig {
 /**
  * Configuration for consumer lag metrics
  */
-interface LagMetricsConfig {
+interface LagMetricsConfig<TMessage = unknown> {
   /** Get current message offset */
-  getCurrentOffset?: (msg: unknown) => number | undefined;
+  getCurrentOffset?: (msg: TMessage) => number | undefined;
   /** Get end offset (high watermark) - can be async */
   getEndOffset?: () => number | Promise<number>;
   /** Get committed offset - can be async */
   getCommittedOffset?: () => number | Promise<number>;
   /** Get partition from message */
-  getPartition?: (msg: unknown) => number | undefined;
+  getPartition?: (msg: TMessage) => number | undefined;
 }
 /**
  * Configuration for message ordering tracking
  */
-interface OrderingConfig {
+interface OrderingConfig<TMessage = unknown> {
   /**
    * Extract sequence number from message
    *
@@ -233,7 +233,7 @@ interface OrderingConfig {
    * sequenceFrom: (msg) => msg.offset
    * ```
    */
-  sequenceFrom?: (msg: unknown) => number | undefined;
+  sequenceFrom?: (msg: TMessage) => number | undefined;
   /**
    * Extract partition key from message
    *
@@ -244,7 +244,7 @@ interface OrderingConfig {
    * partitionKeyFrom: (msg) => msg.key
    * ```
    */
-  partitionKeyFrom?: (msg: unknown) => string | undefined;
+  partitionKeyFrom?: (msg: TMessage) => string | undefined;
   /**
    * Extract message ID for deduplication
    *
@@ -255,7 +255,7 @@ interface OrderingConfig {
    * messageIdFrom: (msg) => msg.headers['idempotency-key']
    * ```
    */
-  messageIdFrom?: (msg: unknown) => string | undefined;
+  messageIdFrom?: (msg: TMessage) => string | undefined;
   /**
    * Enable out-of-order detection
    *
@@ -499,6 +499,11 @@ interface DLQReplayOptions {
 /**
  * Extended trace context for producers with header injection
  */
+/** The W3C trace context headers a producer attaches to a message. */
+interface TraceHeaders {
+  traceparent: string;
+  tracestate?: string;
+}
 interface ProducerContext extends TraceContext {
   /**
    * Get W3C trace context headers to inject into message
@@ -514,10 +519,7 @@ interface ProducerContext extends TraceContext {
    * });
    * ```
    */
-  getTraceHeaders(): {
-    traceparent: string;
-    tracestate?: string;
-  };
+  getTraceHeaders(): TraceHeaders;
   /**
    * Get all propagation headers including baggage if enabled
    *
@@ -700,49 +702,6 @@ interface ConsumerContext extends TraceContext {
    */
   getAssignedPartitions(): PartitionAssignment[];
 }
-/**
- * Create a traced message producer function
- *
- * Sets SpanKind.PRODUCER, OTel messaging semantic attributes,
- * and provides context injection helpers.
- *
- * @param config - Producer configuration
- * @returns Factory function that wraps your producer logic
- *
- * @example Kafka producer
- * ```typescript
- * export const publishUserEvent = traceProducer({
- *   system: 'kafka',
- *   destination: 'user-events',
- *   messageIdFrom: (args) => args[0]?.eventId,
- * })(ctx => async (event: UserEvent) => {
- *   const headers = ctx.getTraceHeaders();
- *   await producer.send({
- *     topic: 'user-events',
- *     messages: [{
- *       key: event.userId,
- *       value: JSON.stringify(event),
- *       headers,
- *     }]
- *   });
- * });
- * ```
- *
- * @example SQS producer
- * ```typescript
- * export const sendToSQS = traceProducer({
- *   system: 'sqs',
- *   destination: 'orders-queue',
- * })(ctx => async (order: Order) => {
- *   const headers = ctx.getAllPropagationHeaders();
- *   await sqs.sendMessage({
- *     QueueUrl: QUEUE_URL,
- *     MessageBody: JSON.stringify(order),
- *     MessageAttributes: headersToSQSAttributes(headers),
- *   });
- * });
- * ```
- */
 declare function traceProducer(config: ProducerConfig): <TArgs extends unknown[], TReturn>(fnFactory: (ctx: ProducerContext) => (...args: TArgs) => Promise<TReturn>) => ((...args: TArgs) => Promise<TReturn>);
 /**
  * Create a traced message consumer function
@@ -812,10 +771,10 @@ declare function traceProducer(config: ProducerConfig): <TArgs extends unknown[]
  * });
  * ```
  */
-declare function traceConsumer(config: ConsumerConfig): <TArgs extends unknown[], TReturn>(fnFactory: (ctx: ConsumerContext) => (...args: TArgs) => Promise<TReturn>) => ((...args: TArgs) => Promise<TReturn>);
+declare function traceConsumer<TMessage = unknown>(typedConfig: ConsumerConfig<TMessage>): <TArgs extends unknown[], TReturn>(fnFactory: (ctx: ConsumerContext) => (...args: TArgs) => Promise<TReturn>) => ((...args: TArgs) => Promise<TReturn>);
 /**
  * Clear sequence tracking state (useful for testing)
  */
 declare function clearOrderingState(): void;
 //#endregion
-export { ConsumerConfig, ConsumerContext, ConsumerGroupState, ConsumerGroupTrackingConfig, DLQOptions, DLQReasonCategory, DLQReplayOptions, LagMetricsConfig, MessagingOperation, MessagingSystem, OrderingConfig, OutOfOrderInfo, PartitionAssignment, PartitionLag, ProducerConfig, ProducerContext, RebalanceEvent, RebalanceType, clearOrderingState, traceConsumer, traceProducer };
+export { ConsumerConfig, ConsumerContext, ConsumerGroupState, ConsumerGroupTrackingConfig, DLQOptions, DLQReasonCategory, DLQReplayOptions, LagMetricsConfig, MessagingOperation, MessagingSystem, OrderingConfig, OutOfOrderInfo, PartitionAssignment, PartitionLag, ProducerConfig, ProducerContext, RebalanceEvent, RebalanceType, TraceHeaders, clearOrderingState, traceConsumer, traceProducer };

package/dist/messaging.d.ts

@@ -1,4 +1,4 @@
-import { n as TraceContext } from "./trace-context-IuyoPyNq.js";
+import { n as TraceContext } from "./trace-context-f89xPJbK.js";
 import { Attributes, Link, SpanContext } from "@opentelemetry/api";
 //#region src/messaging.d.ts
 /**
@@ -83,7 +83,7 @@ interface ProducerConfig {
 /**
  * Configuration for consumer tracing
  */
-interface ConsumerConfig {
+interface ConsumerConfig<TMessage = unknown> {
   /** Messaging system (kafka, rabbitmq, sqs, etc.) */
   system: MessagingSystem;
   /** Destination name (topic/queue) */
@@ -91,7 +91,7 @@ interface ConsumerConfig {
   /** Consumer group name */
   consumerGroup?: string;
   /** Extract headers from message for link creation */
-  headersFrom?: string | ((msg: unknown) => Record<string, string> | undefined);
+  headersFrom?: string | ((msg: TMessage) => Record<string, string> | undefined);
   /** Enable batch mode - extract links from all messages */
   batchMode?: boolean;
   /** Extract baggage from message headers */
@@ -99,7 +99,7 @@ interface ConsumerConfig {
   /** Additional attributes to set on span */
   attributes?: Attributes;
   /** Consumer lag metrics extraction */
-  lagMetrics?: LagMetricsConfig;
+  lagMetrics?: LagMetricsConfig<TMessage>;
   /** Callback when message goes to DLQ */
   onDLQ?: (ctx: ConsumerContext, reason: string) => void;
   /** Callback on error */
@@ -121,7 +121,7 @@ interface ConsumerConfig {
    * }
    * ```
    */
-  ordering?: OrderingConfig;
+  ordering?: OrderingConfig<TMessage>;
   /**
    * Consumer group tracking configuration
    *
@@ -168,7 +168,7 @@ interface ConsumerConfig {
    * })
    * ```
    */
-  customAttributes?: (ctx: ConsumerContext, msg: unknown) => Attributes;
+  customAttributes?: (ctx: ConsumerContext, msg: TMessage) => Attributes;
   /**
    * Hook for custom context extraction (beyond W3C traceparent)
    *
@@ -209,20 +209,20 @@ interface ConsumerConfig {
 /**
  * Configuration for consumer lag metrics
  */
-interface LagMetricsConfig {
+interface LagMetricsConfig<TMessage = unknown> {
   /** Get current message offset */
-  getCurrentOffset?: (msg: unknown) => number | undefined;
+  getCurrentOffset?: (msg: TMessage) => number | undefined;
   /** Get end offset (high watermark) - can be async */
   getEndOffset?: () => number | Promise<number>;
   /** Get committed offset - can be async */
   getCommittedOffset?: () => number | Promise<number>;
   /** Get partition from message */
-  getPartition?: (msg: unknown) => number | undefined;
+  getPartition?: (msg: TMessage) => number | undefined;
 }
 /**
  * Configuration for message ordering tracking
  */
-interface OrderingConfig {
+interface OrderingConfig<TMessage = unknown> {
   /**
    * Extract sequence number from message
    *
@@ -233,7 +233,7 @@ interface OrderingConfig {
    * sequenceFrom: (msg) => msg.offset
    * ```
    */
-  sequenceFrom?: (msg: unknown) => number | undefined;
+  sequenceFrom?: (msg: TMessage) => number | undefined;
   /**
    * Extract partition key from message
    *
@@ -244,7 +244,7 @@ interface OrderingConfig {
    * partitionKeyFrom: (msg) => msg.key
    * ```
    */
-  partitionKeyFrom?: (msg: unknown) => string | undefined;
+  partitionKeyFrom?: (msg: TMessage) => string | undefined;
   /**
    * Extract message ID for deduplication
    *
@@ -255,7 +255,7 @@ interface OrderingConfig {
    * messageIdFrom: (msg) => msg.headers['idempotency-key']
    * ```
    */
-  messageIdFrom?: (msg: unknown) => string | undefined;
+  messageIdFrom?: (msg: TMessage) => string | undefined;
   /**
    * Enable out-of-order detection
    *
@@ -499,6 +499,11 @@ interface DLQReplayOptions {
 /**
  * Extended trace context for producers with header injection
  */
+/** The W3C trace context headers a producer attaches to a message. */
+interface TraceHeaders {
+  traceparent: string;
+  tracestate?: string;
+}
 interface ProducerContext extends TraceContext {
   /**
    * Get W3C trace context headers to inject into message
@@ -514,10 +519,7 @@ interface ProducerContext extends TraceContext {
    * });
    * ```
    */
-  getTraceHeaders(): {
-    traceparent: string;
-    tracestate?: string;
-  };
+  getTraceHeaders(): TraceHeaders;
   /**
    * Get all propagation headers including baggage if enabled
    *
@@ -700,49 +702,6 @@ interface ConsumerContext extends TraceContext {
    */
   getAssignedPartitions(): PartitionAssignment[];
 }
-/**
- * Create a traced message producer function
- *
- * Sets SpanKind.PRODUCER, OTel messaging semantic attributes,
- * and provides context injection helpers.
- *
- * @param config - Producer configuration
- * @returns Factory function that wraps your producer logic
- *
- * @example Kafka producer
- * ```typescript
- * export const publishUserEvent = traceProducer({
- *   system: 'kafka',
- *   destination: 'user-events',
- *   messageIdFrom: (args) => args[0]?.eventId,
- * })(ctx => async (event: UserEvent) => {
- *   const headers = ctx.getTraceHeaders();
- *   await producer.send({
- *     topic: 'user-events',
- *     messages: [{
- *       key: event.userId,
- *       value: JSON.stringify(event),
- *       headers,
- *     }]
- *   });
- * });
- * ```
- *
- * @example SQS producer
- * ```typescript
- * export const sendToSQS = traceProducer({
- *   system: 'sqs',
- *   destination: 'orders-queue',
- * })(ctx => async (order: Order) => {
- *   const headers = ctx.getAllPropagationHeaders();
- *   await sqs.sendMessage({
- *     QueueUrl: QUEUE_URL,
- *     MessageBody: JSON.stringify(order),
- *     MessageAttributes: headersToSQSAttributes(headers),
- *   });
- * });
- * ```
- */
 declare function traceProducer(config: ProducerConfig): <TArgs extends unknown[], TReturn>(fnFactory: (ctx: ProducerContext) => (...args: TArgs) => Promise<TReturn>) => ((...args: TArgs) => Promise<TReturn>);
 /**
  * Create a traced message consumer function
@@ -812,10 +771,10 @@ declare function traceProducer(config: ProducerConfig): <TArgs extends unknown[]
  * });
  * ```
  */
-declare function traceConsumer(config: ConsumerConfig): <TArgs extends unknown[], TReturn>(fnFactory: (ctx: ConsumerContext) => (...args: TArgs) => Promise<TReturn>) => ((...args: TArgs) => Promise<TReturn>);
+declare function traceConsumer<TMessage = unknown>(typedConfig: ConsumerConfig<TMessage>): <TArgs extends unknown[], TReturn>(fnFactory: (ctx: ConsumerContext) => (...args: TArgs) => Promise<TReturn>) => ((...args: TArgs) => Promise<TReturn>);
 /**
  * Clear sequence tracking state (useful for testing)
  */
 declare function clearOrderingState(): void;
 //#endregion
-export { ConsumerConfig, ConsumerContext, ConsumerGroupState, ConsumerGroupTrackingConfig, DLQOptions, DLQReasonCategory, DLQReplayOptions, LagMetricsConfig, MessagingOperation, MessagingSystem, OrderingConfig, OutOfOrderInfo, PartitionAssignment, PartitionLag, ProducerConfig, ProducerContext, RebalanceEvent, RebalanceType, clearOrderingState, traceConsumer, traceProducer };
+export { ConsumerConfig, ConsumerContext, ConsumerGroupState, ConsumerGroupTrackingConfig, DLQOptions, DLQReasonCategory, DLQReplayOptions, LagMetricsConfig, MessagingOperation, MessagingSystem, OrderingConfig, OutOfOrderInfo, PartitionAssignment, PartitionLag, ProducerConfig, ProducerContext, RebalanceEvent, RebalanceType, TraceHeaders, clearOrderingState, traceConsumer, traceProducer };

package/dist/messaging.js

@@ -1,6 +1,7 @@
+import { _ as readProperty, b as toAttributeValue, c as asScalar, g as nonEmptyString, h as isFunction, s as asRecord, v as resolveValue, y as splitNameOrOptions } from "./values-BenyvWKz.js";
 import { createLinkFromHeaders, extractLinksFromBatch } from "./sampling.js";
-import { c as withTracing } from "./functional-0o9xSedq.js";
-import { t as emitCorrelatedEvent } from "./correlated-events-Bzh5y-UB.js";
+import { c as withTracing } from "./functional-uSbNnnxK.js";
+import { t as emitCorrelatedEvent } from "./correlated-events-DwMMbItg.js";
 import { t as assertTraceFactory } from "./trace-factory-validation-BjVAinz6.js";
 import { SpanKind, context, propagation } from "@opentelemetry/api";
 
@@ -90,10 +91,22 @@ import { SpanKind, context, propagation } from "@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 = asRecord(config);
+	if (!record) throw new TypeError(`${fn}: config must be an object`);
+	for (const field of ["system", "destination"]) if (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) => {
 		assertTraceFactory("traceProducer", fnFactory);
@@ -113,7 +126,7 @@ function traceProducer(config) {
 				const userFn = fnFactory(ctx);
 				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;
 				});
 			};
@@ -188,10 +201,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) => {
 		assertTraceFactory("traceConsumer", fnFactory);
@@ -208,15 +220,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: resolveValue(groupTracking?.memberId) ?? null,
+				groupInstanceId: 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);
@@ -233,7 +246,7 @@ function traceConsumer(config) {
 				const userFn = fnFactory(ctx);
 				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;
 				});
 			};
@@ -306,12 +319,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 } = 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);
@@ -604,29 +613,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 (isFunction(headersFrom)) return headersFrom(msg);
+	return asRecord(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 isFunction(extractor) ? extractor(args) : asScalar(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 = toAttributeValue(value);
+		if (attribute !== void 0) ctx.setAttribute(key, attribute);
+	}
 }
 /**
 * Extract and process ordering information from message

package/dist/{metric-testing-CpvP3ZIa.d.cts → metric-testing-86WO1wan.d.cts}

@@ -1,4 +1,4 @@
-import { c as OutcomeStatus, n as EventAttributes, s as FunnelStatus } from "./event-subscriber-CWh8sTGh.cjs";
+import { c as FunnelStatus, l as OutcomeStatus, r as EventAttributes } from "./event-subscriber-DMACQA-1.cjs";
 //#region src/metric-testing.d.ts
 interface MetricsEvent {
   event: string;

package/dist/{metric-testing-CWm6UhaR.d.ts → metric-testing-CbCxdPBp.d.ts}

@@ -1,4 +1,4 @@
-import { c as OutcomeStatus, n as EventAttributes, s as FunnelStatus } from "./event-subscriber-CWh8sTGh.js";
+import { c as FunnelStatus, l as OutcomeStatus, r as EventAttributes } from "./event-subscriber-DMACQA-1.js";
 //#region src/metric-testing.d.ts
 interface MetricsEvent {
   event: string;