fix: PAAL-206 remove telemetry filter

Author: qa-jil-kamerling

adk/agenticlayer/agent_to_a2a.py

@@ -16,6 +16,8 @@
 from google.adk.memory.in_memory_memory_service import InMemoryMemoryService
 from google.adk.runners import Runner
 from google.adk.sessions.in_memory_session_service import InMemorySessionService
+from opentelemetry.instrumentation.starlette import StarletteInstrumentor
+from opentelemetry.instrumentation.asgi import OpenTelemetryMiddleware
 from starlette.applications import Starlette
 
 from .callback_tracer_plugin import CallbackTracerPlugin
@@ -106,10 +108,12 @@ async def lifespan(app: Starlette) -> AsyncIterator[None]:
     # Create a Starlette app that will be configured during startup
     starlette_app = Starlette(lifespan=lifespan)
 
-    # Add TelemetryFilter to exclude health check telemetry
+    # Add OpenTelemetryMiddleware to exclude health check telemetry
     starlette_app.add_middleware(
-        TelemetryFilter,  # type: ignore[arg-type]
-        filtered_paths={AGENT_CARD_WELL_KNOWN_PATH},
+        OpenTelemetryMiddleware,
+        excluded_urls = AGENT_CARD_WELL_KNOWN_PATH,
     )
 
+    StarletteInstrumentor().instrument_app(starlette_app)
+
     return starlette_app

adk/agenticlayer/otel.py

@@ -1,13 +1,11 @@
 import logging
-from typing import Any, Awaitable, Callable, MutableMapping, Set
 
 from openinference.instrumentation.google_adk import GoogleADKInstrumentor
 from opentelemetry import metrics, trace
 from opentelemetry._logs import set_logger_provider
 from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter
 from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
-from opentelemetry.instrumentation.asgi import OpenTelemetryMiddleware
 from opentelemetry.instrumentation.httpx import HTTPXClientInstrumentor
 from opentelemetry.sdk import trace as trace_sdk
 from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
@@ -17,48 +15,6 @@
 from opentelemetry.sdk.trace.export import SimpleSpanProcessor
 
 
-class TelemetryFilter:
-    """ This filter wraps OpenTelemetry's ASGI middleware and selectively applies
-    telemetry based on request paths. Filtered paths bypass all telemetry
-    generation (traces, metrics, logs) for optimal performance.
-    """
-
-    def __init__(
-        self,
-        app: Callable[..., Any],
-        filtered_paths: Set[str],
-        **otel_kwargs: Any
-    ) -> None:
-
-        self.app = app
-        self.filtered_paths = filtered_paths
-
-        # Create the OpenTelemetry middleware for non-filtered requests
-        self.otel_middleware = OpenTelemetryMiddleware(
-            app,
-            **otel_kwargs
-        )
-
-    async def __call__(
-        self,
-        scope: MutableMapping[str, Any],
-        receive: Callable[[], Awaitable[MutableMapping[str, Any]]],
-        send: Callable[[MutableMapping[str, Any]], Awaitable[None]],
-    ) -> None:
-
-        # Only filter HTTP requests
-        if scope["type"] == "http":
-            path = scope.get("path", "")
-
-            # If path is filtered, bypass OpenTelemetry entirely
-            if path in self.filtered_paths:
-                await self.app(scope, receive, send)
-                return
-
-        # For all other requests, use OpenTelemetry middleware
-        await self.otel_middleware(scope, receive, send)
-
-
 def setup_otel() -> None:
     """Set up OpenTelemetry tracing, logging and metrics."""
 

adk/tests/conftest.py

@@ -1,9 +1,5 @@
-from typing import Any
-from unittest.mock import AsyncMock, Mock
-
 import pytest
 from agenticlayer.agent_to_a2a import to_a2a
-from agenticlayer.otel import TelemetryFilter
 from google.adk.agents.base_agent import BaseAgent
 from starlette.applications import Starlette
 from starlette.testclient import TestClient
@@ -40,74 +36,3 @@ def test_agent_card_endpoint(self, starlette_app: Starlette, client: TestClient)
 
             # Verify it contains expected agent card fields
             assert len(data) > 0, "Agent card should not be empty"
-
-
-class TestTelemetryFilter:
-    """Test suite for the TelemetryFilter class."""
-    async def create_telemetry_filter(self, app_mock: AsyncMock) -> TelemetryFilter:
-        return TelemetryFilter(
-            app=app_mock,
-            filtered_paths={"/.well-known/agent-card.json"}
-        )
-
-    async def simulate_request(self, path: str) -> tuple[Mock, dict[str, Any], Mock]:
-        scope = {"type": "http", "path": path}
-        receive = Mock()
-        send = Mock()
-        return receive, scope, send
-
-    @pytest.mark.anyio
-    async def test_telemetry_filter_bypasses_health_checks(self) -> None:
-        """Verify TelemetryFilter bypasses OpenTelemetry for health checks."""
-        # Create mocks
-        app_mock = AsyncMock()
-        otel_middleware_mock = AsyncMock()
-
-        # Create filter with health check path
-        telemetry_filter = await self.create_telemetry_filter(app_mock)
-        telemetry_filter.otel_middleware = otel_middleware_mock
-
-        # Simulate health check request
-        receive, scope, send = await self.simulate_request("/.well-known/agent-card.json")
-        # Call the filter
-        await telemetry_filter(scope, receive, send)
-
-        # Assert: app was called directly (bypassed OTEL)
-        app_mock.assert_called_once_with(scope, receive, send)
-        otel_middleware_mock.assert_not_called()
-
-    @pytest.mark.anyio
-    async def test_telemetry_filter_allows_regular_requests(self) -> None:
-        """Verify TelemetryFilter applies OpenTelemetry for regular requests."""
-        # Create mocks
-        app_mock = AsyncMock()
-        otel_middleware_mock = AsyncMock()
-
-        telemetry_filter = await self.create_telemetry_filter(app_mock)
-        telemetry_filter.otel_middleware = otel_middleware_mock
-
-        # Simulate regular request
-        receive, scope, send = await self.simulate_request("/a2a/v1/tasks")
-        # Call the filter
-        await telemetry_filter(scope, receive, send)
-
-        # Assert: OTEL middleware was used
-        otel_middleware_mock.assert_called_once_with(scope, receive, send)
-
-    @pytest.mark.anyio
-    async def test_telemetry_filter_handles_non_http_requests(self) -> None:
-        """Verify TelemetryFilter passes non-HTTP requests to OTEL middleware."""
-        # Create mocks
-        app_mock = AsyncMock()
-        otel_middleware_mock = AsyncMock()
-
-        telemetry_filter = await self.create_telemetry_filter(app_mock)
-        telemetry_filter.otel_middleware = otel_middleware_mock
-
-        # Simulate WebSocket request (non-HTTP)
-        receive, scope, send = await self.simulate_request("/ws")
-        # Call the filter
-        await telemetry_filter(scope, receive, send)
-
-        # Assert: OTEL middleware was used (non-HTTP requests go through)
-        otel_middleware_mock.assert_called_once_with(scope, receive, send)