Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: get_current_span should return None when llama-index is not instrumented #1169

Merged
merged 2 commits into from
Dec 12, 2024
+14 −14
Merged

fix: get_current_span should return None when llama-index is not instrumented #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dce35af
fix: get_current_span when not instrumented
RogerHYang Dec 12, 2024
b71ee4b
clean up
RogerHYang Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion ...nce-instrumentation-llama-index/src/openinference/instrumentation/llama_index/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,17 @@ def _uninstrument(self, **kwargs: Any) -> None:

def get_current_span() -> Optional[Span]:
from llama_index.core.instrumentation.span import active_span_id
from openinference.instrumentation.llama_index._handler import _SpanHandler

if not isinstance(id_ := active_span_id.get(), str):
return None
if (span := LlamaIndexInstrumentor()._span_handler.open_spans.get(id_)) is None:
instrumentor = LlamaIndexInstrumentor()
try:
span_handler = instrumentor._span_handler
except AttributeError:
return None
if not isinstance(span_handler, _SpanHandler):
return None
if (span := span_handler.open_spans.get(id_)) is None:
return None
return span._otel_span
18 changes: 5 additions & 13 deletions ...tion-llama-index/tests/openinference/instrumentation/llama_index/test_get_current_span.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
from asyncio import create_task, gather, sleep
from random import random
from typing import Iterator

import pytest
from llama_index.core.instrumentation import get_dispatcher
from opentelemetry.sdk.trace import TracerProvider
from opentelemetry.sdk.trace.export.in_memory_span_exporter import InMemorySpanExporter
Expand All @@ -14,7 +12,7 @@


@dispatcher.span # type: ignore[misc,unused-ignore]
async def foo(k: int) -> str:
async def foo(k: int = 1) -> str:
child = create_task(foo(k - 1)) if k > 1 else None
await sleep(random() / 100)
span = get_current_span()
Expand All @@ -24,10 +22,14 @@ async def foo(k: int) -> str:


async def test_get_current_span(
tracer_provider: TracerProvider,
in_memory_span_exporter: InMemorySpanExporter,
) -> None:
assert await foo() == ""
n, k = 10, 5
LlamaIndexInstrumentor().instrument(tracer_provider=tracer_provider)
await gather(*(foo(k) for _ in range(n)))
LlamaIndexInstrumentor().uninstrument()
spans = in_memory_span_exporter.get_finished_spans()
assert len(spans) == n * k
seen = set()
Expand All @@ -38,14 +40,4 @@ async def test_get_current_span(
assert span.attributes.get(OUTPUT_VALUE) == expected


@pytest.fixture(autouse=True)
def instrument(
tracer_provider: TracerProvider,
in_memory_span_exporter: InMemorySpanExporter,
) -> Iterator[None]:
LlamaIndexInstrumentor().instrument(tracer_provider=tracer_provider)
yield
LlamaIndexInstrumentor().uninstrument()


OUTPUT_VALUE = SpanAttributes.OUTPUT_VALUE
Loading