Skip to content

Commit 98d1b7f

Browse files
committed
Clean up
1 parent 260cbc4 commit 98d1b7f

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestService.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
import java.time.Duration;
1919
import java.util.Objects;
2020
import java.util.Optional;
21+
import java.util.concurrent.CompletableFuture;
2122
import java.util.concurrent.ExecutionException;
23+
import java.util.concurrent.TimeUnit;
24+
import java.util.concurrent.TimeoutException;
2225
import java.util.concurrent.atomic.AtomicBoolean;
2326
import java.util.function.Supplier;
2427
import javax.annotation.Nullable;
@@ -131,15 +134,16 @@ private void doSendRequest() {
131134
AgentToServer agentToServer = Objects.requireNonNull(requestSupplier).get().getAgentToServer();
132135

133136
byte[] data = agentToServer.encodeByteString().toByteArray();
134-
try (HttpSender.Response response =
135-
requestSender.send(new ByteArrayWriter(data), data.length).get()) {
137+
CompletableFuture<HttpSender.Response> future =
138+
requestSender.send(new ByteArrayWriter(data), data.length);
139+
try (HttpSender.Response response = future.get(30, TimeUnit.SECONDS)) {
136140
if (isSuccessful(response)) {
137141
handleSuccessResponse(
138142
Response.create(ServerToAgent.ADAPTER.decode(response.bodyInputStream())));
139143
} else {
140144
handleHttpError(response);
141145
}
142-
} catch (IOException | InterruptedException e) {
146+
} catch (IOException | InterruptedException | TimeoutException e) {
143147
getCallback().onRequestFailed(e);
144148
} catch (ExecutionException e) {
145149
if (e.getCause() != null) {

0 commit comments

Comments
 (0)