fix: record exception on agent web server

(cherry picked from commit 5dd549c776cefe08156dd9cbdcc2f5519301b480)

Author: feng-95

agentkit/apps/agent_server_app/agent_server_app.py

@@ -159,7 +159,11 @@ async def run_agent_sse(req: RunAgentRequest) -> StreamingResponse:
                 session_id=req.session_id,
             )
             if not session:
-                raise HTTPException(status_code=404, detail="Session not found")
+                e = HTTPException(status_code=404, detail="Session not found")
+                telemetry.trace_agent_server_finish(
+                    path="/run_sse", func_result="", exception=e
+                )
+                raise e
 
             # Convert the events to properly formatted SSE
             async def event_generator():
@@ -212,7 +216,7 @@ async def event_generator():
                 except Exception as e:
                     logger.exception("Error in event_generator: %s", e)
                     telemetry.trace_agent_server_finish(
-                        path="/invoke", func_result="", exception=e
+                        path="/run_sse", func_result="", exception=e
                     )
                     yield f"data: {json.dumps({'error': str(e)})}\n\n"
                 # Returns a streaming response with the proper media type for SSE
@@ -222,6 +226,17 @@ async def event_generator():
                 media_type="text/event-stream",
             )
 
+        # Move the custom /run_sse route to the beginning of the routes list for priority matching (without deleting the ADK default route)
+        routes = self.app.router.routes
+        for i, r in enumerate(routes):
+            if (
+                    getattr(r, "path", None) == "/run_sse"
+                    and "POST" in getattr(r, "methods", set())
+                    and getattr(r,"endpoint", None) == run_agent_sse
+            ):
+                routes.insert(0, routes.pop(i))
+                break
+
         # Attach ASGI middleware for unified telemetry across all routes
         self.app.add_middleware(AgentkitTelemetryHTTPMiddleware)
 
@@ -236,13 +251,25 @@ async def _invoke_compat(request: Request):
                 for k, v in dict(headers).items()
                 if k.lower() not in {"authorization", "token"}
             }
+            # trace request attributes on current span
+            telemetry.trace_agent_server(
+                func_name="_invoke_compat",
+                span=span,
+                headers=telemetry_headers,
+                text="",
+            )
+
             user_id = headers.get("user_id") or "agentkit_user"
             session_id = headers.get("session_id") or ""
 
             # Determine app_name from loader
             app_names = self.server.agent_loader.list_agents()
             if not app_names:
-                raise HTTPException(status_code=404, detail="No agents configured")
+                exception = HTTPException(status_code=404, detail="No agents configured")
+                telemetry.trace_agent_server_finish(
+                    path="/invoke", func_result="", exception=exception
+                )
+                raise exception
             app_name = app_names[0]
 
             # Parse payload and convert to ADK Content
@@ -266,13 +293,6 @@ async def _invoke_compat(request: Request):
                         text = ""
             content = types.UserContent(parts=[types.Part(text=text or "")])
 
-            # trace request attributes on current span
-            telemetry.trace_agent_server(
-                func_name="_invoke_compat",
-                span=span,
-                headers=telemetry_headers,
-                text=text or "",
-            )
 
             # Ensure session exists
             session = await self.server.session_service.get_session(
@@ -305,10 +325,10 @@ async def event_generator():
                     # finish span on successful end of stream handled by middleware
                     pass
                 except Exception as e:
-                    yield f'data: {{"error": "{str(e)}"}}\n\n'
                     telemetry.trace_agent_server_finish(
                         path="/invoke", func_result="", exception=e
                     )
+                    yield f'data: {{"error": "{str(e)}"}}\n\n'
 
             return StreamingResponse(
                 event_generator(),

agentkit/apps/agent_server_app/telemetry.py

@@ -105,8 +105,10 @@ def trace_agent_server_finish(
             }
             if exception:
                 self.handle_exception(span, exception)
-                attributes["error_type"] = exception.__class__.__name__
-
+                if getattr(exception, "status_code", None):
+                    attributes["error_type"] = f"{exception.__class__.__name__}_{exception.status_code}"
+                else:
+                    attributes["error_type"] = exception.__class__.__name__
             # only record invoke request latency metrics
             if (
                 hasattr(span, "start_time")