openlit 1.33.8__py3-none-any.whl → 1.33.10__py3-none-any.whl

openlit/instrumentation/controlflow/controlflow.py

@@ -5,7 +5,7 @@ Module for monitoring controlflow.
 
 import logging
 from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import TELEMETRY_SDK_NAME
+from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
 from openlit.__helpers import handle_exception
 from openlit.semcov import SemanticConvetion
 
@@ -64,12 +64,12 @@ def wrap_controlflow(gen_ai_endpoint, version, environment, application_name,
                                    gen_ai_endpoint)
                 span.set_attribute(SemanticConvetion.GEN_AI_SYSTEM,
                                    SemanticConvetion.GEN_AI_SYSTEM_CONTROLFLOW)
-                span.set_attribute(SemanticConvetion.GEN_AI_ENVIRONMENT,
+                span.set_attribute(DEPLOYMENT_ENVIRONMENT,
                                    environment)
-                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
+                span.set_attribute(SERVICE_NAME,
                                    application_name)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                   SemanticConvetion.GEN_AI_TYPE_AGENT)
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                   SemanticConvetion.GEN_AI_OPERATION_TYPE_AGENT)
 
                 if gen_ai_endpoint == "controlflow.create_agent":
                     span.set_attribute(SemanticConvetion.GEN_AI_AGENT_ROLE,

openlit/instrumentation/crawl4ai/async_crawl4ai.py

@@ -5,7 +5,7 @@ Module for monitoring Crawl4AI calls.
 
 import logging
 from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import TELEMETRY_SDK_NAME
+from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
 from openlit.__helpers import (
     handle_exception,
 )
@@ -58,13 +58,13 @@ def async_wrap_crawl(gen_ai_endpoint, version, environment, application_name,
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
                 span.set_attribute(SemanticConvetion.GEN_AI_SYSTEM,
                                     SemanticConvetion.GEN_AI_SYSTEM_CRAWL4AI)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_AGENT)
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_AGENT)
                 span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
                                     gen_ai_endpoint)
-                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
+                span.set_attribute(SERVICE_NAME,
                                     application_name)
-                span.set_attribute(SemanticConvetion.GEN_AI_ENVIRONMENT,
+                span.set_attribute(DEPLOYMENT_ENVIRONMENT,
                                     environment)
                 span.set_attribute(SemanticConvetion.GEN_AI_AGENT_TYPE,
                                     SemanticConvetion.GEN_AI_AGENT_TYPE_BROWSER)

openlit/instrumentation/crawl4ai/crawl4ai.py

@@ -5,7 +5,7 @@ Module for monitoring Crawl4AI calls.
 
 import logging
 from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import TELEMETRY_SDK_NAME
+from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
 from openlit.__helpers import (
     handle_exception,
 )
@@ -58,13 +58,13 @@ def wrap_crawl(gen_ai_endpoint, version, environment, application_name,
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
                 span.set_attribute(SemanticConvetion.GEN_AI_SYSTEM,
                                     SemanticConvetion.GEN_AI_SYSTEM_CRAWL4AI)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_AGENT)
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_AGENT)
                 span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
                                     gen_ai_endpoint)
-                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
+                span.set_attribute(SERVICE_NAME,
                                     application_name)
-                span.set_attribute(SemanticConvetion.GEN_AI_ENVIRONMENT,
+                span.set_attribute(DEPLOYMENT_ENVIRONMENT,
                                     environment)
                 span.set_attribute(SemanticConvetion.GEN_AI_AGENT_TYPE,
                                     SemanticConvetion.GEN_AI_AGENT_TYPE_BROWSER)

openlit/instrumentation/crewai/crewai.py

@@ -6,7 +6,7 @@ Module for monitoring LiteLLM calls.
 import logging
 import json
 from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import TELEMETRY_SDK_NAME
+from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
 from openlit.__helpers import (
     handle_exception,
 )
@@ -71,12 +71,14 @@ def crew_wrap(gen_ai_endpoint, version, environment, application_name,
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
                 span.set_attribute(SemanticConvetion.GEN_AI_SYSTEM,
                                     SemanticConvetion.GEN_AI_SYSTEM_CREWAI)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_AGENT)
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_AGENT)
                 span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
                                     gen_ai_endpoint)
-                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
+                span.set_attribute(SERVICE_NAME,
                                     application_name)
+                span.set_attribute(DEPLOYMENT_ENVIRONMENT,
+                                    environment)
 
                 instance_class = instance.__class__.__name__
 

openlit/instrumentation/dynamiq/dynamiq.py

@@ -5,7 +5,7 @@ Module for monitoring Dynamiq calls.
 
 import logging
 from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import TELEMETRY_SDK_NAME
+from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
 from openlit.__helpers import (
     handle_exception,
 )
@@ -58,13 +58,13 @@ def dynamiq_wrap(gen_ai_endpoint, version, environment, application_name,
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
                 span.set_attribute(SemanticConvetion.GEN_AI_SYSTEM,
                                     SemanticConvetion.GEN_AI_SYSTEM_DYNAMIQ)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_AGENT)
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_AGENT)
                 span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
                                     gen_ai_endpoint)
-                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
+                span.set_attribute(SERVICE_NAME,
                                     application_name)
-                span.set_attribute(SemanticConvetion.GEN_AI_ENVIRONMENT,
+                span.set_attribute(DEPLOYMENT_ENVIRONMENT,
                                     environment)
 
                 if gen_ai_endpoint == "dynamiq.agent_run":

openlit/instrumentation/elevenlabs/async_elevenlabs.py

@@ -1,13 +1,17 @@
-# pylint: disable=duplicate-code, broad-exception-caught, too-many-statements, unused-argument, possibly-used-before-assignment
 """
 Module for monitoring Ollama API calls.
 """
 
 import logging
+import time
+from urllib.parse import urlparse
 from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import TELEMETRY_SDK_NAME
-from openlit.__helpers import get_audio_model_cost
-from openlit.__helpers import handle_exception
+from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
+from openlit.__helpers import (
+    get_audio_model_cost,
+    handle_exception,
+    create_metrics_attributes,
+)
 from openlit.semcov import SemanticConvetion
 
 # Initialize logger for logging potential issues and operations
@@ -19,7 +23,6 @@ def async_generate(gen_ai_endpoint, version, environment, application_name,
     Generates a telemetry wrapper for creating speech audio to collect metrics.
     
     Args:
-        gen_ai_endpoint: Endpoint identifier for logging and tracing.
         version: Version of the monitoring package.
         environment: Deployment environment (e.g., production, staging).
         application_name: Name of the application using the ElevenLabs API.
@@ -47,73 +50,95 @@ def async_generate(gen_ai_endpoint, version, environment, application_name,
         Returns:
             The response from the original 'generate' method.
         """
+        url = urlparse(instance._client_wrapper._base_url)
+        server_address, server_port = url.hostname, url.port or 443
+        request_model = kwargs.get('model', kwargs.get('model_id', 'eleven_multilingual_v2'))
 
-        with tracer.start_as_current_span(gen_ai_endpoint, kind= SpanKind.CLIENT) as span:
+        span_name = f'{SemanticConvetion.GEN_AI_OPERATION_TYPE_AUDIO} {request_model}'
+
+        with tracer.start_as_current_span(span_name, kind= SpanKind.CLIENT) as span:
+            start_time = time.time()
             response = await wrapped(*args, **kwargs)
+            end_time = time.time()
 
             try:
                 # Calculate cost of the operation
-                cost = get_audio_model_cost(kwargs.get("model", "eleven_multilingual_v2"),
-                                            pricing_info, kwargs.get("text", ""))
+                cost = get_audio_model_cost(request_model,
+                                            pricing_info, kwargs.get('text', ''))
 
                 # Set Span attributes
-                span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
+                span.set_attribute(TELEMETRY_SDK_NAME, 'openlit')
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_AUDIO)
                 span.set_attribute(SemanticConvetion.GEN_AI_SYSTEM,
-                                    SemanticConvetion.GEN_AI_SYSTEM_ELEVENLABS)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_AUDIO)
-                span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
-                                    gen_ai_endpoint)
-                span.set_attribute(SemanticConvetion.GEN_AI_ENVIRONMENT,
-                                    environment)
-                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
-                                    application_name)
+                                    SemanticConvetion.GEN_AI_SYSTEM_ASSEMBLYAI)
+                span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_MODEL,
+                                    request_model)
+                span.set_attribute(SemanticConvetion.SERVER_ADDRESS,
+                                    server_address)
+                span.set_attribute(SemanticConvetion.SERVER_PORT,
+                                    server_port)
+                span.set_attribute(SemanticConvetion.GEN_AI_RESPONSE_MODEL,
+                                    request_model)
                 span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_MODEL,
-                                    kwargs.get("model", "eleven_multilingual_v2"))
-                if isinstance(kwargs.get("voice", "Rachel"), str):
+                                    request_model)
+                span.set_attribute(SemanticConvetion.GEN_AI_OUTPUT_TYPE,
+                                    'audio')
+
+                # Set Span attributes (Extras)
+                if gen_ai_endpoint == 'elevenlabs.generate':
+                    if isinstance(kwargs.get('voice', 'Rachel'), str):
+                        span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_VOICE,
+                                        kwargs.get('voice', 'Rachel'))
+                else:
                     span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_VOICE,
-                                    kwargs.get("voice", "Rachel"))
-                span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_RESPONSE_FORMAT,
-                                    kwargs.get("output_format", "mp3"))
-                span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_SETTINGS,
-                                    str(kwargs.get("voice_settings", "")))
-                span.set_attribute(SemanticConvetion.GEN_AI_USAGE_COST,
-                                    cost)
+                                        kwargs.get('voice_id', ''))
+                    span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_RESPONSE_FORMAT,
+                                        kwargs.get('output_format', 'mp3'))
+                    span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_SETTINGS,
+                                        str(kwargs.get('voice_settings', '')))
+                    span.set_attribute(DEPLOYMENT_ENVIRONMENT,
+                                        environment)
+                    span.set_attribute(SERVICE_NAME,
+                                        application_name)
+                    span.set_attribute(SemanticConvetion.GEN_AI_USAGE_COST,
+                                        cost)
+                    span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
+                                        version)
                 if trace_content:
                     span.add_event(
                         name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                         attributes={
-                            SemanticConvetion.GEN_AI_CONTENT_PROMPT: str(kwargs.get("text", "")),
+                            SemanticConvetion.GEN_AI_CONTENT_PROMPT: str(kwargs.get('text', '')),
                         },
                     )
 
                 span.set_status(Status(StatusCode.OK))
 
                 if disable_metrics is False:
-                    attributes = {
-                        TELEMETRY_SDK_NAME:
-                            "openlit",
-                        SemanticConvetion.GEN_AI_APPLICATION_NAME:
-                            application_name,
-                        SemanticConvetion.GEN_AI_SYSTEM:
-                            SemanticConvetion.GEN_AI_SYSTEM_ELEVENLABS,
-                        SemanticConvetion.GEN_AI_ENVIRONMENT:
-                            environment,
-                        SemanticConvetion.GEN_AI_TYPE:
-                            SemanticConvetion.GEN_AI_TYPE_AUDIO,
-                        SemanticConvetion.GEN_AI_REQUEST_MODEL:
-                            kwargs.get("model", "eleven_multilingual_v2")
-                    }
-
-                    metrics["genai_requests"].add(1, attributes)
-                    metrics["genai_cost"].record(cost, attributes)
+                    attributes = create_metrics_attributes(
+                        service_name=application_name,
+                        deployment_environment=environment,
+                        operation=SemanticConvetion.GEN_AI_OPERATION_TYPE_AUDIO,
+                        system=SemanticConvetion.GEN_AI_SYSTEM_ELEVENLABS,
+                        request_model=request_model,
+                        server_address=server_address,
+                        server_port=server_port,
+                        response_model=request_model,
+                    )
+
+                    metrics['genai_client_operation_duration'].record(
+                        end_time - start_time, attributes
+                    )
+                    metrics['genai_requests'].add(1, attributes)
+                    metrics['genai_cost'].record(cost, attributes)
 
                 # Return original response
                 return response
 
             except Exception as e:
                 handle_exception(span, e)
-                logger.error("Error in trace creation: %s", e)
+                logger.error('Error in trace creation: %s', e)
 
                 # Return original response
                 return response

openlit/instrumentation/elevenlabs/elevenlabs.py

@@ -1,13 +1,17 @@
-# pylint: disable=duplicate-code, broad-exception-caught, too-many-statements, unused-argument, possibly-used-before-assignment
 """
 Module for monitoring Ollama API calls.
 """
 
 import logging
+import time
+from urllib.parse import urlparse
 from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import TELEMETRY_SDK_NAME
-from openlit.__helpers import get_audio_model_cost
-from openlit.__helpers import handle_exception
+from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
+from openlit.__helpers import (
+    get_audio_model_cost,
+    handle_exception,
+    create_metrics_attributes,
+)
 from openlit.semcov import SemanticConvetion
 
 # Initialize logger for logging potential issues and operations
@@ -19,7 +23,6 @@ def generate(gen_ai_endpoint, version, environment, application_name,
     Generates a telemetry wrapper for creating speech audio to collect metrics.
     
     Args:
-        gen_ai_endpoint: Endpoint identifier for logging and tracing.
         version: Version of the monitoring package.
         environment: Deployment environment (e.g., production, staging).
         application_name: Name of the application using the ElevenLabs API.
@@ -48,78 +51,95 @@ def generate(gen_ai_endpoint, version, environment, application_name,
             The response from the original 'generate' method.
         """
 
-        with tracer.start_as_current_span(gen_ai_endpoint, kind= SpanKind.CLIENT) as span:
+        url = urlparse(instance._client_wrapper._base_url)
+        server_address, server_port = url.hostname, url.port or 443
+        request_model = kwargs.get('model', kwargs.get('model_id', 'eleven_multilingual_v2'))
+
+        span_name = f'{SemanticConvetion.GEN_AI_OPERATION_TYPE_AUDIO} {request_model}'
+
+        with tracer.start_as_current_span(span_name, kind= SpanKind.CLIENT) as span:
+            start_time = time.time()
             response = wrapped(*args, **kwargs)
+            end_time = time.time()
 
             try:
                 # Calculate cost of the operation
-                cost = get_audio_model_cost(kwargs.get("model", "eleven_multilingual_v2"),
-                                            pricing_info, kwargs.get("text", ""))
+                cost = get_audio_model_cost(request_model,
+                                            pricing_info, kwargs.get('text', ''))
 
                 # Set Span attributes
-                span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
+                span.set_attribute(TELEMETRY_SDK_NAME, 'openlit')
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_AUDIO)
                 span.set_attribute(SemanticConvetion.GEN_AI_SYSTEM,
-                                    SemanticConvetion.GEN_AI_SYSTEM_ELEVENLABS)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_AUDIO)
-                span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
-                                    gen_ai_endpoint)
-                span.set_attribute(SemanticConvetion.GEN_AI_ENVIRONMENT,
-                                    environment)
-                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
-                                    application_name)
-                if gen_ai_endpoint == "elevenlabs.generate":
-                    span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_MODEL,
-                                    kwargs.get("model", "eleven_multilingual_v2"))
-                    if isinstance(kwargs.get("voice", "Rachel"), str):
+                                    SemanticConvetion.GEN_AI_SYSTEM_ASSEMBLYAI)
+                span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_MODEL,
+                                    request_model)
+                span.set_attribute(SemanticConvetion.SERVER_ADDRESS,
+                                    server_address)
+                span.set_attribute(SemanticConvetion.SERVER_PORT,
+                                    server_port)
+                span.set_attribute(SemanticConvetion.GEN_AI_RESPONSE_MODEL,
+                                    request_model)
+                span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_MODEL,
+                                    request_model)
+                span.set_attribute(SemanticConvetion.GEN_AI_OUTPUT_TYPE,
+                                    'audio')
+
+                # Set Span attributes (Extras)
+                if gen_ai_endpoint == 'elevenlabs.generate':
+                    if isinstance(kwargs.get('voice', 'Rachel'), str):
                         span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_VOICE,
-                                        kwargs.get("voice", "Rachel"))
+                                        kwargs.get('voice', 'Rachel'))
                 else:
-                    span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_MODEL,
-                                    kwargs.get("model_id", "eleven_multilingual_v2"))
                     span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_VOICE,
-                                        kwargs.get("voice_id", ""))
-                span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_RESPONSE_FORMAT,
-                                    kwargs.get("output_format", "mp3"))
-                span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_SETTINGS,
-                                    str(kwargs.get("voice_settings", "")))
-                span.set_attribute(SemanticConvetion.GEN_AI_USAGE_COST,
-                                    cost)
+                                        kwargs.get('voice_id', ''))
+                    span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_RESPONSE_FORMAT,
+                                        kwargs.get('output_format', 'mp3'))
+                    span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_SETTINGS,
+                                        str(kwargs.get('voice_settings', '')))
+                    span.set_attribute(DEPLOYMENT_ENVIRONMENT,
+                                        environment)
+                    span.set_attribute(SERVICE_NAME,
+                                        application_name)
+                    span.set_attribute(SemanticConvetion.GEN_AI_USAGE_COST,
+                                        cost)
+                    span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
+                                        version)
                 if trace_content:
                     span.add_event(
                         name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                         attributes={
-                            SemanticConvetion.GEN_AI_CONTENT_PROMPT: str(kwargs.get("text", "")),
+                            SemanticConvetion.GEN_AI_CONTENT_PROMPT: str(kwargs.get('text', '')),
                         },
                     )
 
                 span.set_status(Status(StatusCode.OK))
 
                 if disable_metrics is False:
-                    attributes = {
-                        TELEMETRY_SDK_NAME:
-                            "openlit",
-                        SemanticConvetion.GEN_AI_APPLICATION_NAME:
-                            application_name,
-                        SemanticConvetion.GEN_AI_SYSTEM:
-                            SemanticConvetion.GEN_AI_SYSTEM_ELEVENLABS,
-                        SemanticConvetion.GEN_AI_ENVIRONMENT:
-                            environment,
-                        SemanticConvetion.GEN_AI_TYPE:
-                            SemanticConvetion.GEN_AI_TYPE_AUDIO,
-                        SemanticConvetion.GEN_AI_REQUEST_MODEL:
-                            kwargs.get("model", "eleven_multilingual_v2")
-                    }
-
-                    metrics["genai_requests"].add(1, attributes)
-                    metrics["genai_cost"].record(cost, attributes)
+                    attributes = create_metrics_attributes(
+                        service_name=application_name,
+                        deployment_environment=environment,
+                        operation=SemanticConvetion.GEN_AI_OPERATION_TYPE_AUDIO,
+                        system=SemanticConvetion.GEN_AI_SYSTEM_ELEVENLABS,
+                        request_model=request_model,
+                        server_address=server_address,
+                        server_port=server_port,
+                        response_model=request_model,
+                    )
+
+                    metrics['genai_client_operation_duration'].record(
+                        end_time - start_time, attributes
+                    )
+                    metrics['genai_requests'].add(1, attributes)
+                    metrics['genai_cost'].record(cost, attributes)
 
                 # Return original response
                 return response
 
             except Exception as e:
                 handle_exception(span, e)
-                logger.error("Error in trace creation: %s", e)
+                logger.error('Error in trace creation: %s', e)
 
                 # Return original response
                 return response

openlit/instrumentation/embedchain/embedchain.py

@@ -5,7 +5,7 @@ Module for monitoring EmbedChain applications.
 
 import logging
 from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import TELEMETRY_SDK_NAME
+from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
 from openlit.__helpers import handle_exception
 from openlit.semcov import SemanticConvetion
 
@@ -63,11 +63,11 @@ def evaluate(gen_ai_endpoint, version, environment, application_name,
                                     SemanticConvetion.GEN_AI_SYSTEM_EMBEDCHAIN)
                 span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
                                     gen_ai_endpoint)
-                span.set_attribute(SemanticConvetion.GEN_AI_ENVIRONMENT,
+                span.set_attribute(DEPLOYMENT_ENVIRONMENT,
                                     environment)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_FRAMEWORK)
-                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_FRAMEWORK)
+                span.set_attribute(SERVICE_NAME,
                                     application_name)
                 span.set_attribute(SemanticConvetion.GEN_AI_EVAL_CONTEXT_RELEVANCY,
                                     response["context_relevancy"])
@@ -141,11 +141,11 @@ def get_data_sources(gen_ai_endpoint, version, environment, application_name,
                                     SemanticConvetion.GEN_AI_SYSTEM_EMBEDCHAIN)
                 span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
                                     gen_ai_endpoint)
-                span.set_attribute(SemanticConvetion.GEN_AI_ENVIRONMENT,
+                span.set_attribute(DEPLOYMENT_ENVIRONMENT,
                                     environment)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_FRAMEWORK)
-                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_FRAMEWORK)
+                span.set_attribute(SERVICE_NAME,
                                     application_name)
                 span.set_attribute(SemanticConvetion.GEN_AI_DATA_SOURCES,
                                     len(response))

openlit/instrumentation/firecrawl/firecrawl.py

@@ -5,7 +5,7 @@ Module for monitoring FireCrawl calls.
 
 import logging
 from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import TELEMETRY_SDK_NAME
+from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
 from openlit.__helpers import (
     handle_exception,
 )
@@ -58,13 +58,13 @@ def wrap_crawl(gen_ai_endpoint, version, environment, application_name,
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
                 span.set_attribute(SemanticConvetion.GEN_AI_SYSTEM,
                                     SemanticConvetion.GEN_AI_SYSTEM_FIRECRAWL)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_AGENT)
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_AGENT)
                 span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
                                     gen_ai_endpoint)
-                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
+                span.set_attribute(SERVICE_NAME,
                                     application_name)
-                span.set_attribute(SemanticConvetion.GEN_AI_ENVIRONMENT,
+                span.set_attribute(DEPLOYMENT_ENVIRONMENT,
                                     environment)
                 span.set_attribute(SemanticConvetion.GEN_AI_AGENT_TYPE,
                                     SemanticConvetion.GEN_AI_AGENT_TYPE_BROWSER)

openlit/instrumentation/google_ai_studio/__init__.py

@@ -14,11 +14,11 @@ from openlit.instrumentation.google_ai_studio.async_google_ai_studio import (
     async_generate
 )
 
-_instruments = ("google-generativeai >= 0.2.0",)
+_instruments = ("google-genai >= 1.3.0",)
 
 class GoogleAIStudioInstrumentor(BaseInstrumentor):
     """
-    An instrumentor for google-generativeai's client library.
+    An instrumentor for google-genai's client library.
     """
 
     def instrumentation_dependencies(self) -> Collection[str]:
@@ -32,21 +32,21 @@ class GoogleAIStudioInstrumentor(BaseInstrumentor):
         pricing_info = kwargs.get("pricing_info", {})
         trace_content = kwargs.get("trace_content", False)
         disable_metrics = kwargs.get("disable_metrics")
-        version = importlib.metadata.version("google-generativeai")
+        version = importlib.metadata.version("google-genai")
 
         # sync generate
         wrap_function_wrapper(
-            "google.generativeai.generative_models",
-            "GenerativeModel.generate_content",
-            generate("google_ai_studio.generate_content", version, environment, application_name,
+            "google.genai.models",
+            "Models.generate_content",
+            generate(version, environment, application_name,
                   tracer, pricing_info, trace_content, metrics, disable_metrics),
         )
 
         # async generate
         wrap_function_wrapper(
-            "google.generativeai.generative_models",
-            "GenerativeModel.generate_content_async",
-            async_generate("google_ai_studio.generate_content", version, environment,
+            "google.genai.models",
+            "AsyncModels.generate_content",
+            async_generate(version, environment,
                            application_name, tracer, pricing_info, trace_content, metrics,
                            disable_metrics),
         )