@telemetry-dev/bedrock 0.1.0 → 0.1.1

package/dist/agents.d.mts

@@ -2,7 +2,7 @@ import { t as BedrockInstrumentationOptions } from "./internal-_ZoDhB3-.mjs";
 
 //#region src/agents.d.ts
 interface WrappableBedrockAgentClient {
-  send: (...args: never[]) => unknown;
+  send: (...args: never[]) => any;
 }
 declare function wrapBedrockAgents<T extends WrappableBedrockAgentClient>(client: T, options?: BedrockInstrumentationOptions): T;
 declare function instrumentBedrockAgents(options?: BedrockInstrumentationOptions): void;

package/dist/agents.mjs

@@ -1,4 +1,4 @@
-import { r as createInstrumentedSend, t as AGENT_HANDLERS } from "./internal-handlers-BloMjBP8.mjs";
+import { r as createInstrumentedSend, t as AGENT_HANDLERS } from "./internal-handlers-CJPJo9q3.mjs";
 import { BedrockAgentRuntimeClient } from "@aws-sdk/client-bedrock-agent-runtime";
 //#region src/agents.ts
 const WRAPPED = /* @__PURE__ */ new WeakSet();

package/dist/index.d.mts

@@ -2,7 +2,7 @@ import { t as BedrockInstrumentationOptions } from "./internal-_ZoDhB3-.mjs";
 
 //#region src/index.d.ts
 interface WrappableBedrockClient {
-  send: (...args: never[]) => unknown;
+  send: (...args: never[]) => any;
 }
 declare function wrapBedrock<T extends WrappableBedrockClient>(client: T, options?: BedrockInstrumentationOptions): T;
 declare function instrumentBedrock(options?: BedrockInstrumentationOptions): void;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { n as RUNTIME_HANDLERS, r as createInstrumentedSend } from "./internal-handlers-BloMjBP8.mjs";
+import { n as RUNTIME_HANDLERS, r as createInstrumentedSend } from "./internal-handlers-CJPJo9q3.mjs";
 import { BedrockRuntimeClient } from "@aws-sdk/client-bedrock-runtime";
 //#region src/index.ts
 const WRAPPED = /* @__PURE__ */ new WeakSet();

package/dist/{internal-handlers-BloMjBP8.mjs → internal-handlers-CJPJo9q3.mjs}

@@ -4,60 +4,64 @@ const PROVIDER = "amazon-bedrock";
 const STREAM_FINALIZER = typeof FinalizationRegistry === "function" ? new FinalizationRegistry((finish) => finish()) : void 0;
 function createInstrumentedSend(originalSend, options, handlers) {
 	return function instrumentedSend(command, ...rest) {
-		const name = command?.constructor?.name;
-		const handler = typeof name === "string" ? handlers[name] : void 0;
-		if (!handler) return originalSend.apply(this, [command, ...rest]);
-		const input = commandInput(command);
+		const rawCommand = asJsonValue(command);
+		const rawRest = rest.map(asJsonValue);
+		const name = isRecord(rawCommand) ? rawCommand.constructor?.name : void 0;
+		const handler = String(name) === name ? handlers[name] : void 0;
+		if (!handler) return originalSend.apply(this, [rawCommand, ...rawRest]);
+		const input = commandInput(rawCommand);
 		const t0 = performance.now();
 		const spanType = safe(() => handler.spanType(input)) ?? "span";
 		const span = startSpan(safe(() => handler.spanName(input)) ?? name ?? "bedrock", {
 			type: spanType,
 			...safe(() => handler.requestFields(input, options)) ?? {}
 		});
-		const callbackIndex = rest.findIndex((arg) => typeof arg === "function");
+		const callbackIndex = rawRest.findIndex((arg) => arg instanceof Function);
 		if (callbackIndex !== -1) {
-			const callback = rest[callbackIndex];
-			const wrappedRest = [...rest];
+			const callback = rawRest[callbackIndex];
+			const wrappedRest = [...rawRest];
 			wrappedRest[callbackIndex] = (error, data) => {
-				if (error != null) {
+				const rawError = error;
+				const rawData = data;
+				if (rawError != null) {
 					endSpan(span, {
-						...awsMetadataFields(metadataOf(error)),
-						error
+						...awsMetadataFields(metadataOf(rawError)),
+						error: asError(rawError)
 					});
-					callback(error, data);
+					callback(asJsonValue(rawError), asJsonValue(rawData));
 					return;
 				}
-				let nextData = data;
+				let nextData = asJsonValue(rawData);
 				try {
-					nextData = handler.onResult(data, span, t0, input, options);
+					nextData = handler.onResult(asJsonValue(rawData), span, t0, input, options);
 				} catch {
-					endSpan(span, awsMetadataFields(metadataOf(data)));
+					endSpan(span, awsMetadataFields(metadataOf(rawData)));
 				}
-				callback(error, nextData);
+				callback(asJsonValue(rawError), asJsonValue(nextData));
 			};
 			try {
-				return originalSend.apply(this, [command, ...wrappedRest]);
+				return originalSend.apply(this, [rawCommand, ...wrappedRest]);
 			} catch (error) {
 				endSpan(span, {
 					...awsMetadataFields(metadataOf(error)),
-					error
+					error: asError(error)
 				});
 				throw error;
 			}
 		}
 		let result;
 		try {
-			result = originalSend.apply(this, [command, ...rest]);
+			result = originalSend.apply(this, [rawCommand, ...rawRest]);
 		} catch (error) {
 			endSpan(span, {
 				...awsMetadataFields(metadataOf(error)),
-				error
+				error: asError(error)
 			});
 			throw error;
 		}
 		return Promise.resolve(result).then((resolved) => {
 			try {
-				return handler.onResult(resolved, span, t0, input, options);
+				return handler.onResult(asJsonValue(resolved), span, t0, input, options);
 			} catch {
 				endSpan(span, awsMetadataFields(metadataOf(resolved)));
 				return resolved;
@@ -65,18 +69,18 @@ function createInstrumentedSend(originalSend, options, handlers) {
 		}, (error) => {
 			endSpan(span, {
 				...awsMetadataFields(metadataOf(error)),
-				error
+				error: asError(error)
 			});
 			throw error;
 		});
 	};
 }
 function commandInput(command) {
-	const value = command?.input;
-	return isRecord(value) ? value : {};
+	if (!isRecord(command)) return {};
+	return isRecord(command.input) ? command.input : {};
 }
 function isRecord(value) {
-	return value !== null && typeof value === "object" && !Array.isArray(value);
+	return value !== null && Object(value) === value && !Array.isArray(value);
 }
 function safe(fn) {
 	try {
@@ -96,8 +100,8 @@ function updateSpan(span, fields) {
 	} catch {}
 }
 function metadataOf(value) {
-	if (isRecord(value) && isRecord(value.$metadata)) return value.$metadata;
-	return value?.$metadata;
+	if (!isRecord(value)) return void 0;
+	return value.$metadata;
 }
 function modeledStreamError(event) {
 	for (const [key, name] of Object.entries({
@@ -126,11 +130,12 @@ function modeledStreamError(event) {
 	}
 }
 function awsMetadataFields(metadata) {
-	if (!isRecord(metadata)) return {};
-	const requestId = stringValue(metadata.requestId);
-	const attempts = numberValue(metadata.attempts);
-	const httpStatusCode = numberValue(metadata.httpStatusCode);
-	const totalRetryDelay = numberValue(metadata.totalRetryDelay);
+	const raw = metadata;
+	if (!isRecord(raw)) return {};
+	const requestId = stringValue(raw.requestId);
+	const attempts = numberValue(raw.attempts);
+	const httpStatusCode = numberValue(raw.httpStatusCode);
+	const totalRetryDelay = numberValue(raw.totalRetryDelay);
 	const attributes = {};
 	if (httpStatusCode !== void 0) attributes["aws.http.status_code"] = httpStatusCode;
 	if (attempts !== void 0 && attempts > 1) attributes["aws.request.attempts"] = attempts;
@@ -165,30 +170,33 @@ function omitUndefined(value) {
 	return Object.fromEntries(Object.entries(value).filter(([, item]) => item !== void 0));
 }
 function stringValue(value) {
-	return typeof value === "string" && value.length > 0 ? value : void 0;
+	const raw = value;
+	return String(raw) === raw && raw.length > 0 ? raw : void 0;
 }
 function numberValue(value) {
-	return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+	const raw = value;
+	return Number(raw) === raw && Number.isFinite(raw) ? raw : void 0;
 }
 function arrayValue(value) {
 	return Array.isArray(value) ? value : void 0;
 }
 function bytesToString(value) {
-	if (typeof value === "string") return value;
-	if (value instanceof Uint8Array) return new TextDecoder().decode(value);
-	if (ArrayBuffer.isView(value)) return new TextDecoder().decode(value);
+	const raw = value;
+	if (String(raw) === raw) return raw;
+	if (raw instanceof Uint8Array) return new TextDecoder().decode(raw);
+	if (ArrayBuffer.isView(raw)) return new TextDecoder().decode(new Uint8Array(raw.buffer, raw.byteOffset, raw.byteLength));
 }
 function parseJson(value) {
 	const text = bytesToString(value);
 	if (text === void 0) return void 0;
 	try {
-		return JSON.parse(text);
+		return asJsonValue(JSON.parse(text));
 	} catch {
 		return;
 	}
 }
 function wrapAsyncIterable(iterable, state, span, t0, baseFields) {
-	if (!iterable || typeof iterable[Symbol.asyncIterator] !== "function") {
+	if (!iterable || !isAsyncIterable(iterable)) {
 		endSpan(span, baseFields);
 		return iterable;
 	}
@@ -201,11 +209,10 @@ function wrapAsyncIterable(iterable, state, span, t0, baseFields) {
 		STREAM_FINALIZER?.unregister(unregisterToken);
 		endSpan(span, mergeFields(baseFields, fields));
 	};
-	const source = iterable;
 	const generator = async function* () {
 		let completed = false;
 		try {
-			for await (const event of source) {
+			for await (const event of iterable) {
 				if (!first) {
 					first = true;
 					updateSpan(span, { timeToFirstChunkMs: performance.now() - t0 });
@@ -215,7 +222,7 @@ function wrapAsyncIterable(iterable, state, span, t0, baseFields) {
 			}
 			completed = true;
 		} catch (error) {
-			endOnce(mergeFields(state.finish(true), awsMetadataFields(metadataOf(error)), { error }));
+			endOnce(mergeFields(state.finish(true), awsMetadataFields(metadataOf(error)), { error: asError(error) }));
 			throw error;
 		} finally {
 			if (!ended) endOnce(state.finish(!completed));
@@ -232,6 +239,15 @@ function wrapAsyncIterable(iterable, state, span, t0, baseFields) {
 	STREAM_FINALIZER?.register(wrapped, finishAbandoned, unregisterToken);
 	return wrapped;
 }
+function isAsyncIterable(value) {
+	return Object(value) === value && Symbol.asyncIterator in Object(value);
+}
+function asJsonValue(value) {
+	return value;
+}
+function asError(value) {
+	return value instanceof Error ? value : new Error(String(value));
+}
 function basenameArn(value) {
 	const text = stringValue(value);
 	if (!text) return void 0;
@@ -286,23 +302,24 @@ var AgentStreamState = class {
 		this.options = options;
 	}
 	feed(event) {
-		if (!isRecord(event)) return;
-		const streamError = modeledStreamError(event);
+		const raw = event;
+		if (!isRecord(raw)) return;
+		const streamError = modeledStreamError(raw);
 		if (streamError) {
 			this.error = streamError.error;
 			this.errorFields = streamError.fields;
 			return;
 		}
-		const chunk = isRecord(event.chunk) ? event.chunk : void 0;
+		const chunk = isRecord(raw.chunk) ? raw.chunk : void 0;
 		const bytes = chunk?.bytes;
 		if (bytes !== void 0) this.text += bytesToString(bytes) ?? "";
 		const citations = arrayValue((isRecord(chunk?.attribution) ? chunk.attribution : void 0)?.citations);
 		if (citations) this.citationCount += citations.length;
-		const files = isRecord(event.files) ? arrayValue(event.files.files) : void 0;
+		const files = isRecord(raw.files) ? arrayValue(raw.files.files) : void 0;
 		if (files) this.outputFiles.push(...files.map(sanitizeOutputFile));
-		const returnControl = isRecord(event.returnControl) ? event.returnControl : void 0;
+		const returnControl = isRecord(raw.returnControl) ? raw.returnControl : void 0;
 		if (returnControl) this.returnControl = returnControl;
-		const traceEvent = isRecord(event.trace) ? event.trace : void 0;
+		const traceEvent = isRecord(raw.trace) ? raw.trace : void 0;
 		if (traceEvent) {
 			this.traceEventCount += 1;
 			if (this.options.captureAgentTrace) this.traces.push(traceEvent);
@@ -337,10 +354,11 @@ var AgentStreamState = class {
 		}), this.errorFields);
 	}
 	addUsage(value) {
-		if (!isRecord(value)) return;
-		const inputTokens = numberValue(value.inputTokens);
-		const outputTokens = numberValue(value.outputTokens);
-		const totalTokens = numberValue(value.totalTokens);
+		const raw = value;
+		if (!isRecord(raw)) return;
+		const inputTokens = numberValue(raw.inputTokens);
+		const outputTokens = numberValue(raw.outputTokens);
+		const totalTokens = numberValue(raw.totalTokens);
 		if (inputTokens !== void 0) this.usage.inputTokens = (this.usage.inputTokens ?? 0) + inputTokens;
 		if (outputTokens !== void 0) this.usage.outputTokens = (this.usage.outputTokens ?? 0) + outputTokens;
 		if (totalTokens !== void 0) this.usage.totalTokens = (this.usage.totalTokens ?? 0) + totalTokens;
@@ -348,10 +366,11 @@ var AgentStreamState = class {
 	}
 };
 function sanitizeOutputFile(value) {
-	if (!isRecord(value)) return value;
+	const raw = value;
+	if (!isRecord(raw)) return void 0;
 	return omitUndefined({
-		name: stringValue(value.name),
-		type: stringValue(value.type)
+		name: stringValue(raw.name),
+		type: stringValue(raw.type)
 	});
 }
 function retrieveRequestFields(input) {
@@ -362,7 +381,8 @@ function retrieveRequestFields(input) {
 	});
 }
 function retrieveResponseFields(output) {
-	const result = isRecord(output) ? output : {};
+	const raw = output;
+	const result = isRecord(raw) ? raw : {};
 	const retrievalResults = arrayValue(result.retrievalResults);
 	return mergeFields(awsMetadataFields(result.$metadata), {
 		output: retrievalResults,
@@ -394,7 +414,8 @@ function ragRequestFields(input) {
 	});
 }
 function ragResponseFields(output) {
-	const result = isRecord(output) ? output : {};
+	const raw = output;
+	const result = isRecord(raw) ? raw : {};
 	const text = isRecord(result.output) ? stringValue(result.output.text) : void 0;
 	return mergeFields(awsMetadataFields(result.$metadata), {
 		output: text ? [{
@@ -418,17 +439,18 @@ var RagStreamState = class {
 	error;
 	errorFields;
 	feed(event) {
-		if (!isRecord(event)) return;
-		const streamError = modeledStreamError(event);
+		const raw = event;
+		if (!isRecord(raw)) return;
+		const streamError = modeledStreamError(raw);
 		if (streamError) {
 			this.error = streamError.error;
 			this.errorFields = streamError.fields;
 			return;
 		}
-		const output = isRecord(event.output) ? event.output : void 0;
+		const output = isRecord(raw.output) ? raw.output : void 0;
 		this.text += stringValue(output?.text) ?? "";
-		if (event.citation) this.citationCount += 1;
-		const guardrail = isRecord(event.guardrail) ? event.guardrail : void 0;
+		if (raw.citation) this.citationCount += 1;
+		const guardrail = isRecord(raw.guardrail) ? raw.guardrail : void 0;
 		this.guardrailAction = stringValue(guardrail?.action) ?? this.guardrailAction;
 	}
 	finish() {
@@ -461,18 +483,19 @@ var FlowStreamState = class {
 	error;
 	errorFields;
 	feed(event) {
-		if (!isRecord(event)) return;
-		const streamError = modeledStreamError(event);
+		const raw = event;
+		if (!isRecord(raw)) return;
+		const streamError = modeledStreamError(raw);
 		if (streamError) {
 			this.error = streamError.error;
 			this.errorFields = streamError.fields;
 			return;
 		}
-		const output = isRecord(event.flowOutputEvent) ? event.flowOutputEvent : void 0;
+		const output = isRecord(raw.flowOutputEvent) ? raw.flowOutputEvent : void 0;
 		if (output) this.outputs.push(output.content);
-		const inputRequest = isRecord(event.flowMultiTurnInputRequestEvent) ? event.flowMultiTurnInputRequestEvent : void 0;
+		const inputRequest = isRecord(raw.flowMultiTurnInputRequestEvent) ? raw.flowMultiTurnInputRequestEvent : void 0;
 		if (inputRequest) this.outputs.push(inputRequest.content);
-		const completion = isRecord(event.flowCompletionEvent) ? event.flowCompletionEvent : void 0;
+		const completion = isRecord(raw.flowCompletionEvent) ? raw.flowCompletionEvent : void 0;
 		this.completionReason = stringValue(completion?.completionReason) ?? this.completionReason;
 	}
 	finish() {
@@ -490,16 +513,18 @@ function ragName(input) {
 	return `retrieve_and_generate ${basenameArn(ragModel(input)) ?? "knowledge-base"}`;
 }
 function collectTrace(value, onUsage) {
-	if (!isRecord(value)) return;
-	const output = isRecord(value.modelInvocationOutput) ? value.modelInvocationOutput : void 0;
+	const raw = value;
+	if (!isRecord(raw)) return;
+	const output = isRecord(raw.modelInvocationOutput) ? raw.modelInvocationOutput : void 0;
 	if (output) onUsage((isRecord(output.metadata) ? output.metadata : void 0)?.usage);
-	for (const child of Object.values(value)) if (isRecord(child)) collectTrace(child, onUsage);
+	for (const child of Object.values(raw)) if (isRecord(child)) collectTrace(child, onUsage);
 	else if (Array.isArray(child)) child.forEach((item) => collectTrace(item, onUsage));
 }
 function findKey(value, key) {
-	if (!isRecord(value)) return void 0;
-	if (value[key] !== void 0) return value[key];
-	for (const child of Object.values(value)) {
+	const raw = value;
+	if (!isRecord(raw)) return void 0;
+	if (raw[key] !== void 0) return raw[key];
+	for (const child of Object.values(raw)) {
 		const found = findKey(child, key);
 		if (found !== void 0) return found;
 	}
@@ -635,10 +660,13 @@ function normalizeContentBlock(block) {
 	if (citationsContent) {
 		const contentBlocks = arrayValue(citationsContent.content) ?? [];
 		const citations = arrayValue(citationsContent.citations);
-		return contentBlocks.flatMap((contentBlock) => normalizeContentBlock(citations ? {
-			...contentBlock,
-			citations
-		} : contentBlock));
+		return contentBlocks.flatMap((contentBlock) => {
+			if (!citations) return normalizeContentBlock(contentBlock);
+			return normalizeContentBlock({
+				...contentBlock,
+				citations
+			});
+		});
 	}
 	const guardContent = isRecord(block.guardContent) ? block.guardContent : void 0;
 	if (guardContent) {
@@ -662,8 +690,9 @@ function normalizeContentBlock(block) {
 }
 function simplifyToolResult(content) {
 	const blocks = arrayValue(content);
-	if (!blocks) return content;
-	if (blocks.length === 1 && typeof blocks[0]?.text === "string") return blocks[0].text;
+	if (!blocks) return isJsonValue(content) ? content : void 0;
+	const text = stringValue(blocks[0]?.text);
+	if (blocks.length === 1 && text !== void 0) return text;
 	return blocks.flatMap((block) => normalizeContentBlock(block));
 }
 function s3Uri(value) {
@@ -725,14 +754,16 @@ var ConverseStreamState = class {
 				kind: "text",
 				text: ""
 			};
-			if (typeof delta.text === "string") {
+			const text = stringValue(delta.text);
+			if (text !== void 0) {
 				block.kind = "text";
-				block.text = `${block.text ?? ""}${delta.text}`;
+				block.text = `${block.text ?? ""}${text}`;
 			}
 			const toolUse = isRecord(delta.toolUse) ? delta.toolUse : void 0;
-			if (toolUse && typeof toolUse.input === "string") {
+			const input = stringValue(toolUse?.input);
+			if (toolUse && input !== void 0) {
 				block.kind = "tool";
-				block.input = `${block.input ?? ""}${toolUse.input}`;
+				block.input = `${block.input ?? ""}${input}`;
 			}
 			const reasoning = isRecord(delta.reasoningContent) ? delta.reasoningContent : void 0;
 			if (reasoning) {
@@ -799,6 +830,9 @@ var ConverseStreamState = class {
 		}), this.errorFields);
 	}
 };
+function isJsonValue(value) {
+	return value == null || String(value) === value || Number(value) === value || Boolean(value) === value || Array.isArray(value) || isRecord(value);
+}
 function blockToPart(block) {
 	if (block.kind === "tool") return omitUndefined({
 		type: "tool_call",
@@ -857,7 +891,7 @@ function nativeSamplingFields(model, body) {
 			temperature: numberValue(cfg.temperature),
 			topP: numberValue(cfg.topP),
 			maxTokens: numberValue(cfg.maxTokenCount),
-			stopSequences: Array.isArray(cfg.stopSequences) ? cfg.stopSequences : void 0
+			stopSequences: arrayValue(cfg.stopSequences)
 		});
 	}
 	if (lower.includes("amazon.nova")) {
@@ -867,7 +901,7 @@ function nativeSamplingFields(model, body) {
 			topP: numberValue(cfg.topP) ?? numberValue(cfg.top_p),
 			topK: numberValue(cfg.topK),
 			maxTokens: numberValue(cfg.maxTokens) ?? numberValue(cfg.max_new_tokens),
-			stopSequences: Array.isArray(cfg.stopSequences) ? cfg.stopSequences : void 0
+			stopSequences: arrayValue(cfg.stopSequences)
 		});
 	}
 	if (lower.includes("anthropic.claude")) return omitUndefined({
@@ -875,7 +909,7 @@ function nativeSamplingFields(model, body) {
 		topP: numberValue(body.top_p),
 		topK: numberValue(body.top_k),
 		maxTokens: numberValue(body.max_tokens),
-		stopSequences: Array.isArray(body.stop_sequences) ? body.stop_sequences : void 0
+		stopSequences: arrayValue(body.stop_sequences)
 	});
 	if (lower.includes("meta.llama")) return omitUndefined({
 		temperature: numberValue(body.temperature),
@@ -967,8 +1001,9 @@ function headerUsageFields(metadata) {
 	return { usage: Object.keys(usage).length > 0 ? usage : void 0 };
 }
 function headerNumber(value) {
-	if (typeof value === "string") {
-		const parsed = Number.parseInt(value, 10);
+	const text = stringValue(value);
+	if (text !== void 0) {
+		const parsed = Number.parseInt(text, 10);
 		return Number.isFinite(parsed) ? parsed : void 0;
 	}
 	return numberValue(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telemetry-dev/bedrock",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "AWS Bedrock instrumentation for telemetry.dev: Converse, InvokeModel, and Bedrock Agents spans for AWS SDK v3 clients.",
   "keywords": [
     "aws",
@@ -49,17 +49,17 @@
     "@smithy/eventstream-codec": "^4.2.5",
     "@smithy/protocol-http": "^5.3.10",
     "@smithy/types": "^4.12.0",
+    "@telemetry-dev/sdk": "^0.1.1",
     "@types/node": "^25.5.0",
     "@typescript/native-preview": "7.0.0-dev.20260328.1",
     "typescript": "^6.0.2",
     "vite-plus": "0.1.20",
-    "vitest": "npm:@voidzero-dev/vite-plus-test@0.1.20",
-    "@telemetry-dev/sdk": "^0.1.0"
+    "vitest": "npm:@voidzero-dev/vite-plus-test@0.1.20"
   },
   "peerDependencies": {
     "@aws-sdk/client-bedrock-agent-runtime": ">=3.600.0 <4",
     "@aws-sdk/client-bedrock-runtime": ">=3.600.0 <4",
-    "@telemetry-dev/sdk": "^0.1.0"
+    "@telemetry-dev/sdk": "^0.1.1"
   },
   "peerDependenciesMeta": {
     "@aws-sdk/client-bedrock-agent-runtime": {