Skip to content

Commit 560c92a

Browse files
committed
Using daemon thread factory
1 parent 061e743 commit 560c92a

File tree

3 files changed

+23
-18
lines changed

3 files changed

+23
-18
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package io.opentelemetry.opamp.client.internal.request.service;
2+
3+
import java.util.concurrent.Executors;
4+
import java.util.concurrent.ThreadFactory;
5+
import javax.annotation.Nonnull;
6+
7+
final class DaemonThreadFactory implements ThreadFactory {
8+
private final ThreadFactory delegate = Executors.defaultThreadFactory();
9+
10+
@Override
11+
public Thread newThread(@Nonnull Runnable r) {
12+
Thread t = delegate.newThread(r);
13+
try {
14+
t.setDaemon(true);
15+
} catch (SecurityException e) {
16+
// Well, we tried.
17+
}
18+
return t;
19+
}
20+
}

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@
2222
import java.util.concurrent.Executors;
2323
import java.util.concurrent.ScheduledExecutorService;
2424
import java.util.concurrent.ScheduledFuture;
25-
import java.util.concurrent.ThreadFactory;
2625
import java.util.concurrent.TimeUnit;
2726
import java.util.concurrent.TimeoutException;
2827
import java.util.concurrent.atomic.AtomicBoolean;
2928
import java.util.concurrent.atomic.AtomicReference;
3029
import java.util.function.Supplier;
31-
import javax.annotation.Nonnull;
3230
import javax.annotation.Nullable;
3331
import opamp.proto.AgentToServer;
3432
import opamp.proto.ServerErrorResponse;
@@ -255,19 +253,4 @@ Duration getNextDelay() {
255253
return currentDelay.getNextDelay();
256254
}
257255
}
258-
259-
private static class DaemonThreadFactory implements ThreadFactory {
260-
private final ThreadFactory delegate = Executors.defaultThreadFactory();
261-
262-
@Override
263-
public Thread newThread(@Nonnull Runnable r) {
264-
Thread t = delegate.newThread(r);
265-
try {
266-
t.setDaemon(true);
267-
} catch (SecurityException e) {
268-
// Well, we tried.
269-
}
270-
return t;
271-
}
272-
}
273256
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ public static WebSocketRequestService create(WebSocket webSocket) {
6464
public static WebSocketRequestService create(
6565
WebSocket webSocket, PeriodicDelay periodicRetryDelay) {
6666
return new WebSocketRequestService(
67-
webSocket, periodicRetryDelay, Executors.newSingleThreadScheduledExecutor());
67+
webSocket,
68+
periodicRetryDelay,
69+
Executors.newSingleThreadScheduledExecutor(new DaemonThreadFactory()));
6870
}
6971

7072
WebSocketRequestService(

0 commit comments

Comments
 (0)