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

Adjust to changes in commons.

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2020-12-10 14:10:23 +01:00
parent 24884ec277
commit 3e47aae3c6
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java
View File

@@ -42,7 +42,6 @@ import org.springframework.cloud.sleuth.Tracer;
import org.springframework.cloud.sleuth.test.TestSpanHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.http.ResponseEntity;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.test.annotation.DirtiesContext;
@@ -150,9 +149,10 @@ public class WebClientExceptionTests {
public static class ExceptionServiceLoadBalancerClientConfiguration {
@Bean
public ServiceInstanceListSupplier serviceInstanceListSupplier(Environment env) {
return ServiceInstanceListSuppliers.from("exceptionservice", new DefaultServiceInstance(
"exceptionservice" + "-1", "exceptionservice", "invalid.host.to.break.tests", 1234, false));
public ServiceInstanceListSupplier serviceInstanceListSupplier() {
return ServiceInstanceListSuppliers
.from("exceptionservice", new DefaultServiceInstance(
"exceptionservice" + "-1", "exceptionservice", "invalid.host.to.break.tests", 1234, false));
}
}

3
tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/notsampled/WebClientNotSampledTests.java
View File

@@ -42,7 +42,6 @@ import org.springframework.cloud.sleuth.Tracer;
import org.springframework.cloud.sleuth.test.TestSpanHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;
import org.springframework.test.annotation.DirtiesContext;
@@ -182,7 +181,7 @@ public abstract class WebClientNotSampledTests {
private int port = 0;
@Bean
public ServiceInstanceListSupplier serviceInstanceListSupplier(Environment env) {
public ServiceInstanceListSupplier serviceInstanceListSupplier() {
return ServiceInstanceListSuppliers.from("fooservice",
new DefaultServiceInstance("fooservice" + "-1", "fooservice", "localhost", port, false));
}

3
tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/parser/WebClientCustomParserTests.java
View File

@@ -44,7 +44,6 @@ import org.springframework.cloud.sleuth.test.TestSpanHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.core.env.Environment;
import org.springframework.http.ResponseEntity;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
@@ -124,7 +123,7 @@ public abstract class WebClientCustomParserTests {
private int port = 0;
@Bean
public ServiceInstanceListSupplier serviceInstanceListSupplier(Environment env) {
public ServiceInstanceListSupplier serviceInstanceListSupplier() {
return ServiceInstanceListSuppliers.from("fooservice",
new DefaultServiceInstance("fooservice" + "-1", "fooservice", "localhost", port, false));
}

3
tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/sampled/WebClientTests.java
View File

@@ -63,7 +63,6 @@ import org.springframework.cloud.sleuth.exporter.FinishedSpan;
import org.springframework.cloud.sleuth.test.TestSpanHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;
import org.springframework.test.annotation.DirtiesContext;
@@ -545,7 +544,7 @@ public abstract class WebClientTests {
private int port = 0;
@Bean
public ServiceInstanceListSupplier serviceInstanceListSupplier(Environment env) {
public ServiceInstanceListSupplier serviceInstanceListSupplier() {
return ServiceInstanceListSuppliers.from("fooservice",
new DefaultServiceInstance("fooservice" + "-1", "fooservice", "localhost", port, false));
}