openlit 1.7.0 → 1.8.0

package/dist/instrumentation/mistral/wrapper.js

@@ -0,0 +1,340 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const api_1 = require("@opentelemetry/api");
+const config_1 = __importDefault(require("../../config"));
+const helpers_1 = __importDefault(require("../../helpers"));
+const semantic_convention_1 = __importDefault(require("../../semantic-convention"));
+const base_wrapper_1 = __importDefault(require("../base-wrapper"));
+class MistralWrapper extends base_wrapper_1.default {
+    static _patchChatCompletionCreate(tracer) {
+        const genAIEndpoint = 'mistral.chat.completions';
+        return (originalMethod) => {
+            return async function (...args) {
+                const span = tracer.startSpan(genAIEndpoint, { kind: api_1.SpanKind.CLIENT });
+                return api_1.context
+                    .with(api_1.trace.setSpan(api_1.context.active(), span), async () => {
+                    return originalMethod.apply(this, args);
+                })
+                    .then((response) => {
+                    // Detect streaming: new Mistral SDK's chat.stream() returns an async iterable directly
+                    const isStream = args[0]?.stream === true || typeof response[Symbol.asyncIterator] === 'function';
+                    if (isStream) {
+                        return helpers_1.default.createStreamProxy(response, MistralWrapper._chatCompletionGenerator({
+                            args,
+                            genAIEndpoint,
+                            response,
+                            span,
+                        }));
+                    }
+                    return MistralWrapper._chatCompletion({ args, genAIEndpoint, response, span });
+                })
+                    .catch((e) => {
+                    helpers_1.default.handleException(span, e);
+                    span.end();
+                    throw e;
+                });
+            };
+        };
+    }
+    static async _chatCompletion({ args, genAIEndpoint, response, span, }) {
+        let metricParams;
+        try {
+            metricParams = await MistralWrapper._chatCompletionCommonSetter({
+                args,
+                genAIEndpoint,
+                result: response,
+                span,
+            });
+            return response;
+        }
+        catch (e) {
+            helpers_1.default.handleException(span, e);
+            throw e;
+        }
+        finally {
+            span.end();
+            if (metricParams) {
+                base_wrapper_1.default.recordMetrics(span, metricParams);
+            }
+        }
+    }
+    static async *_chatCompletionGenerator({ args, genAIEndpoint, response, span, }) {
+        let metricParams;
+        const timestamps = [];
+        const startTime = Date.now();
+        try {
+            const { messages } = args[0];
+            let { tools } = args[0];
+            const result = {
+                id: '0',
+                created: -1,
+                model: '',
+                choices: [
+                    {
+                        index: 0,
+                        finish_reason: 'stop',
+                        message: { role: 'assistant', content: '' },
+                    },
+                ],
+                usage: {
+                    prompt_tokens: 0,
+                    completion_tokens: 0,
+                    total_tokens: 0,
+                },
+            };
+            let toolCalls = [];
+            for await (const chunk of response) {
+                timestamps.push(Date.now());
+                // New Mistral SDK wraps each SSE event in { data: { ... } }
+                const chunkData = chunk.data ?? chunk;
+                result.id = chunkData.id || result.id;
+                result.created = chunkData.created || result.created;
+                result.model = chunkData.model || result.model;
+                if (chunkData.choices && chunkData.choices[0]) {
+                    if (chunkData.choices[0].finish_reason) {
+                        result.choices[0].finish_reason = chunkData.choices[0].finish_reason;
+                    }
+                    if (chunkData.choices[0].delta?.content) {
+                        result.choices[0].message.content += chunkData.choices[0].delta.content;
+                    }
+                    // Handle tool calls for streaming
+                    if (chunkData.choices[0].delta?.tool_calls) {
+                        const deltaTools = chunkData.choices[0].delta.tool_calls;
+                        for (const tool of deltaTools) {
+                            const idx = tool.index || 0;
+                            while (toolCalls.length <= idx) {
+                                toolCalls.push({
+                                    id: '',
+                                    type: 'function',
+                                    function: { name: '', arguments: '' }
+                                });
+                            }
+                            if (tool.id) {
+                                toolCalls[idx].id = tool.id;
+                                toolCalls[idx].type = tool.type || 'function';
+                                if (tool.function?.name) {
+                                    toolCalls[idx].function.name = tool.function.name;
+                                }
+                                if (tool.function?.arguments) {
+                                    toolCalls[idx].function.arguments = tool.function.arguments;
+                                }
+                            }
+                            else if (tool.function?.arguments) {
+                                toolCalls[idx].function.arguments += tool.function.arguments;
+                            }
+                        }
+                        tools = true;
+                    }
+                }
+                yield chunk;
+            }
+            if (toolCalls.length > 0) {
+                result.choices[0].message = {
+                    ...result.choices[0].message,
+                    tool_calls: toolCalls
+                };
+            }
+            // Estimate token usage if not provided
+            let promptTokens = 0;
+            for (const message of messages || []) {
+                promptTokens += helpers_1.default.openaiTokens(message.content, result.model) ?? 0;
+            }
+            const completionTokens = helpers_1.default.openaiTokens(result.choices[0].message.content ?? '', result.model);
+            if (completionTokens) {
+                result.usage = {
+                    prompt_tokens: promptTokens,
+                    completion_tokens: completionTokens,
+                    total_tokens: promptTokens + completionTokens,
+                };
+            }
+            args[0].tools = tools;
+            // Calculate TTFT and TBT
+            const ttft = timestamps.length > 0 ? (timestamps[0] - startTime) / 1000 : 0;
+            let tbt = 0;
+            if (timestamps.length > 1) {
+                const timeDiffs = timestamps.slice(1).map((t, i) => t - timestamps[i]);
+                tbt = timeDiffs.reduce((a, b) => a + b, 0) / timeDiffs.length / 1000;
+            }
+            metricParams = await MistralWrapper._chatCompletionCommonSetter({
+                args,
+                genAIEndpoint,
+                result,
+                span,
+                ttft,
+                tbt,
+            });
+            return result;
+        }
+        catch (e) {
+            helpers_1.default.handleException(span, e);
+            throw e;
+        }
+        finally {
+            span.end();
+            if (metricParams) {
+                base_wrapper_1.default.recordMetrics(span, metricParams);
+            }
+        }
+    }
+    static async _chatCompletionCommonSetter({ args, genAIEndpoint, result, span, ttft = 0, tbt = 0, }) {
+        const traceContent = config_1.default.traceContent;
+        const { messages, max_tokens = null, temperature = 0.7, top_p, user, stream = false, safe_prompt = false, } = args[0];
+        // Request Params attributes
+        span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_TOP_P, top_p || 1);
+        span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_MAX_TOKENS, max_tokens || -1);
+        span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_TEMPERATURE, temperature);
+        span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_IS_STREAM, stream);
+        if (user) {
+            span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_USER, user);
+        }
+        if (safe_prompt !== undefined) {
+            span.setAttribute('gen_ai.request.safe_prompt', safe_prompt);
+        }
+        if (traceContent) {
+            span.setAttribute(semantic_convention_1.default.GEN_AI_INPUT_MESSAGES, helpers_1.default.buildInputMessages(messages || []));
+        }
+        span.setAttribute(semantic_convention_1.default.GEN_AI_OPERATION, semantic_convention_1.default.GEN_AI_OPERATION_TYPE_CHAT);
+        span.setAttribute(semantic_convention_1.default.GEN_AI_RESPONSE_ID, result.id);
+        const model = result.model || 'mistral-small-latest';
+        const responseModel = result.model || model;
+        const pricingInfo = await config_1.default.updatePricingJson(config_1.default.pricing_json);
+        // Support both camelCase (new SDK) and snake_case (old SDK) usage fields
+        const promptTokens = result.usage?.promptTokens ?? result.usage?.prompt_tokens ?? 0;
+        const completionTokens = result.usage?.completionTokens ?? result.usage?.completion_tokens ?? 0;
+        const totalTokens = result.usage?.totalTokens ?? result.usage?.total_tokens ?? 0;
+        // Calculate cost of the operation
+        const cost = helpers_1.default.getChatModelCost(model, pricingInfo, promptTokens, completionTokens);
+        MistralWrapper.setBaseSpanAttributes(span, {
+            genAIEndpoint,
+            model,
+            user,
+            cost,
+            aiSystem: MistralWrapper.aiSystem,
+        });
+        // Response model
+        span.setAttribute(semantic_convention_1.default.GEN_AI_RESPONSE_MODEL, responseModel);
+        // Token usage
+        span.setAttribute(semantic_convention_1.default.GEN_AI_USAGE_INPUT_TOKENS, promptTokens);
+        span.setAttribute(semantic_convention_1.default.GEN_AI_USAGE_OUTPUT_TOKENS, completionTokens);
+        span.setAttribute(semantic_convention_1.default.GEN_AI_USAGE_TOTAL_TOKENS, totalTokens);
+        span.setAttribute(semantic_convention_1.default.GEN_AI_CLIENT_TOKEN_USAGE, totalTokens);
+        // TTFT and TBT metrics
+        if (ttft > 0) {
+            span.setAttribute(semantic_convention_1.default.GEN_AI_SERVER_TTFT, ttft);
+        }
+        if (tbt > 0) {
+            span.setAttribute(semantic_convention_1.default.GEN_AI_SERVER_TBT, tbt);
+        }
+        // Finish reason
+        if (result.choices[0].finish_reason) {
+            span.setAttribute(semantic_convention_1.default.GEN_AI_RESPONSE_FINISH_REASON, [result.choices[0].finish_reason]);
+        }
+        // Output type
+        const outputType = typeof result.choices[0].message.content === 'string'
+            ? semantic_convention_1.default.GEN_AI_OUTPUT_TYPE_TEXT
+            : semantic_convention_1.default.GEN_AI_OUTPUT_TYPE_JSON;
+        span.setAttribute(semantic_convention_1.default.GEN_AI_OUTPUT_TYPE, outputType);
+        // Tool calls handling
+        if (result.choices[0].message.tool_calls) {
+            const toolCalls = result.choices[0].message.tool_calls;
+            const toolNames = toolCalls.map((t) => t.function?.name || '').filter(Boolean);
+            const toolIds = toolCalls.map((t) => t.id || '').filter(Boolean);
+            const toolArgs = toolCalls.map((t) => t.function?.arguments || '').filter(Boolean);
+            const toolTypes = toolCalls.map((t) => t.type || '').filter(Boolean);
+            if (toolNames.length > 0) {
+                span.setAttribute(semantic_convention_1.default.GEN_AI_TOOL_NAME, toolNames.join(', '));
+            }
+            if (toolIds.length > 0) {
+                span.setAttribute(semantic_convention_1.default.GEN_AI_TOOL_CALL_ID, toolIds.join(', '));
+            }
+            if (toolArgs.length > 0) {
+                span.setAttribute(semantic_convention_1.default.GEN_AI_TOOL_CALL_ARGUMENTS, toolArgs);
+            }
+            if (toolTypes.length > 0) {
+                span.setAttribute(semantic_convention_1.default.GEN_AI_TOOL_TYPE, toolTypes.join(', '));
+            }
+        }
+        // Content
+        if (traceContent) {
+            const completionContent = result.choices[0].message.content || '';
+            const toolCalls = result.choices[0].message.tool_calls;
+            span.setAttribute(semantic_convention_1.default.GEN_AI_OUTPUT_MESSAGES, helpers_1.default.buildOutputMessages(completionContent, result.choices[0].finish_reason || 'stop', toolCalls));
+        }
+        return {
+            genAIEndpoint,
+            model,
+            user,
+            cost,
+            aiSystem: MistralWrapper.aiSystem,
+        };
+    }
+    static _patchEmbedding(tracer) {
+        const genAIEndpoint = 'mistral.embeddings';
+        const traceContent = config_1.default.traceContent;
+        return (originalMethod) => {
+            return async function (...args) {
+                const span = tracer.startSpan(genAIEndpoint, { kind: api_1.SpanKind.CLIENT });
+                return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), async () => {
+                    let metricParams;
+                    try {
+                        const response = await originalMethod.apply(this, args);
+                        const model = args[0].model || 'mistral-embed';
+                        const pricingInfo = await config_1.default.updatePricingJson(config_1.default.pricing_json);
+                        // Mistral SDK returns camelCase usage fields
+                        const promptTokens = response.usage?.promptTokens ?? response.usage?.prompt_tokens ?? 0;
+                        const totalTokens = response.usage?.totalTokens ?? response.usage?.total_tokens ?? 0;
+                        const cost = helpers_1.default.getEmbedModelCost(model, pricingInfo, promptTokens);
+                        span.setAttribute(semantic_convention_1.default.GEN_AI_OPERATION, semantic_convention_1.default.GEN_AI_OPERATION_TYPE_EMBEDDING);
+                        const { input, inputs, user, encoding_format = 'float' } = args[0];
+                        const embeddingInput = input ?? inputs;
+                        MistralWrapper.setBaseSpanAttributes(span, {
+                            genAIEndpoint,
+                            model,
+                            user,
+                            cost,
+                            aiSystem: MistralWrapper.aiSystem,
+                        });
+                        span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_ENCODING_FORMATS, [encoding_format]);
+                        span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_IS_STREAM, false);
+                        span.setAttribute(semantic_convention_1.default.GEN_AI_SERVER_TBT, 0);
+                        span.setAttribute(semantic_convention_1.default.GEN_AI_SERVER_TTFT, 0);
+                        if (user) {
+                            span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_USER, user);
+                        }
+                        if (traceContent && embeddingInput) {
+                            const inputArr = Array.isArray(embeddingInput) ? embeddingInput : [embeddingInput];
+                            span.setAttribute(semantic_convention_1.default.GEN_AI_INPUT_MESSAGES, helpers_1.default.buildInputMessages(inputArr.map((c) => ({ role: 'user', content: c }))));
+                        }
+                        span.setAttribute(semantic_convention_1.default.GEN_AI_USAGE_INPUT_TOKENS, promptTokens);
+                        span.setAttribute(semantic_convention_1.default.GEN_AI_USAGE_TOTAL_TOKENS, totalTokens);
+                        span.setAttribute(semantic_convention_1.default.GEN_AI_CLIENT_TOKEN_USAGE, promptTokens);
+                        metricParams = {
+                            genAIEndpoint,
+                            model,
+                            user,
+                            cost,
+                            aiSystem: MistralWrapper.aiSystem,
+                        };
+                        return response;
+                    }
+                    catch (e) {
+                        helpers_1.default.handleException(span, e);
+                        throw e;
+                    }
+                    finally {
+                        span.end();
+                        if (metricParams) {
+                            base_wrapper_1.default.recordMetrics(span, metricParams);
+                        }
+                    }
+                });
+            };
+        };
+    }
+}
+MistralWrapper.aiSystem = 'mistral';
+exports.default = MistralWrapper;
+//# sourceMappingURL=wrapper.js.map

package/dist/instrumentation/mistral/wrapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../../src/instrumentation/mistral/wrapper.ts"],"names":[],"mappings":"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"}

package/dist/instrumentation/ollama/wrapper.d.ts

@@ -1,7 +1,7 @@
 import { Span, Tracer } from '@opentelemetry/api';
 import BaseWrapper from '../base-wrapper';
 export default class OllamaWrapper extends BaseWrapper {
-    static setBaseSpanAttributes(span: any, { genAIEndpoint, model, user, cost, environment, applicationName }: any): void;
+    static aiSystem: string;
     static _patchChat(tracer: Tracer): any;
     static _chat({ args, genAIEndpoint, response, span, }: {
         args: any[];
@@ -15,10 +15,18 @@ export default class OllamaWrapper extends BaseWrapper {
         response: any;
         span: Span;
     }): AsyncGenerator<any, any, unknown>;
-    static _chatCommonSetter({ args, genAIEndpoint, result, span, }: {
+    static _chatCommonSetter({ args, genAIEndpoint, result, span, ttft, tbt, }: {
         args: any[];
         genAIEndpoint: string;
         result: any;
         span: Span;
-    }): Promise<void>;
+        ttft?: number;
+        tbt?: number;
+    }): Promise<{
+        genAIEndpoint: string;
+        model: any;
+        user: any;
+        cost: number;
+        aiSystem: string;
+    }>;
 }

package/dist/instrumentation/ollama/wrapper.js

@@ -7,24 +7,8 @@ const api_1 = require("@opentelemetry/api");
 const config_1 = __importDefault(require("../../config"));
 const helpers_1 = __importDefault(require("../../helpers"));
 const semantic_convention_1 = __importDefault(require("../../semantic-convention"));
-const constant_1 = require("../../constant");
 const base_wrapper_1 = __importDefault(require("../base-wrapper"));
 class OllamaWrapper extends base_wrapper_1.default {
-    static setBaseSpanAttributes(span, { genAIEndpoint, model, user, cost, environment, applicationName }) {
-        span.setAttributes({
-            [constant_1.TELEMETRY_SDK_NAME]: constant_1.SDK_NAME,
-        });
-        span.setAttribute(constant_1.TELEMETRY_SDK_NAME, constant_1.SDK_NAME);
-        span.setAttribute(semantic_convention_1.default.GEN_AI_SYSTEM, semantic_convention_1.default.GEN_AI_SYSTEM_ANTHROPIC);
-        span.setAttribute(semantic_convention_1.default.GEN_AI_ENDPOINT, genAIEndpoint);
-        span.setAttribute(semantic_convention_1.default.GEN_AI_ENVIRONMENT, environment);
-        span.setAttribute(semantic_convention_1.default.GEN_AI_APPLICATION_NAME, applicationName);
-        span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_MODEL, model);
-        span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_USER, user);
-        if (cost !== undefined)
-            span.setAttribute(semantic_convention_1.default.GEN_AI_USAGE_COST, cost);
-        span.setStatus({ code: api_1.SpanStatusCode.OK });
-    }
     static _patchChat(tracer) {
         const genAIEndpoint = 'ollama.chat';
         return (originalMethod) => {
@@ -55,8 +39,9 @@ class OllamaWrapper extends base_wrapper_1.default {
         };
     }
     static async _chat({ args, genAIEndpoint, response, span, }) {
+        let metricParams;
         try {
-            await OllamaWrapper._chatCommonSetter({
+            metricParams = await OllamaWrapper._chatCommonSetter({
                 args,
                 genAIEndpoint,
                 result: response,
@@ -69,61 +54,50 @@ class OllamaWrapper extends base_wrapper_1.default {
         }
         finally {
             span.end();
+            if (metricParams) {
+                base_wrapper_1.default.recordMetrics(span, metricParams);
+            }
         }
     }
     static async *_chatGenerator({ args, genAIEndpoint, response, span, }) {
+        let metricParams;
+        const timestamps = [];
+        const startTime = Date.now();
         try {
             const result = {
-                id: '0',
                 model: '',
-                stop_reason: '',
-                content: [
-                    {
-                        text: '',
-                        role: '',
-                    },
-                ],
-                usage: {
-                    input_tokens: 0,
-                    output_tokens: 0,
-                    total_tokens: 0,
-                },
+                message: { role: 'assistant', content: '' },
+                done_reason: '',
+                prompt_eval_count: 0,
+                eval_count: 0,
             };
             for await (const chunk of response) {
-                switch (chunk.type) {
-                    case 'content_block_delta':
-                        result.content[0].text += chunk.delta?.text ?? '';
-                        break;
-                    case 'message_stop':
-                        break;
-                    case 'content_block_stop':
-                        break;
-                    case 'message_start':
-                        if (chunk.message) {
-                            result.id = chunk.message.id;
-                            result.model = chunk.message.model;
-                            result.content[0].role = chunk.message.role;
-                            result.usage.input_tokens += Number(chunk.message.usage?.input_tokens) ?? 0;
-                            result.usage.output_tokens += Number(chunk.message.usage?.output_tokens) ?? 0;
-                            result.stop_reason = chunk.message?.stop_reason ?? '';
-                        }
-                        break;
-                    case 'content_block_start':
-                        result.content[0].text = chunk.content_block?.text ?? '';
-                        break;
-                    case 'message_delta':
-                        result.stop_reason = chunk.delta?.stop_reason ?? '';
-                        result.usage.output_tokens += Number(chunk.usage?.output_tokens) ?? 0;
-                        break;
+                timestamps.push(Date.now());
+                result.model = chunk.model || result.model;
+                if (chunk.message?.content) {
+                    result.message.content += chunk.message.content;
+                    result.message.role = chunk.message.role || result.message.role;
+                }
+                if (chunk.done) {
+                    result.done_reason = chunk.done_reason || '';
+                    result.prompt_eval_count = chunk.prompt_eval_count || 0;
+                    result.eval_count = chunk.eval_count || 0;
                 }
                 yield chunk;
             }
-            result.usage.total_tokens = result.usage.output_tokens + result.usage.input_tokens;
-            await OllamaWrapper._chatCommonSetter({
+            const ttft = timestamps.length > 0 ? (timestamps[0] - startTime) / 1000 : 0;
+            let tbt = 0;
+            if (timestamps.length > 1) {
+                const timeDiffs = timestamps.slice(1).map((t, i) => t - timestamps[i]);
+                tbt = timeDiffs.reduce((a, b) => a + b, 0) / timeDiffs.length / 1000;
+            }
+            metricParams = await OllamaWrapper._chatCommonSetter({
                 args,
                 genAIEndpoint,
                 result,
                 span,
+                ttft,
+                tbt,
             });
             return response;
         }
@@ -132,43 +106,20 @@ class OllamaWrapper extends base_wrapper_1.default {
         }
         finally {
             span.end();
+            if (metricParams) {
+                base_wrapper_1.default.recordMetrics(span, metricParams);
+            }
         }
     }
-    static async _chatCommonSetter({ args, genAIEndpoint, result, span, }) {
-        const applicationName = config_1.default.applicationName;
-        const environment = config_1.default.environment;
+    static async _chatCommonSetter({ args, genAIEndpoint, result, span, ttft = 0, tbt = 0, }) {
         const traceContent = config_1.default.traceContent;
-        const { messages, max_tokens = null, seed = null, temperature = 1, top_p, top_k, user, stream = false, stop_reason, } = args[0];
-        // Format 'messages' into a single string
-        const messagePrompt = messages || '';
-        const formattedMessages = [];
-        for (const message of messagePrompt) {
-            const role = message.role;
-            const content = message.content;
-            if (Array.isArray(content)) {
-                const contentStr = content
-                    .map((item) => {
-                    if ('type' in item) {
-                        return `${item.type}: ${item.text ? item.text : item.image_url}`;
-                    }
-                    else {
-                        return `text: ${item.text}`;
-                    }
-                })
-                    .join(', ');
-                formattedMessages.push(`${role}: ${contentStr}`);
-            }
-            else {
-                formattedMessages.push(`${role}: ${content}`);
-            }
-        }
-        const prompt = formattedMessages.join('\n');
+        const { messages, max_tokens = null, seed = null, temperature = 1, top_p, top_k, user, stream = false, } = args[0];
         span.setAttribute(semantic_convention_1.default.GEN_AI_OPERATION, semantic_convention_1.default.GEN_AI_OPERATION_TYPE_CHAT);
         span.setAttribute(semantic_convention_1.default.GEN_AI_RESPONSE_ID, result.id);
         const model = result.model || args[0].model;
         const pricingInfo = await config_1.default.updatePricingJson(config_1.default.pricing_json);
-        const promptTokens = result.prompt_eval_count;
-        const completionTokens = result.eval_count;
+        const promptTokens = result.prompt_eval_count || 0;
+        const completionTokens = result.eval_count || 0;
         const totalTokens = promptTokens + completionTokens;
         // Calculate cost of the operation
         const cost = helpers_1.default.getChatModelCost(model, pricingInfo, promptTokens, completionTokens);
@@ -177,34 +128,48 @@ class OllamaWrapper extends base_wrapper_1.default {
             model,
             user,
             cost,
-            applicationName,
-            environment,
+            aiSystem: OllamaWrapper.aiSystem,
         });
+        // Response model
+        span.setAttribute(semantic_convention_1.default.GEN_AI_RESPONSE_MODEL, model);
         // Request Params attributes : Start
         span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_TOP_P, top_p);
         span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_TOP_K, top_k);
         span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_MAX_TOKENS, max_tokens);
         span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_TEMPERATURE, temperature);
-        span.setAttribute(semantic_convention_1.default.GEN_AI_RESPONSE_FINISH_REASON, stop_reason);
         span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_IS_STREAM, stream);
         span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_SEED, seed);
         if (traceContent) {
-            span.setAttribute(semantic_convention_1.default.GEN_AI_CONTENT_PROMPT, prompt);
+            span.setAttribute(semantic_convention_1.default.GEN_AI_INPUT_MESSAGES, helpers_1.default.buildInputMessages(messages || []));
         }
         // Request Params attributes : End
         span.setAttribute(semantic_convention_1.default.GEN_AI_USAGE_INPUT_TOKENS, promptTokens);
         span.setAttribute(semantic_convention_1.default.GEN_AI_USAGE_OUTPUT_TOKENS, completionTokens);
         span.setAttribute(semantic_convention_1.default.GEN_AI_USAGE_TOTAL_TOKENS, totalTokens);
+        span.setAttribute(semantic_convention_1.default.GEN_AI_CLIENT_TOKEN_USAGE, totalTokens);
         if (result.done_reason) {
-            span.setAttribute(semantic_convention_1.default.GEN_AI_RESPONSE_FINISH_REASON, result.done_reason);
+            span.setAttribute(semantic_convention_1.default.GEN_AI_RESPONSE_FINISH_REASON, [result.done_reason]);
+        }
+        // TTFT and TBT metrics
+        if (ttft > 0) {
+            span.setAttribute(semantic_convention_1.default.GEN_AI_SERVER_TTFT, ttft);
+        }
+        if (tbt > 0) {
+            span.setAttribute(semantic_convention_1.default.GEN_AI_SERVER_TBT, tbt);
         }
         if (traceContent) {
-            // Format 'messages' into a single string
             const { message = {} } = result;
-            const messageString = `${message.role}: ${message.content}`;
-            span.setAttribute(semantic_convention_1.default.GEN_AI_CONTENT_COMPLETION, messageString);
+            span.setAttribute(semantic_convention_1.default.GEN_AI_OUTPUT_MESSAGES, helpers_1.default.buildOutputMessages(message.content || '', result.done_reason || 'stop'));
         }
+        return {
+            genAIEndpoint,
+            model,
+            user,
+            cost,
+            aiSystem: OllamaWrapper.aiSystem,
+        };
     }
 }
+OllamaWrapper.aiSystem = 'ollama';
 exports.default = OllamaWrapper;
 //# sourceMappingURL=wrapper.js.map