emecii commented on PR #987: URL: https://github.com/apache/flink-agents/pull/987#issuecomment-5443443953
Rebased onto main (`fabc5f14`) — conflicts resolved, `mergeable` is clean again and CI is 28/28. Thanks for the review. Flagging one part of the resolution, because it was semantic rather than textual and is worth a second pair of eyes. Three files conflicted, two of them only on import blocks. The real one was `ActionExecutionOperator.close()`: #924 replaced `eventRouter.close()` with `eventLogWriter.close()` in the close chain, and `EventRouter` no longer has a `close()` method at all. Taking either side wholesale would have been wrong — "ours" drops `eventLogWriter` from the close path and does not compile, "theirs" drops the aggregation. The ladder now closes: ```java resourceCache, contextManager, pythonBridge, eventLogWriter, durableExecManager ``` then `super.close()`, which matches main's sequence element for element. `ActionExecutionOperatorTest` mocks `EventLogWriter` instead of `EventRouter` accordingly, so the `InOrder` chain still pins the full set. Verified on the rebased branch rather than assuming the pre-rebase runs still held: `./tools/ut.sh -j` 1661 tests / 0 failures / 0 errors / 40 skipped, Python 936 passed / 13 skipped, Ruff, Spotless and RAT clean. Note this needed a full `./tools/build.sh` first, since main moved to `0.4-SNAPSHOT`. Also updated the `Generated-by` trailers to the format AGENTS.md adopted while this was open (`Generated-by: Claude Code 2.1.227 (Claude Opus 5)`). The old line had a blank line before `Co-Authored-By`, so git was not parsing it as a trailer at all; both are now in the same block and `git log --format=%(trailers)` picks them up. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
