Conversation
Eureka registry calls must not use load-balanced RestClient or WebClient builders. Filter @LoadBalanced beans when resolving builders and fall back to plain factory methods when needed. Fixes spring-cloudgh-4591 Signed-off-by: arimu1 <19286898+arimu1@users.noreply.github.com>
ryanjbaxter
requested changes
Sep 17, 2026
|
|
||
| private static <T> T resolveNonLoadBalancedBuilder(ConfigurableListableBeanFactory beanFactory, Class<T> type, | ||
| Supplier<T> fallback) { | ||
| for (String name : beanFactory.getBeanNamesForType(type)) { |
Contributor
There was a problem hiding this comment.
The selected bean ignores @Order/@Priority of beans
| return () -> resolveNonLoadBalancedBuilder(beanFactory, WebClient.Builder.class, WebClient::builder); | ||
| } | ||
|
|
||
| private static <T> T resolveNonLoadBalancedBuilder(ConfigurableListableBeanFactory beanFactory, Class<T> type, |
Contributor
There was a problem hiding this comment.
This only needs to happen once, and not once right now it happens on every EurekaClient creation
| } | ||
|
|
||
| @Test | ||
| void restClientTransportPrefersPlainRestClientBuilderOverLoadBalanced() { |
Contributor
There was a problem hiding this comment.
WebClient should have a similar test
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
3 participants
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
RestClient.Builder/WebClient.Buildercandidates by excluding beans annotated with@LoadBalanced, so calls to the Eureka server URL are not routed through the load balancer (fixesNo instances available for localhostwhen only a load-balanced builder is registered).RestClient.builder()/WebClient.builder()when every registered builder is load-balanced.Fixes gh-4591 (same root cause as gh-4524).
Test plan
./mvnw -pl spring-cloud-netflix-eureka-client -Dtest=LoadBalancedEurekaHttpClientBuilderConfigurationTests test(JDK 21)./mvnw -pl spring-cloud-netflix-eureka-client -am test— module suite passes except pre-existingEurekaConfigServerBootstrapperIntegrationTests(Docker not available locally)