Use Virtual Threads (#519)

* migrating thread pools to virtual threads

* using virtual thread executor when querying remote dns servers

* fixing test

* stress test related code

* configuring supervisor

* adjusting default dns

* created stress test

* created stress test

* creating docs of how to use stress tests

* more asserts

* creating collector structure

* skipping login page and set as admin

* configuring metrics

* fixing test conflict with running dps on machine

* configuring default dashboards

* changing filter time

* updating the docs

* adjusting the docs order

* linking doc

* clean code

* clean code

* release notes

* [Gradle Release Plugin] - new version commit:  '3.25.0-snapshot'.

Author: mageddo

.gitignore

@@ -71,3 +71,5 @@ issues
 /files
 tmp/
 Poc.java
+
+src/stress-test/docker/dps-stress-test-instance/files

RELEASE-NOTES.md

@@ -1,4 +1,7 @@
-## 3.24.2 
+## 3.25.0
+* Optimize resource utilization by using Java Virtual Threads #436.
+
+## 3.24.2
 * Mitigate arm release failure due inexistence of required debian package #517
 
 ## 3.24.1

build.gradle

@@ -24,6 +24,21 @@ repositories {
 sourceCompatibility = JavaVersion.VERSION_21
 targetCompatibility = JavaVersion.VERSION_21
 
+sourceSets {
+  stressTest {
+    java {
+      srcDir 'src/stress-test/java'
+    }
+    resources {
+      srcDir 'src/stress-test/resources'
+    }
+    compileClasspath += sourceSets.test.runtimeClasspath
+    runtimeClasspath += sourceSets.test.runtimeClasspath
+  }
+}
+
+
+
 dependencies {
 
   compileOnly('org.projectlombok:lombok:1.18.+')
@@ -56,9 +71,13 @@ dependencies {
   implementation('com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.1')
 
   testAnnotationProcessor("com.google.dagger:dagger-compiler:2.45")
+
   testCompileOnly('org.projectlombok:lombok:1.18.+')
   testAnnotationProcessor('org.projectlombok:lombok:1.18.+')
 
+  stressTestCompileOnly('org.projectlombok:lombok:1.18.+')
+  stressTestAnnotationProcessor('org.projectlombok:lombok:1.18.+')
+
   testImplementation("org.junit.jupiter:junit-jupiter:5.10.+")
   testImplementation('org.mockito:mockito-junit-jupiter:5.12.+')
   testImplementation('io.rest-assured:rest-assured:5.3.0')
@@ -83,6 +102,19 @@ task compTest(type: Test) {
   }
 }
 
+task stressTest(type: Test) {
+
+  testClassesDirs = sourceSets.stressTest.output.classesDirs
+  classpath += sourceSets.stressTest.runtimeClasspath
+
+  useJUnitPlatform()
+  include "**/*Test.class"
+  failFast = true
+  testLogging {
+    events "passed", "skipped", "failed"
+  }
+}
+
 compileJava {
   options.encoding = 'UTF-8'
   options.compilerArgs << '-parameters'

docs/content/4-developing/compiling.en.md

@@ -1,7 +1,7 @@
 ---
 title: Compiling from source
 weight: 4
-pre: "<b>4. </b>"
+pre: "<b>1. </b>"
 ---
 
 ## Requirements

docs/content/4-developing/generating-docs.en.md

@@ -1,7 +1,7 @@
 ---
 title: Generating the docs
 weight: 6
-pre: "<b>6. </b>"
+pre: "<b>2. </b>"
 ---
 
 ## Introduction

docs/content/4-developing/releasing.en.md

@@ -1,7 +1,7 @@
 ---
 title: Release Process
 weight: 7
-pre: "<b>7. </b>"
+pre: "<b>3. </b>"
 ---
 
 ## Feature Request - Phase 1

docs/content/4-developing/stress-tests.en.md

@@ -0,0 +1,28 @@
+---
+title: Stress Tests
+pre: "<b>4. </b>"
+---
+
+Start DPS Instance to be tested
+
+```bash
+./gradlew clean build compTest shadowJar nativeImageJar nativeCompile -i
+cp build/native/nativeCompile/dns-proxy-server ./src/stress-test/docker/dps-stress-test-instance/files/
+docker-compose -f src/stress-test/docker/dps-stress-test-instance/docker-compose.yml up --build
+```
+
+Start Grafana Stack to Collect Performance Metrics
+
+```bash
+docker-compose -f src/stress-test/docker/grafana/docker-compose.yml up --build
+```
+
+Run the Stress Test Suite
+
+```bash 
+./gradlew build stressTest
+```
+
+Access http://localhost:3000 to see the metrics
+
+[1]: {{%relref "1-getting-started/requirements/_index.en.md" %}}

gradle.properties

@@ -1 +1 @@
-version=3.24.2-snapshot
+version=3.25.0-snapshot

src/main/java/com/mageddo/dnsproxyserver/solver/RemoteResolvers.java

@@ -3,25 +3,39 @@
 import com.mageddo.net.IpAddr;
 
 import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.function.Function;
 
-public class RemoteResolvers {
+public class RemoteResolvers implements AutoCloseable {
 
   private final List<Resolver> resolvers;
+  private final ExecutorService executor;
 
-  private RemoteResolvers(List<Resolver> resolvers) {
+  private RemoteResolvers(List<Resolver> resolvers, ExecutorService executor) {
     this.resolvers = resolvers;
+    this.executor = executor;
   }
 
   public static RemoteResolvers of(List<IpAddr> servers, final Function<IpAddr, Resolver> resolverProvider) {
     final var resolvers = servers
       .stream()
       .map(resolverProvider)
       .toList();
-    return new RemoteResolvers(resolvers);
+    return new RemoteResolvers(resolvers, Executors.newVirtualThreadPerTaskExecutor());
   }
 
   public List<Resolver> resolvers() {
     return this.resolvers;
   }
+
+  @Override
+  public void close() throws Exception {
+    this.executor.close();
+  }
+
+  public Executor getExecutor() {
+    return this.executor;
+  }
 }

src/main/java/com/mageddo/dnsproxyserver/solver/SolverRemote.java

@@ -87,7 +87,7 @@ Result safeQueryResult(Request req) {
   }
 
   Result queryResultWhilePingingResolver(Request req) {
-    final var resFuture = req.sendQueryAsyncToResolver();
+    final var resFuture = req.sendQueryAsyncToResolver(this.delegate.getExecutor());
     this.netWatchdog.watch(req.getResolverAddr(), resFuture, PING_TIMEOUT_IN_MS);
     return this.transformToResult(resFuture, req);
   }