autotel-cloudflare 6.0.2 → 9.0.0

package/README.md

@@ -23,7 +23,7 @@
 The package direction is to make Cloudflare observability feel the same across Workers, Queues, Durable Objects, alarms, and Workflows:
 
 - use Cloudflare-native wrappers to create the root span
-- use plain `trace(name?, fn)` for business logic, with ambient `getActiveTraceContext()` or explicit `withTracing({ name })((ctx) => fn)` when span access is needed
+- use `trace(fn)` for inferred-name wrappers and `trace(name, ctx => result)` for immediate named work; use `withTracing({ name })((ctx) => fn)` for reusable named business logic (`instrument(handler, config)` is the Worker handler adapter)
 - prefer span attributes and one execution snapshot over scattered info logs
 
 See [docs/CLOUDFLARE-DX.md](../../docs/CLOUDFLARE-DX.md) for the design target and review rules.

package/dist/actors.d.ts

@@ -1,3 +1,4 @@
+import { t as UnknownRecord } from "./values-CRvW9g6_.js";
 import { ConfigurationOption } from "autotel-edge";
 //#region src/actors/types.d.ts
 /**
@@ -59,9 +60,21 @@ interface ActorLike {
 /**
  * Constructor type for Actor classes
  */
-type ActorConstructor<T extends ActorLike = ActorLike> = new (state: DurableObjectState, env: unknown) => T;
+type ActorConstructor<T extends ActorLike = ActorLike> = (new (state: DurableObjectState, env: Record<string, unknown>) => T) & {
+  /** A class's own name, which the instrumentation puts on the span. */
+  readonly name?: string;
+};
 //#endregion
 //#region src/actors/instrument-actor.d.ts
+/**
+ * The Actor class being instrumented. Its own type belongs to the application,
+ * so this names only what the wrappers read off it: the class name that goes on
+ * the span, and the marker used to detect a cold start.
+ */
+/** What an Actor persists, and what a WebSocket carries: the app's own values. */
+type ActorPayload = string | number | boolean | null | undefined | UnknownRecord | unknown[] | ArrayBuffer;
+/** The env a Durable Object is constructed with: whatever wrangler bound. */
+type ActorEnv = UnknownRecord;
 /**
  * Instrument an Actor class for comprehensive OpenTelemetry tracing
  *
@@ -107,7 +120,7 @@ type ActorConstructor<T extends ActorLike = ActorLike> = new (state: DurableObje
  * @param config - Configuration (static object or function)
  * @returns Instrumented Actor class
  */
-declare function instrumentActor<C extends ActorConstructor>(actorClass: C, config: ActorConfig | ((env: unknown, trigger?: unknown) => ActorConfig)): C;
+declare function instrumentActor<C extends ActorConstructor>(actorClass: C, config: ActorConfig | ((env: ActorEnv, trigger?: ActorPayload) => ActorConfig)): C;
 //#endregion
 //#region src/actors/traced-handler.d.ts
 /**

package/dist/actors.js

@@ -1,6 +1,8 @@
-import { a as wrap } from "./common-DiWH6nmG.js";
+import { a as asRecord, c as asString, f as member, g as readProperty, l as describeValue, n as asBoolean, r as asFunction } from "./values-BC6rdpGG.js";
+import { o as wrap, t as toException } from "./exception-D3xOCdBW.js";
+import { t as workerTracer } from "./tracer-z8zwRBVS.js";
 import { createInitialiser, setConfig } from "autotel-edge";
-import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
+import { SpanKind, SpanStatusCode, context, propagation } from "@opentelemetry/api";
 
 //#region src/actors/storage.ts
 /**
@@ -12,7 +14,7 @@ import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentele
 * Get the tracer instance
 */
 function getTracer$4() {
-	return trace.getTracer("autotel-cloudflare-actors");
+	return workerTracer("autotel-cloudflare-actors");
 }
 /**
 * Instrument Actor storage for tracing
@@ -22,12 +24,14 @@ function getTracer$4() {
 * - Key-value operations (if available)
 */
 function instrumentActorStorage(storage, actorInstance, actorClass) {
-	if (!storage || typeof storage !== "object") return storage;
-	const actorClassName = actorClass.name || "Actor";
+	const storageRecord = asRecord(storage);
+	if (!storageRecord) return storage;
+	const actorClassName = asString(member(actorClass, "name")) || "Actor";
 	const actorName = actorInstance.name || actorClassName;
-	return wrap(storage, { get(target, prop) {
-		const value = Reflect.get(target, prop);
-		if (prop === "exec" && typeof value === "function") return function instrumentedExec(query, ...params) {
+	return wrap(storageRecord, { get(target, prop) {
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if (prop === "exec" && method) return function instrumentedExec(query, ...params) {
 			const tracer = getTracer$4();
 			const spanName = `Actor ${actorName}: storage.exec`;
 			return tracer.startActiveSpan(spanName, {
@@ -42,11 +46,11 @@ function instrumentActorStorage(storage, actorInstance, actorClass) {
 				}
 			}, (span) => {
 				try {
-					const result = value.call(target, query, ...params);
+					const result = method.call(target, query, ...params);
 					span.setStatus({ code: SpanStatusCode.OK });
 					return result;
 				} catch (error) {
-					span.recordException(error);
+					span.recordException(toException(error));
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
 						message: error instanceof Error ? error.message : String(error)
@@ -57,7 +61,7 @@ function instrumentActorStorage(storage, actorInstance, actorClass) {
 				}
 			});
 		};
-		if (prop === "query" && typeof value === "function") return function instrumentedQuery(query, ...params) {
+		if (prop === "query" && method) return function instrumentedQuery(query, ...params) {
 			const tracer = getTracer$4();
 			const spanName = `Actor ${actorName}: storage.query`;
 			return tracer.startActiveSpan(spanName, {
@@ -72,11 +76,11 @@ function instrumentActorStorage(storage, actorInstance, actorClass) {
 				}
 			}, (span) => {
 				try {
-					const result = value.call(target, query, ...params);
+					const result = method.call(target, query, ...params);
 					span.setStatus({ code: SpanStatusCode.OK });
 					return result;
 				} catch (error) {
-					span.recordException(error);
+					span.recordException(toException(error));
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
 						message: error instanceof Error ? error.message : String(error)
@@ -87,7 +91,7 @@ function instrumentActorStorage(storage, actorInstance, actorClass) {
 				}
 			});
 		};
-		if (prop === "get" && typeof value === "function") return async function instrumentedGet(key) {
+		if (prop === "get" && method) return async function instrumentedGet(key) {
 			const tracer = getTracer$4();
 			const spanName = `Actor ${actorName}: storage.get`;
 			return tracer.startActiveSpan(spanName, {
@@ -101,12 +105,12 @@ function instrumentActorStorage(storage, actorInstance, actorClass) {
 				}
 			}, async (span) => {
 				try {
-					const result = await value.call(target, key);
+					const result = await method.call(target, key);
 					span.setAttributes({ "db.result.found": result !== null && result !== void 0 });
 					span.setStatus({ code: SpanStatusCode.OK });
 					return result;
 				} catch (error) {
-					span.recordException(error);
+					span.recordException(toException(error));
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
 						message: error instanceof Error ? error.message : String(error)
@@ -117,7 +121,7 @@ function instrumentActorStorage(storage, actorInstance, actorClass) {
 				}
 			});
 		};
-		if (prop === "put" && typeof value === "function") return async function instrumentedPut(key, val) {
+		if (prop === "put" && method) return async function instrumentedPut(key, val) {
 			const tracer = getTracer$4();
 			const spanName = `Actor ${actorName}: storage.put`;
 			return tracer.startActiveSpan(spanName, {
@@ -132,10 +136,10 @@ function instrumentActorStorage(storage, actorInstance, actorClass) {
 				}
 			}, async (span) => {
 				try {
-					await value.call(target, key, val);
+					await method.call(target, key, val);
 					span.setStatus({ code: SpanStatusCode.OK });
 				} catch (error) {
-					span.recordException(error);
+					span.recordException(toException(error));
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
 						message: error instanceof Error ? error.message : String(error)
@@ -146,7 +150,7 @@ function instrumentActorStorage(storage, actorInstance, actorClass) {
 				}
 			});
 		};
-		if (prop === "delete" && typeof value === "function") return async function instrumentedDelete(key) {
+		if (prop === "delete" && method) return async function instrumentedDelete(key) {
 			const tracer = getTracer$4();
 			const spanName = `Actor ${actorName}: storage.delete`;
 			return tracer.startActiveSpan(spanName, {
@@ -160,12 +164,13 @@ function instrumentActorStorage(storage, actorInstance, actorClass) {
 				}
 			}, async (span) => {
 				try {
-					const result = await value.call(target, key);
-					span.setAttributes({ "db.result.deleted": result });
+					const result = await method.call(target, key);
+					const deleted = asBoolean(result);
+					if (deleted !== void 0) span.setAttributes({ "db.result.deleted": deleted });
 					span.setStatus({ code: SpanStatusCode.OK });
 					return result;
 				} catch (error) {
-					span.recordException(error);
+					span.recordException(toException(error));
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
 						message: error instanceof Error ? error.message : String(error)
@@ -176,8 +181,7 @@ function instrumentActorStorage(storage, actorInstance, actorClass) {
 				}
 			});
 		};
-		if (typeof value === "function") return value.bind(target);
-		return value;
+		return method ? method.bind(target) : value;
 	} });
 }
 
@@ -192,7 +196,7 @@ function instrumentActorStorage(storage, actorInstance, actorClass) {
 * Get the tracer instance
 */
 function getTracer$3() {
-	return trace.getTracer("autotel-cloudflare-actors");
+	return workerTracer("autotel-cloudflare-actors");
 }
 /**
 * Instrument Actor alarms for tracing
@@ -204,12 +208,14 @@ function getTracer$3() {
 * - cancelAll: Cancel all alarms
 */
 function instrumentActorAlarms(alarms, actorInstance, actorClass) {
-	if (!alarms || typeof alarms !== "object") return alarms;
-	const actorClassName = actorClass.name || "Actor";
+	const alarmsRecord = asRecord(alarms);
+	if (!alarmsRecord) return alarms;
+	const actorClassName = asString(member(actorClass, "name")) || "Actor";
 	const actorName = actorInstance.name || actorClassName;
-	return wrap(alarms, { get(target, prop) {
-		const value = Reflect.get(target, prop);
-		if (prop === "set" && typeof value === "function") return async function instrumentedSet(...args) {
+	return wrap(alarmsRecord, { get(target, prop) {
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if (prop === "set" && method) return async function instrumentedSet(...args) {
 			const tracer = getTracer$3();
 			const spanName = `Actor ${actorName}: alarms.set`;
 			const alarmAttributes = {
@@ -228,11 +234,11 @@ function instrumentActorAlarms(alarms, actorInstance, actorClass) {
 				attributes: alarmAttributes
 			}, async (span) => {
 				try {
-					const result = await value.apply(target, args);
+					const result = await method.apply(target, args);
 					span.setStatus({ code: SpanStatusCode.OK });
 					return result;
 				} catch (error) {
-					span.recordException(error);
+					span.recordException(toException(error));
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
 						message: error instanceof Error ? error.message : String(error)
@@ -243,7 +249,7 @@ function instrumentActorAlarms(alarms, actorInstance, actorClass) {
 				}
 			});
 		};
-		if (prop === "setMultiple" && typeof value === "function") return async function instrumentedSetMultiple(alarmDefs) {
+		if (prop === "setMultiple" && method) return async function instrumentedSetMultiple(alarmDefs) {
 			const tracer = getTracer$3();
 			const spanName = `Actor ${actorName}: alarms.setMultiple`;
 			return tracer.startActiveSpan(spanName, {
@@ -256,11 +262,11 @@ function instrumentActorAlarms(alarms, actorInstance, actorClass) {
 				}
 			}, async (span) => {
 				try {
-					const result = await value.call(target, alarmDefs);
+					const result = await method.call(target, alarmDefs);
 					span.setStatus({ code: SpanStatusCode.OK });
 					return result;
 				} catch (error) {
-					span.recordException(error);
+					span.recordException(toException(error));
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
 						message: error instanceof Error ? error.message : String(error)
@@ -271,7 +277,7 @@ function instrumentActorAlarms(alarms, actorInstance, actorClass) {
 				}
 			});
 		};
-		if (prop === "cancel" && typeof value === "function") return async function instrumentedCancel(alarmId) {
+		if (prop === "cancel" && method) return async function instrumentedCancel(alarmId) {
 			const tracer = getTracer$3();
 			const spanName = `Actor ${actorName}: alarms.cancel`;
 			return tracer.startActiveSpan(spanName, {
@@ -284,11 +290,11 @@ function instrumentActorAlarms(alarms, actorInstance, actorClass) {
 				}
 			}, async (span) => {
 				try {
-					const result = await value.call(target, alarmId);
+					const result = await method.call(target, alarmId);
 					span.setStatus({ code: SpanStatusCode.OK });
 					return result;
 				} catch (error) {
-					span.recordException(error);
+					span.recordException(toException(error));
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
 						message: error instanceof Error ? error.message : String(error)
@@ -299,7 +305,7 @@ function instrumentActorAlarms(alarms, actorInstance, actorClass) {
 				}
 			});
 		};
-		if (prop === "cancelAll" && typeof value === "function") return async function instrumentedCancelAll() {
+		if (prop === "cancelAll" && method) return async function instrumentedCancelAll() {
 			const tracer = getTracer$3();
 			const spanName = `Actor ${actorName}: alarms.cancelAll`;
 			return tracer.startActiveSpan(spanName, {
@@ -311,11 +317,11 @@ function instrumentActorAlarms(alarms, actorInstance, actorClass) {
 				}
 			}, async (span) => {
 				try {
-					const result = await value.call(target);
+					const result = await method.call(target);
 					span.setStatus({ code: SpanStatusCode.OK });
 					return result;
 				} catch (error) {
-					span.recordException(error);
+					span.recordException(toException(error));
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
 						message: error instanceof Error ? error.message : String(error)
@@ -326,8 +332,7 @@ function instrumentActorAlarms(alarms, actorInstance, actorClass) {
 				}
 			});
 		};
-		if (typeof value === "function") return value.bind(target);
-		return value;
+		return method ? method.bind(target) : value;
 	} });
 }
 
@@ -342,7 +347,7 @@ function instrumentActorAlarms(alarms, actorInstance, actorClass) {
 * Get the tracer instance
 */
 function getTracer$2() {
-	return trace.getTracer("autotel-cloudflare-actors");
+	return workerTracer("autotel-cloudflare-actors");
 }
 /**
 * Instrument Actor sockets for tracing
@@ -353,12 +358,14 @@ function getTracer$2() {
 * - send: Send message to a specific socket
 */
 function instrumentActorSockets(sockets, actorInstance, actorClass) {
-	if (!sockets || typeof sockets !== "object") return sockets;
-	const actorClassName = actorClass.name || "Actor";
+	const socketsRecord = asRecord(sockets);
+	if (!socketsRecord) return sockets;
+	const actorClassName = asString(member(actorClass, "name")) || "Actor";
 	const actorName = actorInstance.name || actorClassName;
-	return wrap(sockets, { get(target, prop) {
-		const value = Reflect.get(target, prop);
-		if (prop === "acceptWebSocket" && typeof value === "function") return function instrumentedAcceptWebSocket(request) {
+	return wrap(socketsRecord, { get(target, prop) {
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if (prop === "acceptWebSocket" && method) return function instrumentedAcceptWebSocket(request) {
 			const tracer = getTracer$2();
 			const spanName = `Actor ${actorName}: sockets.acceptWebSocket`;
 			return tracer.startActiveSpan(spanName, {
@@ -371,11 +378,11 @@ function instrumentActorSockets(sockets, actorInstance, actorClass) {
 				}
 			}, (span) => {
 				try {
-					const result = value.call(target, request);
+					const result = method.call(target, request);
 					span.setStatus({ code: SpanStatusCode.OK });
 					return result;
 				} catch (error) {
-					span.recordException(error);
+					span.recordException(toException(error));
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
 						message: error instanceof Error ? error.message : String(error)
@@ -386,7 +393,7 @@ function instrumentActorSockets(sockets, actorInstance, actorClass) {
 				}
 			});
 		};
-		if (prop === "broadcast" && typeof value === "function") return function instrumentedBroadcast(message) {
+		if (prop === "broadcast" && method) return function instrumentedBroadcast(message) {
 			const tracer = getTracer$2();
 			const spanName = `Actor ${actorName}: sockets.broadcast`;
 			tracer.startActiveSpan(spanName, {
@@ -400,10 +407,10 @@ function instrumentActorSockets(sockets, actorInstance, actorClass) {
 				}
 			}, (span) => {
 				try {
-					value.call(target, message);
+					method.call(target, message);
 					span.setStatus({ code: SpanStatusCode.OK });
 				} catch (error) {
-					span.recordException(error);
+					span.recordException(toException(error));
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
 						message: error instanceof Error ? error.message : String(error)
@@ -414,7 +421,7 @@ function instrumentActorSockets(sockets, actorInstance, actorClass) {
 				}
 			});
 		};
-		if (prop === "send" && typeof value === "function") return function instrumentedSend(ws, message) {
+		if (prop === "send" && method) return function instrumentedSend(ws, message) {
 			const tracer = getTracer$2();
 			const spanName = `Actor ${actorName}: sockets.send`;
 			tracer.startActiveSpan(spanName, {
@@ -428,10 +435,10 @@ function instrumentActorSockets(sockets, actorInstance, actorClass) {
 				}
 			}, (span) => {
 				try {
-					value.call(target, ws, message);
+					method.call(target, ws, message);
 					span.setStatus({ code: SpanStatusCode.OK });
 				} catch (error) {
-					span.recordException(error);
+					span.recordException(toException(error));
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
 						message: error instanceof Error ? error.message : String(error)
@@ -442,7 +449,7 @@ function instrumentActorSockets(sockets, actorInstance, actorClass) {
 				}
 			});
 		};
-		if (prop === "getConnections" && typeof value === "function") return function instrumentedGetConnections() {
+		if (prop === "getConnections" && method) return function instrumentedGetConnections() {
 			const tracer = getTracer$2();
 			const spanName = `Actor ${actorName}: sockets.getConnections`;
 			return tracer.startActiveSpan(spanName, {
@@ -454,12 +461,12 @@ function instrumentActorSockets(sockets, actorInstance, actorClass) {
 				}
 			}, (span) => {
 				try {
-					const result = value.call(target);
+					const result = method.call(target);
 					if (Array.isArray(result)) span.setAttribute("websocket.connections.count", result.length);
 					span.setStatus({ code: SpanStatusCode.OK });
 					return result;
 				} catch (error) {
-					span.recordException(error);
+					span.recordException(toException(error));
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
 						message: error instanceof Error ? error.message : String(error)
@@ -470,8 +477,7 @@ function instrumentActorSockets(sockets, actorInstance, actorClass) {
 				}
 			});
 		};
-		if (typeof value === "function") return value.bind(target);
-		return value;
+		return method ? method.bind(target) : value;
 	} });
 }
 
@@ -502,7 +508,7 @@ function isColdStart(actorClass) {
 * Get the tracer instance
 */
 function getTracer$1() {
-	return trace.getTracer("autotel-cloudflare-actors");
+	return workerTracer("autotel-cloudflare-actors");
 }
 /**
 * Default span name formatter
@@ -510,9 +516,6 @@ function getTracer$1() {
 function defaultSpanNameFormatter(actorName, actorClass, lifecycle) {
 	return `Actor ${actorName || actorClass}: ${lifecycle}`;
 }
-/**
-* Create base Actor span attributes
-*/
 function createActorAttributes(actorInstance, actorClass, lifecycle) {
 	return {
 		"actor.name": actorInstance.name || "unknown",
@@ -538,7 +541,7 @@ function instrumentOnInit(originalMethod, actorInstance, actorClass, options) {
 				await originalMethod.call(actorInstance);
 				span.setStatus({ code: SpanStatusCode.OK });
 			} catch (error) {
-				span.recordException(error);
+				span.recordException(toException(error));
 				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: error instanceof Error ? error.message : String(error)
@@ -577,7 +580,7 @@ function instrumentOnRequest(originalMethod, actorInstance, actorClass, options)
 				else span.setStatus({ code: SpanStatusCode.ERROR });
 				return response;
 			} catch (error) {
-				span.recordException(error);
+				span.recordException(toException(error));
 				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: error instanceof Error ? error.message : String(error)
@@ -608,7 +611,7 @@ function instrumentOnAlarm(originalMethod, actorInstance, actorClass, options) {
 				await originalMethod.call(actorInstance, alarmInfo);
 				span.setStatus({ code: SpanStatusCode.OK });
 			} catch (error) {
-				span.recordException(error);
+				span.recordException(toException(error));
 				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: error instanceof Error ? error.message : String(error)
@@ -634,14 +637,14 @@ function instrumentOnPersist(originalMethod, actorInstance, actorClass, options)
 			attributes: {
 				...createActorAttributes(actorInstance, actorClass, "persist"),
 				"actor.persist.key": key,
-				"actor.persist.value_type": typeof value
+				"actor.persist.value_type": describeValue(value)
 			}
 		}, (span) => {
 			try {
 				originalMethod.call(actorInstance, key, value);
 				span.setStatus({ code: SpanStatusCode.OK });
 			} catch (error) {
-				span.recordException(error);
+				span.recordException(toException(error));
 				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: error instanceof Error ? error.message : String(error)
@@ -672,7 +675,7 @@ function instrumentWebSocketConnect(originalMethod, actorInstance, actorClass, o
 				originalMethod.call(actorInstance, ws, request);
 				span.setStatus({ code: SpanStatusCode.OK });
 			} catch (error) {
-				span.recordException(error);
+				span.recordException(toException(error));
 				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: error instanceof Error ? error.message : String(error)
@@ -693,15 +696,15 @@ function instrumentWebSocketMessage(originalMethod, actorInstance, actorClass, o
 			kind: SpanKind.SERVER,
 			attributes: {
 				...createActorAttributes(actorInstance, actorClass, "websocket.message"),
-				"websocket.message.type": typeof message,
-				"websocket.message.size": typeof message === "string" ? message.length : message instanceof ArrayBuffer ? message.byteLength : 0
+				"websocket.message.type": describeValue(message),
+				"websocket.message.size": asString(message)?.length ?? (message instanceof ArrayBuffer ? message.byteLength : 0)
 			}
 		}, (span) => {
 			try {
 				originalMethod.call(actorInstance, ws, message);
 				span.setStatus({ code: SpanStatusCode.OK });
 			} catch (error) {
-				span.recordException(error);
+				span.recordException(toException(error));
 				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: error instanceof Error ? error.message : String(error)
@@ -726,7 +729,7 @@ function instrumentWebSocketDisconnect(originalMethod, actorInstance, actorClass
 				originalMethod.call(actorInstance, ws);
 				span.setStatus({ code: SpanStatusCode.OK });
 			} catch (error) {
-				span.recordException(error);
+				span.recordException(toException(error));
 				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: error instanceof Error ? error.message : String(error)
@@ -743,19 +746,19 @@ function instrumentWebSocketDisconnect(originalMethod, actorInstance, actorClass
 */
 function instrumentActorInstance(actorInstance, _state, _env, actorClass, options) {
 	return wrap(actorInstance, { get(target, prop) {
-		const value = Reflect.get(target, prop);
-		if (prop === "onInit" && typeof value === "function") return instrumentOnInit(value.bind(target), target, actorClass, options);
-		if (prop === "onRequest" && typeof value === "function") return instrumentOnRequest(value.bind(target), target, actorClass, options);
-		if (prop === "onAlarm" && typeof value === "function") return instrumentOnAlarm(value.bind(target), target, actorClass, options);
-		if (prop === "onPersist" && typeof value === "function") return instrumentOnPersist(value.bind(target), target, actorClass, options);
-		if (prop === "onWebSocketConnect" && typeof value === "function") return instrumentWebSocketConnect(value.bind(target), target, actorClass, options);
-		if (prop === "onWebSocketMessage" && typeof value === "function") return instrumentWebSocketMessage(value.bind(target), target, actorClass, options);
-		if (prop === "onWebSocketDisconnect" && typeof value === "function") return instrumentWebSocketDisconnect(value.bind(target), target, actorClass, options);
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if (prop === "onInit" && method) return instrumentOnInit(method.bind(target), target, actorClass, options);
+		if (prop === "onRequest" && method) return instrumentOnRequest(method.bind(target), target, actorClass, options);
+		if (prop === "onAlarm" && method) return instrumentOnAlarm(method.bind(target), target, actorClass, options);
+		if (prop === "onPersist" && method) return instrumentOnPersist(method.bind(target), target, actorClass, options);
+		if (prop === "onWebSocketConnect" && method) return instrumentWebSocketConnect(method.bind(target), target, actorClass, options);
+		if (prop === "onWebSocketMessage" && method) return instrumentWebSocketMessage(method.bind(target), target, actorClass, options);
+		if (prop === "onWebSocketDisconnect" && method) return instrumentWebSocketDisconnect(method.bind(target), target, actorClass, options);
 		if (prop === "storage" && value && options.instrumentStorage !== false) return instrumentActorStorage(value, target, actorClass);
 		if (prop === "alarms" && value && options.instrumentAlarms !== false) return instrumentActorAlarms(value, target, actorClass);
 		if (prop === "sockets" && value && options.instrumentSockets !== false) return instrumentActorSockets(value, target, actorClass);
-		if (typeof value === "function") return value.bind(target);
-		return value;
+		return method ? method.bind(target) : value;
 	} });
 }
 /**
@@ -812,11 +815,10 @@ function instrumentActor(actorClass, config) {
 		capturePersistEvents: true
 	};
 	return wrap(actorClass, { construct(target, [state, env]) {
-		const resolvedConfig = typeof config === "function" ? config(env, {
+		const actorOptions = readProperty(typeof config === "function" ? config(env, {
 			id: state.id.toString(),
 			name: state.id.name
-		}) : config;
-		const actorOptions = resolvedConfig && typeof resolvedConfig === "object" && "actors" in resolvedConfig ? resolvedConfig.actors : void 0;
+		}) : config, "actors");
 		const options = {
 			...defaultOptions,
 			...actorOptions
@@ -846,7 +848,7 @@ function instrumentActor(actorClass, config) {
 * Get the tracer instance
 */
 function getTracer() {
-	return trace.getTracer("autotel-cloudflare-actors");
+	return workerTracer("autotel-cloudflare-actors");
 }
 /**
 * Create a traced handler that combines Actor instrumentation with request tracing
@@ -949,7 +951,7 @@ function tracedHandler(actorClass, config) {
 				else span.setStatus({ code: SpanStatusCode.ERROR });
 				return response;
 			} catch (error) {
-				span.recordException(error);
+				span.recordException(toException(error));
 				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: error instanceof Error ? error.message : String(error)
@@ -1017,7 +1019,7 @@ function wrapHandler(originalHandler, config) {
 				else span.setStatus({ code: SpanStatusCode.ERROR });
 				return response;
 			} catch (error) {
-				span.recordException(error);
+				span.recordException(toException(error));
 				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: error instanceof Error ? error.message : String(error)

package/dist/agents.d.ts

@@ -1,3 +1,4 @@
+import { t as UnknownRecord } from "./values-CRvW9g6_.js";
 import { ConfigurationOption } from "autotel-edge";
 import { Attributes } from "@opentelemetry/api";
 //#region src/agents/base.d.ts
@@ -689,6 +690,6 @@ declare class OtelObservability implements Observability {
   emit(event: ObservabilityEvent, ctx?: ObservabilityExecutionContext): void;
 }
 declare function createOtelObservability(config: OtelObservabilityConfig): OtelObservability;
-declare function createOtelObservabilityFromEnv(env: Record<string, unknown>, options?: AgentInstrumentationOptions): OtelObservability;
+declare function createOtelObservabilityFromEnv(env: UnknownRecord, options?: AgentInstrumentationOptions): OtelObservability;
 //#endregion
 export { type AgentInstrumentationOptions, type AgentObservabilityEvent, type AgentSpanAttributes, type BaseEvent, type ChannelEventMap, type MCPObservabilityEvent, type Observability, type ObservabilityEvent, OtelObservability, type OtelObservabilityConfig, channels, createOtelObservability, createOtelObservabilityFromEnv, genericObservability, subscribe };