opentelemetry-instrumentation-llamaindex 0.34.0__tar.gz → 0.35.0__tar.gz

{opentelemetry_instrumentation_llamaindex-0.34.0 → opentelemetry_instrumentation_llamaindex-0.35.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentelemetry-instrumentation-llamaindex
-Version: 0.34.0
+Version: 0.35.0
 Summary: OpenTelemetry LlamaIndex instrumentation
 Home-page: https://github.com/traceloop/openllmetry/tree/main/packages/opentelemetry-instrumentation-llamaindex
 License: Apache-2.0

{opentelemetry_instrumentation_llamaindex-0.34.0 → opentelemetry_instrumentation_llamaindex-0.35.0}/opentelemetry/instrumentation/llamaindex/dispatcher_wrapper.py

@@ -24,6 +24,7 @@ from llama_index.core.instrumentation.events.llm import (
 from llama_index.core.instrumentation.events.rerank import ReRankStartEvent
 from llama_index.core.instrumentation.event_handlers import BaseEventHandler
 from llama_index.core.instrumentation.span_handlers import BaseSpanHandler
+from llama_index.core.workflow import Workflow
 from opentelemetry import context as context_api
 from opentelemetry.instrumentation.llamaindex.utils import (
     JSONEncoder,
@@ -44,7 +45,7 @@ from opentelemetry.trace.span import Span
 # we use the regular OpenLLMetry instrumentations
 AVAILABLE_OPENLLMETRY_INSTRUMENTATIONS = ["OpenAI"]
 
-CLASS_NAME_FROM_ID_REGEX = re.compile(r"^([a-zA-Z]+)\.")
+CLASS_ANDMETHOD_NAME_FROM_ID_REGEX = re.compile(r"([a-zA-Z]+)\.([a-zA-Z_]+)-")
 STREAMING_END_EVENTS = (
     LLMChatEndEvent,
     LLMCompletionEndEvent,
@@ -188,14 +189,14 @@ class SpanHolder:
             return [self.parent] + self.parent.notify_parent()
         return []
 
-    def end(self):
+    def end(self, should_detach_context: bool = True):
         if not self._active:
             return
 
         self._active = False
         if self.otel_span:
             self.otel_span.end()
-        if self.token:
+        if self.token and should_detach_context:
             context_api.detach(self.token)
 
     @singledispatchmethod
@@ -245,24 +246,33 @@ class OpenLLMetrySpanHandler(BaseSpanHandler[SpanHolder]):
         **kwargs: Any,
     ) -> Optional[SpanHolder]:
         """Create a span."""
-        parent = self.open_spans.get(parent_span_id)
-        kind = (
-            TraceloopSpanKindValues.TASK.value
-            if parent
-            else TraceloopSpanKindValues.WORKFLOW.value
-        )
-        # Take the class name from id_ where id_ is e.g.
+        # Take the class name and method name from id_ where id_ is e.g.
         # 'SentenceSplitter.split_text_metadata_aware-a2f2a780-2fa6-4682-a88e-80dc1f1ebe6a'
-        class_name = CLASS_NAME_FROM_ID_REGEX.match(id_).groups()[0]
+        matches = CLASS_ANDMETHOD_NAME_FROM_ID_REGEX.match(id_)
+        class_name = matches.groups()[0]
+        method_name = matches.groups()[1]
+
+        parent = self.open_spans.get(parent_span_id)
+
         if class_name in AVAILABLE_OPENLLMETRY_INSTRUMENTATIONS:
-            context_api.attach(
+            token = context_api.attach(
                 context_api.set_value(
                     SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY, False
                 )
             )
-            return SpanHolder(id_, parent)
+            return SpanHolder(id_, parent, token=token)
+
+        kind = (
+            TraceloopSpanKindValues.TASK.value
+            if parent
+            else TraceloopSpanKindValues.WORKFLOW.value
+        )
+
+        if isinstance(instance, Workflow):
+            span_name = f"{instance.__class__.__name__}.{kind}" if not parent_span_id else f"{method_name}.{kind}"
+        else:
+            span_name = f"{class_name}.{kind}"
 
-        span_name = f"{class_name}.{kind}"
         span = self._tracer.start_span(
             span_name,
             context=parent.context if parent else None,
@@ -322,7 +332,8 @@ class OpenLLMetrySpanHandler(BaseSpanHandler[SpanHolder]):
                 self.waiting_for_streaming_spans[id_] = span_holder
             return span_holder
         else:
-            span_holder.end()
+            should_detach_context = not isinstance(instance, Workflow)
+            span_holder.end(should_detach_context)
             return span_holder
 
     def prepare_to_drop_span(

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

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

{opentelemetry_instrumentation_llamaindex-0.34.0 → opentelemetry_instrumentation_llamaindex-0.35.0}/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-llamaindex"
-version = "0.34.0"
+version = "0.35.0"
 description = "OpenTelemetry LlamaIndex instrumentation"
 authors = [
   "Gal Kleinman <gal@traceloop.com>",
@@ -38,19 +38,20 @@ flake8 = "7.0.0"
 vcrpy = "^6.0.1"
 pytest-recording = "^0.13.1"
 pytest-asyncio = "^0.23.7"
-chromadb = "=0.5.15"
+chromadb = "^0.5.23"
 openai = "^1.52.2"
 opentelemetry-sdk = "^1.27.0"
-llama-index = "^0.11.20"
-llama-index-postprocessor-cohere-rerank = "^0.2.1"
-opentelemetry-instrumentation-openai = "==0.34.0"
-opentelemetry-instrumentation-cohere = "==0.34.0"
-opentelemetry-instrumentation-chromadb = "==0.34.0"
+llama-index = "^0.12.6"
+llama-index-postprocessor-cohere-rerank = "^0.3.0"
+opentelemetry-instrumentation-openai = "==0.35.0"
+opentelemetry-instrumentation-cohere = "==0.35.0"
+opentelemetry-instrumentation-chromadb = "==0.35.0"
 sqlalchemy = "^2.0.31"
-llama-index-agent-openai = "^0.3.4"
-llama-index-vector-stores-chroma = "^0.2.1"
-llama-index-llms-cohere = "^0.3.2"
-llama-index-embeddings-openai = "^0.2.5"
+llama-index-agent-openai = "^0.4.1"
+llama-index-vector-stores-chroma = "^0.4.1"
+llama-index-llms-cohere = "^0.4.0"
+llama-index-embeddings-openai = "^0.3.1"
+onnxruntime = "<1.20.0"
 
 [build-system]
 requires = ["poetry-core"]

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

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