autotel-cloudflare 6.0.2 → 9.0.0

package/dist/{bindings-DznsCwCn.js → bindings-s6W9szMm.js}

@@ -1,6 +1,8 @@
-import { a as wrap, r as setAttr, t as isWrapped } from "./common-DiWH6nmG.js";
+import { _ as trapArgs, a as asRecord, c as asString, d as hasMethods, f as member, g as readProperty, h as readPath, i as asNumber, m as numberAt, n as asBoolean, r as asFunction, u as hasMethod } from "./values-BC6rdpGG.js";
+import { i as setAttr, n as isWrapped, o as wrap, t as toException } from "./exception-D3xOCdBW.js";
+import { t as workerTracer } from "./tracer-z8zwRBVS.js";
 import { getActiveConfig } from "autotel-edge";
-import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
+import { SpanKind, SpanStatusCode } from "@opentelemetry/api";
 
 //#region src/bindings/ai.ts
 /**
@@ -12,10 +14,11 @@ import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 function instrumentAI(ai, bindingName) {
 	const name = bindingName || "ai";
 	return wrap(ai, { get(target, prop) {
-		const value = Reflect.get(target, prop);
-		if (prop === "run" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			const [model] = args;
-			return trace.getTracer("autotel-edge").startActiveSpan(`AI ${name}: run ${model}`, {
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if (prop === "run" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			const [model] = trapArgs(args);
+			return workerTracer("autotel-edge").startActiveSpan(`AI ${name}: run ${model}`, {
 				kind: SpanKind.CLIENT,
 				attributes: {
 					"gen_ai.provider.name": "cloudflare-workers-ai",
@@ -24,13 +27,15 @@ function instrumentAI(ai, bindingName) {
 				}
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
-					if (result?.usage?.prompt_tokens !== void 0) setAttr(span, "gen_ai.usage.input_tokens", Number(result.usage.prompt_tokens));
-					if (result?.usage?.completion_tokens !== void 0) setAttr(span, "gen_ai.usage.output_tokens", Number(result.usage.completion_tokens));
+					const result = await fnTarget.apply(target, args);
+					const inputTokens = numberAt(result, "usage", "prompt_tokens");
+					if (inputTokens !== void 0) setAttr(span, "gen_ai.usage.input_tokens", inputTokens);
+					const outputTokens = numberAt(result, "usage", "completion_tokens");
+					if (outputTokens !== void 0) setAttr(span, "gen_ai.usage.output_tokens", outputTokens);
 					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)
@@ -64,10 +69,11 @@ const TRACED_METHODS = [
 function instrumentVectorize(vectorize, indexName) {
 	const name = indexName || "vectorize";
 	return wrap(vectorize, { get(target, prop) {
-		const value = Reflect.get(target, prop);
-		if (typeof prop === "string" && TRACED_METHODS.includes(prop) && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if (typeof prop === "string" && TRACED_METHODS.includes(prop) && method !== void 0) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
 			const operation = prop;
-			const tracer = trace.getTracer("autotel-edge");
+			const tracer = workerTracer("autotel-edge");
 			const attributes = {
 				"db.system": "cloudflare-vectorize",
 				"db.operation": operation,
@@ -83,12 +89,13 @@ function instrumentVectorize(vectorize, indexName) {
 				attributes
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
-					if (operation === "query" && result?.matches) setAttr(span, "db.vectorize.matches_count", result.matches.length);
+					const result = await fnTarget.apply(target, args);
+					const matches = readProperty(result, "matches");
+					if (operation === "query" && Array.isArray(matches)) setAttr(span, "db.vectorize.matches_count", matches.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)
@@ -114,9 +121,10 @@ function instrumentVectorize(vectorize, indexName) {
 function instrumentHyperdrive(hyperdrive, bindingName) {
 	const name = bindingName || "hyperdrive";
 	return wrap(hyperdrive, { get(target, prop) {
-		const value = Reflect.get(target, prop);
-		if (prop === "connect" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			const tracer = trace.getTracer("autotel-edge");
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if (prop === "connect" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			const tracer = workerTracer("autotel-edge");
 			const attributes = {
 				"db.system": "cloudflare-hyperdrive",
 				"db.operation": "connect"
@@ -137,11 +145,11 @@ function instrumentHyperdrive(hyperdrive, bindingName) {
 				attributes
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
+					const result = await fnTarget.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)
@@ -167,9 +175,10 @@ function instrumentHyperdrive(hyperdrive, bindingName) {
 function instrumentQueueProducer(queue, queueName) {
 	const name = queueName || "queue";
 	return wrap(queue, { get(target, prop) {
-		const value = Reflect.get(target, prop);
-		if (prop === "send" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			return trace.getTracer("autotel-edge").startActiveSpan(`Queue ${name}: send`, {
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if (prop === "send" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			return workerTracer("autotel-edge").startActiveSpan(`Queue ${name}: send`, {
 				kind: SpanKind.PRODUCER,
 				attributes: {
 					"messaging.system": "cloudflare-queues",
@@ -179,12 +188,12 @@ function instrumentQueueProducer(queue, queueName) {
 				}
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
+					const result = await fnTarget.apply(target, args);
 					setAttr(span, "messaging.message.id", result?.messageId);
 					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)
@@ -195,9 +204,9 @@ function instrumentQueueProducer(queue, queueName) {
 				}
 			});
 		} });
-		if (prop === "sendBatch" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			const [messages] = args;
-			return trace.getTracer("autotel-edge").startActiveSpan(`Queue ${name}: sendBatch`, {
+		if (prop === "sendBatch" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			const [messages] = trapArgs(args);
+			return workerTracer("autotel-edge").startActiveSpan(`Queue ${name}: sendBatch`, {
 				kind: SpanKind.PRODUCER,
 				attributes: {
 					"messaging.system": "cloudflare-queues",
@@ -208,11 +217,11 @@ function instrumentQueueProducer(queue, queueName) {
 				}
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
+					const result = await fnTarget.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)
@@ -238,10 +247,11 @@ function instrumentQueueProducer(queue, queueName) {
 function instrumentAnalyticsEngine(ae, datasetName) {
 	const name = datasetName || "analytics-engine";
 	return wrap(ae, { get(target, prop) {
-		const value = Reflect.get(target, prop);
-		if (prop === "writeDataPoint" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			const [dataPoint] = args;
-			const tracer = trace.getTracer("autotel-edge");
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if (prop === "writeDataPoint" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			const [dataPoint] = trapArgs(args);
+			const tracer = workerTracer("autotel-edge");
 			const attributes = {
 				"analytics.system": "cloudflare-analytics-engine",
 				"analytics.operation": "writeDataPoint"
@@ -256,10 +266,10 @@ function instrumentAnalyticsEngine(ae, datasetName) {
 				attributes
 			}, (span) => {
 				try {
-					Reflect.apply(fnTarget, target, args);
+					fnTarget.apply(target, args);
 					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)
@@ -286,15 +296,16 @@ function instrumentAnalyticsEngine(ae, datasetName) {
 const pipelineMetaSymbol = Symbol("images-pipeline-meta");
 function proxyTransformer(transformer, meta, bindingName) {
 	const proxy = new Proxy(transformer, { get(target, prop) {
-		const value = Reflect.get(target, prop);
-		if ((prop === "transform" || prop === "draw") && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if ((prop === "transform" || prop === "draw") && method !== void 0) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
 			meta.operationCount++;
-			const result = Reflect.apply(fnTarget, target, args);
+			const result = fnTarget.apply(target, args);
 			if (result === target || result && typeof result === "object" && "output" in result) return proxyTransformer(result, meta, bindingName);
 			return result;
 		} });
-		if (prop === "output" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			const tracer = trace.getTracer("autotel-edge");
+		if (prop === "output" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			const tracer = workerTracer("autotel-edge");
 			const [formatOrOptions] = args;
 			const attributes = {
 				"images.system": "cloudflare-images",
@@ -310,11 +321,11 @@ function proxyTransformer(transformer, meta, bindingName) {
 				attributes
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
+					const result = await fnTarget.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)
@@ -341,9 +352,10 @@ function proxyTransformer(transformer, meta, bindingName) {
 function instrumentImages(images, bindingName) {
 	const name = bindingName || "images";
 	return wrap(images, { get(target, prop) {
-		const value = Reflect.get(target, prop);
-		if (prop === "info" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			return trace.getTracer("autotel-edge").startActiveSpan(`Images ${name}: info`, {
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if (prop === "info" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			return workerTracer("autotel-edge").startActiveSpan(`Images ${name}: info`, {
 				kind: SpanKind.CLIENT,
 				attributes: {
 					"images.system": "cloudflare-images",
@@ -351,14 +363,14 @@ function instrumentImages(images, bindingName) {
 				}
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
-					setAttr(span, "images.width", result?.width);
-					setAttr(span, "images.height", result?.height);
-					setAttr(span, "images.format", result?.format);
+					const result = await fnTarget.apply(target, args);
+					setAttr(span, "images.width", numberAt(result, "width"));
+					setAttr(span, "images.height", numberAt(result, "height"));
+					setAttr(span, "images.format", asString(readProperty(result, "format")));
 					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)
@@ -369,8 +381,8 @@ function instrumentImages(images, bindingName) {
 				}
 			});
 		} });
-		if (prop === "input" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			return proxyTransformer(Reflect.apply(fnTarget, target, args), { operationCount: 0 }, name);
+		if (prop === "input" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			return proxyTransformer(fnTarget.apply(target, args), { operationCount: 0 }, name);
 		} });
 		return value;
 	} });
@@ -413,10 +425,11 @@ function sanitizeStatement(query, mode) {
 function instrumentKV(kv, namespaceName) {
 	const name = namespaceName || "kv";
 	return wrap(kv, { get(target, prop) {
-		const value = Reflect.get(target, prop);
-		if (prop === "get" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			const [key, options] = args;
-			return trace.getTracer("autotel-edge").startActiveSpan(`KV ${name}: get`, {
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if (prop === "get" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			const [key, options] = trapArgs(args);
+			return workerTracer("autotel-edge").startActiveSpan(`KV ${name}: get`, {
 				kind: SpanKind.CLIENT,
 				attributes: {
 					"db.system": "cloudflare-kv",
@@ -427,12 +440,12 @@ function instrumentKV(kv, namespaceName) {
 				}
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
+					const result = await fnTarget.apply(target, args);
 					span.setAttribute("db.result.type", result === null ? "null" : typeof result);
 					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)
@@ -443,9 +456,9 @@ function instrumentKV(kv, namespaceName) {
 				}
 			});
 		} });
-		if (prop === "put" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			const [key] = args;
-			return trace.getTracer("autotel-edge").startActiveSpan(`KV ${name}: put`, {
+		if (prop === "put" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			const [key] = trapArgs(args);
+			return workerTracer("autotel-edge").startActiveSpan(`KV ${name}: put`, {
 				kind: SpanKind.CLIENT,
 				attributes: {
 					"db.system": "cloudflare-kv",
@@ -455,11 +468,11 @@ function instrumentKV(kv, namespaceName) {
 				}
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
+					const result = await fnTarget.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)
@@ -470,9 +483,9 @@ function instrumentKV(kv, namespaceName) {
 				}
 			});
 		} });
-		if (prop === "delete" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			const [key] = args;
-			return trace.getTracer("autotel-edge").startActiveSpan(`KV ${name}: delete`, {
+		if (prop === "delete" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			const [key] = trapArgs(args);
+			return workerTracer("autotel-edge").startActiveSpan(`KV ${name}: delete`, {
 				kind: SpanKind.CLIENT,
 				attributes: {
 					"db.system": "cloudflare-kv",
@@ -482,11 +495,11 @@ function instrumentKV(kv, namespaceName) {
 				}
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
+					const result = await fnTarget.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)
@@ -497,9 +510,9 @@ function instrumentKV(kv, namespaceName) {
 				}
 			});
 		} });
-		if (prop === "list" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			const [options] = args;
-			return trace.getTracer("autotel-edge").startActiveSpan(`KV ${name}: list`, {
+		if (prop === "list" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			const [options] = trapArgs(args);
+			return workerTracer("autotel-edge").startActiveSpan(`KV ${name}: list`, {
 				kind: SpanKind.CLIENT,
 				attributes: {
 					"db.system": "cloudflare-kv",
@@ -510,12 +523,13 @@ function instrumentKV(kv, namespaceName) {
 				}
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
-					span.setAttribute("db.result.keys_count", result.keys.length);
+					const result = await fnTarget.apply(target, args);
+					const keys = readProperty(result, "keys");
+					if (Array.isArray(keys)) span.setAttribute("db.result.keys_count", keys.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)
@@ -535,10 +549,11 @@ function instrumentKV(kv, namespaceName) {
 function instrumentR2(r2, bucketName) {
 	const name = bucketName || "r2";
 	return wrap(r2, { get(target, prop) {
-		const value = Reflect.get(target, prop);
-		if (prop === "get" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			const [key] = args;
-			return trace.getTracer("autotel-edge").startActiveSpan(`R2 ${name}: get`, {
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if (prop === "get" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			const [key] = trapArgs(args);
+			return workerTracer("autotel-edge").startActiveSpan(`R2 ${name}: get`, {
 				kind: SpanKind.CLIENT,
 				attributes: {
 					"db.system": "cloudflare-r2",
@@ -548,16 +563,17 @@ function instrumentR2(r2, bucketName) {
 				}
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
+					const result = await fnTarget.apply(target, args);
 					if (result) {
-						span.setAttribute("db.result.size", result.size);
-						span.setAttribute("db.result.etag", result.etag);
-						span.setAttribute("db.result.content_type", result.httpMetadata?.contentType);
+						setResultAttr(span, "db.result.size", result, "size");
+						setResultAttr(span, "db.result.etag", result, "etag");
+						const contentType = asString(readPath(result, "httpMetadata", "contentType"));
+						if (contentType !== void 0) span.setAttribute("db.result.content_type", contentType);
 					} else span.setAttribute("db.result.exists", false);
 					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)
@@ -568,9 +584,9 @@ function instrumentR2(r2, bucketName) {
 				}
 			});
 		} });
-		if (prop === "put" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			const [key] = args;
-			return trace.getTracer("autotel-edge").startActiveSpan(`R2 ${name}: put`, {
+		if (prop === "put" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			const [key] = trapArgs(args);
+			return workerTracer("autotel-edge").startActiveSpan(`R2 ${name}: put`, {
 				kind: SpanKind.CLIENT,
 				attributes: {
 					"db.system": "cloudflare-r2",
@@ -580,13 +596,13 @@ function instrumentR2(r2, bucketName) {
 				}
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
-					span.setAttribute("db.result.etag", result.etag);
-					span.setAttribute("db.result.uploaded", result.uploaded);
+					const result = await fnTarget.apply(target, args);
+					setResultAttr(span, "db.result.etag", result, "etag");
+					setResultAttr(span, "db.result.uploaded", result, "uploaded");
 					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)
@@ -597,9 +613,9 @@ function instrumentR2(r2, bucketName) {
 				}
 			});
 		} });
-		if (prop === "delete" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
+		if (prop === "delete" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
 			const keys = args;
-			return trace.getTracer("autotel-edge").startActiveSpan(`R2 ${name}: delete`, {
+			return workerTracer("autotel-edge").startActiveSpan(`R2 ${name}: delete`, {
 				kind: SpanKind.CLIENT,
 				attributes: {
 					"db.system": "cloudflare-r2",
@@ -609,11 +625,11 @@ function instrumentR2(r2, bucketName) {
 				}
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
+					const result = await fnTarget.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)
@@ -624,9 +640,9 @@ function instrumentR2(r2, bucketName) {
 				}
 			});
 		} });
-		if (prop === "list" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			const [options] = args;
-			return trace.getTracer("autotel-edge").startActiveSpan(`R2 ${name}: list`, {
+		if (prop === "list" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			const [options] = trapArgs(args);
+			return workerTracer("autotel-edge").startActiveSpan(`R2 ${name}: list`, {
 				kind: SpanKind.CLIENT,
 				attributes: {
 					"db.system": "cloudflare-r2",
@@ -637,13 +653,14 @@ function instrumentR2(r2, bucketName) {
 				}
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
-					span.setAttribute("db.result.objects_count", result.objects.length);
-					span.setAttribute("db.result.truncated", result.truncated);
+					const result = await fnTarget.apply(target, args);
+					const objects = readProperty(result, "objects");
+					if (Array.isArray(objects)) span.setAttribute("db.result.objects_count", objects.length);
+					setResultAttr(span, "db.result.truncated", result, "truncated");
 					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)
@@ -663,13 +680,15 @@ function instrumentR2(r2, bucketName) {
 function instrumentD1(d1, databaseName) {
 	const name = databaseName || "d1";
 	return wrap(d1, { get(target, prop) {
-		const value = Reflect.get(target, prop);
-		if (prop === "prepare" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			const [query] = args;
-			const tracer = trace.getTracer("autotel-edge");
-			return wrap(Reflect.apply(fnTarget, target, args), { get(target, prop) {
-				const value = Reflect.get(target, prop);
-				if (prop === "first" || prop === "run" || prop === "all" || prop === "raw") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if (prop === "prepare" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			const [query] = trapArgs(args);
+			const tracer = workerTracer("autotel-edge");
+			return wrap(fnTarget.apply(target, args), { get(target, prop) {
+				const value = member(target, prop);
+				const method = asFunction(value);
+				if (method && (prop === "first" || prop === "run" || prop === "all" || prop === "raw")) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
 					const captureMode = getActiveConfig()?.dataSafety?.captureDbStatement ?? "full";
 					const statement = sanitizeStatement(query, captureMode);
 					const attributes = {
@@ -683,13 +702,13 @@ function instrumentD1(d1, databaseName) {
 						attributes
 					}, async (span) => {
 						try {
-							const result = await Reflect.apply(fnTarget, target, args);
+							const result = await fnTarget.apply(target, args);
 							if (prop === "all" && Array.isArray(result)) span.setAttribute("db.result.rows_count", result.length);
 							else if (prop === "first" && result) span.setAttribute("db.result.exists", true);
 							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)
@@ -703,9 +722,9 @@ function instrumentD1(d1, databaseName) {
 				return value;
 			} });
 		} });
-		if (prop === "exec" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			const [query] = args;
-			const tracer = trace.getTracer("autotel-edge");
+		if (prop === "exec" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			const [query] = trapArgs(args);
+			const tracer = workerTracer("autotel-edge");
 			const statement = sanitizeStatement(query, getActiveConfig()?.dataSafety?.captureDbStatement ?? "full");
 			const attributes = {
 				"db.system": "cloudflare-d1",
@@ -718,12 +737,13 @@ function instrumentD1(d1, databaseName) {
 				attributes
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
-					span.setAttribute("db.result.count", result.count);
+					const result = await fnTarget.apply(target, args);
+					const count = numberAt(result, "count");
+					if (count !== void 0) span.setAttribute("db.result.count", count);
 					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)
@@ -743,7 +763,7 @@ function instrumentD1(d1, databaseName) {
 * Unlike other bindings, Fetcher objects are native Cloudflare C++ bindings
 * whose methods throw "Illegal invocation" when called through a Proxy with
 * a different `this` reference. We work around this by calling `target.fetch()`
-* directly on the original binding instead of using `Reflect.apply` on a
+* directly on the original binding instead of using `fn.apply` on a
 * detached function reference.
 */
 function instrumentServiceBinding(fetcher, serviceName) {
@@ -751,9 +771,9 @@ function instrumentServiceBinding(fetcher, serviceName) {
 	return wrap(fetcher, { get(target, prop) {
 		if (prop === "fetch" && typeof target.fetch === "function") {
 			const tracedFetch = (...args) => {
-				const [input, init] = args;
+				const [input, init] = trapArgs(args);
 				const request = new Request(input, init);
-				return trace.getTracer("autotel-edge").startActiveSpan(`Service ${name}: ${request.method}`, {
+				return workerTracer("autotel-edge").startActiveSpan(`Service ${name}: ${request.method}`, {
 					kind: SpanKind.CLIENT,
 					attributes: {
 						"rpc.system": "cloudflare-service-binding",
@@ -768,7 +788,7 @@ function instrumentServiceBinding(fetcher, serviceName) {
 						span.setStatus({ code: SpanStatusCode.OK });
 						return response;
 					} catch (error) {
-						span.recordException(error);
+						span.recordException(toException(error));
 						span.setStatus({
 							code: SpanStatusCode.ERROR,
 							message: error instanceof Error ? error.message : String(error)
@@ -781,16 +801,16 @@ function instrumentServiceBinding(fetcher, serviceName) {
 			};
 			return tracedFetch;
 		}
-		const value = Reflect.get(target, prop);
-		if (typeof value === "function") return value.bind(target);
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if (method !== void 0) return method.bind(target);
 		return value;
 	} });
 }
 /**
-* Detection helpers
+* Detection helpers - a binding is recognised by the methods it carries.
 */
-const hasMethod = (obj, m) => typeof obj?.[m] === "function";
-const hasExactMethods = (obj, methods) => methods.every((m) => hasMethod(obj, m));
+const hasExactMethods = (obj, methods) => hasMethods(obj, methods);
 /**
 * Auto-instrument all Cloudflare bindings in the environment
 *
@@ -811,13 +831,36 @@ const hasExactMethods = (obj, methods) => methods.every((m) => hasMethod(obj, m)
 * - Browser Rendering — indistinguishable from Service Binding
 */
 const envCache = /* @__PURE__ */ new WeakMap();
+/**
+* One Worker binding, read as the type its method set identifies it as.
+*
+* SAFETY: each call below has just checked the exact set of methods that
+* distinguishes one binding kind from every other, in the documented order
+* (R2 before KV because R2 also has `head`, service bindings last because
+* `fetch` is the broadest). The wrapper that receives it calls only the
+* methods that check just found.
+*/
+/** Set an attribute from a result field, when the result carries one there. */
+function setResultAttr(span, attribute, result, key) {
+	const value = readProperty(result, key);
+	const attributeValue = asString(value) ?? asNumber(value) ?? asBoolean(value);
+	if (attributeValue !== void 0) span.setAttribute(attribute, attributeValue);
+}
+function asBinding(value) {
+	return value;
+}
+/** A binding is an object; anything else in env is a plain config value. */
+function asObjectBinding(value) {
+	return asRecord(value);
+}
 function instrumentBindings(env) {
 	const cached = envCache.get(env);
 	if (cached) return cached;
 	const instrumented = {};
-	for (const [key, value] of Object.entries(env)) {
-		if (!value || typeof value !== "object") {
-			instrumented[key] = value;
+	for (const [key, entry] of Object.entries(env)) {
+		const value = asObjectBinding(entry);
+		if (!value) {
+			instrumented[key] = entry;
 			continue;
 		}
 		if (isWrapped(value)) {
@@ -831,7 +874,7 @@ function instrumentBindings(env) {
 			"list",
 			"head"
 		])) {
-			instrumented[key] = instrumentR2(value, key);
+			instrumented[key] = instrumentR2(asBinding(value), key);
 			continue;
 		}
 		if (hasExactMethods(value, [
@@ -840,11 +883,11 @@ function instrumentBindings(env) {
 			"delete",
 			"list"
 		]) && !("head" in value)) {
-			instrumented[key] = instrumentKV(value, key);
+			instrumented[key] = instrumentKV(asBinding(value), key);
 			continue;
 		}
 		if (hasExactMethods(value, ["prepare", "exec"])) {
-			instrumented[key] = instrumentD1(value, key);
+			instrumented[key] = instrumentD1(asBinding(value), key);
 			continue;
 		}
 		if (hasExactMethods(value, [
@@ -853,31 +896,31 @@ function instrumentBindings(env) {
 			"upsert",
 			"describe"
 		])) {
-			instrumented[key] = instrumentVectorize(value, key);
+			instrumented[key] = instrumentVectorize(asBinding(value), key);
 			continue;
 		}
 		if (hasMethod(value, "run") && ("gateway" in value || "models" in value)) {
-			instrumented[key] = instrumentAI(value, key);
+			instrumented[key] = instrumentAI(asBinding(value), key);
 			continue;
 		}
 		if (hasMethod(value, "connect") && "connectionString" in value && "host" in value) {
-			instrumented[key] = instrumentHyperdrive(value, key);
+			instrumented[key] = instrumentHyperdrive(asBinding(value), key);
 			continue;
 		}
 		if (hasExactMethods(value, ["send", "sendBatch"]) && !("get" in value)) {
-			instrumented[key] = instrumentQueueProducer(value, key);
+			instrumented[key] = instrumentQueueProducer(asBinding(value), key);
 			continue;
 		}
 		if (hasMethod(value, "writeDataPoint")) {
-			instrumented[key] = instrumentAnalyticsEngine(value, key);
+			instrumented[key] = instrumentAnalyticsEngine(asBinding(value), key);
 			continue;
 		}
 		if (hasExactMethods(value, ["info", "input"])) {
-			instrumented[key] = instrumentImages(value, key);
+			instrumented[key] = instrumentImages(asBinding(value), key);
 			continue;
 		}
 		if (hasMethod(value, "fetch")) {
-			instrumented[key] = instrumentServiceBinding(value, key);
+			instrumented[key] = instrumentServiceBinding(asBinding(value), key);
 			continue;
 		}
 		instrumented[key] = value;
@@ -897,10 +940,11 @@ function instrumentBindings(env) {
 function instrumentRateLimiter(limiter, bindingName) {
 	const name = bindingName || "rate-limiter";
 	return wrap(limiter, { get(target, prop) {
-		const value = Reflect.get(target, prop);
-		if (prop === "limit" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			const [options] = args;
-			return trace.getTracer("autotel-edge").startActiveSpan(`RateLimiter ${name}: limit`, {
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if (prop === "limit" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			const [options] = trapArgs(args);
+			return workerTracer("autotel-edge").startActiveSpan(`RateLimiter ${name}: limit`, {
 				kind: SpanKind.CLIENT,
 				attributes: {
 					"rate_limiter.system": "cloudflare-rate-limiter",
@@ -908,12 +952,12 @@ function instrumentRateLimiter(limiter, bindingName) {
 				}
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
-					setAttr(span, "rate_limiter.success", result?.success);
+					const result = await fnTarget.apply(target, args);
+					setAttr(span, "rate_limiter.success", asBoolean(readProperty(result, "success")));
 					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)
@@ -939,11 +983,12 @@ function instrumentRateLimiter(limiter, bindingName) {
 function instrumentBrowserRendering(browser, bindingName) {
 	const name = bindingName || "browser";
 	return wrap(browser, { get(target, prop) {
-		const value = Reflect.get(target, prop);
-		if (prop === "fetch" && typeof value === "function") return new Proxy(value, { apply: (fnTarget, _thisArg, args) => {
-			const [input] = args;
+		const value = member(target, prop);
+		const method = asFunction(value);
+		if (prop === "fetch" && method) return new Proxy(method, { apply: (fnTarget, _thisArg, args) => {
+			const [input] = trapArgs(args);
 			const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
-			return trace.getTracer("autotel-edge").startActiveSpan(`BrowserRendering ${name}: fetch`, {
+			return workerTracer("autotel-edge").startActiveSpan(`BrowserRendering ${name}: fetch`, {
 				kind: SpanKind.CLIENT,
 				attributes: {
 					"browser.system": "cloudflare-browser-rendering",
@@ -951,12 +996,12 @@ function instrumentBrowserRendering(browser, bindingName) {
 				}
 			}, async (span) => {
 				try {
-					const result = await Reflect.apply(fnTarget, target, args);
-					setAttr(span, "http.response.status_code", result?.status);
+					const result = await fnTarget.apply(target, args);
+					setAttr(span, "http.response.status_code", numberAt(result, "status"));
 					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)