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

Merge branch '2.2.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-01-21 10:13:44 +01:00
parent 8866b84906 349354a1c7
commit 598f924db9
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/src/main/asciidoc/spring-cloud-sleuth.adoc
View File

@@ -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]

4
tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueX/IssueXTests.java → tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue1125/ManuallyCreatedLoadBalancerFeignClientTests.java
View File

@@ -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;

8
tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueY/IssueYTests.java → tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue1125delegates/ManuallyCreatedDelegateLoadBalancerFeignClientTests.java
View File

@@ -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<MyNameRemote>(
.contract(contract).target(new HardCodedTarget<>(
MyNameRemote.class, "foo", "https://non.existing.url"));
}