openlit 1.11.0 → 1.13.0

package/dist/instrumentation/base-wrapper.js

@@ -9,8 +9,9 @@ const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
 const semantic_convention_1 = __importDefault(require("../semantic-convention"));
 const api_1 = require("@opentelemetry/api");
 const metrics_1 = __importDefault(require("../otel/metrics"));
+const helpers_1 = require("../helpers");
 class BaseWrapper {
-    static setBaseSpanAttributes(span, { genAIEndpoint, model, user, cost, aiSystem, serverAddress, serverPort }) {
+    static setBaseSpanAttributes(span, { genAIEndpoint: _genAIEndpoint, model, user, cost, aiSystem, serverAddress, serverPort }) {
         const applicationName = config_1.default.applicationName;
         const environment = config_1.default.environment;
         if (!applicationName) {
@@ -19,11 +20,10 @@ class BaseWrapper {
         if (!environment) {
             throw new Error("[Openlit] OpenlitConfig.environment is not set. Please check your configuration.");
         }
-        span.setAttribute(semantic_convention_1.default.GEN_AI_PROVIDER_NAME, aiSystem);
+        span.setAttribute(semantic_conventions_1.ATTR_TELEMETRY_SDK_NAME, constant_1.SDK_NAME);
         span.setAttribute(semantic_convention_1.default.GEN_AI_PROVIDER_NAME_OTEL, aiSystem);
-        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.ATTR_DEPLOYMENT_ENVIRONMENT, environment);
+        span.setAttribute(semantic_conventions_1.ATTR_SERVICE_NAME, applicationName);
         span.setAttribute(semantic_convention_1.default.GEN_AI_REQUEST_MODEL, model);
         span.setAttribute(semantic_convention_1.default.GEN_AI_SDK_VERSION, constant_1.SDK_VERSION);
         if (serverAddress) {
@@ -38,51 +38,63 @@ class BaseWrapper {
         if (cost !== undefined) {
             span.setAttribute(semantic_convention_1.default.GEN_AI_USAGE_COST, cost);
         }
+        (0, helpers_1.applyCustomSpanAttributes)(span);
         span.setStatus({ code: api_1.SpanStatusCode.OK });
     }
     static recordMetrics(span, baseAttributes) {
         const applicationName = config_1.default.applicationName;
         const environment = config_1.default.environment;
-        const { genAIEndpoint, model, user, aiSystem, cost } = baseAttributes;
+        const { model, aiSystem, cost, errorType } = baseAttributes;
         const inputTokens = BaseWrapper.getSpanAttribute(span, semantic_convention_1.default.GEN_AI_USAGE_INPUT_TOKENS);
         const outputTokens = BaseWrapper.getSpanAttribute(span, semantic_convention_1.default.GEN_AI_USAGE_OUTPUT_TOKENS);
         const duration = BaseWrapper.getSpanAttribute(span, 'duration') ?? BaseWrapper.getSpanAttribute(span, semantic_convention_1.default.GEN_AI_DURATION_LEGACY);
+        const operationName = BaseWrapper.getSpanAttribute(span, semantic_convention_1.default.GEN_AI_OPERATION);
+        const responseModel = BaseWrapper.getSpanAttribute(span, semantic_convention_1.default.GEN_AI_RESPONSE_MODEL);
+        const serverAddress = BaseWrapper.getSpanAttribute(span, semantic_convention_1.default.SERVER_ADDRESS);
+        const serverPort = BaseWrapper.getSpanAttribute(span, semantic_convention_1.default.SERVER_PORT);
         const attributes = {
+            [semantic_conventions_1.ATTR_TELEMETRY_SDK_NAME]: constant_1.SDK_NAME,
             [semantic_conventions_1.ATTR_SERVICE_NAME]: applicationName,
-            [semantic_convention_1.default.GEN_AI_PROVIDER_NAME]: aiSystem,
-            [semantic_convention_1.default.GEN_AI_PROVIDER_NAME_OTEL]: aiSystem,
-            [semantic_convention_1.default.GEN_AI_ENDPOINT]: genAIEndpoint,
             [semantic_convention_1.default.ATTR_DEPLOYMENT_ENVIRONMENT]: environment,
+            [semantic_convention_1.default.GEN_AI_PROVIDER_NAME_OTEL]: aiSystem,
             [semantic_convention_1.default.GEN_AI_REQUEST_MODEL]: model,
-            [semantic_convention_1.default.GEN_AI_REQUEST_USER]: typeof user === 'string' || typeof user === 'number' ? user : String(user ?? ''),
         };
-        metrics_1.default.genaiRequests?.add(1, attributes);
-        if (Number.isFinite(inputTokens))
-            metrics_1.default.genaiPromptTokens?.add(inputTokens, attributes);
-        if (Number.isFinite(outputTokens))
-            metrics_1.default.genaiCompletionTokens?.add(outputTokens, attributes);
+        if (operationName)
+            attributes[semantic_convention_1.default.GEN_AI_OPERATION] = operationName;
+        if (responseModel)
+            attributes[semantic_convention_1.default.GEN_AI_RESPONSE_MODEL] = responseModel;
+        if (serverAddress)
+            attributes[semantic_convention_1.default.SERVER_ADDRESS] = serverAddress;
+        if (serverPort !== undefined)
+            attributes[semantic_convention_1.default.SERVER_PORT] = serverPort;
+        if (errorType)
+            attributes[semantic_convention_1.default.ERROR_TYPE] = errorType;
+        if (Number.isFinite(inputTokens)) {
+            metrics_1.default.genaiClientUsageTokens?.record(inputTokens, {
+                ...attributes,
+                [semantic_convention_1.default.GEN_AI_TOKEN_TYPE]: semantic_convention_1.default.GEN_AI_TOKEN_TYPE_INPUT,
+            });
+        }
+        if (Number.isFinite(outputTokens)) {
+            metrics_1.default.genaiClientUsageTokens?.record(outputTokens, {
+                ...attributes,
+                [semantic_convention_1.default.GEN_AI_TOKEN_TYPE]: semantic_convention_1.default.GEN_AI_TOKEN_TYPE_OUTPUT,
+            });
+        }
         if (Number.isFinite(duration)) {
             metrics_1.default.genaiClientOperationDuration?.record(duration / 1e9, attributes);
         }
-        const totalTokens = (Number.isFinite(inputTokens) ? inputTokens : 0) + (Number.isFinite(outputTokens) ? outputTokens : 0);
-        if (totalTokens > 0)
-            metrics_1.default.genaiClientUsageTokens?.record(totalTokens, attributes);
-        const reasoningTokens = BaseWrapper.getSpanAttribute(span, semantic_convention_1.default.GEN_AI_USAGE_REASONING_TOKENS);
-        if (Number.isFinite(reasoningTokens))
-            metrics_1.default.genaiReasoningTokens?.add(reasoningTokens, attributes);
         const tbt = BaseWrapper.getSpanAttribute(span, semantic_convention_1.default.GEN_AI_SERVER_TBT);
         if (Number.isFinite(tbt))
             metrics_1.default.genaiServerTbt?.record(tbt, attributes);
         const ttft = BaseWrapper.getSpanAttribute(span, semantic_convention_1.default.GEN_AI_SERVER_TTFT);
         if (Number.isFinite(ttft))
             metrics_1.default.genaiServerTtft?.record(ttft, attributes);
-        // Client-perspective streaming metrics (OTel semconv v1.29+)
         if (Number.isFinite(ttft) && ttft > 0) {
             metrics_1.default.genaiClientTimeToFirstChunk?.record(ttft, attributes);
         }
         if (Number.isFinite(tbt) && tbt > 0) {
             metrics_1.default.genaiClientTimePerOutputChunk?.record(tbt, attributes);
-            // Server request duration = TTFT + TBT * max(output_tokens - 1, 0)
             const outputTokensVal = Number.isFinite(outputTokens) ? outputTokens : 0;
             const serverRequestDuration = ttft + tbt * Math.max(outputTokensVal - 1, 0);
             metrics_1.default.genaiServerRequestDuration?.record(serverRequestDuration, attributes);

package/dist/instrumentation/base-wrapper.js.map

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

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

@@ -1,10 +1,28 @@
-import { Tracer } from '@opentelemetry/api';
-import BaseWrapper from '../base-wrapper';
+import { Span, Tracer } from '@opentelemetry/api';
+import BaseWrapper, { BaseSpanAttributes } from '../base-wrapper';
 declare class BedrockWrapper extends BaseWrapper {
     static aiSystem: string;
+    static serverAddress: string;
+    static serverPort: number;
     static _patchSend(tracer: Tracer): any;
     static _handleConverseCommand(tracer: Tracer, originalMethod: any, instance: any, args: any[]): Promise<any>;
+    static _converseComplete({ input, genAIEndpoint, response, span, modelId, }: {
+        input: any;
+        genAIEndpoint: string;
+        response: any;
+        span: Span;
+        modelId: string;
+    }): Promise<any>;
     static _handleConverseStreamCommand(tracer: Tracer, originalMethod: any, instance: any, args: any[]): Promise<any>;
-    static _handleInvokeModelCommand(tracer: Tracer, originalMethod: any, instance: any, args: any[], commandName: string): Promise<any>;
+    static _converseCommonSetter({ input, genAIEndpoint, result, span, modelId, isStream, ttft, tbt, }: {
+        input: any;
+        genAIEndpoint: string;
+        result: any;
+        span: Span;
+        modelId: string;
+        isStream: boolean;
+        ttft?: number;
+        tbt?: number;
+    }): BaseSpanAttributes;
 }
 export default BedrockWrapper;