Skip to content

Commit 391b643

Browse files
committed
Revert "Merge branch '3.2.x' into 3.3.x"
This reverts commit d86160d, reversing changes made to 70d2907. See gh-42388
2 parents a159358 + b470261 commit 391b643

File tree

1 file changed

+3
-3
lines changed
  • spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin

1 file changed

+3
-3
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void beforeEach() {
8181

8282
@Override
8383
BytesMessageSender createSender() {
84-
return createSender(Encoding.JSON, Duration.ofMinutes(1));
84+
return createSender(Encoding.JSON, Duration.ofSeconds(10));
8585
}
8686

8787
ZipkinWebClientSender createSender(Encoding encoding, Duration timeout) {
@@ -110,7 +110,7 @@ void sendShouldSendSpansToZipkin() throws IOException, InterruptedException {
110110
void sendShouldSendSpansToZipkinInProto3() throws IOException, InterruptedException {
111111
mockBackEnd.enqueue(new MockResponse());
112112
List<byte[]> encodedSpans = List.of(toByteArray("span1"), toByteArray("span2"));
113-
try (BytesMessageSender sender = createSender(Encoding.PROTO3, Duration.ofMinutes(1))) {
113+
try (BytesMessageSender sender = createSender(Encoding.PROTO3, Duration.ofSeconds(10))) {
114114
sender.send(encodedSpans);
115115
}
116116
requestAssertions((request) -> {
@@ -126,7 +126,7 @@ void sendUsesDynamicEndpoint() throws Exception {
126126
mockBackEnd.enqueue(new MockResponse());
127127
try (HttpEndpointSupplier httpEndpointSupplier = new TestHttpEndpointSupplier(ZIPKIN_URL)) {
128128
try (BytesMessageSender sender = createSender((endpoint) -> httpEndpointSupplier, Encoding.JSON,
129-
Duration.ofMinutes(1))) {
129+
Duration.ofSeconds(10))) {
130130
sender.send(Collections.emptyList());
131131
sender.send(Collections.emptyList());
132132
}

0 commit comments

Comments
 (0)