openlit 1.33.9__py3-none-any.whl → 1.33.11__py3-none-any.whl

openlit/instrumentation/multion/__init__.py

@@ -30,7 +30,7 @@ class MultiOnInstrumentor(BaseInstrumentor):
         tracer = kwargs.get("tracer")
         metrics = kwargs.get("metrics_dict")
         pricing_info = kwargs.get("pricing_info", {})
-        trace_content = kwargs.get("trace_content", False)
+        capture_message_content = kwargs.get("capture_message_content", False)
         disable_metrics = kwargs.get("disable_metrics")
         version = importlib.metadata.version("multion")
 
@@ -39,19 +39,19 @@ class MultiOnInstrumentor(BaseInstrumentor):
             "multion.client",
             "MultiOn.browse",
             multion_wrap("multion.browse", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
         wrap_function_wrapper(
             "multion.client",
             "MultiOn.retrieve",
             multion_wrap("multion.retrieve", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
         wrap_function_wrapper(
             "multion.sessions.client",
             "SessionsClient.create",
             multion_wrap("multion.sessions.create", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # Asynchronus
@@ -59,19 +59,19 @@ class MultiOnInstrumentor(BaseInstrumentor):
             "multion.client",
             "AsyncMultiOn.browse",
             async_multion_wrap("multion.browse", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
         wrap_function_wrapper(
             "multion.client",
             "AsyncMultiOn.retrieve",
             async_multion_wrap("multion.retrieve", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
         wrap_function_wrapper(
             "multion.sessions.client",
             "AsyncSessionsClient.create",
             async_multion_wrap("multion.sessions.create", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
 

openlit/instrumentation/multion/async_multion.py

@@ -5,7 +5,7 @@ Module for monitoring multion 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,
 )
@@ -15,7 +15,7 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def async_multion_wrap(gen_ai_endpoint, version, environment, application_name,
-                     tracer, pricing_info, trace_content, metrics, disable_metrics):
+                     tracer, pricing_info, capture_message_content, metrics, disable_metrics):
     """
     Generates a telemetry wrapper for chat completions to collect metrics.
 
@@ -26,7 +26,7 @@ def async_multion_wrap(gen_ai_endpoint, version, environment, application_name,
         application_name: Name of the application using the multion Agent.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of multion usage.
-        trace_content: Flag indicating whether to trace the actual content.
+        capture_message_content: Flag indicating whether to trace the actual content.
 
     Returns:
         A function that wraps the chat completions method to add telemetry.
@@ -62,8 +62,10 @@ def async_multion_wrap(gen_ai_endpoint, version, environment, application_name,
                                     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)
 
                 if gen_ai_endpoint == "multion.browse":
                     span.set_attribute(SemanticConvetion.GEN_AI_AGENT_BROWSE_URL,
@@ -73,7 +75,7 @@ def async_multion_wrap(gen_ai_endpoint, version, environment, application_name,
                     span.set_attribute(SemanticConvetion.GEN_AI_AGENT_RESPONSE_TIME,
                                     response.metadata.processing_time)
 
-                    if trace_content:
+                    if capture_message_content:
                         span.add_event(
                             name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                             attributes={
@@ -90,7 +92,7 @@ def async_multion_wrap(gen_ai_endpoint, version, environment, application_name,
                     span.set_attribute(SemanticConvetion.GEN_AI_AGENT_BROWSE_URL,
                                     kwargs.get("url", ""))
 
-                    if trace_content:
+                    if capture_message_content:
                         span.add_event(
                             name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                             attributes={
@@ -108,7 +110,7 @@ def async_multion_wrap(gen_ai_endpoint, version, environment, application_name,
                     span.set_attribute(SemanticConvetion.GEN_AI_AGENT_BROWSE_URL,
                                     kwargs.get("url", ""))
 
-                    if trace_content:
+                    if capture_message_content:
                         span.add_event(
                             name=SemanticConvetion.GEN_AI_CONTENT_COMPLETION_EVENT,
                             attributes={

openlit/instrumentation/multion/multion.py

@@ -5,7 +5,7 @@ Module for monitoring multion 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,
 )
@@ -15,7 +15,7 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def multion_wrap(gen_ai_endpoint, version, environment, application_name,
-                     tracer, pricing_info, trace_content, metrics, disable_metrics):
+                     tracer, pricing_info, capture_message_content, metrics, disable_metrics):
     """
     Generates a telemetry wrapper for chat completions to collect metrics.
 
@@ -26,7 +26,7 @@ def multion_wrap(gen_ai_endpoint, version, environment, application_name,
         application_name: Name of the application using the multion Agent.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of multion usage.
-        trace_content: Flag indicating whether to trace the actual content.
+        capture_message_content: Flag indicating whether to trace the actual content.
 
     Returns:
         A function that wraps the chat completions method to add telemetry.
@@ -62,8 +62,10 @@ def multion_wrap(gen_ai_endpoint, version, environment, application_name,
                                     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)
 
                 if gen_ai_endpoint == "multion.browse":
                     span.set_attribute(SemanticConvetion.GEN_AI_AGENT_BROWSE_URL,
@@ -73,7 +75,7 @@ def multion_wrap(gen_ai_endpoint, version, environment, application_name,
                     span.set_attribute(SemanticConvetion.GEN_AI_AGENT_RESPONSE_TIME,
                                     response.metadata.processing_time)
 
-                    if trace_content:
+                    if capture_message_content:
                         span.add_event(
                             name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                             attributes={
@@ -90,7 +92,7 @@ def multion_wrap(gen_ai_endpoint, version, environment, application_name,
                     span.set_attribute(SemanticConvetion.GEN_AI_AGENT_BROWSE_URL,
                                     kwargs.get("url", ""))
 
-                    if trace_content:
+                    if capture_message_content:
                         span.add_event(
                             name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                             attributes={
@@ -108,7 +110,7 @@ def multion_wrap(gen_ai_endpoint, version, environment, application_name,
                     span.set_attribute(SemanticConvetion.GEN_AI_AGENT_BROWSE_URL,
                                     kwargs.get("url", ""))
 
-                    if trace_content:
+                    if capture_message_content:
                         span.add_event(
                             name=SemanticConvetion.GEN_AI_CONTENT_COMPLETION_EVENT,
                             attributes={

openlit/instrumentation/ollama/__init__.py

@@ -1,5 +1,6 @@
-# pylint: disable=useless-return, bad-staticmethod-argument, disable=duplicate-code
-"""Initializer of Auto Instrumentation of Ollama Functions"""
+"""
+Initializer of Auto Instrumentation of Ollama Functions
+"""
 
 from typing import Collection
 import importlib.metadata
@@ -7,10 +8,10 @@ from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from wrapt import wrap_function_wrapper
 
 from openlit.instrumentation.ollama.ollama import (
-    chat, embeddings, generate
+    chat, embeddings
 )
 from openlit.instrumentation.ollama.async_ollama import (
-    async_chat, async_embeddings, async_generate
+    async_chat, async_embeddings
 )
 
 _instruments = ("ollama >= 0.2.0",)
@@ -27,9 +28,10 @@ class OllamaInstrumentor(BaseInstrumentor):
         application_name = kwargs.get("application_name", "default_application")
         environment = kwargs.get("environment", "default_environment")
         tracer = kwargs.get("tracer")
+        event_provider = kwargs.get("event_provider")
         metrics = kwargs.get("metrics_dict")
         pricing_info = kwargs.get("pricing_info", {})
-        trace_content = kwargs.get("trace_content", False)
+        capture_message_content = kwargs.get("capture_message_content", False)
         disable_metrics = kwargs.get("disable_metrics")
         version = importlib.metadata.version("ollama")
 
@@ -37,66 +39,44 @@ class OllamaInstrumentor(BaseInstrumentor):
         wrap_function_wrapper(
             "ollama",
             "chat",
-            chat("ollama.chat", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+            chat(version, environment, application_name,
+                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
         )
         wrap_function_wrapper(
             "ollama",
             "Client.chat",
-            chat("ollama.chat", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+            chat(version, environment, application_name,
+                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # sync embeddings
         wrap_function_wrapper(
             "ollama",
             "embeddings",
-            embeddings("ollama.embeddings", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+            embeddings(version, environment, application_name,
+                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
         )
         wrap_function_wrapper(
             "ollama",
             "Client.embeddings",
-            embeddings("ollama.embeddings", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
-        )
-
-        # sync generate
-        wrap_function_wrapper(
-            "ollama",
-            "generate",
-            generate("ollama.generate", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
-        )
-        wrap_function_wrapper(
-            "ollama",
-            "Client.generate",
-            generate("ollama.generate", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+            embeddings(version, environment, application_name,
+                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # async chat
         wrap_function_wrapper(
             "ollama",
             "AsyncClient.chat",
-            async_chat("ollama.chat", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+            async_chat(version, environment, application_name,
+                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # async embeddings
         wrap_function_wrapper(
             "ollama",
             "AsyncClient.embeddings",
-            async_embeddings("ollama.embeddings", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
-        )
-
-        # aync generate
-        wrap_function_wrapper(
-            "ollama",
-            "AsyncClient.generate",
-            async_generate("ollama.generate", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+            async_embeddings(version, environment, application_name,
+                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
     def _uninstrument(self, **kwargs):