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

openlit/instrumentation/llamaindex/__init__.py

@@ -35,7 +35,7 @@ class LlamaIndexInstrumentor(BaseInstrumentor):
         environment = kwargs.get("environment")
         tracer = kwargs.get("tracer")
         pricing_info = kwargs.get("pricing_info")
-        trace_content = kwargs.get("trace_content")
+        capture_message_content = kwargs.get("capture_message_content")
         version = importlib.metadata.version("llama-index")
 
         for wrapped_method in WRAPPED_METHODS:
@@ -47,7 +47,7 @@ class LlamaIndexInstrumentor(BaseInstrumentor):
                 wrap_package,
                 wrap_object,
                 wrapper(gen_ai_endpoint, version, environment, application_name,
-                 tracer, pricing_info, trace_content),
+                 tracer, pricing_info, capture_message_content),
             )
 
     @staticmethod

openlit/instrumentation/llamaindex/llamaindex.py

@@ -5,7 +5,7 @@ Module for monitoring LlamaIndex 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
 
@@ -13,7 +13,7 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def load_data(gen_ai_endpoint, version, environment, application_name,
-                 tracer, pricing_info, trace_content):
+                 tracer, pricing_info, capture_message_content):
     """
     Creates a wrapper around a function call to trace and log its execution metrics.
 
@@ -27,7 +27,7 @@ def load_data(gen_ai_endpoint, version, environment, application_name,
     - application_name (str): Name of the LlamaIndex application.
     - tracer (opentelemetry.trace.Tracer): The tracer object used for OpenTelemetry tracing.
     - pricing_info (dict): Information about the pricing for internal metrics (currently not used).
-    - trace_content (bool): Flag indicating whether to trace the content of the response.
+    - capture_message_content (bool): Flag indicating whether to trace the content of the response.
 
     Returns:
     - function: A higher-order function that takes a function 'wrapped' and returns
@@ -63,11 +63,11 @@ def load_data(gen_ai_endpoint, version, environment, application_name,
                                     SemanticConvetion.GEN_AI_SYSTEM_LLAMAINDEX)
                 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_OPERATION,
                                     SemanticConvetion.GEN_AI_OPERATION_TYPE_FRAMEWORK)
-                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
+                span.set_attribute(SERVICE_NAME,
                                     application_name)
                 span.set_attribute(SemanticConvetion.GEN_AI_RETRIEVAL_SOURCE,
                                     response[0].metadata["file_path"])

openlit/instrumentation/mem0/__init__.py

@@ -59,7 +59,7 @@ class Mem0Instrumentor(BaseInstrumentor):
         environment = kwargs.get("environment")
         tracer = kwargs.get("tracer")
         pricing_info = kwargs.get("pricing_info")
-        trace_content = kwargs.get("trace_content")
+        capture_message_content = kwargs.get("capture_message_content")
         version = importlib.metadata.version("mem0ai")
 
         for wrapped_method in WRAPPED_METHODS:
@@ -71,7 +71,7 @@ class Mem0Instrumentor(BaseInstrumentor):
                 wrap_package,
                 wrap_object,
                 wrapper(gen_ai_endpoint, version, environment, application_name,
-                 tracer, pricing_info, trace_content),
+                 tracer, pricing_info, capture_message_content),
             )
 
     @staticmethod

openlit/instrumentation/mem0/mem0.py

@@ -5,7 +5,7 @@ Module for monitoring mem0 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
 
@@ -13,7 +13,7 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def mem0_wrap(gen_ai_endpoint, version, environment, application_name,
-                 tracer, pricing_info, trace_content):
+                 tracer, pricing_info, capture_message_content):
     """
     Creates a wrapper around a function call to trace and log its execution metrics.
 
@@ -27,7 +27,7 @@ def mem0_wrap(gen_ai_endpoint, version, environment, application_name,
     - application_name (str): Name of the mem0 application.
     - tracer (opentelemetry.trace.Tracer): The tracer object used for OpenTelemetry tracing.
     - pricing_info (dict): Information about the pricing for internal metrics (currently not used).
-    - trace_content (bool): Flag indicating whether to trace the content of the response.
+    - capture_message_content (bool): Flag indicating whether to trace the content of the response.
 
     Returns:
     - function: A higher-order function that takes a function 'wrapped' and returns
@@ -63,11 +63,11 @@ def mem0_wrap(gen_ai_endpoint, version, environment, application_name,
                                     SemanticConvetion.GEN_AI_SYSTEM_MEM0)
                 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_OPERATION,
                                     SemanticConvetion.GEN_AI_OPERATION_TYPE_FRAMEWORK)
-                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
+                span.set_attribute(SERVICE_NAME,
                                     application_name)
 
                 if gen_ai_endpoint == "mem0.memory_add":

openlit/instrumentation/milvus/__init__.py

@@ -72,7 +72,7 @@ class MilvusInstrumentor(BaseInstrumentor):
         tracer = kwargs.get("tracer")
         metrics = kwargs.get("metrics_dict")
         pricing_info = kwargs.get("pricing_info")
-        trace_content = kwargs.get("trace_content")
+        capture_message_content = kwargs.get("capture_message_content")
         disable_metrics = kwargs.get("disable_metrics")
         version = importlib.metadata.version("pymilvus")
 
@@ -85,7 +85,7 @@ class MilvusInstrumentor(BaseInstrumentor):
                 wrap_package,
                 wrap_object,
                 wrapper(gen_ai_endpoint, version, environment, application_name,
-                 tracer, pricing_info, trace_content, metrics, disable_metrics),
+                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
             )
 
 

openlit/instrumentation/milvus/milvus.py

@@ -5,7 +5,7 @@ Module for monitoring Milvus.
 
 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
 
@@ -25,7 +25,7 @@ def object_count(obj):
     return cnt
 
 def general_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):
     """
     Creates a wrapper around a function call to trace and log its execution metrics.
 
@@ -39,7 +39,7 @@ def general_wrap(gen_ai_endpoint, version, environment, application_name,
     - application_name (str): Name of the Langchain application.
     - tracer (opentelemetry.trace.Tracer): The tracer object used for OpenTelemetry tracing.
     - pricing_info (dict): Information about the pricing for internal metrics (currently not used).
-    - trace_content (bool): Flag indicating whether to trace the content of the response.
+    - capture_message_content (bool): Flag indicating whether to trace the content of the response.
 
     Returns:
     - function: A higher-order function that takes a function 'wrapped' and returns
@@ -73,9 +73,9 @@ def general_wrap(gen_ai_endpoint, version, environment, application_name,
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
                 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_APPLICATION_NAME,
+                span.set_attribute(SERVICE_NAME,
                                    application_name)
                 span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_VECTORDB)
@@ -153,11 +153,11 @@ def general_wrap(gen_ai_endpoint, version, environment, application_name,
                     attributes = {
                         TELEMETRY_SDK_NAME:
                             "openlit",
-                        SemanticConvetion.GEN_AI_APPLICATION_NAME:
+                        SERVICE_NAME:
                             application_name,
                         SemanticConvetion.DB_SYSTEM:
                             SemanticConvetion.DB_SYSTEM_MILVUS,
-                        SemanticConvetion.GEN_AI_ENVIRONMENT:
+                        DEPLOYMENT_ENVIRONMENT:
                             environment,
                         SemanticConvetion.GEN_AI_OPERATION:
                             SemanticConvetion.GEN_AI_OPERATION_TYPE_VECTORDB,

openlit/instrumentation/mistral/__init__.py

@@ -23,7 +23,7 @@ class MistralInstrumentor(BaseInstrumentor):
         tracer = kwargs.get("tracer")
         metrics = kwargs.get("metrics_dict")
         pricing_info = kwargs.get("pricing_info")
-        trace_content = kwargs.get("trace_content")
+        capture_message_content = kwargs.get("capture_message_content")
         disable_metrics = kwargs.get("disable_metrics")
         version = importlib.metadata.version("mistralai")
 
@@ -31,48 +31,48 @@ class MistralInstrumentor(BaseInstrumentor):
         wrap_function_wrapper(
             "mistralai.chat",  
             "Chat.complete",  
-            chat("mistral.chat", version, environment, application_name,
-                 tracer, pricing_info, trace_content, metrics, disable_metrics),
+            chat(version, environment, application_name,
+                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # sync
         wrap_function_wrapper(
             "mistralai.chat",  
             "Chat.stream",  
-            chat_stream("mistral.chat", version, environment, application_name,
-                        tracer, pricing_info, trace_content, metrics, disable_metrics),
+            chat_stream(version, environment, application_name,
+                        tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # sync
         wrap_function_wrapper(
             "mistralai.embeddings",  
             "Embeddings.create",  
-            embeddings("mistral.embeddings", version, environment, application_name,
-                       tracer, pricing_info, trace_content, metrics, disable_metrics),
+            embeddings(version, environment, application_name,
+                       tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # Async
         wrap_function_wrapper(
             "mistralai.chat",  
             "Chat.complete_async",  
-            async_chat("mistral.chat", version, environment, application_name,
-                       tracer, pricing_info, trace_content, metrics, disable_metrics),
+            async_chat(version, environment, application_name,
+                       tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # Async
         wrap_function_wrapper(
             "mistralai.chat",  
             "Chat.stream_async",  
-            async_chat_stream("mistral.chat", version, environment, application_name,
-                              tracer, pricing_info, trace_content, metrics, disable_metrics),
+            async_chat_stream(version, environment, application_name,
+                              tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         #sync
         wrap_function_wrapper(
             "mistralai.embeddings",  
             "Embeddings.create_async",  
-            async_embeddings("mistral.embeddings", version, environment, application_name,
-                             tracer, pricing_info, trace_content, metrics, disable_metrics),
+            async_embeddings(version, environment, application_name,
+                             tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
     @staticmethod