Conversation
Preserve registered ThreadLocal state across the boundedElastic thread hop used for streaming tool execution. Fixes spring-projects#3877 Signed-off-by: luyu0425 <2072649770@qq.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Preserve registered
ThreadLocalcontext across theboundedElasticthreadhop used for streaming tool execution.
Streaming tool calls execute blocking tool callbacks on a
boundedElasticworker. As a result, thread-local state from the subscribing thread, such as
servlet request attributes, is otherwise unavailable during tool execution.
The change captures registered Micrometer
ThreadLocalAccessorstate atsubscription time, carries it through Reactor Context, and restores it around
tool execution.
It also:
Observationstate so the existing Spring AI tracing hierarchy is preservedRequestAttributesThreadLocalAccessoronly for servlet web applicationsTests cover subscription-time capture, recursive tool-call rounds, scope
cleanup, stale worker state, observation exclusion, and servlet
auto-configuration lifecycle.
Fixes #3877
Testing
./mvnw -pl spring-ai-client-chat -am test./mvnw -pl auto-configurations/models/chat/client/spring-ai-autoconfigure-model-chat-client -am test./mvnw clean package