From f3f4b2a6b5e75f84a65454220de57c13d76e505b Mon Sep 17 00:00:00 2001 From: Emilio Garcia Date: Mon, 24 Nov 2025 10:42:36 -0500 Subject: [PATCH] fix: telemetry tests no longer reference old telemetry system --- tests/integration/telemetry/collectors/in_memory.py | 6 +----- tests/integration/telemetry/conftest.py | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/integration/telemetry/collectors/in_memory.py b/tests/integration/telemetry/collectors/in_memory.py index 7127b3816..9ff8de6f5 100644 --- a/tests/integration/telemetry/collectors/in_memory.py +++ b/tests/integration/telemetry/collectors/in_memory.py @@ -15,11 +15,10 @@ from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import SimpleSpanProcessor from opentelemetry.sdk.trace.export.in_memory_span_exporter import InMemorySpanExporter -import llama_stack.core.telemetry.telemetry as telemetry_module - from .base import BaseTelemetryCollector, MetricStub, SpanStub +# TODO: Fix thi to work with Automatic Instrumentation class InMemoryTelemetryCollector(BaseTelemetryCollector): """In-memory telemetry collector for library-client tests. @@ -75,13 +74,10 @@ class InMemoryTelemetryManager: meter_provider = MeterProvider(metric_readers=[metric_reader]) metrics.set_meter_provider(meter_provider) - telemetry_module._TRACER_PROVIDER = tracer_provider - self.collector = InMemoryTelemetryCollector(span_exporter, metric_reader) self._tracer_provider = tracer_provider self._meter_provider = meter_provider def shutdown(self) -> None: - telemetry_module._TRACER_PROVIDER = None self._tracer_provider.shutdown() self._meter_provider.shutdown() diff --git a/tests/integration/telemetry/conftest.py b/tests/integration/telemetry/conftest.py index fd9224ae4..9448e40a0 100644 --- a/tests/integration/telemetry/conftest.py +++ b/tests/integration/telemetry/conftest.py @@ -15,6 +15,7 @@ from tests.integration.fixtures.common import instantiate_llama_stack_client from tests.integration.telemetry.collectors import InMemoryTelemetryManager, OtlpHttpTestCollector +# TODO: Fix this to work with Automatic Instrumentation @pytest.fixture(scope="session") def telemetry_test_collector(): stack_mode = os.environ.get("LLAMA_STACK_TEST_STACK_CONFIG_TYPE", "library_client") @@ -48,6 +49,7 @@ def telemetry_test_collector(): manager.shutdown() +# TODO: Fix this to work with Automatic Instrumentation @pytest.fixture(scope="session") def llama_stack_client(telemetry_test_collector, request): """Ensure telemetry collector is ready before initializing the stack client."""