SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed Zipkin with WebFlux to use filter function; related to gh-2339

Browse Source
This commit is contained in:
Marcin Grzejszczak
2024-02-09 14:19:52 +01:00
parent 71a141a702
commit 4f47bce169
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfiguration.java
View File

@@ -16,8 +16,6 @@
package org.springframework.cloud.sleuth.autoconfig.zipkin2;
import java.net.URI;
import zipkin2.reporter.Sender;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +28,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
import org.springframework.cloud.client.loadbalancer.reactive.LoadBalancedExchangeFilterFunction;
import org.springframework.cloud.sleuth.zipkin2.CachingZipkinUrlExtractor;
import org.springframework.cloud.sleuth.zipkin2.LoadBalancerClientZipkinLoadBalancer;
import org.springframework.cloud.sleuth.zipkin2.RestTemplateSender;
@@ -45,6 +44,7 @@ import org.springframework.cloud.sleuth.zipkin2.ZipkinWebClientBuilderProvider;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.lang.Nullable;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.reactive.function.client.WebClient;
@@ -84,17 +84,19 @@ class ZipkinHttpSenderConfiguration {
static class ZipkinReactiveConfiguration {
@Bean(ZipkinAutoConfiguration.SENDER_BEAN_NAME)
Sender webClientSender(ZipkinProperties zipkin, ZipkinWebClientBuilderProvider zipkinWebClientBuilderProvider,
ZipkinUrlExtractor zipkinUrlExtractor) {
Sender webClientSender(ZipkinProperties zipkin, ZipkinWebClientBuilderProvider zipkinWebClientBuilderProvider) {
WebClient.Builder webClientBuilder = zipkinWebClientBuilderProvider.zipkinWebClientBuilder();
URI uri = zipkinUrlExtractor.zipkinUrl(zipkin);
return new WebClientSender(webClientBuilder.build(), uri.toString(), zipkin.getApiPath(),
return new WebClientSender(webClientBuilder.build(), zipkin.getBaseUrl(), zipkin.getApiPath(),
zipkin.getEncoder(), zipkin.getCheckTimeout());
}
@Bean
@ConditionalOnMissingBean
ZipkinWebClientBuilderProvider defaultZipkinWebClientProvider() {
ZipkinWebClientBuilderProvider defaultZipkinWebClientProvider(
final @Nullable LoadBalancedExchangeFilterFunction filterFunction) {
if (filterFunction != null) {
return () -> WebClient.builder().filter(filterFunction);
}
return WebClient::builder;
}

3
spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfigurationReactiveTests.java
View File

@@ -49,7 +49,8 @@ class ZipkinHttpSenderConfigurationReactiveTests {
springApplication.setWebApplicationType(WebApplicationType.REACTIVE);
try (ConfigurableApplicationContext context = springApplication.run("--spring.sleuth.noop.enabled=true",
"--server.port=0", "--spring.zipkin.base-url=http://cloudUrl")) {
"--server.port=0", "--spring.zipkin.base-url=http://cloudUrl",
"--spring.cloud.discovery.client.simple.instances.cloudUrl[0].uri=http://localhost:9411")) {
then(context.getBean(Sender.class)).isInstanceOf(WebClientSender.class);
}
}