From eca49777fb57dab8622acba1fa1dd0d9052fa14c Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 21 Jul 2020 21:33:24 +0200 Subject: [PATCH] Fix --- benchmarks/src/main/resources/application.yml | 2 +- .../sleuth/zipkin2/ZipkinDiscoveryClientTests.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/benchmarks/src/main/resources/application.yml b/benchmarks/src/main/resources/application.yml index 8eb7c1da3..3cea7ae21 100644 --- a/benchmarks/src/main/resources/application.yml +++ b/benchmarks/src/main/resources/application.yml @@ -1,4 +1,4 @@ logging.level: org.springframework: ERROR - org.springframework.sleuth: ERROR + org.springframework.sleuth: INFO brave: ERROR diff --git a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinDiscoveryClientTests.java b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinDiscoveryClientTests.java index f023211df..db7d65ef4 100644 --- a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinDiscoveryClientTests.java +++ b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinDiscoveryClientTests.java @@ -35,6 +35,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; import org.springframework.cloud.client.loadbalancer.LoadBalancerRequest; +import org.springframework.cloud.client.loadbalancer.Request; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -109,6 +110,10 @@ public class ZipkinDiscoveryClientTests { @Override public ServiceInstance choose(String serviceId) { + return instance(); + } + + private ServiceInstance instance() { return new ServiceInstance() { @Override public String getServiceId() { @@ -141,6 +146,11 @@ public class ZipkinDiscoveryClientTests { } }; } + + @Override + public ServiceInstance choose(String serviceId, Request request) { + return instance(); + } }; }