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

openlit/instrumentation/chroma/chroma.py

@@ -5,7 +5,7 @@ Module for monitoring ChromaDB.
 
 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)
@@ -173,11 +173,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_CHROMA,
-                        SemanticConvetion.GEN_AI_ENVIRONMENT:
+                        DEPLOYMENT_ENVIRONMENT:
                             environment,
                         SemanticConvetion.GEN_AI_OPERATION:
                             SemanticConvetion.GEN_AI_OPERATION_TYPE_VECTORDB,

openlit/instrumentation/cohere/__init__.py

@@ -23,7 +23,7 @@ class CohereInstrumentor(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("cohere")
 
@@ -32,19 +32,19 @@ class CohereInstrumentor(BaseInstrumentor):
             "cohere.client_v2",  
             "ClientV2.chat",  
             chat(version, environment, application_name,
-                 tracer, pricing_info, trace_content, metrics, disable_metrics),
+                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
         wrap_function_wrapper(
             "cohere.client_v2",  
             "ClientV2.chat_stream",  
             chat_stream(version, environment, application_name,
-                        tracer, pricing_info, trace_content, metrics, disable_metrics),
+                        tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
         wrap_function_wrapper(
             "cohere.client_v2",  
             "ClientV2.embed",  
             embed(version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # Async Client
@@ -52,21 +52,21 @@ class CohereInstrumentor(BaseInstrumentor):
             "cohere.client_v2",  
             "AsyncClientV2.chat",  
             async_chat(version, environment, application_name,
-                 tracer, pricing_info, trace_content, metrics, disable_metrics),
+                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
             "cohere.client_v2",  
             "AsyncClientV2.chat_stream",  
             async_chat_stream(version, environment, application_name,
-                        tracer, pricing_info, trace_content, metrics, disable_metrics),
+                        tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
             "cohere.client_v2",  
             "AsyncClientV2.embed",  
             async_embed(version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
     @staticmethod

openlit/instrumentation/cohere/async_cohere.py

@@ -22,7 +22,7 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def async_embed(version, environment, application_name, tracer,
-          pricing_info, trace_content, metrics, disable_metrics):
+          pricing_info, capture_message_content, metrics, disable_metrics):
     """
     Generates a telemetry wrapper for embeddings to collect metrics.
     
@@ -32,7 +32,7 @@ def async_embed(version, environment, application_name, tracer,
         application_name: Name of the application using the Cohere API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of Cohere 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 embeddings method to add telemetry.
@@ -105,7 +105,7 @@ def async_embed(version, environment, application_name, tracer,
                 span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
                                     version)
 
-                if trace_content:
+                if capture_message_content:
                     span.add_event(
                         name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                         attributes={
@@ -149,7 +149,7 @@ def async_embed(version, environment, application_name, tracer,
     return wrapper
 
 def async_chat(version, environment, application_name, tracer,
-         pricing_info, trace_content, metrics, disable_metrics):
+         pricing_info, capture_message_content, metrics, disable_metrics):
     """
     Generates a telemetry wrapper for chat to collect metrics.
 
@@ -159,7 +159,7 @@ def async_chat(version, environment, application_name, tracer,
         application_name: Name of the application using the Cohere API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of Cohere 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 method to add telemetry.
@@ -281,7 +281,7 @@ def async_chat(version, environment, application_name, tracer,
                 span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
                                     version)
 
-                if trace_content:
+                if capture_message_content:
                     span.add_event(
                         name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                         attributes={
@@ -336,7 +336,7 @@ def async_chat(version, environment, application_name, tracer,
     return wrapper
 
 def async_chat_stream(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_stream to collect metrics.
 
@@ -346,7 +346,7 @@ def async_chat_stream(version, environment, application_name,
         application_name: Name of the application using the Cohere API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of Cohere 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 method to add telemetry.
@@ -372,7 +372,7 @@ def async_chat_stream(version, environment, application_name,
         class TracedAsyncStream:
             """
             Wrapper for streaming responses to collect metrics and trace data.
-            Wraps the 'cohere.AsyncStream' response to collect message IDs and aggregated response.
+            Wraps the response to collect message IDs and aggregated response.
 
             This class implements the '__aiter__' and '__anext__' methods that
             handle asynchronous streaming responses.
@@ -547,7 +547,7 @@ def async_chat_stream(version, environment, application_name,
                                             self._ttft)
                         self._span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
                                             version)
-                        if trace_content:
+                        if capture_message_content:
                             self._span.add_event(
                                 name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                                 attributes={

openlit/instrumentation/cohere/cohere.py

@@ -22,7 +22,7 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def embed(version, environment, application_name, tracer,
-          pricing_info, trace_content, metrics, disable_metrics):
+          pricing_info, capture_message_content, metrics, disable_metrics):
     """
     Generates a telemetry wrapper for embeddings to collect metrics.
     
@@ -32,7 +32,7 @@ def embed(version, environment, application_name, tracer,
         application_name: Name of the application using the Cohere API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of Cohere 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 embeddings method to add telemetry.
@@ -105,7 +105,7 @@ def embed(version, environment, application_name, tracer,
                 span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
                                     version)
 
-                if trace_content:
+                if capture_message_content:
                     span.add_event(
                         name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                         attributes={
@@ -149,7 +149,7 @@ def embed(version, environment, application_name, tracer,
     return wrapper
 
 def chat(version, environment, application_name, tracer,
-         pricing_info, trace_content, metrics, disable_metrics):
+         pricing_info, capture_message_content, metrics, disable_metrics):
     """
     Generates a telemetry wrapper for chat to collect metrics.
 
@@ -159,7 +159,7 @@ def chat(version, environment, application_name, tracer,
         application_name: Name of the application using the Cohere API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of Cohere 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 method to add telemetry.
@@ -222,7 +222,7 @@ def chat(version, environment, application_name, tracer,
 
                 llm_response = response_dict.get('message').get('content')[0].get('text')
 
-                 # Set base span attribues (OTel Semconv)
+                # Set base span attribues (OTel Semconv)
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
                 span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
                                     SemanticConvetion.GEN_AI_OPERATION_TYPE_CHAT)
@@ -281,7 +281,7 @@ def chat(version, environment, application_name, tracer,
                 span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
                                     version)
 
-                if trace_content:
+                if capture_message_content:
                     span.add_event(
                         name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                         attributes={
@@ -336,7 +336,7 @@ def chat(version, environment, application_name, tracer,
     return wrapper
 
 def chat_stream(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_stream to collect metrics.
 
@@ -346,7 +346,7 @@ def chat_stream(version, environment, application_name,
         application_name: Name of the application using the Cohere API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of Cohere 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 method to add telemetry.
@@ -372,7 +372,7 @@ def chat_stream(version, environment, application_name,
         class TracedSyncStream:
             """
             Wrapper for streaming responses to collect metrics and trace data.
-            Wraps the 'cohere.AsyncStream' response to collect message IDs and aggregated response.
+            Wraps the response to collect message IDs and aggregated response.
 
             This class implements the '__aiter__' and '__anext__' methods that
             handle asynchronous streaming responses.
@@ -547,7 +547,7 @@ def chat_stream(version, environment, application_name,
                                             self._ttft)
                         self._span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
                                             version)
-                        if trace_content:
+                        if capture_message_content:
                             self._span.add_event(
                                 name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                                 attributes={

openlit/instrumentation/controlflow/__init__.py

@@ -26,7 +26,7 @@ class ControlFlowInstrumentor(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("controlflow")
 
@@ -34,21 +34,21 @@ class ControlFlowInstrumentor(BaseInstrumentor):
             "controlflow.agents.agent",
             "Agent.__init__",
             wrap_controlflow("controlflow.create_agent", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
             "controlflow.tasks.task",
             "Task.__init__",
             wrap_controlflow("controlflow.create_task", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
             "controlflow",
             "run",
             wrap_controlflow("controlflow.run", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
     def _uninstrument(self, **kwargs):

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
 
@@ -13,7 +13,7 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def wrap_controlflow(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.
 
@@ -27,7 +27,7 @@ def wrap_controlflow(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
@@ -64,9 +64,9 @@ 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_OPERATION,
                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_AGENT)

openlit/instrumentation/crawl4ai/__init__.py

@@ -29,7 +29,7 @@ class Crawl4AIInstrumentor(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("crawl4ai")
 
@@ -37,14 +37,14 @@ class Crawl4AIInstrumentor(BaseInstrumentor):
             "crawl4ai.web_crawler",
             "WebCrawler.run",
             wrap_crawl("crawl4ai.web_crawl", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
             "crawl4ai.async_webcrawler",
             "AsyncWebCrawler.arun",
             async_wrap_crawl("crawl4ai.web_crawl", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
     def _uninstrument(self, **kwargs):

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,
 )
@@ -15,7 +15,7 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def async_wrap_crawl(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_wrap_crawl(gen_ai_endpoint, version, environment, application_name,
         application_name: Name of the application using the Crawl4AI Agent.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of Crawl4AI 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,9 +62,9 @@ def async_wrap_crawl(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(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,
 )
@@ -15,7 +15,7 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def wrap_crawl(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 wrap_crawl(gen_ai_endpoint, version, environment, application_name,
         application_name: Name of the application using the Crawl4AI Agent.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of Crawl4AI 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,9 +62,9 @@ def wrap_crawl(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(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/__init__.py

@@ -26,7 +26,7 @@ class CrewAIInstrumentor(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("crewai")
 
@@ -34,14 +34,14 @@ class CrewAIInstrumentor(BaseInstrumentor):
             "crewai.agent",
             "Agent.execute_task",
             crew_wrap("crewai.agent_execute_task", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
             "crewai.task",
             "Task._execute_core",
             crew_wrap("crewai.task_execute_core", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
 

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,
 )
@@ -28,7 +28,7 @@ def _parse_tools(tools):
     return json.dumps(result)
 
 def crew_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.
 
@@ -39,7 +39,7 @@ def crew_wrap(gen_ai_endpoint, version, environment, application_name,
         application_name: Name of the application using the CrewAI Agent.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of CrewAI 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.
@@ -75,8 +75,10 @@ def crew_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)
 
                 instance_class = instance.__class__.__name__
 

openlit/instrumentation/dynamiq/__init__.py

@@ -26,7 +26,7 @@ class DynamiqInstrumentor(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("dynamiq")
 
@@ -34,28 +34,28 @@ class DynamiqInstrumentor(BaseInstrumentor):
             "dynamiq.nodes.agents.base",
             "Agent.run",
             dynamiq_wrap("dynamiq.agent_run", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
             "dynamiq",
             "Workflow.run",
             dynamiq_wrap("dynamiq.workflow_run", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
             "dynamiq.memory",
             "Memory.add",
             dynamiq_wrap("dynamiq.memory_add", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
             "dynamiq.memory",
             "Memory.search",
             dynamiq_wrap("dynamiq.memory_search", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
 

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,
 )
@@ -15,7 +15,7 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def dynamiq_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 dynamiq_wrap(gen_ai_endpoint, version, environment, application_name,
         application_name: Name of the application using the dynamiq Agent.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of dynamiq 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,9 +62,9 @@ def dynamiq_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(SemanticConvetion.GEN_AI_ENVIRONMENT,
+                span.set_attribute(DEPLOYMENT_ENVIRONMENT,
                                     environment)
 
                 if gen_ai_endpoint == "dynamiq.agent_run":