From 24884ec2777940a6c0f37c54d758258d6c7207be Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Thu, 10 Dec 2020 14:03:36 +0100 Subject: [PATCH] Adjust to changes in commons. --- .../web/client/exception/WebClientExceptionTests.java | 6 ++++-- .../integration/notsampled/WebClientNotSampledTests.java | 5 ++++- .../integration/parser/WebClientCustomParserTests.java | 5 ++++- .../web/client/integration/sampled/WebClientTests.java | 5 ++++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java index c75fbe8a0..7737240c6 100644 --- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java +++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java @@ -30,9 +30,11 @@ import org.junit.jupiter.params.provider.MethodSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient; import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier; +import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.sleuth.Span; @@ -149,8 +151,8 @@ public class WebClientExceptionTests { @Bean public ServiceInstanceListSupplier serviceInstanceListSupplier(Environment env) { - return ServiceInstanceListSupplier.fixed(env) - .instance("invalid.host.to.break.tests", 1234, "exceptionservice").build(); + return ServiceInstanceListSuppliers.from("exceptionservice", new DefaultServiceInstance( + "exceptionservice" + "-1", "exceptionservice", "invalid.host.to.break.tests", 1234, false)); } } diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/notsampled/WebClientNotSampledTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/notsampled/WebClientNotSampledTests.java index 9ce33e3ea..07d1d8a6a 100644 --- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/notsampled/WebClientNotSampledTests.java +++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/notsampled/WebClientNotSampledTests.java @@ -30,9 +30,11 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration; import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient; import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier; +import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.sleuth.Span; @@ -181,7 +183,8 @@ public abstract class WebClientNotSampledTests { @Bean public ServiceInstanceListSupplier serviceInstanceListSupplier(Environment env) { - return ServiceInstanceListSupplier.fixed(env).instance(this.port, "fooservice").build(); + return ServiceInstanceListSuppliers.from("fooservice", + new DefaultServiceInstance("fooservice" + "-1", "fooservice", "localhost", port, false)); } } diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/parser/WebClientCustomParserTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/parser/WebClientCustomParserTests.java index 81a0772d8..b0fb5c2d1 100644 --- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/parser/WebClientCustomParserTests.java +++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/parser/WebClientCustomParserTests.java @@ -28,8 +28,10 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration; import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient; import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier; +import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.sleuth.Span; @@ -123,7 +125,8 @@ public abstract class WebClientCustomParserTests { @Bean public ServiceInstanceListSupplier serviceInstanceListSupplier(Environment env) { - return ServiceInstanceListSupplier.fixed(env).instance(this.port, "fooservice").build(); + return ServiceInstanceListSuppliers.from("fooservice", + new DefaultServiceInstance("fooservice" + "-1", "fooservice", "localhost", port, false)); } } diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/sampled/WebClientTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/sampled/WebClientTests.java index c1e69c5ff..2323c45fc 100644 --- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/sampled/WebClientTests.java +++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/sampled/WebClientTests.java @@ -50,9 +50,11 @@ import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.boot.web.client.RestTemplateCustomizer; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.boot.web.servlet.error.ErrorAttributes; +import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient; import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier; +import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.sleuth.Span; @@ -544,7 +546,8 @@ public abstract class WebClientTests { @Bean public ServiceInstanceListSupplier serviceInstanceListSupplier(Environment env) { - return ServiceInstanceListSupplier.fixed(env).instance(this.port, "fooservice").build(); + return ServiceInstanceListSuppliers.from("fooservice", + new DefaultServiceInstance("fooservice" + "-1", "fooservice", "localhost", port, false)); } }