Skip to content

Commit 2b906b9

Browse files
committed
Fixed build for jdk 17
1 parent 068b579 commit 2b906b9

File tree

3 files changed

+47
-6
lines changed

3 files changed

+47
-6
lines changed

metrics-examples/src/main/java/io/scalecube/metrics/loki/LokiPublisherAgent.java

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
import java.time.Duration;
1515
import java.util.ArrayList;
1616
import java.util.concurrent.CompletableFuture;
17+
import java.util.concurrent.ExecutorService;
18+
import java.util.concurrent.Executors;
1719
import java.util.zip.GZIPOutputStream;
18-
import org.agrona.CloseHelper;
1920
import org.agrona.LangUtil;
2021
import org.agrona.concurrent.Agent;
2122
import org.agrona.concurrent.AgentTerminationException;
@@ -45,6 +46,7 @@ public enum State {
4546
private final Delay retryInterval;
4647
private final Delay publishInterval;
4748
private HttpClient httpClient;
49+
private ExecutorService executor;
4850
private CompletableFuture<HttpResponse<String>> future;
4951
private State state = State.CLOSED;
5052

@@ -97,7 +99,14 @@ private int init() {
9799
return 0;
98100
}
99101

100-
httpClient = HttpClient.newHttpClient();
102+
executor =
103+
Executors.newSingleThreadExecutor(
104+
r -> {
105+
final var thread = new Thread(r);
106+
thread.setDaemon(true);
107+
return thread;
108+
});
109+
httpClient = HttpClient.newBuilder().executor(executor).build();
101110
publishInterval.delay();
102111

103112
state(State.RUNNING);
@@ -157,8 +166,12 @@ public static byte[] gzip(WriteRequest request) {
157166
}
158167

159168
private int cleanup() {
160-
CloseHelper.quietClose(httpClient);
169+
if (executor != null) {
170+
executor.shutdownNow();
171+
}
172+
// CloseHelper.quietClose(httpClient);
161173
httpClient = null;
174+
executor = null;
162175

163176
if (future != null) {
164177
future.cancel(true);

metrics-mimir/src/main/java/io/scalecube/metrics/mimir/MimirPublisherAgent.java

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
import java.net.http.HttpResponse;
1010
import java.time.Duration;
1111
import java.util.concurrent.CompletableFuture;
12-
import org.agrona.CloseHelper;
12+
import java.util.concurrent.ExecutorService;
13+
import java.util.concurrent.Executors;
1314
import org.agrona.LangUtil;
1415
import org.agrona.concurrent.Agent;
1516
import org.agrona.concurrent.AgentTerminationException;
@@ -37,6 +38,7 @@ public enum State {
3738

3839
private final Delay retryInterval;
3940
private final Delay publishInterval;
41+
private ExecutorService executor;
4042
private HttpClient httpClient;
4143
private CompletableFuture<HttpResponse<String>> future;
4244
private State state = State.CLOSED;
@@ -90,7 +92,14 @@ private int init() {
9092
return 0;
9193
}
9294

93-
httpClient = HttpClient.newHttpClient();
95+
executor =
96+
Executors.newSingleThreadExecutor(
97+
r -> {
98+
final var thread = new Thread(r);
99+
thread.setDaemon(true);
100+
return thread;
101+
});
102+
httpClient = HttpClient.newBuilder().executor(executor).build();
94103
publishInterval.delay();
95104

96105
state(State.RUNNING);
@@ -154,8 +163,12 @@ private CompletableFuture<HttpResponse<String>> send(WriteRequest request) {
154163
}
155164

156165
private int cleanup() {
157-
CloseHelper.quietClose(httpClient);
166+
if (executor != null) {
167+
executor.shutdownNow();
168+
}
169+
// CloseHelper.quietClose(httpClient);
158170
httpClient = null;
171+
executor = null;
159172

160173
if (future != null) {
161174
future.cancel(true);

pom.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,4 +223,19 @@
223223
</dependencies>
224224
</dependencyManagement>
225225

226+
<build>
227+
<plugins>
228+
<plugin>
229+
<artifactId>maven-surefire-plugin</artifactId>
230+
<configuration>
231+
<argLine>
232+
-javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar
233+
--add-exports java.base/jdk.internal.misc=ALL-UNNAMED
234+
--add-exports java.base/sun.nio.ch=ALL-UNNAMED
235+
</argLine>
236+
</configuration>
237+
</plugin>
238+
</plugins>
239+
</build>
240+
226241
</project>

0 commit comments

Comments
 (0)