@telemetry-dev/bedrock 0.1.2 → 0.1.5

package/dist/agents.mjs

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

package/dist/index.mjs

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

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

@@ -195,7 +195,7 @@ function parseJson(value) {
 		return;
 	}
 }
-function wrapAsyncIterable(iterable, state, span, t0, baseFields) {
+function wrapAsyncIterable(iterable, state, span, t0, baseFields, trackOutputChunks = true) {
 	if (!iterable || !isAsyncIterable(iterable)) {
 		endSpan(span, baseFields);
 		return iterable;
@@ -213,11 +213,13 @@ function wrapAsyncIterable(iterable, state, span, t0, baseFields) {
 		let completed = false;
 		try {
 			for await (const event of iterable) {
+				const receivedAt = performance.now();
 				if (!first) {
 					first = true;
-					updateSpan(span, { timeToFirstChunkMs: performance.now() - t0 });
+					updateSpan(span, { timeToFirstChunkMs: receivedAt - t0 });
 				}
-				safe(() => state.feed(event));
+				const stateHasOutput = safe(() => state.feed(event));
+				if (trackOutputChunks && (stateHasOutput ?? bedrockEventHasOutput(event))) safe(() => span.recordOutputChunk?.(receivedAt));
 				yield event;
 			}
 			completed = true;
@@ -239,6 +241,43 @@ function wrapAsyncIterable(iterable, state, span, t0, baseFields) {
 	STREAM_FINALIZER?.register(wrapped, finishAbandoned, unregisterToken);
 	return wrapped;
 }
+function bedrockEventHasOutput(event) {
+	const record = isRecord(event) ? event : void 0;
+	if (!record) return false;
+	const output = isRecord(record.output) ? record.output : void 0;
+	if (typeof output?.text === "string" && output.text.length > 0) return true;
+	const block = isRecord(record.contentBlockDelta) ? record.contentBlockDelta : void 0;
+	const delta = isRecord(block?.delta) ? block.delta : void 0;
+	const reasoning = isRecord(delta?.reasoningContent) ? delta.reasoningContent : void 0;
+	const toolUse = isRecord(delta?.toolUse) ? delta.toolUse : void 0;
+	if (typeof delta?.text === "string" && delta.text.length > 0 || typeof reasoning?.text === "string" && reasoning.text.length > 0 || typeof toolUse?.input === "string" && toolUse.input.length > 0) return true;
+	const raw = (isRecord(record.chunk) ? record.chunk : void 0)?.bytes;
+	if (raw === void 0) return false;
+	const text = typeof raw === "string" ? raw : raw instanceof Uint8Array ? new TextDecoder().decode(raw) : void 0;
+	if (!text) return false;
+	const parsed = parseJson(text);
+	if (parsed === void 0) return text.length > 0;
+	if (!isRecord(parsed)) return false;
+	const parsedDelta = isRecord(parsed.delta) ? parsed.delta : void 0;
+	const contentDelta = isRecord(parsed.contentBlockDelta ?? parsed.content_block_delta) ? parsed.contentBlockDelta ?? parsed.content_block_delta : void 0;
+	const nested = isRecord(contentDelta) && isRecord(contentDelta.delta) ? contentDelta.delta : void 0;
+	const generations = Array.isArray(parsed.generations) ? parsed.generations : [];
+	const generation = isRecord(generations[0]) ? generations[0] : void 0;
+	const outputs = Array.isArray(parsed.outputs) ? parsed.outputs : [];
+	const firstOutput = isRecord(outputs[0]) ? outputs[0] : void 0;
+	return [
+		parsed.outputText,
+		parsed.generation,
+		parsed.completion,
+		parsed.text,
+		parsedDelta?.text,
+		parsedDelta?.thinking,
+		parsedDelta?.partial_json,
+		nested?.text,
+		firstOutput?.text,
+		generation?.text
+	].some((value) => typeof value === "string" && value.length > 0);
+}
 function isAsyncIterable(value) {
 	return Object(value) === value && Symbol.asyncIterator in Object(value);
 }
@@ -1016,15 +1055,19 @@ var InvokeModelStreamState = class {
 	error;
 	errorFields;
 	feed(event) {
-		if (!isRecord(event)) return;
+		if (!isRecord(event)) return false;
 		const streamError = modeledStreamError(event);
 		if (streamError) {
 			this.error = streamError.error;
 			this.errorFields = streamError.fields;
-			return;
+			return false;
+		}
+		const chunk = isRecord(event.chunk) ? event.chunk : void 0;
+		const parsed = parseJson(chunk?.bytes);
+		if (parsed === void 0) {
+			const raw = chunk?.bytes;
+			return (typeof raw === "string" || raw instanceof Uint8Array) && raw.length > 0;
 		}
-		const parsed = parseJson((isRecord(event.chunk) ? event.chunk : void 0)?.bytes);
-		if (parsed === void 0) return;
 		this.chunks.push(parsed);
 		this.text += textFromProviderChunk(parsed);
 		if (isRecord(parsed)) {
@@ -1044,6 +1087,7 @@ var InvokeModelStreamState = class {
 				cacheCreationInputTokens: numberValue(messageUsage?.cache_creation_input_tokens) ?? this.usage?.cacheCreationInputTokens
 			});
 		}
+		return providerChunkHasOutput(parsed);
 	}
 	finish() {
 		return mergeFields(omitUndefined({
@@ -1069,6 +1113,11 @@ function textFromProviderChunk(value) {
 	const generation = Array.isArray(value.generations) && isRecord(value.generations[0]) ? value.generations[0] : void 0;
 	return stringValue(value.outputText) ?? stringValue(value.generation) ?? stringValue(value.completion) ?? stringValue(value.text) ?? stringValue(delta?.text) ?? stringValue(nestedDelta?.text) ?? (Array.isArray(value.outputs) && isRecord(value.outputs[0]) ? stringValue(value.outputs[0].text) : void 0) ?? stringValue(generation?.text) ?? "";
 }
+function providerChunkHasOutput(value) {
+	if (!isRecord(value)) return false;
+	const delta = isRecord(value.delta) ? value.delta : void 0;
+	return textFromProviderChunk(value).length > 0 || typeof delta?.thinking === "string" && delta.thinking.length > 0 || typeof delta?.partial_json === "string" && delta.partial_json.length > 0;
+}
 //#endregion
 //#region src/internal-handlers.ts
 const RUNTIME_HANDLERS = {
@@ -1194,7 +1243,7 @@ const AGENT_HANDLERS = {
 			}
 			return {
 				...response,
-				stream: wrapAsyncIterable(response.stream, new RagStreamState(), span, t0, base)
+				stream: wrapAsyncIterable(response.stream, new RagStreamState(), span, t0, base, false)
 			};
 		}
 	},
@@ -1210,7 +1259,7 @@ const AGENT_HANDLERS = {
 			}
 			return {
 				...response,
-				responseStream: wrapAsyncIterable(response.responseStream, new FlowStreamState(), span, t0, awsMetadataFields(response.$metadata))
+				responseStream: wrapAsyncIterable(response.responseStream, new FlowStreamState(), span, t0, awsMetadataFields(response.$metadata), false)
 			};
 		}
 	}
@@ -1228,7 +1277,7 @@ function streamAgentResult(key) {
 		}
 		return {
 			...response,
-			[key]: wrapAsyncIterable(response[key], new AgentStreamState(options), span, t0, base)
+			[key]: wrapAsyncIterable(response[key], new AgentStreamState(options), span, t0, base, false)
 		};
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telemetry-dev/bedrock",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "description": "AWS Bedrock instrumentation for telemetry.dev: Converse, InvokeModel, and Bedrock Agents spans for AWS SDK v3 clients.",
   "keywords": [
     "aws",
@@ -16,7 +16,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/telemetry-dev/telemetry.dev.git",
+    "url": "git+https://github.com/telemetry-dev/telemetry.git",
     "directory": "packages/bedrock"
   },
   "files": [
@@ -49,7 +49,7 @@
     "@smithy/eventstream-codec": "^4.2.5",
     "@smithy/protocol-http": "^5.3.10",
     "@smithy/types": "^4.12.0",
-    "@telemetry-dev/sdk": "^0.1.2",
+    "@telemetry-dev/sdk": "^0.1.5",
     "@types/node": "^25.5.0",
     "@typescript/native-preview": "7.0.0-dev.20260328.1",
     "typescript": "^6.0.2",
@@ -59,7 +59,7 @@
   "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.2"
+    "@telemetry-dev/sdk": "^0.1.5"
   },
   "peerDependenciesMeta": {
     "@aws-sdk/client-bedrock-agent-runtime": {

package/src/agent-handlers.ts

@@ -20,6 +20,7 @@ import {
 
 export function agentInputMessages<T>(inputText: T): JsonValue {
   const text = stringValue(inputText);
+
   return text ? [{ role: "user", parts: [{ type: "text", content: text }] }] : undefined;
 }
 
@@ -63,35 +64,47 @@ export class AgentStreamState implements StreamState {
 
   feed<T>(event: T): void {
     const raw: unknown = event;
+
     if (!isRecord(raw)) return;
     const streamError = modeledStreamError(raw);
+
     if (streamError) {
       this.error = streamError.error;
       this.errorFields = streamError.fields;
+
       return;
     }
+
     const chunk = isRecord(raw.chunk) ? raw.chunk : undefined;
     const bytes = chunk?.bytes;
+
     if (bytes !== undefined) this.text += bytesToString(bytes) ?? "";
     const attribution = isRecord(chunk?.attribution) ? chunk.attribution : undefined;
     const citations = arrayValue<unknown>(attribution?.citations);
+
     if (citations) this.citationCount += citations.length;
 
     const files = isRecord(raw.files) ? arrayValue<JsonValue>(raw.files.files) : undefined;
+
     if (files) this.outputFiles.push(...files.map(sanitizeOutputFile));
 
     const returnControl = isRecord(raw.returnControl) ? raw.returnControl : undefined;
+
     if (returnControl) this.returnControl = returnControl;
 
     const traceEvent = isRecord(raw.trace) ? raw.trace : undefined;
+
     if (traceEvent) {
       this.traceEventCount += 1;
+
       if (this.options.captureAgentTrace) this.traces.push(traceEvent);
       collectTrace(traceEvent, (usage) => this.addUsage(usage));
       const failure = findKey(traceEvent, "failureTrace");
+
       if (isRecord(failure))
         this.failureReason = stringValue(failure.failureReason) ?? this.failureReason;
       const guardrail = findKey(traceEvent, "guardrailTrace");
+
       if (isRecord(guardrail))
         this.guardrailAction = stringValue(guardrail.action) ?? this.guardrailAction;
     }
@@ -108,6 +121,7 @@ export class AgentStreamState implements StreamState {
       agent_trace:
         this.options.captureAgentTrace && this.traces.length > 0 ? this.traces : undefined,
     });
+
     return mergeFields(
       omitUndefined({
         output: this.returnControl
@@ -124,14 +138,18 @@ export class AgentStreamState implements StreamState {
   }
   private addUsage<T>(value: T): void {
     const raw: unknown = value;
+
     if (!isRecord(raw)) return;
     const inputTokens = numberValue(raw.inputTokens);
     const outputTokens = numberValue(raw.outputTokens);
     const totalTokens = numberValue(raw.totalTokens);
+
     if (inputTokens !== undefined)
       this.usage.inputTokens = (this.usage.inputTokens ?? 0) + inputTokens;
+
     if (outputTokens !== undefined)
       this.usage.outputTokens = (this.usage.outputTokens ?? 0) + outputTokens;
+
     if (totalTokens !== undefined)
       this.usage.totalTokens = (this.usage.totalTokens ?? 0) + totalTokens;
     else if (inputTokens !== undefined || outputTokens !== undefined) {
@@ -142,7 +160,9 @@ export class AgentStreamState implements StreamState {
 
 function sanitizeOutputFile<T>(value: T): JsonValue {
   const raw: unknown = value;
+
   if (!isRecord(raw)) return undefined;
+
   return omitUndefined({
     name: stringValue(raw.name),
     type: stringValue(raw.type),
@@ -161,6 +181,7 @@ export function retrieveResponseFields<T>(output: T): SpanFields {
   const raw: unknown = output;
   const result = isRecord(raw) ? raw : {};
   const retrievalResults = arrayValue<unknown>(result.retrievalResults);
+
   return mergeFields(awsMetadataFields(result.$metadata), {
     output: retrievalResults,
     metadata: omitUndefined({
@@ -174,17 +195,21 @@ export function ragModel(input: JsonRecord): string | undefined {
   const config = isRecord(input.retrieveAndGenerateConfiguration)
     ? input.retrieveAndGenerateConfiguration
     : undefined;
+
   const kb = isRecord(config?.knowledgeBaseConfiguration)
     ? config?.knowledgeBaseConfiguration
     : undefined;
+
   const external = isRecord(config?.externalSourcesConfiguration)
     ? config?.externalSourcesConfiguration
     : undefined;
+
   return stringValue(kb?.modelArn) ?? stringValue(external?.modelArn);
 }
 
 export function ragRequestFields(input: JsonRecord): SpanFields {
   const text = isRecord(input.input) ? stringValue(input.input.text) : undefined;
+
   return omitUndefined({
     provider: PROVIDER,
     model: ragModel(input),
@@ -197,6 +222,7 @@ export function ragResponseFields<T>(output: T): SpanFields {
   const raw: unknown = output;
   const result = isRecord(raw) ? raw : {};
   const text = isRecord(result.output) ? stringValue(result.output.text) : undefined;
+
   return mergeFields(awsMetadataFields(result.$metadata), {
     output: text ? [{ role: "assistant", parts: [{ type: "text", content: text }] }] : undefined,
     metadata: omitUndefined({
@@ -216,15 +242,20 @@ export class RagStreamState implements StreamState {
 
   feed<T>(event: T): void {
     const raw: unknown = event;
+
     if (!isRecord(raw)) return;
     const streamError = modeledStreamError(raw);
+
     if (streamError) {
       this.error = streamError.error;
       this.errorFields = streamError.fields;
+
       return;
     }
+
     const output = isRecord(raw.output) ? raw.output : undefined;
     this.text += stringValue(output?.text) ?? "";
+
     if (raw.citation) this.citationCount += 1;
     const guardrail = isRecord(raw.guardrail) ? raw.guardrail : undefined;
     this.guardrailAction = stringValue(guardrail?.action) ?? this.guardrailAction;
@@ -263,18 +294,25 @@ export class FlowStreamState implements StreamState {
 
   feed<T>(event: T): void {
     const raw: unknown = event;
+
     if (!isRecord(raw)) return;
     const streamError = modeledStreamError(raw);
+
     if (streamError) {
       this.error = streamError.error;
       this.errorFields = streamError.fields;
+
       return;
     }
+
     const output = isRecord(raw.flowOutputEvent) ? raw.flowOutputEvent : undefined;
+
     if (output) this.outputs.push(output.content);
+
     const inputRequest = isRecord(raw.flowMultiTurnInputRequestEvent)
       ? raw.flowMultiTurnInputRequestEvent
       : undefined;
+
     if (inputRequest) this.outputs.push(inputRequest.content);
     const completion = isRecord(raw.flowCompletionEvent) ? raw.flowCompletionEvent : undefined;
     this.completionReason = stringValue(completion?.completionReason) ?? this.completionReason;
@@ -302,12 +340,15 @@ export function ragName(input: JsonRecord): string {
 
 function collectTrace<T>(value: T, onUsage: <TUsage>(usage: TUsage) => void): void {
   const raw: unknown = value;
+
   if (!isRecord(raw)) return;
   const output = isRecord(raw.modelInvocationOutput) ? raw.modelInvocationOutput : undefined;
+
   if (output) {
     const metadata = isRecord(output.metadata) ? output.metadata : undefined;
     onUsage(metadata?.usage);
   }
+
   for (const child of Object.values(raw)) {
     if (isRecord(child)) collectTrace(child, onUsage);
     else if (Array.isArray(child)) child.forEach((item) => collectTrace(item, onUsage));
@@ -316,11 +357,16 @@ function collectTrace<T>(value: T, onUsage: <TUsage>(usage: TUsage) => void): vo
 
 function findKey<T>(value: T, key: string): JsonValue {
   const raw: unknown = value;
+
   if (!isRecord(raw)) return undefined;
+
   if (raw[key] !== undefined) return raw[key];
+
   for (const child of Object.values(raw)) {
     const found = findKey(child, key);
+
     if (found !== undefined) return found;
   }
+
   return undefined;
 }

package/src/agents.ts

@@ -28,6 +28,7 @@ export function wrapBedrockAgents<T extends WrappableBedrockAgentClient>(
     writable: true,
   });
   WRAPPED.add(client as object);
+
   return client;
 }
 
@@ -37,13 +38,16 @@ export function instrumentBedrockAgents(options: BedrockInstrumentationOptions =
   const hadOwn = Object.prototype.hasOwnProperty.call(proto, "send");
   const original = proto.send;
   const instrumentedSend = createInstrumentedSend(original, options, AGENT_HANDLERS);
+
   const wrapper = function telemetryDevBedrockAgentSend(
     this: WrappableBedrockAgentClient,
     ...args: unknown[]
   ) {
     if (WRAPPED.has(this as object)) return original.apply(this, args);
+
     return instrumentedSend.apply(this, args);
   };
+
   ORIGINAL = { proto, hadOwn, value: original, wrapper };
   Object.defineProperty(proto, "send", {
     configurable: true,
@@ -54,9 +58,12 @@ export function instrumentBedrockAgents(options: BedrockInstrumentationOptions =
 
 export function uninstrumentBedrockAgents(): void {
   const original = ORIGINAL;
+
   if (!original) return;
+
   if (Object.getOwnPropertyDescriptor(original.proto, "send")?.value !== original.wrapper) return;
   ORIGINAL = undefined;
+
   if (original.hadOwn) {
     Object.defineProperty(original.proto, "send", {
       configurable: true,