root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Revert "Merge branch '3.2.x' into 3.3.x" 

This reverts commit d86160d362, reversing
changes made to 70d2907351.

See gh-42388
This commit is contained in:
Andy Wilkinson 2024-09-20 11:07:30 +01:00
parent a1593585e3 b4702612de
commit 391b643d8d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSenderTests.java
View File

@ -81,7 +81,7 @@ class ZipkinWebClientSenderTests extends ZipkinHttpSenderTests {
@Override @Override
BytesMessageSender createSender() { BytesMessageSender createSender() {
return createSender(Encoding.JSON, Duration.ofMinutes(1)); return createSender(Encoding.JSON, Duration.ofSeconds(10));
} }
ZipkinWebClientSender createSender(Encoding encoding, Duration timeout) { ZipkinWebClientSender createSender(Encoding encoding, Duration timeout) {
@ -110,7 +110,7 @@ class ZipkinWebClientSenderTests extends ZipkinHttpSenderTests {
void sendShouldSendSpansToZipkinInProto3() throws IOException, InterruptedException { void sendShouldSendSpansToZipkinInProto3() throws IOException, InterruptedException {
mockBackEnd.enqueue(new MockResponse()); mockBackEnd.enqueue(new MockResponse());
List<byte[]> encodedSpans = List.of(toByteArray("span1"), toByteArray("span2")); List<byte[]> encodedSpans = List.of(toByteArray("span1"), toByteArray("span2"));
try (BytesMessageSender sender = createSender(Encoding.PROTO3, Duration.ofMinutes(1))) { try (BytesMessageSender sender = createSender(Encoding.PROTO3, Duration.ofSeconds(10))) {
sender.send(encodedSpans); sender.send(encodedSpans);
} }
requestAssertions((request) -> { requestAssertions((request) -> {
@ -126,7 +126,7 @@ class ZipkinWebClientSenderTests extends ZipkinHttpSenderTests {
mockBackEnd.enqueue(new MockResponse()); mockBackEnd.enqueue(new MockResponse());
try (HttpEndpointSupplier httpEndpointSupplier = new TestHttpEndpointSupplier(ZIPKIN_URL)) { try (HttpEndpointSupplier httpEndpointSupplier = new TestHttpEndpointSupplier(ZIPKIN_URL)) {
try (BytesMessageSender sender = createSender((endpoint) -> httpEndpointSupplier, Encoding.JSON, try (BytesMessageSender sender = createSender((endpoint) -> httpEndpointSupplier, Encoding.JSON,
Duration.ofMinutes(1))) { Duration.ofSeconds(10))) {
sender.send(Collections.emptyList()); sender.send(Collections.emptyList());
sender.send(Collections.emptyList()); sender.send(Collections.emptyList());
} }