openlit 1.34.23__py3-none-any.whl → 1.34.24__py3-none-any.whl

openlit/__helpers.py

@@ -205,11 +205,22 @@ def set_server_address_and_port(client_instance: Any,
         config = getattr(client_instance, 'sdk_configuration', None)
         base_url = getattr(config, 'server_url', None)
 
+    if not base_url:
+        # Attempt to get host from instance.config.host (used by Pinecone and other vector DBs)
+        config = getattr(client_instance, 'config', None)
+        base_url = getattr(config, 'host', None)
+
     if base_url:
         if isinstance(base_url, str):
-            url = urlparse(base_url)
-            server_address = url.hostname or default_server_address
-            server_port = url.port if url.port is not None else default_server_port
+            # Check if it's a full URL or just a hostname
+            if base_url.startswith(('http://', 'https://')):
+                url = urlparse(base_url)
+                server_address = url.hostname or default_server_address
+                server_port = url.port if url.port is not None else default_server_port
+            else:
+                # If it's just a hostname (like Pinecone's case), use it directly
+                server_address = base_url
+                server_port = default_server_port
         else:  # base_url might not be a str; handle as an object.
             server_address = getattr(base_url, 'host', None) or default_server_address
             port_attr = getattr(base_url, 'port', None)
@@ -442,3 +453,37 @@ def record_image_metrics(metrics, gen_ai_operation, gen_ai_system, server_addres
     metrics["genai_client_operation_duration"].record(end_time - start_time, attributes)
     metrics["genai_requests"].add(1, attributes)
     metrics["genai_cost"].record(cost, attributes)
+
+def common_db_span_attributes(scope, db_system, server_address, server_port,
+    environment, application_name, version):
+    """
+    Set common span attributes for database operations.
+    """
+
+    scope._span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
+    scope._span.set_attribute(SemanticConvention.GEN_AI_OPERATION, SemanticConvention.GEN_AI_OPERATION_TYPE_VECTORDB)
+    scope._span.set_attribute(SemanticConvention.DB_SYSTEM_NAME, db_system)
+    scope._span.set_attribute(SemanticConvention.SERVER_ADDRESS, server_address)
+    scope._span.set_attribute(SemanticConvention.SERVER_PORT, server_port)
+    scope._span.set_attribute(DEPLOYMENT_ENVIRONMENT, environment)
+    scope._span.set_attribute(SERVICE_NAME, application_name)
+    scope._span.set_attribute(SemanticConvention.DB_SDK_VERSION, version)
+
+def record_db_metrics(metrics, db_system, server_address, server_port,
+    environment, application_name, start_time, end_time):
+    """
+    Record database-specific metrics for the operation.
+    """
+
+    attributes = create_metrics_attributes(
+        operation=SemanticConvention.GEN_AI_OPERATION_TYPE_VECTORDB,
+        system=db_system,
+        request_model=db_system,
+        server_address=server_address,
+        server_port=server_port,
+        response_model=db_system,
+        service_name=application_name,
+        deployment_environment=environment,
+    )
+    metrics["db_requests"].add(1, attributes)
+    metrics["db_client_operation_duration"].record(end_time - start_time, attributes)

openlit/instrumentation/pinecone/__init__.py

@@ -1,66 +1,174 @@
-# pylint: disable=useless-return, bad-staticmethod-argument, disable=duplicate-code
 """Initializer of Auto Instrumentation of Pinecone Functions"""
+
 from typing import Collection
 import importlib.metadata
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from wrapt import wrap_function_wrapper
 
 from openlit.instrumentation.pinecone.pinecone import general_wrap
+from openlit.instrumentation.pinecone.async_pinecone import async_general_wrap
 
-_instruments = ("pinecone-client >= 2.2.0",)
+_instruments = ("pinecone >= 7.3.0",)
 
 class PineconeInstrumentor(BaseInstrumentor):
-    """An instrumentor for Pinecone's client library."""
+    """
+    An instrumentor for Pinecone's client library.
+    """
 
     def instrumentation_dependencies(self) -> Collection[str]:
         return _instruments
 
     def _instrument(self, **kwargs):
-        application_name = kwargs.get("application_name")
-        environment = kwargs.get("environment")
+        version = importlib.metadata.version("pinecone")
+        environment = kwargs.get("environment", "default")
+        application_name = kwargs.get("application_name", "default")
         tracer = kwargs.get("tracer")
+        pricing_info = kwargs.get("pricing_info", {})
+        capture_message_content = kwargs.get("capture_message_content", False)
         metrics = kwargs.get("metrics_dict")
-        pricing_info = kwargs.get("pricing_info")
-        capture_message_content = kwargs.get("capture_message_content")
         disable_metrics = kwargs.get("disable_metrics")
-        version = importlib.metadata.version("pinecone-client")
 
+        # Sync operations
         wrap_function_wrapper(
-            "pinecone.control.pinecone",  
+            "pinecone.pinecone",
             "Pinecone.create_index",
-            general_wrap("pinecone.create_index", version, environment, application_name,
-                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+            general_wrap("pinecone.create_collection", version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
+
+        wrap_function_wrapper(
+            "pinecone.pinecone",
+            "Pinecone.create_index_for_model",
+            general_wrap("pinecone.create_collection", version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
-            "pinecone.data.index",  
+            "pinecone.db_data.index",
             "Index.upsert",
             general_wrap("pinecone.upsert", version, environment, application_name,
-                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
+
+        wrap_function_wrapper(
+            "pinecone.db_data.index",
+            "Index.upsert_records",
+            general_wrap("pinecone.upsert_records", version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
-            "pinecone.data.index",  
+            "pinecone.db_data.index",
             "Index.query",
             general_wrap("pinecone.query", version, environment, application_name,
-                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
+
+        wrap_function_wrapper(
+            "pinecone.db_data.index",
+            "Index.search",
+            general_wrap("pinecone.search", version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
-            "pinecone.data.index",  
+            "pinecone.db_data.index",
+            "Index.fetch",
+            general_wrap("pinecone.fetch", version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
+
+        wrap_function_wrapper(
+            "pinecone.db_data.index",
+            "Index.search_records",
+            general_wrap("pinecone.search_records", version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
+
+        wrap_function_wrapper(
+            "pinecone.db_data.index",
             "Index.update",
             general_wrap("pinecone.update", version, environment, application_name,
-                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
-            "pinecone.data.index",  
+            "pinecone.db_data.index",
             "Index.delete",
             general_wrap("pinecone.delete", version, environment, application_name,
-                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
+        # Async operations
+        wrap_function_wrapper(
+            "pinecone.pinecone_asyncio",
+            "PineconeAsyncio.create_index",
+            async_general_wrap("pinecone.create_index", version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
+
+        wrap_function_wrapper(
+            "pinecone.pinecone_asyncio",
+            "PineconeAsyncio.create_index_for_model",
+            async_general_wrap("pinecone.create_index", version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
+
+        wrap_function_wrapper(
+            "pinecone.db_data.index_asyncio",
+            "_IndexAsyncio.upsert",
+            async_general_wrap("pinecone.upsert", version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
+
+        wrap_function_wrapper(
+            "pinecone.db_data.index_asyncio",
+            "_IndexAsyncio.upsert_records",
+            async_general_wrap("pinecone.upsert_records", version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
+
+        wrap_function_wrapper(
+            "pinecone.db_data.index_asyncio",
+            "_IndexAsyncio.query",
+            async_general_wrap("pinecone.query", version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
+
+        wrap_function_wrapper(
+            "pinecone.db_data.index_asyncio",
+            "_IndexAsyncio.search",
+            async_general_wrap("pinecone.search", version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
+
+        wrap_function_wrapper(
+            "pinecone.db_data.index_asyncio",
+            "_IndexAsyncio.fetch",
+            async_general_wrap("pinecone.fetch", version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
+
+        wrap_function_wrapper(
+            "pinecone.db_data.index_asyncio",
+            "_IndexAsyncio.search_records",
+            async_general_wrap("pinecone.search_records", version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
+
+        wrap_function_wrapper(
+            "pinecone.db_data.index_asyncio",
+            "_IndexAsyncio.update",
+            async_general_wrap("pinecone.update", version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
+
+        wrap_function_wrapper(
+            "pinecone.db_data.index_asyncio",
+            "_IndexAsyncio.delete",
+            async_general_wrap("pinecone.delete", version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
 
-    @staticmethod
     def _uninstrument(self, **kwargs):
         pass

openlit/instrumentation/pinecone/async_pinecone.py

@@ -0,0 +1,59 @@
+"""
+Module for monitoring Pinecone async API calls.
+"""
+
+import time
+from opentelemetry.trace import SpanKind
+from opentelemetry import context as context_api
+from openlit.__helpers import (
+    handle_exception,
+    set_server_address_and_port,
+)
+from openlit.instrumentation.pinecone.utils import (
+    process_vectordb_response,
+    DB_OPERATION_MAP,
+)
+
+def async_general_wrap(gen_ai_endpoint, version, environment, application_name,
+    tracer, pricing_info, capture_message_content, metrics, disable_metrics):
+    """
+    Generates a telemetry wrapper for Pinecone async function calls.
+    """
+
+    async def wrapper(wrapped, instance, args, kwargs):
+        """
+        Wraps the Pinecone async function call.
+        """
+
+        if context_api.get_value(context_api._SUPPRESS_INSTRUMENTATION_KEY):
+            return await wrapped(*args, **kwargs)
+
+        # Get server address and port using the standard helper
+        server_address, server_port = set_server_address_and_port(instance, "pinecone.io", 443)
+
+        db_operation = DB_OPERATION_MAP.get(gen_ai_endpoint, "unknown")
+        if db_operation == "create_collection":
+            namespace = kwargs.get("name") or (args[0] if args else "unknown")
+        else:
+            namespace = kwargs.get("namespace") or (args[0] if args else "unknown")
+        span_name = f"{db_operation} {namespace}"
+
+        with tracer.start_as_current_span(span_name, kind=SpanKind.CLIENT) as span:
+            try:
+                start_time = time.time()
+                response = await wrapped(*args, **kwargs)
+
+                # Process response and generate telemetry
+                response = process_vectordb_response(
+                    response, db_operation, server_address, server_port,
+                    environment, application_name, metrics, start_time, span,
+                    capture_message_content, disable_metrics, version, instance, args, **kwargs
+                )
+
+                return response
+
+            except Exception as e:
+                handle_exception(span, e)
+                raise
+
+    return wrapper

openlit/instrumentation/pinecone/pinecone.py

@@ -1,173 +1,59 @@
-# pylint: disable=duplicate-code, broad-exception-caught, too-many-statements, unused-argument, possibly-used-before-assignment
 """
-Module for monitoring Pinecone.
+Module for monitoring Pinecone API calls.
 """
 
-import logging
-from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
-from openlit.__helpers import handle_exception
-from openlit.semcov import SemanticConvention
-
-# Initialize logger for logging potential issues and operations
-logger = logging.getLogger(__name__)
-
-def object_count(obj):
-    """
-    Counts Length of object if it exists, Else returns None
-    """
-
-    if obj:
-        return len(obj)
-
-    return None
+import time
+from opentelemetry.trace import SpanKind
+from opentelemetry import context as context_api
+from openlit.__helpers import (
+    handle_exception,
+    set_server_address_and_port,
+)
+from openlit.instrumentation.pinecone.utils import (
+    process_vectordb_response,
+    DB_OPERATION_MAP,
+)
 
 def general_wrap(gen_ai_endpoint, version, environment, application_name,
-                 tracer, pricing_info, capture_message_content, metrics, disable_metrics):
+    tracer, pricing_info, capture_message_content, metrics, disable_metrics):
     """
-    Wraps a Pinecone operation to trace and log its execution metrics.
-
-    This function is intended to wrap around Pinecone operations in order to
-    measure their execution time, log relevant information, and trace the execution
-    using OpenTelemetry. This helps in monitoring and debugging operations within
-    the Pinecone space.
-
-    Parameters:
-    - pinecone_operation (str): The specific Pinecone operation being monitored.
-                                Examples include 'create_index', 'query', 'upsert', etc.
-    - version (str): The version of the application interfacing with Pinecone.
-    - environment (str): The deployment environment, such as 'production' or 'development'.
-    - application_name (str): The name of the application performing the Pinecone operation.
-    - tracer (opentelemetry.trace.Tracer): An object used for OpenTelemetry tracing.
-    - pricing_info (dict): Information about pricing, not used in current implementation.
-    - capture_message_content (bool): A flag indicating whether the content of responses should be traced.
-
-    Returns:
-    - function: A decorator function that, when applied, wraps the target function with
-                additional functionality for tracing and logging Pinecone operations.
+    Generates a telemetry wrapper for Pinecone function calls.
     """
 
     def wrapper(wrapped, instance, args, kwargs):
         """
-        Executes the wrapped Pinecone operation, adding tracing and logging.
-
-        This inner wrapper function captures the execution of Pinecone operations,
-        annotating the operation with relevant metrics and tracing information, and
-        ensuring any exceptions are caught and logged appropriately.
-
-        Parameters:
-        - wrapped (Callable): The Pinecone operation to be wrapped and executed.
-        - instance (object): The instance on which the operation is called (for class methods).
-        - args (tuple): Positional arguments for the Pinecone operation.
-        - kwargs (dict): Keyword arguments for the Pinecone operation.
-
-        Returns:
-        - Any: The result of executing the wrapped Pinecone operation.
+        Wraps the Pinecone function call.
         """
 
-        with tracer.start_as_current_span(gen_ai_endpoint, kind= SpanKind.CLIENT) as span:
-            response = wrapped(*args, **kwargs)
-
-            try:
-                span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
-                span.set_attribute(SemanticConvention.GEN_AI_ENDPOINT,
-                                   gen_ai_endpoint)
-                span.set_attribute(DEPLOYMENT_ENVIRONMENT,
-                                   environment)
-                span.set_attribute(SERVICE_NAME,
-                                   application_name)
-                span.set_attribute(SemanticConvention.GEN_AI_OPERATION,
-                                   SemanticConvention.GEN_AI_OPERATION_TYPE_VECTORDB)
-                span.set_attribute(SemanticConvention.DB_SYSTEM_NAME,
-                                   SemanticConvention.DB_SYSTEM_PINECONE)
-
-                if gen_ai_endpoint == "pinecone.create_index":
-                    db_operation = SemanticConvention.DB_OPERATION_CREATE_INDEX
-                    span.set_attribute(SemanticConvention.DB_OPERATION_NAME,
-                                       SemanticConvention.DB_OPERATION_CREATE_INDEX)
-                    span.set_attribute(SemanticConvention.DB_INDEX_NAME,
-                                       kwargs.get("name", ""))
-                    span.set_attribute(SemanticConvention.DB_INDEX_DIMENSION,
-                                       kwargs.get("dimensions", ""))
-                    span.set_attribute(SemanticConvention.DB_INDEX_METRIC,
-                                       kwargs.get("metric", ""))
-                    span.set_attribute(SemanticConvention.DB_INDEX_SPEC,
-                                       str(kwargs.get("spec", "")))
-
-                elif gen_ai_endpoint == "pinecone.query":
-                    db_operation = SemanticConvention.DB_OPERATION_QUERY
-                    span.set_attribute(SemanticConvention.DB_OPERATION_NAME,
-                                       SemanticConvention.DB_OPERATION_QUERY)
-                    span.set_attribute(SemanticConvention.DB_STATEMENT,
-                                       str(kwargs.get("vector")))
-                    span.set_attribute(SemanticConvention.DB_N_RESULTS,
-                                       kwargs.get("top_k", ""))
-                    span.set_attribute(SemanticConvention.DB_FILTER,
-                                       str(kwargs.get("filter", "")))
-                    span.set_attribute(SemanticConvention.DB_NAMESPACE,
-                                       str(kwargs.get("namespace", "")))
+        if context_api.get_value(context_api._SUPPRESS_INSTRUMENTATION_KEY):
+            return wrapped(*args, **kwargs)
 
-                elif gen_ai_endpoint == "pinecone.update":
-                    db_operation = SemanticConvention.DB_OPERATION_UPDATE
-                    span.set_attribute(SemanticConvention.DB_OPERATION_NAME,
-                                       SemanticConvention.DB_OPERATION_UPDATE)
-                    span.set_attribute(SemanticConvention.DB_UPDATE_ID,
-                                       kwargs.get("id",""))
-                    span.set_attribute(SemanticConvention.DB_UPDATE_VALUES,
-                                       str(kwargs.get("values",[])))
-                    span.set_attribute(SemanticConvention.DB_NAMESPACE,
-                                       str(kwargs.get("namespace", "")))
-                    span.set_attribute(SemanticConvention.DB_UPDATE_METADATA,
-                                       str(kwargs.get("set_metadata", "")))
+        # Get server address and port using the standard helper
+        server_address, server_port = set_server_address_and_port(instance, "pinecone.io", 443)
 
-                elif gen_ai_endpoint == "pinecone.upsert":
-                    db_operation = SemanticConvention.DB_OPERATION_UPSERT
-                    span.set_attribute(SemanticConvention.DB_OPERATION_NAME,
-                                       SemanticConvention.DB_OPERATION_UPSERT)
-                    span.set_attribute(SemanticConvention.DB_VECTOR_COUNT,
-                                       object_count(kwargs.get("vectors")))
+        db_operation = DB_OPERATION_MAP.get(gen_ai_endpoint, "unknown")
+        if db_operation == "create_collection":
+            namespace = kwargs.get("name") or (args[0] if args else "unknown")
+        else:
+            namespace = kwargs.get("namespace") or (args[0] if args else "unknown")
+        span_name = f"{db_operation} {namespace}"
 
-                elif gen_ai_endpoint == "pinecone.delete":
-                    db_operation = SemanticConvention.DB_OPERATION_DELETE
-                    span.set_attribute(SemanticConvention.DB_OPERATION_NAME,
-                                       SemanticConvention.DB_OPERATION_DELETE)
-                    span.set_attribute(SemanticConvention.DB_ID_COUNT,
-                                       object_count(kwargs.get("ids")))
-                    span.set_attribute(SemanticConvention.DB_FILTER,
-                                       str(kwargs.get("filter", "")))
-                    span.set_attribute(SemanticConvention.DB_DELETE_ALL,
-                                       kwargs.get("delete_all", False))
-                    span.set_attribute(SemanticConvention.DB_NAMESPACE,
-                                       kwargs.get("namespace", ""))
-
-                span.set_status(Status(StatusCode.OK))
-
-                if disable_metrics is False:
-                    attributes = {
-                        TELEMETRY_SDK_NAME:
-                            "openlit",
-                        SERVICE_NAME:
-                            application_name,
-                        SemanticConvention.DB_SYSTEM_NAME:
-                            SemanticConvention.DB_SYSTEM_PINECONE,
-                        DEPLOYMENT_ENVIRONMENT:
-                            environment,
-                        SemanticConvention.GEN_AI_OPERATION:
-                            SemanticConvention.GEN_AI_OPERATION_TYPE_VECTORDB,
-                        SemanticConvention.DB_OPERATION_NAME:
-                            db_operation
-                    }
+        with tracer.start_as_current_span(span_name, kind=SpanKind.CLIENT) as span:
+            try:
+                start_time = time.time()
+                response = wrapped(*args, **kwargs)
 
-                    metrics["db_requests"].add(1, attributes)
+                # Process response and generate telemetry
+                response = process_vectordb_response(
+                    response, db_operation, server_address, server_port,
+                    environment, application_name, metrics, start_time, span,
+                    capture_message_content, disable_metrics, version, instance, args, **kwargs
+                )
 
-                # Return original response
                 return response
 
             except Exception as e:
                 handle_exception(span, e)
-                logger.error("Error in trace creation: %s", e)
-
-                # Return original response
-                return response
+                raise
 
     return wrapper

openlit/instrumentation/pinecone/utils.py

@@ -0,0 +1,182 @@
+"""
+Pinecone OpenTelemetry instrumentation utility functions
+"""
+import time
+
+from opentelemetry.trace import Status, StatusCode
+
+from openlit.__helpers import (
+    common_db_span_attributes,
+    record_db_metrics,
+)
+from openlit.semcov import SemanticConvention
+
+# Operation mapping for simple span naming
+DB_OPERATION_MAP = {
+    "pinecone.create_collection": SemanticConvention.DB_OPERATION_CREATE_COLLECTION,
+    "pinecone.upsert": SemanticConvention.DB_OPERATION_UPSERT,
+    "pinecone.query": SemanticConvention.DB_OPERATION_QUERY,
+    "pinecone.search": SemanticConvention.DB_OPERATION_SEARCH,
+    "pinecone.fetch": SemanticConvention.DB_OPERATION_FETCH,
+    "pinecone.update": SemanticConvention.DB_OPERATION_UPDATE,
+    "pinecone.delete": SemanticConvention.DB_OPERATION_DELETE,
+    "pinecone.upsert_records": SemanticConvention.DB_OPERATION_UPSERT,
+    "pinecone.search_records": SemanticConvention.DB_OPERATION_QUERY,
+}
+
+def object_count(obj):
+    """
+    Counts length of object if it exists, else returns 0.
+    """
+    return len(obj) if obj else 0
+
+def common_vectordb_logic(scope, environment, application_name,
+    metrics, capture_message_content, disable_metrics, version, instance=None):
+    """
+    Process vector database request and generate telemetry.
+    """
+
+    scope._end_time = time.time()
+
+    # Set common database span attributes using helper
+    common_db_span_attributes(scope, SemanticConvention.DB_SYSTEM_PINECONE, scope._server_address, scope._server_port,
+        environment, application_name, version)
+
+    # Set DB operation specific attributes
+    scope._span.set_attribute(SemanticConvention.DB_OPERATION_NAME, scope._db_operation)
+    scope._span.set_attribute(SemanticConvention.DB_CLIENT_OPERATION_DURATION, scope._end_time - scope._start_time)
+
+    # Set Create Index operation specific attributes
+    if scope._db_operation == SemanticConvention.DB_OPERATION_CREATE_COLLECTION:
+        # Standard database attributes
+        scope._span.set_attribute(SemanticConvention.DB_COLLECTION_NAME, scope._kwargs.get("name", ""))
+
+        # Vector database specific attributes (extensions)
+        scope._span.set_attribute(SemanticConvention.DB_COLLECTION_DIMENSION, scope._kwargs.get("dimension", -1))
+        scope._span.set_attribute(SemanticConvention.DB_SEARCH_SIMILARITY_METRIC, scope._kwargs.get("metric", "cosine"))
+        scope._span.set_attribute(SemanticConvention.DB_COLLECTION_SPEC, str(scope._kwargs.get("spec", "")))
+
+    elif scope._db_operation == SemanticConvention.DB_OPERATION_SEARCH:
+        namespace = scope._kwargs.get("namespace", "default") or (scope._args[0] if scope._args else "unknown")
+        query = scope._kwargs.get("query", {})
+
+        # Extract query text or vector from different possible locations
+        query_text = query.get("inputs", {}).get("text", "")
+        query_vector = query.get("vector", {})
+        query_content = query_text or str(query_vector)
+
+        # Standard database attributes
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_TEXT, query_content)
+        scope._span.set_attribute(SemanticConvention.DB_NAMESPACE, namespace)
+
+        # Vector database specific attributes (extensions)
+        scope._span.set_attribute(SemanticConvention.DB_VECTOR_QUERY_TOP_K, query.get("top_k", -1))
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_SUMMARY,
+            f"SEARCH {namespace} top_k={query.get('top_k', -1)} text={query_text} vector={query_vector}")
+
+    elif scope._db_operation == SemanticConvention.DB_OPERATION_QUERY:
+        namespace = scope._kwargs.get("namespace", "default") or (scope._args[0] if scope._args else "unknown")
+        query = scope._kwargs.get("vector", [])
+
+        # Standard database attributes
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_TEXT, str(query))
+        scope._span.set_attribute(SemanticConvention.DB_NAMESPACE, namespace)
+
+        # Vector database specific attributes (extensions)
+        scope._span.set_attribute(SemanticConvention.DB_VECTOR_QUERY_TOP_K, scope._kwargs.get("top_k", ""))
+        scope._span.set_attribute(SemanticConvention.DB_FILTER, str(scope._kwargs.get("filter", "")))
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_SUMMARY,
+            f"{scope._db_operation} {namespace} "
+            f"top_k={scope._kwargs.get('top_k', -1)} "
+            f"filtered={scope._kwargs.get('filter', '')} "
+            f"vector={scope._kwargs.get('vector', '')}")
+
+    elif scope._db_operation == SemanticConvention.DB_OPERATION_FETCH:
+        namespace = scope._kwargs.get("namespace", "default") or (scope._args[0] if scope._args else "unknown")
+        query = scope._kwargs.get("ids", [])
+
+        # Standard database attributes
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_TEXT, str(query))
+        scope._span.set_attribute(SemanticConvention.DB_NAMESPACE, namespace)
+
+        # Vector database specific attributes (extensions)
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_SUMMARY,
+            f"FETCH {namespace} ids={query}")
+        scope._span.set_attribute(SemanticConvention.DB_RESPONSE_RETURNED_ROWS, object_count(scope._response.vectors))
+
+    elif scope._db_operation == SemanticConvention.DB_OPERATION_UPDATE:
+        namespace = scope._kwargs.get("namespace") or (scope._args[0] if scope._args else "unknown")
+        query = scope._kwargs.get("id", "")
+
+        # Standard database attributes
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_TEXT, query)
+        scope._span.set_attribute(SemanticConvention.DB_NAMESPACE, namespace)
+
+        # Vector database specific attributes (extensions)
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_SUMMARY,
+            f"{scope._db_operation} {namespace} "
+            f"id={query} "
+            f"values={scope._kwargs.get('values', [])} "
+            f"set_metadata={scope._kwargs.get('set_metadata', '')}")
+
+    elif scope._db_operation == SemanticConvention.DB_OPERATION_UPSERT:
+        namespace = scope._kwargs.get("namespace") or (scope._args[0] if scope._args else "unknown")
+        query = scope._kwargs.get("vectors") or (scope._args[1] if len(scope._args) > 1 else None)
+
+        # Standard database attributes
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_TEXT, str(query))
+        scope._span.set_attribute(SemanticConvention.DB_NAMESPACE, namespace)
+
+        # Vector database specific attributes (extensions)
+        scope._span.set_attribute(SemanticConvention.DB_VECTOR_COUNT, object_count(query))
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_SUMMARY,
+            f"{scope._db_operation} {namespace} vectors_count={object_count(query)}")
+
+    elif scope._db_operation == SemanticConvention.DB_OPERATION_DELETE:
+        namespace = scope._kwargs.get("namespace") or (scope._args[0] if scope._args else "unknown")
+        query = scope._kwargs.get("ids") or (scope._args[1] if len(scope._args) > 1 else None)
+
+        # Standard database attributes
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_TEXT, str(query))
+        scope._span.set_attribute(SemanticConvention.DB_NAMESPACE, namespace)
+
+        # Vector database specific attributes (extensions)
+        scope._span.set_attribute(SemanticConvention.DB_ID_COUNT, object_count(scope._kwargs.get("ids")))
+        scope._span.set_attribute(SemanticConvention.DB_FILTER, str(scope._kwargs.get("filter", "")))
+        scope._span.set_attribute(SemanticConvention.DB_DELETE_ALL, scope._kwargs.get("delete_all", False))
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_SUMMARY,
+            f"{scope._db_operation} {namespace} "
+            f"ids={query} "
+            f"filter={scope._kwargs.get('filter', '')} "
+            f"delete_all={scope._kwargs.get('delete_all', False)}")
+
+    scope._span.set_status(Status(StatusCode.OK))
+
+    # Record metrics using helper
+    if not disable_metrics:
+        record_db_metrics(metrics, SemanticConvention.DB_SYSTEM_PINECONE, scope._server_address, scope._server_port,
+            environment, application_name, scope._start_time, scope._end_time)
+
+def process_vectordb_response(response, db_operation, server_address, server_port,
+    environment, application_name, metrics, start_time, span,
+    capture_message_content=False, disable_metrics=False,
+    version="1.0.0", instance=None, args=None, **kwargs):
+    """
+    Process vector database response and generate telemetry following OpenTelemetry conventions.
+    """
+
+    scope = type("GenericScope", (), {})()
+
+    scope._start_time = start_time
+    scope._span = span
+    scope._kwargs = kwargs
+    scope._args = args or []
+    scope._db_operation = db_operation
+    scope._response = response
+    scope._server_address = server_address
+    scope._server_port = server_port
+
+    common_vectordb_logic(scope, environment, application_name,
+        metrics, capture_message_content, disable_metrics, version, instance)
+
+    return response

openlit/semcov/__init__.py

@@ -23,6 +23,7 @@ class SemanticConvention:
 
     # GenAI Metric Names (OTel Semconv)
     GEN_AI_CLIENT_TOKEN_USAGE = "gen_ai.client.token.usage"
+    DB_CLIENT_TOKEN_USAGE = "db.client.token.usage"
     GEN_AI_CLIENT_OPERATION_DURATION = "gen_ai.client.operation.duration"
     GEN_AI_SERVER_REQUEST_DURATION = "gen_ai.server.request.duration"
     GEN_AI_SERVER_TBT = "gen_ai.server.time_per_output_token"
@@ -56,9 +57,12 @@ class SemanticConvention:
     GEN_AI_RESPONSE_FINISH_REASON = "gen_ai.response.finish_reasons"
     GEN_AI_RESPONSE_ID = "gen_ai.response.id"
     GEN_AI_RESPONSE_MODEL = "gen_ai.response.model"
+
     GEN_AI_USAGE_INPUT_TOKENS = "gen_ai.usage.input_tokens"
     GEN_AI_USAGE_OUTPUT_TOKENS = "gen_ai.usage.output_tokens"
     GEN_AI_USAGE_REASONING_TOKENS = "gen_ai.usage.reasoning_tokens"
+    GEN_AI_USAGE_READ_UNITS = "gen_ai.usage.read_units"
+    GEN_AI_USAGE_RERANK_UNITS = "gen_ai.usage.rerank_units"
     GEN_AI_TOOL_CALL_ID = "gen_ai.tool.call.id"
     GEN_AI_TOOL_NAME = "gen_ai.tool.name"
     GEN_AI_TOOL_ARGS = "gen_ai.tool.args"
@@ -190,6 +194,7 @@ class SemanticConvention:
     DB_NAMESPACE = "db.namespace"
     DB_OPERATION_NAME = "db.operation.name"
     DB_QUERY_TEXT = "db.query.text"
+    DB_QUERY_SUMMARY = "db.query.summary"
     DB_RESPONSE_RETURNED_ROWS = "db.response.returned_rows"
 
 
@@ -208,6 +213,8 @@ class SemanticConvention:
     DB_OPERATION_INSERT = "INSERT"
     DB_OPERATION_SELECT = "SELECT"
     DB_OPERATION_QUERY = "QUERY"
+    DB_OPERATION_SEARCH = "SEARCH"
+    DB_OPERATION_FETCH = "FETCH"
     DB_OPERATION_REPLACE = "findAndModify"
     DB_OPERATION_FIND_AND_DELETE = "findAndDelete"
     DB_OPERATION_DELETE = "DELETE"
@@ -217,7 +224,7 @@ class SemanticConvention:
     DB_OPERATION_ADD = "ADD"
     DB_OPERATION_PEEK = "peePEEKk"
     DB_ID_COUNT = "db.ids_count"
-    DB_VECTOR_COUNT = "db.vector_count"
+    DB_VECTOR_COUNT = "db.vector.count"
     DB_METADATA = "db.metadata"
     DB_METADATA_COUNT = "db.metadatas_count"
     DB_DOCUMENTS_COUNT = "db.documents_count"
@@ -230,15 +237,20 @@ class SemanticConvention:
     DB_N_RESULTS = "db.n_results"
     DB_DELETE_ALL = "db.delete_all"
     DB_INDEX_NAME = "db.index.name"
+    DB_COLLECTION_DIMENSION = "db.collection.dimension"
     DB_INDEX_DIMENSION = "db.index.dimension"
     DB_COLLECTION_DIMENSION = "db.collection.dimension"
+    DB_SEARCH_SIMILARITY_METRIC = "db.search.similarity_metric"
     DB_INDEX_METRIC = "db.create_index.metric"
+    DB_COLLECTION_SPEC = "db.collection.spec"
     DB_INDEX_SPEC = "db.create_index.spec"
     DB_NAMESPACE = "db.query.namespace"
     DB_UPDATE_METADATA = "db.update.metadata"
     DB_UPDATE_VALUES = "db.update.values"
     DB_UPDATE_ID = "db.update.id"
     DB_DELETE_ID = "db.delete.id"
+    DB_VECTOR_QUERY_TOP_K = "db.vector.query.top_k"
+    DB_VECTOR_QUERY_FILTER = "db.vector.query.filter"
 
     DB_SYSTEM_CHROMA = "chroma"
     DB_SYSTEM_PINECONE = "pinecone"

{openlit-1.34.23.dist-info → openlit-1.34.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openlit
-Version: 1.34.23
+Version: 1.34.24
 Summary: OpenTelemetry-native Auto instrumentation library for monitoring LLM Applications and GPUs, facilitating the integration of observability into your GenAI-driven projects
 License: Apache-2.0
 Keywords: OpenTelemetry,otel,otlp,llm,tracing,openai,anthropic,claude,cohere,llm monitoring,observability,monitoring,gpt,Generative AI,chatGPT,gpu

{openlit-1.34.23.dist-info → openlit-1.34.24.dist-info}/RECORD

@@ -1,4 +1,4 @@
-openlit/__helpers.py,sha256=UmW0E97r7UUps2rkdQ-S_lXhaeH3Txp-umyAOon45mk,16458
+openlit/__helpers.py,sha256=kfbLD_rtiOGhd79MuaRK6jjEvbrN8fhZ8b0DACEKkw4,18518
 openlit/__init__.py,sha256=tYsR2OkDOq7Zf3wBOd3kFfosqUKgZxljMm6mZagMUiI,24296
 openlit/evals/__init__.py,sha256=nJe99nuLo1b5rf7pt9U9BCdSDedzbVi2Fj96cgl7msM,380
 openlit/evals/all.py,sha256=oWrue3PotE-rB5WePG3MRYSA-ro6WivkclSHjYlAqGs,7154
@@ -117,8 +117,10 @@ openlit/instrumentation/openai_agents/__init__.py,sha256=tRTSIrUtkXc_lfQnVanXmQL
 openlit/instrumentation/openai_agents/openai_agents.py,sha256=kRWPgjofcOviMi3w7CsRvJO3SCjqPmuq-PM800vIM7g,2678
 openlit/instrumentation/phidata/__init__.py,sha256=tqls5-UI6FzbjxYgq_qqAfALhWJm8dHn2NtgqiQA4f8,1557
 openlit/instrumentation/phidata/phidata.py,sha256=ohrxs6i0Oik75P2BrjNGbK71tdZg94ZMmaXixrXwV5M,4834
-openlit/instrumentation/pinecone/__init__.py,sha256=0guSEPmObaZiOF8yHExpOGY-qW_egHXfZGog3rKGi8M,2596
-openlit/instrumentation/pinecone/pinecone.py,sha256=7hVUlC0HOj0yQyvLasfdb6kS46hRJQdoSRzZQ4ixIkk,8850
+openlit/instrumentation/pinecone/__init__.py,sha256=DaWkIeG_ukn_JkBfz11TgPjORUUE9vPPjt42dH_26Jk,7210
+openlit/instrumentation/pinecone/async_pinecone.py,sha256=JBQgro4GYQhnp7IMGnk0xmJQJrQZjuVyOwTRc8x3qQU,2098
+openlit/instrumentation/pinecone/pinecone.py,sha256=_Jo_xh44sWDnqv2pA2Jx1ptDol25epJASfxKfHDHrzI,2056
+openlit/instrumentation/pinecone/utils.py,sha256=_Ims5EwmuVd3r2OBg5If2JY7HqsPA_luhmLW9AMsUjw,8995
 openlit/instrumentation/premai/__init__.py,sha256=3YlqyV-eNA_4aVUHDVUQUvGJRW8iVVcRtREw91yhbyw,1728
 openlit/instrumentation/premai/premai.py,sha256=rWRqfoIZUbTz-M7zgC2Z92gTVv9fCj1Z4iJcsG86YeI,6438
 openlit/instrumentation/premai/utils.py,sha256=K7EKGRDDh1X3OznG4z8H506zzFOHN6MH3oqtxM5eUyM,11409
@@ -149,8 +151,8 @@ openlit/instrumentation/vllm/vllm.py,sha256=VzazF2f4LLwjZDO_G8lIN_d622oSJM0fIO9w
 openlit/otel/events.py,sha256=VrMjTpvnLtYRBHCiFwJojTQqqNpRCxoD4yJYeQrtPsk,3560
 openlit/otel/metrics.py,sha256=GM2PDloBGRhBTkHHkYaqmOwIAQkY124ZhW4sEqW1Fgk,7086
 openlit/otel/tracing.py,sha256=tjV2bEbEDPUB1Z46gE-UsJsb04sRdFrfbhIDkxViZc0,3103
-openlit/semcov/__init__.py,sha256=8oIh2VC667NDh8FA3M-ESusHmeus1sgDUD8binx_nAc,13519
-openlit-1.34.23.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openlit-1.34.23.dist-info/METADATA,sha256=I28zXVmrGZFQxfl8ayXqVX2YSHYTX0R5upGyteI5tLg,23470
-openlit-1.34.23.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-openlit-1.34.23.dist-info/RECORD,,
+openlit/semcov/__init__.py,sha256=9QRSBwOvUS6z7T0HZkE9XlTEnqp-76R_BXM2o4IaEA8,14070
+openlit-1.34.24.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openlit-1.34.24.dist-info/METADATA,sha256=NKUgBOoqkr6scsH-Y8H6DVnjV6cf1Cqx0X5MVx1OPHk,23470
+openlit-1.34.24.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+openlit-1.34.24.dist-info/RECORD,,