@traceloop/instrumentation-bedrock 0.23.0 → 0.24.0

package/dist/index.js

@@ -5,9 +5,40 @@ var api = require('@opentelemetry/api');
 var instrumentation = require('@opentelemetry/instrumentation');
 var aiSemanticConventions = require('@traceloop/ai-semantic-conventions');
 var incubating = require('@opentelemetry/semantic-conventions/incubating');
+var instrumentationUtils = require('@traceloop/instrumentation-utils');
 
-var version = "0.23.0";
+exports.BedrockVendor = void 0;
+(function (BedrockVendor) {
+    BedrockVendor["AI21"] = "ai21";
+    BedrockVendor["AMAZON"] = "amazon";
+    BedrockVendor["ANTHROPIC"] = "anthropic";
+    BedrockVendor["COHERE"] = "cohere";
+    BedrockVendor["META"] = "meta";
+})(exports.BedrockVendor || (exports.BedrockVendor = {}));
 
+var version = "0.24.0";
+
+const bedrockFinishReasonMap = {
+    // AI21
+    endoftext: aiSemanticConventions.FinishReasons.STOP,
+    // Amazon Titan / Nova
+    FINISH: aiSemanticConventions.FinishReasons.STOP,
+    LENGTH: aiSemanticConventions.FinishReasons.LENGTH,
+    CONTENT_FILTERED: aiSemanticConventions.FinishReasons.CONTENT_FILTER,
+    // Anthropic
+    end_turn: aiSemanticConventions.FinishReasons.STOP,
+    max_tokens: aiSemanticConventions.FinishReasons.LENGTH,
+    stop_sequence: aiSemanticConventions.FinishReasons.STOP,
+    tool_use: aiSemanticConventions.FinishReasons.TOOL_CALL,
+    // Cohere
+    COMPLETE: aiSemanticConventions.FinishReasons.STOP,
+    MAX_TOKENS: aiSemanticConventions.FinishReasons.LENGTH,
+    ERROR: aiSemanticConventions.FinishReasons.ERROR,
+    ERROR_TOXIC: aiSemanticConventions.FinishReasons.CONTENT_FILTER,
+    // Meta
+    stop: aiSemanticConventions.FinishReasons.STOP,
+    length: aiSemanticConventions.FinishReasons.LENGTH,
+};
 class BedrockInstrumentation extends instrumentation.InstrumentationBase {
     constructor(config = {}) {
         super("@traceloop/instrumentation-bedrock", version, config);
@@ -38,9 +69,11 @@ class BedrockInstrumentation extends instrumentation.InstrumentationBase {
         // eslint-disable-next-line
         return (original) => {
             return function method(...args) {
+                var _a, _b, _c;
                 const span = plugin._startSpan({
                     params: args[0],
                 });
+                const modelId = (_c = (_b = (_a = args[0]) === null || _a === void 0 ? void 0 : _a.input) === null || _b === void 0 ? void 0 : _b.modelId) !== null && _c !== void 0 ? _c : "";
                 const execContext = api.trace.setSpan(api.context.active(), span);
                 const execPromise = instrumentation.safeExecuteInTheMiddle(() => {
                     return api.context.with(execContext, () => {
@@ -51,17 +84,18 @@ class BedrockInstrumentation extends instrumentation.InstrumentationBase {
                         plugin._diag.error(`Error in bedrock instrumentation`, e);
                     }
                 });
-                const wrappedPromise = plugin._wrapPromise(span, execPromise);
+                const wrappedPromise = plugin._wrapPromise(span, execPromise, modelId);
                 return api.context.bind(execContext, wrappedPromise);
             };
         };
     }
-    _wrapPromise(span, promise) {
+    _wrapPromise(span, promise, modelId) {
         return promise
             .then((result) => tslib.__awaiter(this, void 0, void 0, function* () {
             yield this._endSpan({
                 span,
                 result: result,
+                modelId,
             });
             return new Promise((resolve) => resolve(result));
         }))
@@ -80,17 +114,21 @@ class BedrockInstrumentation extends instrumentation.InstrumentationBase {
     _startSpan({ params, }) {
         var _a, _b;
         let attributes = {};
+        let spanName = "bedrock.completion";
         try {
             const input = params.input;
             const { modelVendor, model } = this._extractVendorAndModel(input.modelId || "");
             attributes = {
-                [incubating.ATTR_GEN_AI_SYSTEM]: "AWS",
+                [incubating.ATTR_GEN_AI_PROVIDER_NAME]: incubating.GEN_AI_PROVIDER_NAME_VALUE_AWS_BEDROCK,
                 [incubating.ATTR_GEN_AI_REQUEST_MODEL]: model,
-                [incubating.ATTR_GEN_AI_RESPONSE_MODEL]: input.modelId,
-                [aiSemanticConventions.SpanAttributes.LLM_REQUEST_TYPE]: aiSemanticConventions.LLMRequestTypeValues.COMPLETION,
             };
             if (typeof input.body === "string") {
                 const requestBody = JSON.parse(input.body);
+                const operationType = this._getOperationType(modelVendor, requestBody);
+                spanName = `${operationType} ${model}`;
+                // Set operation name before _setRequestAttributes so it is always
+                // present even if _setRequestAttributes throws for an unexpected body.
+                attributes = Object.assign(Object.assign({}, attributes), { [incubating.ATTR_GEN_AI_OPERATION_NAME]: operationType });
                 attributes = Object.assign(Object.assign({}, attributes), this._setRequestAttributes(modelVendor, requestBody));
             }
         }
@@ -98,50 +136,57 @@ class BedrockInstrumentation extends instrumentation.InstrumentationBase {
             this._diag.debug(e);
             (_b = (_a = this._config).exceptionLogger) === null || _b === void 0 ? void 0 : _b.call(_a, e);
         }
-        return this.tracer.startSpan(`bedrock.completion`, {
+        return this.tracer.startSpan(spanName, {
             kind: api.SpanKind.CLIENT,
             attributes,
         });
     }
     _endSpan(_a) {
-        return tslib.__awaiter(this, arguments, void 0, function* ({ span, result, }) {
+        return tslib.__awaiter(this, arguments, void 0, function* ({ span, result, modelId, }) {
             var _b, e_1, _c, _d;
-            var _e, _f, _g;
+            var _e, _f, _g, _h;
             try {
                 if ("body" in result) {
                     const attributes = "attributes" in span
                         ? span["attributes"]
                         : {};
-                    if (incubating.ATTR_GEN_AI_SYSTEM in attributes) {
-                        const modelId = attributes[incubating.ATTR_GEN_AI_RESPONSE_MODEL];
+                    if (incubating.ATTR_GEN_AI_PROVIDER_NAME in attributes) {
                         const { modelVendor, model } = this._extractVendorAndModel(modelId);
                         span.setAttribute(incubating.ATTR_GEN_AI_RESPONSE_MODEL, model);
                         if (!(result.body instanceof Object.getPrototypeOf(Uint8Array))) {
                             const rawRes = result.body;
                             let streamedContent = "";
                             try {
-                                for (var _h = true, rawRes_1 = tslib.__asyncValues(rawRes), rawRes_1_1; rawRes_1_1 = yield rawRes_1.next(), _b = rawRes_1_1.done, !_b; _h = true) {
+                                for (var _j = true, rawRes_1 = tslib.__asyncValues(rawRes), rawRes_1_1; rawRes_1_1 = yield rawRes_1.next(), _b = rawRes_1_1.done, !_b; _j = true) {
                                     _d = rawRes_1_1.value;
-                                    _h = false;
+                                    _j = false;
                                     const value = _d;
                                     // Convert it to a JSON String
                                     const jsonString = new TextDecoder().decode((_e = value.chunk) === null || _e === void 0 ? void 0 : _e.bytes);
                                     // Parse the JSON string
                                     const parsedResponse = JSON.parse(jsonString);
                                     if ("amazon-bedrock-invocationMetrics" in parsedResponse) {
-                                        span.setAttribute(incubating.ATTR_GEN_AI_USAGE_PROMPT_TOKENS, parsedResponse["amazon-bedrock-invocationMetrics"]["inputTokenCount"]);
-                                        span.setAttribute(incubating.ATTR_GEN_AI_USAGE_COMPLETION_TOKENS, parsedResponse["amazon-bedrock-invocationMetrics"]["outputTokenCount"]);
-                                        span.setAttribute(aiSemanticConventions.SpanAttributes.LLM_USAGE_TOTAL_TOKENS, parsedResponse["amazon-bedrock-invocationMetrics"]["inputTokenCount"] +
-                                            parsedResponse["amazon-bedrock-invocationMetrics"]["outputTokenCount"]);
+                                        span.setAttribute(incubating.ATTR_GEN_AI_USAGE_INPUT_TOKENS, parsedResponse["amazon-bedrock-invocationMetrics"]["inputTokenCount"]);
+                                        span.setAttribute(incubating.ATTR_GEN_AI_USAGE_OUTPUT_TOKENS, parsedResponse["amazon-bedrock-invocationMetrics"]["outputTokenCount"]);
+                                        const totalTokens = parsedResponse["amazon-bedrock-invocationMetrics"]["inputTokenCount"] +
+                                            parsedResponse["amazon-bedrock-invocationMetrics"]["outputTokenCount"];
+                                        span.setAttribute(aiSemanticConventions.SpanAttributes.GEN_AI_USAGE_TOTAL_TOKENS, totalTokens);
                                     }
-                                    let responseAttributes = this._setResponseAttributes(modelVendor, parsedResponse, true);
+                                    this._handleNovaStreamingMetadata(span, parsedResponse);
+                                    const responseAttributes = this._setResponseAttributes(modelVendor, parsedResponse, true);
                                     // ! NOTE: This make sure the content always have all streamed chunks
                                     if (this._shouldSendPrompts()) {
-                                        // Update local value with attribute value that was set by _setResponseAttributes
-                                        streamedContent +=
-                                            responseAttributes[`${incubating.ATTR_GEN_AI_COMPLETION}.0.content`];
-                                        // re-assign the new value to responseAttributes
-                                        responseAttributes = Object.assign(Object.assign({}, responseAttributes), { [`${incubating.ATTR_GEN_AI_COMPLETION}.0.content`]: streamedContent });
+                                        const chunkContent = this._getStreamChunkContent(modelVendor, parsedResponse);
+                                        if (chunkContent !== undefined) {
+                                            streamedContent += chunkContent;
+                                        }
+                                        // When finish reason is available (final chunk), set OTel 1.40 output message
+                                        if (responseAttributes[incubating.ATTR_GEN_AI_RESPONSE_FINISH_REASONS]) {
+                                            const finishReasons = responseAttributes[incubating.ATTR_GEN_AI_RESPONSE_FINISH_REASONS];
+                                            responseAttributes[incubating.ATTR_GEN_AI_OUTPUT_MESSAGES] =
+                                                instrumentationUtils.formatOutputMessage(streamedContent, (_f = finishReasons[0]) !== null && _f !== void 0 ? _f : null, {}, // already mapped by _setResponseAttributes
+                                                attributes[incubating.ATTR_GEN_AI_OPERATION_NAME], instrumentationUtils.mapBedrockContentBlock);
+                                        }
                                     }
                                     span.setAttributes(responseAttributes);
                                 }
@@ -149,7 +194,7 @@ class BedrockInstrumentation extends instrumentation.InstrumentationBase {
                             catch (e_1_1) { e_1 = { error: e_1_1 }; }
                             finally {
                                 try {
-                                    if (!_h && !_b && (_c = rawRes_1.return)) yield _c.call(rawRes_1);
+                                    if (!_j && !_b && (_c = rawRes_1.return)) yield _c.call(rawRes_1);
                                 }
                                 finally { if (e_1) throw e_1.error; }
                             }
@@ -167,34 +212,51 @@ class BedrockInstrumentation extends instrumentation.InstrumentationBase {
             }
             catch (e) {
                 this._diag.debug(e);
-                (_g = (_f = this._config).exceptionLogger) === null || _g === void 0 ? void 0 : _g.call(_f, e);
+                (_h = (_g = this._config).exceptionLogger) === null || _h === void 0 ? void 0 : _h.call(_g, e);
             }
             span.setStatus({ code: api.SpanStatusCode.OK });
             span.end();
         });
     }
     _setRequestAttributes(vendor, requestBody) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         switch (vendor) {
-            case "ai21": {
-                return Object.assign({ [incubating.ATTR_GEN_AI_REQUEST_TOP_P]: requestBody["topP"], [incubating.ATTR_GEN_AI_REQUEST_TEMPERATURE]: requestBody["temperature"], [incubating.ATTR_GEN_AI_REQUEST_MAX_TOKENS]: requestBody["maxTokens"], [aiSemanticConventions.SpanAttributes.LLM_PRESENCE_PENALTY]: requestBody["presencePenalty"]["scale"], [aiSemanticConventions.SpanAttributes.LLM_FREQUENCY_PENALTY]: requestBody["frequencyPenalty"]["scale"] }, (this._shouldSendPrompts()
+            case exports.BedrockVendor.AI21: {
+                // Jamba format: messages array + max_tokens + top_p
+                if (requestBody["messages"]) {
+                    return Object.assign({ [incubating.ATTR_GEN_AI_REQUEST_TOP_P]: requestBody["top_p"], [incubating.ATTR_GEN_AI_REQUEST_TEMPERATURE]: requestBody["temperature"], [incubating.ATTR_GEN_AI_REQUEST_MAX_TOKENS]: requestBody["max_tokens"] }, (this._shouldSendPrompts()
+                        ? {
+                            [incubating.ATTR_GEN_AI_INPUT_MESSAGES]: instrumentationUtils.formatInputMessages(requestBody["messages"], instrumentationUtils.mapBedrockContentBlock),
+                        }
+                        : {}));
+                }
+                // Legacy Jurassic format: prompt + topP + maxTokens
+                return Object.assign({ [incubating.ATTR_GEN_AI_REQUEST_TOP_P]: requestBody["topP"], [incubating.ATTR_GEN_AI_REQUEST_TEMPERATURE]: requestBody["temperature"], [incubating.ATTR_GEN_AI_REQUEST_MAX_TOKENS]: requestBody["maxTokens"], [incubating.ATTR_GEN_AI_REQUEST_PRESENCE_PENALTY]: (_a = requestBody["presencePenalty"]) === null || _a === void 0 ? void 0 : _a["scale"], [incubating.ATTR_GEN_AI_REQUEST_FREQUENCY_PENALTY]: (_b = requestBody["frequencyPenalty"]) === null || _b === void 0 ? void 0 : _b["scale"] }, (this._shouldSendPrompts()
                     ? {
-                        [`${incubating.ATTR_GEN_AI_PROMPT}.0.role`]: "user",
-                        [`${incubating.ATTR_GEN_AI_PROMPT}.0.content`]: requestBody["prompt"],
+                        [incubating.ATTR_GEN_AI_INPUT_MESSAGES]: instrumentationUtils.formatInputMessagesFromPrompt(requestBody["prompt"]),
                     }
                     : {}));
             }
-            case "amazon": {
-                return Object.assign({ [incubating.ATTR_GEN_AI_REQUEST_TOP_P]: requestBody["textGenerationConfig"]["topP"], [incubating.ATTR_GEN_AI_REQUEST_TEMPERATURE]: requestBody["textGenerationConfig"]["temperature"], [incubating.ATTR_GEN_AI_REQUEST_MAX_TOKENS]: requestBody["textGenerationConfig"]["maxTokenCount"] }, (this._shouldSendPrompts()
+            case exports.BedrockVendor.AMAZON: {
+                // Amazon Nova format: messages array + inferenceConfig
+                if (requestBody["messages"]) {
+                    return Object.assign({ [incubating.ATTR_GEN_AI_REQUEST_TOP_P]: (_c = requestBody["inferenceConfig"]) === null || _c === void 0 ? void 0 : _c["topP"], [incubating.ATTR_GEN_AI_REQUEST_TEMPERATURE]: (_d = requestBody["inferenceConfig"]) === null || _d === void 0 ? void 0 : _d["temperature"], [incubating.ATTR_GEN_AI_REQUEST_MAX_TOKENS]: (_e = requestBody["inferenceConfig"]) === null || _e === void 0 ? void 0 : _e["maxTokens"] }, (this._shouldSendPrompts()
+                        ? {
+                            [incubating.ATTR_GEN_AI_INPUT_MESSAGES]: instrumentationUtils.formatInputMessages(requestBody["messages"], instrumentationUtils.mapBedrockContentBlock),
+                        }
+                        : {}));
+                }
+                // Amazon Titan format: inputText + textGenerationConfig
+                return Object.assign({ [incubating.ATTR_GEN_AI_REQUEST_TOP_P]: (_f = requestBody["textGenerationConfig"]) === null || _f === void 0 ? void 0 : _f["topP"], [incubating.ATTR_GEN_AI_REQUEST_TEMPERATURE]: (_g = requestBody["textGenerationConfig"]) === null || _g === void 0 ? void 0 : _g["temperature"], [incubating.ATTR_GEN_AI_REQUEST_MAX_TOKENS]: (_h = requestBody["textGenerationConfig"]) === null || _h === void 0 ? void 0 : _h["maxTokenCount"] }, (this._shouldSendPrompts()
                     ? {
-                        [`${incubating.ATTR_GEN_AI_PROMPT}.0.role`]: "user",
-                        [`${incubating.ATTR_GEN_AI_PROMPT}.0.content`]: requestBody["inputText"],
+                        [incubating.ATTR_GEN_AI_INPUT_MESSAGES]: instrumentationUtils.formatInputMessagesFromPrompt(requestBody["inputText"]),
                     }
                     : {}));
             }
-            case "anthropic": {
+            case exports.BedrockVendor.ANTHROPIC: {
                 const baseAttributes = {
                     [incubating.ATTR_GEN_AI_REQUEST_TOP_P]: requestBody["top_p"],
-                    [aiSemanticConventions.SpanAttributes.LLM_TOP_K]: requestBody["top_k"],
+                    [incubating.ATTR_GEN_AI_REQUEST_TOP_K]: requestBody["top_k"],
                     [incubating.ATTR_GEN_AI_REQUEST_TEMPERATURE]: requestBody["temperature"],
                     [incubating.ATTR_GEN_AI_REQUEST_MAX_TOKENS]: requestBody["max_tokens_to_sample"] || requestBody["max_tokens"],
                 };
@@ -203,39 +265,35 @@ class BedrockInstrumentation extends instrumentation.InstrumentationBase {
                 }
                 // Handle new messages API format (used by langchain)
                 if (requestBody["messages"]) {
-                    const promptAttributes = {};
-                    requestBody["messages"].forEach((message, index) => {
-                        promptAttributes[`${incubating.ATTR_GEN_AI_PROMPT}.${index}.role`] =
-                            message.role;
-                        promptAttributes[`${incubating.ATTR_GEN_AI_PROMPT}.${index}.content`] =
-                            typeof message.content === "string"
-                                ? message.content
-                                : JSON.stringify(message.content);
-                    });
+                    const promptAttributes = {
+                        [incubating.ATTR_GEN_AI_INPUT_MESSAGES]: instrumentationUtils.formatInputMessages(requestBody["messages"], instrumentationUtils.mapBedrockContentBlock),
+                    };
+                    if (requestBody["system"] !== undefined) {
+                        promptAttributes[incubating.ATTR_GEN_AI_SYSTEM_INSTRUCTIONS] =
+                            instrumentationUtils.formatSystemInstructions(requestBody["system"]);
+                    }
                     return Object.assign(Object.assign({}, baseAttributes), promptAttributes);
                 }
                 // Handle legacy prompt format
                 if (requestBody["prompt"]) {
-                    return Object.assign(Object.assign({}, baseAttributes), { [`${incubating.ATTR_GEN_AI_PROMPT}.0.role`]: "user", [`${incubating.ATTR_GEN_AI_PROMPT}.0.content`]: requestBody["prompt"]
-                            // The format is removing when we are setting span attribute
+                    return Object.assign(Object.assign({}, baseAttributes), { [incubating.ATTR_GEN_AI_INPUT_MESSAGES]: instrumentationUtils.formatInputMessagesFromPrompt(requestBody["prompt"]
                             .replace("\n\nHuman:", "")
-                            .replace("\n\nAssistant:", "") });
+                            .replace("\n\nAssistant:", "")) });
                 }
                 return baseAttributes;
             }
-            case "cohere": {
-                return Object.assign({ [incubating.ATTR_GEN_AI_REQUEST_TOP_P]: requestBody["p"], [aiSemanticConventions.SpanAttributes.LLM_TOP_K]: requestBody["k"], [incubating.ATTR_GEN_AI_REQUEST_TEMPERATURE]: requestBody["temperature"], [incubating.ATTR_GEN_AI_REQUEST_MAX_TOKENS]: requestBody["max_tokens"] }, (this._shouldSendPrompts()
-                    ? {
-                        [`${incubating.ATTR_GEN_AI_PROMPT}.0.role`]: "user",
-                        [`${incubating.ATTR_GEN_AI_PROMPT}.0.content`]: requestBody["message"] || requestBody["prompt"],
-                    }
-                    : {}));
+            case exports.BedrockVendor.COHERE: {
+                return {
+                    [incubating.ATTR_GEN_AI_REQUEST_TOP_P]: requestBody["p"],
+                    [incubating.ATTR_GEN_AI_REQUEST_TOP_K]: requestBody["k"],
+                    [incubating.ATTR_GEN_AI_REQUEST_TEMPERATURE]: requestBody["temperature"],
+                    [incubating.ATTR_GEN_AI_REQUEST_MAX_TOKENS]: requestBody["max_tokens"],
+                };
             }
-            case "meta": {
+            case exports.BedrockVendor.META: {
                 return Object.assign({ [incubating.ATTR_GEN_AI_REQUEST_TOP_P]: requestBody["top_p"], [incubating.ATTR_GEN_AI_REQUEST_TEMPERATURE]: requestBody["temperature"], [incubating.ATTR_GEN_AI_REQUEST_MAX_TOKENS]: requestBody["max_gen_len"] }, (this._shouldSendPrompts()
                     ? {
-                        [`${incubating.ATTR_GEN_AI_PROMPT}.0.role`]: "user",
-                        [`${incubating.ATTR_GEN_AI_PROMPT}.0.content`]: requestBody["prompt"],
+                        [incubating.ATTR_GEN_AI_INPUT_MESSAGES]: instrumentationUtils.formatInputMessagesFromPrompt(requestBody["prompt"]),
                     }
                     : {}));
             }
@@ -244,71 +302,182 @@ class BedrockInstrumentation extends instrumentation.InstrumentationBase {
         }
     }
     _setResponseAttributes(vendor, response, isStream = false) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8;
         switch (vendor) {
-            case "ai21": {
-                return Object.assign({ [`${incubating.ATTR_GEN_AI_COMPLETION}.0.finish_reason`]: response["completions"][0]["finishReason"]["reason"], [`${incubating.ATTR_GEN_AI_COMPLETION}.0.role`]: "assistant" }, (this._shouldSendPrompts()
+            case exports.BedrockVendor.AI21: {
+                // Jamba format: choices[0].message + choices[0].finish_reason
+                if (response["choices"]) {
+                    const usage = response["usage"];
+                    const finishReason = (_a = response["choices"][0]) === null || _a === void 0 ? void 0 : _a["finish_reason"];
+                    const content = isStream
+                        ? (_c = (_b = response["choices"][0]) === null || _b === void 0 ? void 0 : _b["delta"]) === null || _c === void 0 ? void 0 : _c["content"]
+                        : (_e = (_d = response["choices"][0]) === null || _d === void 0 ? void 0 : _d["message"]) === null || _e === void 0 ? void 0 : _e["content"];
+                    return Object.assign(Object.assign(Object.assign({}, (finishReason != null
+                        ? {
+                            [incubating.ATTR_GEN_AI_RESPONSE_FINISH_REASONS]: [
+                                (_f = bedrockFinishReasonMap[finishReason]) !== null && _f !== void 0 ? _f : finishReason,
+                            ],
+                        }
+                        : {})), (usage
+                        ? {
+                            [incubating.ATTR_GEN_AI_USAGE_INPUT_TOKENS]: usage["prompt_tokens"],
+                            [incubating.ATTR_GEN_AI_USAGE_OUTPUT_TOKENS]: usage["completion_tokens"],
+                            [aiSemanticConventions.SpanAttributes.GEN_AI_USAGE_TOTAL_TOKENS]: usage["total_tokens"],
+                        }
+                        : {})), (this._shouldSendPrompts()
+                        ? {
+                            [incubating.ATTR_GEN_AI_OUTPUT_MESSAGES]: instrumentationUtils.formatOutputMessage(content !== null && content !== void 0 ? content : "", finishReason, bedrockFinishReasonMap, incubating.GEN_AI_OPERATION_NAME_VALUE_TEXT_COMPLETION, instrumentationUtils.mapBedrockContentBlock),
+                        }
+                        : {}));
+                }
+                // Legacy Jurassic format: completions[0].data.text
+                const jurassicFinishReason = response["completions"][0]["finishReason"]["reason"];
+                const jurassicContent = response["completions"][0]["data"]["text"];
+                return Object.assign({ [incubating.ATTR_GEN_AI_RESPONSE_FINISH_REASONS]: [
+                        (_g = bedrockFinishReasonMap[jurassicFinishReason]) !== null && _g !== void 0 ? _g : jurassicFinishReason,
+                    ] }, (this._shouldSendPrompts()
                     ? {
-                        [`${incubating.ATTR_GEN_AI_COMPLETION}.0.content`]: response["completions"][0]["data"]["text"],
+                        [incubating.ATTR_GEN_AI_OUTPUT_MESSAGES]: instrumentationUtils.formatOutputMessage(jurassicContent, jurassicFinishReason, bedrockFinishReasonMap, incubating.GEN_AI_OPERATION_NAME_VALUE_TEXT_COMPLETION, instrumentationUtils.mapBedrockContentBlock),
                     }
                     : {}));
             }
-            case "amazon": {
-                return Object.assign({ [`${incubating.ATTR_GEN_AI_COMPLETION}.0.finish_reason`]: isStream
-                        ? response["completionReason"]
-                        : response["results"][0]["completionReason"], [`${incubating.ATTR_GEN_AI_COMPLETION}.0.role`]: "assistant", [incubating.ATTR_GEN_AI_USAGE_PROMPT_TOKENS]: response["inputTextTokenCount"], [incubating.ATTR_GEN_AI_USAGE_COMPLETION_TOKENS]: isStream
-                        ? response["totalOutputTextTokenCount"]
-                        : response["results"][0]["tokenCount"], [aiSemanticConventions.SpanAttributes.LLM_USAGE_TOTAL_TOKENS]: isStream
-                        ? response["inputTextTokenCount"] +
-                            response["totalOutputTextTokenCount"]
-                        : response["inputTextTokenCount"] +
-                            response["results"][0]["tokenCount"] }, (this._shouldSendPrompts()
+            case exports.BedrockVendor.AMAZON: {
+                if (isStream) {
+                    // Amazon Nova format: contentBlockDelta has text, messageStop has stopReason
+                    const novaFinishReason = (_h = response["messageStop"]) === null || _h === void 0 ? void 0 : _h["stopReason"];
+                    // Amazon Titan format: outputText, completionReason
+                    const titanFinishReason = response["completionReason"];
+                    const finishReason = novaFinishReason !== null && novaFinishReason !== void 0 ? novaFinishReason : titanFinishReason;
+                    return Object.assign(Object.assign({}, (finishReason != null
+                        ? {
+                            [incubating.ATTR_GEN_AI_RESPONSE_FINISH_REASONS]: [
+                                (_j = bedrockFinishReasonMap[finishReason]) !== null && _j !== void 0 ? _j : finishReason,
+                            ],
+                        }
+                        : {})), (response["inputTextTokenCount"] != null
+                        ? {
+                            [incubating.ATTR_GEN_AI_USAGE_INPUT_TOKENS]: response["inputTextTokenCount"],
+                            [incubating.ATTR_GEN_AI_USAGE_OUTPUT_TOKENS]: response["totalOutputTextTokenCount"],
+                            [aiSemanticConventions.SpanAttributes.GEN_AI_USAGE_TOTAL_TOKENS]: response["inputTextTokenCount"] +
+                                response["totalOutputTextTokenCount"],
+                        }
+                        : {}));
+                }
+                // Amazon Titan token fields
+                const titanInputTokens = response["inputTextTokenCount"];
+                const titanOutputTokens = (_l = (_k = response["results"]) === null || _k === void 0 ? void 0 : _k[0]) === null || _l === void 0 ? void 0 : _l["tokenCount"];
+                // Amazon Nova token fields
+                const novaUsage = response["usage"];
+                const amazonFinishReason = (_p = (_o = (_m = response["results"]) === null || _m === void 0 ? void 0 : _m[0]) === null || _o === void 0 ? void 0 : _o["completionReason"]) !== null && _p !== void 0 ? _p : response["stopReason"];
+                const novaRawContent = (_r = (_q = response["output"]) === null || _q === void 0 ? void 0 : _q["message"]) === null || _r === void 0 ? void 0 : _r["content"];
+                const titanContent = (_t = (_s = response["results"]) === null || _s === void 0 ? void 0 : _s[0]) === null || _t === void 0 ? void 0 : _t["outputText"];
+                const outputContent = (_u = novaRawContent !== null && novaRawContent !== void 0 ? novaRawContent : titanContent) !== null && _u !== void 0 ? _u : "";
+                const operationType = novaRawContent
+                    ? incubating.GEN_AI_OPERATION_NAME_VALUE_CHAT
+                    : incubating.GEN_AI_OPERATION_NAME_VALUE_TEXT_COMPLETION;
+                return Object.assign(Object.assign(Object.assign({}, (amazonFinishReason != null
                     ? {
-                        [`${incubating.ATTR_GEN_AI_COMPLETION}.0.content`]: isStream
-                            ? response["outputText"]
-                            : response["results"][0]["outputText"],
+                        [incubating.ATTR_GEN_AI_RESPONSE_FINISH_REASONS]: [
+                            (_v = bedrockFinishReasonMap[amazonFinishReason]) !== null && _v !== void 0 ? _v : amazonFinishReason,
+                        ],
+                    }
+                    : {})), (titanInputTokens != null
+                    ? {
+                        [incubating.ATTR_GEN_AI_USAGE_INPUT_TOKENS]: titanInputTokens,
+                        [incubating.ATTR_GEN_AI_USAGE_OUTPUT_TOKENS]: titanOutputTokens,
+                        [aiSemanticConventions.SpanAttributes.GEN_AI_USAGE_TOTAL_TOKENS]: titanInputTokens + titanOutputTokens,
+                    }
+                    : novaUsage != null
+                        ? {
+                            [incubating.ATTR_GEN_AI_USAGE_INPUT_TOKENS]: novaUsage["inputTokens"],
+                            [incubating.ATTR_GEN_AI_USAGE_OUTPUT_TOKENS]: novaUsage["outputTokens"],
+                            [aiSemanticConventions.SpanAttributes.GEN_AI_USAGE_TOTAL_TOKENS]: novaUsage["totalTokens"],
+                        }
+                        : {})), (this._shouldSendPrompts()
+                    ? {
+                        [incubating.ATTR_GEN_AI_OUTPUT_MESSAGES]: instrumentationUtils.formatOutputMessage(outputContent, amazonFinishReason, bedrockFinishReasonMap, operationType, instrumentationUtils.mapBedrockContentBlock),
                     }
                     : {}));
             }
-            case "anthropic": {
-                const baseAttributes = {
-                    [`${incubating.ATTR_GEN_AI_COMPLETION}.0.finish_reason`]: response["stop_reason"],
-                    [`${incubating.ATTR_GEN_AI_COMPLETION}.0.role`]: "assistant",
-                };
+            case exports.BedrockVendor.ANTHROPIC: {
+                if (isStream) {
+                    // New messages API streaming: content_block_delta has delta.text,
+                    // message_delta has delta.stop_reason
+                    const stopReason = (_x = (_w = response["delta"]) === null || _w === void 0 ? void 0 : _w["stop_reason"]) !== null && _x !== void 0 ? _x : response["stop_reason"];
+                    const finishReason = stopReason !== null && stopReason !== void 0 ? stopReason : undefined;
+                    return Object.assign({}, (finishReason != null
+                        ? {
+                            [incubating.ATTR_GEN_AI_RESPONSE_FINISH_REASONS]: [
+                                (_y = bedrockFinishReasonMap[finishReason]) !== null && _y !== void 0 ? _y : finishReason,
+                            ],
+                        }
+                        : {}));
+                }
+                const stopReason = response["stop_reason"];
+                const usage = response["usage"];
+                const baseAttributes = Object.assign(Object.assign({}, (stopReason != null
+                    ? {
+                        [incubating.ATTR_GEN_AI_RESPONSE_FINISH_REASONS]: [
+                            (_z = bedrockFinishReasonMap[stopReason]) !== null && _z !== void 0 ? _z : stopReason,
+                        ],
+                    }
+                    : {})), (usage
+                    ? {
+                        [incubating.ATTR_GEN_AI_USAGE_INPUT_TOKENS]: usage["input_tokens"],
+                        [incubating.ATTR_GEN_AI_USAGE_OUTPUT_TOKENS]: usage["output_tokens"],
+                        [aiSemanticConventions.SpanAttributes.GEN_AI_USAGE_TOTAL_TOKENS]: (usage["input_tokens"] || 0) + (usage["output_tokens"] || 0),
+                    }
+                    : {}));
                 if (!this._shouldSendPrompts()) {
                     return baseAttributes;
                 }
                 // Handle new messages API format response
                 if (response["content"]) {
                     const content = Array.isArray(response["content"])
-                        ? response["content"].map((c) => c.text || c).join("")
+                        ? response["content"]
                         : response["content"];
-                    return Object.assign(Object.assign({}, baseAttributes), { [`${incubating.ATTR_GEN_AI_COMPLETION}.0.content`]: content });
+                    return Object.assign(Object.assign({}, baseAttributes), { [incubating.ATTR_GEN_AI_OUTPUT_MESSAGES]: instrumentationUtils.formatOutputMessage(content, stopReason, bedrockFinishReasonMap, incubating.GEN_AI_OPERATION_NAME_VALUE_CHAT, instrumentationUtils.mapBedrockContentBlock) });
                 }
                 // Handle legacy completion format
                 if (response["completion"]) {
-                    return Object.assign(Object.assign({}, baseAttributes), { [`${incubating.ATTR_GEN_AI_COMPLETION}.0.content`]: response["completion"] });
+                    return Object.assign(Object.assign({}, baseAttributes), { [incubating.ATTR_GEN_AI_OUTPUT_MESSAGES]: instrumentationUtils.formatOutputMessage(response["completion"], stopReason, bedrockFinishReasonMap, incubating.GEN_AI_OPERATION_NAME_VALUE_TEXT_COMPLETION, instrumentationUtils.mapBedrockContentBlock) });
                 }
                 return baseAttributes;
             }
-            case "cohere": {
-                const baseAttributes = Object.assign({ [`${incubating.ATTR_GEN_AI_COMPLETION}.0.finish_reason`]: (_b = (_a = response["generations"]) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b["finish_reason"], [`${incubating.ATTR_GEN_AI_COMPLETION}.0.role`]: "assistant" }, (this._shouldSendPrompts()
+            case exports.BedrockVendor.COHERE: {
+                const cohereFinishReason = (_2 = (_1 = (_0 = response["generations"]) === null || _0 === void 0 ? void 0 : _0[0]) === null || _1 === void 0 ? void 0 : _1["finish_reason"]) !== null && _2 !== void 0 ? _2 : response["finish_reason"];
+                const cohereText = (_5 = (_4 = (_3 = response["generations"]) === null || _3 === void 0 ? void 0 : _3[0]) === null || _4 === void 0 ? void 0 : _4["text"]) !== null && _5 !== void 0 ? _5 : response["text"];
+                return Object.assign(Object.assign(Object.assign({}, (cohereFinishReason != null
                     ? {
-                        [`${incubating.ATTR_GEN_AI_COMPLETION}.0.content`]: (_d = (_c = response["generations"]) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d["text"],
+                        [incubating.ATTR_GEN_AI_RESPONSE_FINISH_REASONS]: [
+                            (_6 = bedrockFinishReasonMap[cohereFinishReason]) !== null && _6 !== void 0 ? _6 : cohereFinishReason,
+                        ],
+                    }
+                    : {})), (((_7 = response["meta"]) === null || _7 === void 0 ? void 0 : _7["billed_units"])
+                    ? {
+                        [incubating.ATTR_GEN_AI_USAGE_INPUT_TOKENS]: response["meta"]["billed_units"]["input_tokens"],
+                        [incubating.ATTR_GEN_AI_USAGE_OUTPUT_TOKENS]: response["meta"]["billed_units"]["output_tokens"],
+                        [aiSemanticConventions.SpanAttributes.GEN_AI_USAGE_TOTAL_TOKENS]: (response["meta"]["billed_units"]["input_tokens"] || 0) +
+                            (response["meta"]["billed_units"]["output_tokens"] || 0),
+                    }
+                    : {})), (this._shouldSendPrompts() && cohereText != null
+                    ? {
+                        [incubating.ATTR_GEN_AI_OUTPUT_MESSAGES]: instrumentationUtils.formatOutputMessage(cohereText, cohereFinishReason, bedrockFinishReasonMap, incubating.GEN_AI_OPERATION_NAME_VALUE_TEXT_COMPLETION, instrumentationUtils.mapBedrockContentBlock),
                     }
                     : {}));
-                // Add token usage if available
-                if (response["meta"] && response["meta"]["billed_units"]) {
-                    const billedUnits = response["meta"]["billed_units"];
-                    return Object.assign(Object.assign({}, baseAttributes), { [incubating.ATTR_GEN_AI_USAGE_PROMPT_TOKENS]: billedUnits["input_tokens"], [incubating.ATTR_GEN_AI_USAGE_COMPLETION_TOKENS]: billedUnits["output_tokens"], [aiSemanticConventions.SpanAttributes.LLM_USAGE_TOTAL_TOKENS]: (billedUnits["input_tokens"] || 0) +
-                            (billedUnits["output_tokens"] || 0) });
-                }
-                return baseAttributes;
             }
-            case "meta": {
-                return Object.assign({ [`${incubating.ATTR_GEN_AI_COMPLETION}.0.finish_reason`]: response["stop_reason"], [`${incubating.ATTR_GEN_AI_COMPLETION}.0.role`]: "assistant", [incubating.ATTR_GEN_AI_USAGE_PROMPT_TOKENS]: response["prompt_token_count"], [incubating.ATTR_GEN_AI_USAGE_COMPLETION_TOKENS]: response["generation_token_count"], [aiSemanticConventions.SpanAttributes.LLM_USAGE_TOTAL_TOKENS]: response["prompt_token_count"] + response["generation_token_count"] }, (this._shouldSendPrompts()
+            case exports.BedrockVendor.META: {
+                const metaFinishReason = response["stop_reason"];
+                const metaContent = response["generation"];
+                return Object.assign(Object.assign(Object.assign({}, (metaFinishReason != null
+                    ? {
+                        [incubating.ATTR_GEN_AI_RESPONSE_FINISH_REASONS]: [
+                            (_8 = bedrockFinishReasonMap[metaFinishReason]) !== null && _8 !== void 0 ? _8 : metaFinishReason,
+                        ],
+                    }
+                    : {})), { [incubating.ATTR_GEN_AI_USAGE_INPUT_TOKENS]: response["prompt_token_count"], [incubating.ATTR_GEN_AI_USAGE_OUTPUT_TOKENS]: response["generation_token_count"], [aiSemanticConventions.SpanAttributes.GEN_AI_USAGE_TOTAL_TOKENS]: response["prompt_token_count"] + response["generation_token_count"] }), (this._shouldSendPrompts()
                     ? {
-                        [`${incubating.ATTR_GEN_AI_COMPLETION}.0.content`]: response["generation"],
+                        [incubating.ATTR_GEN_AI_OUTPUT_MESSAGES]: instrumentationUtils.formatOutputMessage(metaContent !== null && metaContent !== void 0 ? metaContent : "", metaFinishReason, bedrockFinishReasonMap, incubating.GEN_AI_OPERATION_NAME_VALUE_TEXT_COMPLETION, instrumentationUtils.mapBedrockContentBlock),
                     }
                     : {}));
             }
@@ -316,6 +485,15 @@ class BedrockInstrumentation extends instrumentation.InstrumentationBase {
                 return {};
         }
     }
+    _handleNovaStreamingMetadata(span, parsedResponse) {
+        var _a;
+        if ("metadata" in parsedResponse && ((_a = parsedResponse["metadata"]) === null || _a === void 0 ? void 0 : _a["usage"])) {
+            const usage = parsedResponse["metadata"]["usage"];
+            span.setAttribute(incubating.ATTR_GEN_AI_USAGE_INPUT_TOKENS, usage["inputTokens"]);
+            span.setAttribute(incubating.ATTR_GEN_AI_USAGE_OUTPUT_TOKENS, usage["outputTokens"]);
+            span.setAttribute(aiSemanticConventions.SpanAttributes.GEN_AI_USAGE_TOTAL_TOKENS, usage["totalTokens"]);
+        }
+    }
     _shouldSendPrompts() {
         const contextShouldSendPrompts = api.context
             .active()
@@ -327,17 +505,63 @@ class BedrockInstrumentation extends instrumentation.InstrumentationBase {
             ? this._config.traceContent
             : true;
     }
+    _getOperationType(vendor, requestBody) {
+        switch (vendor) {
+            case exports.BedrockVendor.AI21:
+            case exports.BedrockVendor.AMAZON:
+            case exports.BedrockVendor.ANTHROPIC:
+                return requestBody["messages"]
+                    ? incubating.GEN_AI_OPERATION_NAME_VALUE_CHAT
+                    : incubating.GEN_AI_OPERATION_NAME_VALUE_TEXT_COMPLETION;
+            case exports.BedrockVendor.COHERE:
+            case exports.BedrockVendor.META:
+                return incubating.GEN_AI_OPERATION_NAME_VALUE_TEXT_COMPLETION;
+            default:
+                return incubating.GEN_AI_OPERATION_NAME_VALUE_TEXT_COMPLETION;
+        }
+    }
+    _getStreamChunkContent(vendor, response) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        switch (vendor) {
+            case exports.BedrockVendor.AMAZON:
+                return ((_c = (_b = (_a = response["contentBlockDelta"]) === null || _a === void 0 ? void 0 : _a["delta"]) === null || _b === void 0 ? void 0 : _b["text"]) !== null && _c !== void 0 ? _c : response["outputText"]);
+            case exports.BedrockVendor.ANTHROPIC:
+                return (_e = (_d = response["delta"]) === null || _d === void 0 ? void 0 : _d["text"]) !== null && _e !== void 0 ? _e : response["completion"];
+            case exports.BedrockVendor.AI21:
+                return (_h = (_g = (_f = response["choices"]) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g["delta"]) === null || _h === void 0 ? void 0 : _h["content"];
+            case exports.BedrockVendor.META:
+                return response["generation"];
+            default:
+                return undefined;
+        }
+    }
     _extractVendorAndModel(modelId) {
         if (!modelId) {
             return { modelVendor: "", model: "" };
         }
-        const parts = modelId.split(".");
+        // Handle cross-region inference profile IDs like "us.anthropic.claude-3-5-sonnet-20241022-v2:0"
+        // Mirrors Python's _cross_region_check logic.
+        const prefixes = ["us", "us-gov", "eu", "apac"];
+        const hasCrossRegionPrefix = prefixes.some((prefix) => modelId.startsWith(prefix + "."));
+        if (hasCrossRegionPrefix) {
+            const parts = modelId.split(".");
+            if (parts.length > 2) {
+                parts.shift(); // remove region prefix ("us", "eu", etc.)
+            }
+            return { modelVendor: parts[0] || "", model: parts[1] || "" };
+        }
+        // Standard format: "vendor.model-name"
+        const dotIndex = modelId.indexOf(".");
+        if (dotIndex === -1) {
+            return { modelVendor: modelId, model: "" };
+        }
         return {
-            modelVendor: parts[0] || "",
-            model: parts[1] || "",
+            modelVendor: modelId.slice(0, dotIndex),
+            model: modelId.slice(dotIndex + 1),
         };
     }
 }
 
 exports.BedrockInstrumentation = BedrockInstrumentation;
+exports.bedrockFinishReasonMap = bedrockFinishReasonMap;
 //# sourceMappingURL=index.js.map