Repository navigation
Commit faa3482
fix(a2a): fail the A2A stream in the handler, not via the transport
`StreamHandler.handleEvent` called `ResponseConverter.clientEventToEvent` with no
guard, so a conversion failure escaped into the transport's read loop and
whether the caller saw anything at all depended on what that loop did with it.
On the default JSON-RPC/SSE transport it does terminate today, but only by
accident of an implementation detail: the throw escapes the body subscriber in
`JdkA2AHttpClient` and the JDK's own line-subscriber adapter catches it, cancels
the subscription and re-signals it as `onError`. Nothing in the A2A client
guarantees that - `Client` catches only `A2AClientError` and the SSE listener
only `JsonProcessingException` - and a gRPC `StreamObserver` or a custom
`A2AHttpClient` need not behave the same way. The error also arrives mislabelled
as `Failed to communicate with the remote agent` when the connection was fine
and the payload was not.
Fail the flow in the handler with a message that names the real cause, then
rethrow so the transport still tears the connection down as it does today.
The rethrow is skipped in exactly one case: synchronous dispatch, where
`Client.sendMessage` invokes the consumer inline and `Flowable.create` has
already failed the flow, so throwing into it would only add an undeliverable
through `RxJavaPlugins`. That case is identified by both being inside the
`sendMessage` call and running on the subscribe thread. Each condition alone
misses a different transport, and both misses silently leak the connection:
thread identity alone misses a transport that delivers on the subscribe thread
after `sendMessage` returns, and the `sendMessage` window alone misses a
transport thread that delivers while the call is still on the stack.
`handleError` is idempotent, so a transport that re-signals cannot double-report
to the subscriber.
Behaviour change for non-streaming callers: a conversion failure previously
reached the subscriber as the raw `IllegalArgumentException`, because
`Flowable.create` passed the throw straight through. It is now wrapped in
`A2AClientError` with the original as the cause, which is what makes the two
paths consistent.
PiperOrigin-RevId: 9620313901 parent e5aba3a commit faa3482
2 files changed
Lines changed: 204 additions & 9 deletions
File tree
- a2a/src
- main/java/com/google/adk/a2a/agent
- test/java/com/google/adk/a2a/agent
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
228 | 228 | | |
229 | 229 | | |
230 | 230 | | |
231 | | - | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
232 | 236 | | |
233 | 237 | | |
234 | | - | |
| 238 | + | |
| 239 | + | |
235 | 240 | | |
236 | 241 | | |
237 | 242 | | |
238 | 243 | | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
239 | 250 | | |
240 | 251 | | |
241 | 252 | | |
| |||
249 | 260 | | |
250 | 261 | | |
251 | 262 | | |
252 | | - | |
253 | 263 | | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
254 | 283 | | |
255 | 284 | | |
256 | 285 | | |
| |||
259 | 288 | | |
260 | 289 | | |
261 | 290 | | |
262 | | - | |
263 | | - | |
| 291 | + | |
| 292 | + | |
264 | 293 | | |
265 | 294 | | |
266 | 295 | | |
267 | | - | |
268 | 296 | | |
| 297 | + | |
269 | 298 | | |
270 | 299 | | |
271 | 300 | | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
272 | 305 | | |
273 | 306 | | |
274 | 307 | | |
| |||
280 | 313 | | |
281 | 314 | | |
282 | 315 | | |
283 | | - | |
| 316 | + | |
284 | 317 | | |
285 | 318 | | |
286 | 319 | | |
| |||
296 | 329 | | |
297 | 330 | | |
298 | 331 | | |
299 | | - | |
300 | | - | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
301 | 359 | | |
302 | 360 | | |
303 | 361 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
27 | 28 | | |
| 29 | + | |
28 | 30 | | |
29 | 31 | | |
30 | 32 | | |
| |||
51 | 53 | | |
52 | 54 | | |
53 | 55 | | |
| 56 | + | |
54 | 57 | | |
55 | 58 | | |
56 | 59 | | |
| |||
61 | 64 | | |
62 | 65 | | |
63 | 66 | | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
64 | 71 | | |
65 | 72 | | |
66 | 73 | | |
67 | 74 | | |
| 75 | + | |
68 | 76 | | |
| 77 | + | |
69 | 78 | | |
70 | 79 | | |
71 | 80 | | |
| |||
300 | 309 | | |
301 | 310 | | |
302 | 311 | | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
303 | 431 | | |
304 | 432 | | |
305 | 433 | | |
| |||
796 | 924 | | |
797 | 925 | | |
798 | 926 | | |
| 927 | + | |
| 928 | + | |
| 929 | + | |
| 930 | + | |
| 931 | + | |
| 932 | + | |
| 933 | + | |
| 934 | + | |
| 935 | + | |
799 | 936 | | |
800 | 937 | | |
801 | 938 | | |
| |||
0 commit comments