From 31d4574a1cde3e3796d0a304722ec4ed2bc99e87 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 20 Jan 2020 16:05:31 +0100 Subject: [PATCH 1/2] Fix test naming. --- .../ManuallyCreatedLoadBalancerFeignClientTests.java} | 4 ++-- ...uallyCreatedDelegateLoadBalancerFeignClientTests.java} | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) rename tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/{issueX/IssueXTests.java => issue1125/ManuallyCreatedLoadBalancerFeignClientTests.java} (98%) rename tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/{issueY/IssueYTests.java => issue1125delegates/ManuallyCreatedDelegateLoadBalancerFeignClientTests.java} (96%) diff --git a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueX/IssueXTests.java b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue1125/ManuallyCreatedLoadBalancerFeignClientTests.java similarity index 98% rename from tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueX/IssueXTests.java rename to tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue1125/ManuallyCreatedLoadBalancerFeignClientTests.java index 6bb43fa99..caa7a8058 100644 --- a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueX/IssueXTests.java +++ b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue1125/ManuallyCreatedLoadBalancerFeignClientTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.sleuth.instrument.feign.issues.issueX; +package org.springframework.cloud.sleuth.instrument.feign.issues.issue1125; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -57,7 +57,7 @@ import static org.assertj.core.api.BDDAssertions.then; webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "feign.hystrix.enabled=false" }) @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) -public class IssueXTests { +public class ManuallyCreatedLoadBalancerFeignClientTests { @Autowired MyClient myClient; diff --git a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueY/IssueYTests.java b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue1125delegates/ManuallyCreatedDelegateLoadBalancerFeignClientTests.java similarity index 96% rename from tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueY/IssueYTests.java rename to tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue1125delegates/ManuallyCreatedDelegateLoadBalancerFeignClientTests.java index 5ca471a46..8fc639b98 100644 --- a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueY/IssueYTests.java +++ b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue1125delegates/ManuallyCreatedDelegateLoadBalancerFeignClientTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.sleuth.instrument.feign.issues.issueY; +package org.springframework.cloud.sleuth.instrument.feign.issues.issue1125delegates; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -61,9 +61,9 @@ import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) @SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.NONE, - properties = { "feign.hystrix.enabled=false" }) + properties = {"feign.hystrix.enabled=false"}) @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) -public class IssueYTests { +public class ManuallyCreatedDelegateLoadBalancerFeignClientTests { @Autowired MyClient myClient; @@ -138,7 +138,7 @@ class Application { public MyNameRemote myNameRemote(Client client, Decoder decoder, Encoder encoder, Contract contract) { return Feign.builder().client(client).encoder(encoder).decoder(decoder) - .contract(contract).target(new HardCodedTarget( + .contract(contract).target(new HardCodedTarget<>( MyNameRemote.class, "foo", "https://non.existing.url")); } From 349354a1c76056b39bde541b31b434cafab0d4d0 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 21 Jan 2020 10:13:29 +0100 Subject: [PATCH 2/2] Added info about activemq sender --- docs/src/main/asciidoc/spring-cloud-sleuth.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc index 96f4009cc..40e8d9c50 100644 --- a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc +++ b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc @@ -1009,8 +1009,8 @@ zipkinserver: ListOfServers: host1,host2 ---- -If you have web, rabbit, or kafka together on the classpath, you might need to pick the means by which you would like to send spans to zipkin. -To do so, set `web`, `rabbit`, or `kafka` to the `spring.zipkin.sender.type` property. +If you have web, rabbit, activemq or kafka together on the classpath, you might need to pick the means by which you would like to send spans to zipkin. +To do so, set `web`, `rabbit`, `activemq` or `kafka` to the `spring.zipkin.sender.type` property. The following example shows setting the sender type for `web`: [source,yaml]