opentelemetry-instrumentation-llamaindex 0.39.1__tar.gz → 0.39.3__tar.gz

{opentelemetry_instrumentation_llamaindex-0.39.1 → opentelemetry_instrumentation_llamaindex-0.39.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: opentelemetry-instrumentation-llamaindex
-Version: 0.39.1
+Version: 0.39.3
 Summary: OpenTelemetry LlamaIndex instrumentation
 License: Apache-2.0
 Author: Gal Kleinman

{opentelemetry_instrumentation_llamaindex-0.39.1 → opentelemetry_instrumentation_llamaindex-0.39.3}/opentelemetry/instrumentation/llamaindex/__init__.py

@@ -38,24 +38,39 @@ from opentelemetry.instrumentation.llamaindex.dispatcher_wrapper import instrume
 
 logger = logging.getLogger(__name__)
 
-_instruments = ("llama-index >= 0.7.0",)
+_core_instruments = ("llama-index-core >= 0.7.0", )
+_full_instruments = ("llama-index >= 0.7.0",)
 
 
 class LlamaIndexInstrumentor(BaseInstrumentor):
-    """An instrumentor for LlamaIndex SDK."""
+    """An instrumentor for both: core and legacy LlamaIndex SDK."""
 
     def __init__(self, exception_logger=None):
-        super().__init__()
-        Config.exception_logger = exception_logger
+        self.legacy = LlamaIndexInstrumentorFull(exception_logger)
+        self.core = LlamaIndexInstrumentorCore(exception_logger)
 
     def instrumentation_dependencies(self) -> Collection[str]:
-        return _instruments
+        return ()
 
     def _instrument(self, **kwargs):
+        # Try to use the legacy entry point for instrumentation
+        if self.legacy._check_dependency_conflicts() is None:
+            self.legacy.instrument(**kwargs)
+        if not self.legacy._is_instrumented_by_opentelemetry:
+            # it didn't work -> try the new package
+            if self.core._check_dependency_conflicts() is None:
+                self.core.instrument(**kwargs)
+
+    def _uninstrument(self, **kwargs):
+        self.legacy.uninstrument(**kwargs)
+        self.core.uninstrument(**kwargs)
+
+    @staticmethod
+    def apply_instrumentation(name, **kwargs):
         tracer_provider = kwargs.get("tracer_provider")
         tracer = get_tracer(__name__, __version__, tracer_provider)
 
-        if import_version("llama-index") >= "0.10.20":
+        if import_version(name) >= "0.10.20":
             instrument_with_dispatcher(tracer)
         else:
             RetrieverQueryEngineInstrumentor(tracer).instrument()
@@ -67,5 +82,36 @@ class LlamaIndexInstrumentor(BaseInstrumentor):
             BaseAgentInstrumentor(tracer).instrument()
             BaseToolInstrumentor(tracer).instrument()
 
+
+class LlamaIndexInstrumentorCore(BaseInstrumentor):
+    """An instrumentor for core LlamaIndex SDK."""
+
+    def __init__(self, exception_logger=None):
+        super().__init__()
+        Config.exception_logger = exception_logger
+
+    def instrumentation_dependencies(self) -> Collection[str]:
+        return _core_instruments
+
+    def _instrument(self, **kwargs):
+        LlamaIndexInstrumentor.apply_instrumentation("llama-index-core", **kwargs)
+
+    def _uninstrument(self, **kwargs):
+        pass
+
+
+class LlamaIndexInstrumentorFull(BaseInstrumentor):
+    """An instrumentor for legacy LlamaIndex SDK."""
+
+    def __init__(self, exception_logger=None):
+        super().__init__()
+        Config.exception_logger = exception_logger
+
+    def instrumentation_dependencies(self) -> Collection[str]:
+        return _full_instruments
+
+    def _instrument(self, **kwargs):
+        LlamaIndexInstrumentor.apply_instrumentation("llama-index", **kwargs)
+
     def _uninstrument(self, **kwargs):
         pass

opentelemetry_instrumentation_llamaindex-0.39.3/opentelemetry/instrumentation/llamaindex/version.py

@@ -0,0 +1 @@
+__version__ = "0.39.3"

{opentelemetry_instrumentation_llamaindex-0.39.1 → opentelemetry_instrumentation_llamaindex-0.39.3}/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-llamaindex"
-version = "0.39.1"
+version = "0.39.3"
 description = "OpenTelemetry LlamaIndex instrumentation"
 authors = [
   "Gal Kleinman <gal@traceloop.com>",
@@ -43,9 +43,9 @@ openai = "^1.52.2"
 opentelemetry-sdk = "^1.27.0"
 llama-index = "^0.12.6"
 llama-index-postprocessor-cohere-rerank = "^0.3.0"
-opentelemetry-instrumentation-openai = "==0.39.1"
-opentelemetry-instrumentation-cohere = "==0.39.1"
-opentelemetry-instrumentation-chromadb = "==0.39.1"
+opentelemetry-instrumentation-openai = "==0.39.3"
+opentelemetry-instrumentation-cohere = "==0.39.3"
+opentelemetry-instrumentation-chromadb = "==0.39.3"
 sqlalchemy = "^2.0.31"
 llama-index-agent-openai = "^0.4.1"
 llama-index-vector-stores-chroma = "^0.4.1"

opentelemetry_instrumentation_llamaindex-0.39.1/opentelemetry/instrumentation/llamaindex/version.py

@@ -1 +0,0 @@
-__version__ = "0.39.1"