opentelemetry-instrumentation-llamaindex 0.39.1__py3-none-any.whl → 0.39.3__py3-none-any.whl

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/version.py

@@ -1 +1 @@
-__version__ = "0.39.1"
+__version__ = "0.39.3"

{opentelemetry_instrumentation_llamaindex-0.39.1.dist-info → opentelemetry_instrumentation_llamaindex-0.39.3.dist-info}/METADATA

@@ -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.dist-info → opentelemetry_instrumentation_llamaindex-0.39.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-opentelemetry/instrumentation/llamaindex/__init__.py,sha256=m5ycp9c8Zt5gT-G5QkUC-0bWb0wGiTsjxAKHSZUuSs8,2622
+opentelemetry/instrumentation/llamaindex/__init__.py,sha256=chlwxW79qgH42JXjRzV3EJxmiONJwoFpTLdWa9GO1pU,4270
 opentelemetry/instrumentation/llamaindex/base_agent_instrumentor.py,sha256=WvPuSECoouFQ3MzItWDcnWVQXULjskfLxE-zyH5HrTg,2645
 opentelemetry/instrumentation/llamaindex/base_embedding_instrumentor.py,sha256=SsbAhMtIiC5Djrc32LOkCMxETJlz4653aeC1x0uXm4g,2207
 opentelemetry/instrumentation/llamaindex/base_retriever_instrumentor.py,sha256=aHuH7VNz6D1fWsc0jXV3U3vbqG-Mo20mhHIHcfJbuzo,2346
@@ -10,8 +10,8 @@ opentelemetry/instrumentation/llamaindex/dispatcher_wrapper.py,sha256=a4l-dnUCjz
 opentelemetry/instrumentation/llamaindex/query_pipeline_instrumentor.py,sha256=PfUens1GisvbU98TLXEJ8_ALWGhnbOdsQkMwhFom8ZA,2496
 opentelemetry/instrumentation/llamaindex/retriever_query_engine_instrumentor.py,sha256=OtQ7uZckFtzq9mzqSlKDhvO-Uffl99axuZ2TJXCqDRQ,2627
 opentelemetry/instrumentation/llamaindex/utils.py,sha256=7NfuSbIf5Uohxo79AUM_gB-8RQtxgUO5glCWzXHeueQ,2349
-opentelemetry/instrumentation/llamaindex/version.py,sha256=cg7Dz0Iq1rY6w0Q0CcrPmBwg1BFyVuHpxRW72zbf07c,23
-opentelemetry_instrumentation_llamaindex-0.39.1.dist-info/METADATA,sha256=uqg-45GlXbYLIGLZag9aq9b1STtn5Dt8Ovv8VyomARo,2212
-opentelemetry_instrumentation_llamaindex-0.39.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-opentelemetry_instrumentation_llamaindex-0.39.1.dist-info/entry_points.txt,sha256=gtV40W4oFCp6VNvgowTKa0zQjfIrvfdlYflgGdSsA5A,106
-opentelemetry_instrumentation_llamaindex-0.39.1.dist-info/RECORD,,
+opentelemetry/instrumentation/llamaindex/version.py,sha256=GYnnsRVgceT_tJ60Z37OvvWZHZCwQZoLzh7147BZRDs,23
+opentelemetry_instrumentation_llamaindex-0.39.3.dist-info/METADATA,sha256=E1WXduE6-SuWmVBWRi4TPf3youkNqHZKfDXRwRLVFTU,2212
+opentelemetry_instrumentation_llamaindex-0.39.3.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+opentelemetry_instrumentation_llamaindex-0.39.3.dist-info/entry_points.txt,sha256=gtV40W4oFCp6VNvgowTKa0zQjfIrvfdlYflgGdSsA5A,106
+opentelemetry_instrumentation_llamaindex-0.39.3.dist-info/RECORD,,