Upgrade to Vert.x 4.5 (#532)

rashtao · web-flow · commit 501d5ccbb8e7 · 2024-01-15T12:33:10.000+01:00
* updated vertx to version 4.5

* native image fix

* re-enabled timeout resilience tests with HTTP/2

* test fix

* fixed native tests on Liberica NIK

* resilience tests: wait after enabling and disabling endpoints

* CI: fixed native tests

* removed duplicated resilience tests
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -132,7 +132,7 @@ jobs:
         db-ext-names:
           - false
         java-version:
-          - 11
+          - 21
         user-language:
           - en
 
diff --git a/driver/pom.xml b/driver/pom.xml
@@ -186,7 +186,7 @@
         <dependency>
             <groupId>org.graalvm.sdk</groupId>
             <artifactId>graal-sdk</artifactId>
-            <version>22.3.3</version>
+            <version>${graalvm.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/driver/src/test/java/com/arangodb/ArangoCollectionAsyncTest.java b/driver/src/test/java/com/arangodb/ArangoCollectionAsyncTest.java
@@ -2987,7 +2987,7 @@ void grantAccessRW(ArangoCollectionAsync collection) throws ExecutionException,
         ArangoDBAsync arangoDB = collection.db().arango();
         try {
             arangoDB.createUser("user1", "1234", null).get();
-            collection.grantAccess("user1", Permissions.RW);
+            collection.grantAccess("user1", Permissions.RW).get();
         } finally {
             arangoDB.deleteUser("user1").get();
         }
diff --git a/driver/src/test/java/graal/BrotliSubstitutions.java b/driver/src/test/java/graal/BrotliSubstitutions.java
@@ -0,0 +1,22 @@
+package graal;
+
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+
+@TargetClass(className = "io.netty.handler.codec.compression.Brotli")
+final class Target_com_arangodb_shaded_netty_handler_codec_compression_Brotli {
+    @Substitute
+    public static boolean isAvailable() {
+        return false;
+    }
+
+    @Substitute
+    public static void ensureAvailability() throws Throwable {
+        throw new UnsupportedOperationException();
+    }
+}
+
+public class BrotliSubstitutions {
+
+}
diff --git a/driver/src/test/java/graal/VertxSubstitutions.java b/driver/src/test/java/graal/VertxSubstitutions.java
@@ -82,7 +82,7 @@ public void close(Promise<Void> promise) {
     }
 
     @Substitute
-    public MessageImpl createMessage(boolean send, String address, MultiMap headers, Object body, String codecName) {
+    public MessageImpl createMessage(boolean send, boolean isLocal, String address, MultiMap headers, Object body, String codecName) {
         throw new RuntimeException("Not Implemented");
     }
 
diff --git a/pom.xml b/pom.xml
@@ -39,6 +39,7 @@
         <sonar.organization>arangodb-1</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <adb.jackson.version>2.16.0</adb.jackson.version>
+        <graalvm.version>23.1.1</graalvm.version>
         <moduleName/>
         <SslTest/>
     </properties>
@@ -105,7 +106,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.10.0</version>
+                <version>5.10.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -182,7 +183,7 @@
             <dependency>
                 <groupId>com.tngtech.archunit</groupId>
                 <artifactId>archunit-junit5</artifactId>
-                <version>1.1.0</version>
+                <version>1.2.1</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse</groupId>
@@ -192,7 +193,7 @@
             <dependency>
                 <groupId>io.vertx</groupId>
                 <artifactId>vertx-stack-depchain</artifactId>
-                <version>4.4.2</version>
+                <version>4.5.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -405,7 +406,7 @@
                     <plugin>
                         <groupId>org.graalvm.buildtools</groupId>
                         <artifactId>native-maven-plugin</artifactId>
-                        <version>0.9.27</version>
+                        <version>0.9.28</version>
                         <extensions>true</extensions>
                         <executions>
                             <execution>
@@ -432,12 +433,6 @@
                 </plugins>
             </build>
             <dependencies>
-                <dependency>
-                    <groupId>com.aayushatharva.brotli4j</groupId>
-                    <artifactId>brotli4j</artifactId>
-                    <version>1.11.0</version>
-                    <scope>test</scope>
-                </dependency>
                 <dependency>
                     <groupId>javax.annotation</groupId>
                     <artifactId>javax.annotation-api</artifactId>
diff --git a/resilience-tests/src/test/java/resilience/ActiveFailoverTest.java b/resilience-tests/src/test/java/resilience/ActiveFailoverTest.java
diff --git a/resilience-tests/src/test/java/resilience/ClusterTest.java b/resilience-tests/src/test/java/resilience/ClusterTest.java
@@ -50,10 +50,8 @@ static void afterAll() throws IOException {
     }
 
     @BeforeEach
-    void beforeEach() throws IOException {
-        for (Endpoint endpoint : endpoints) {
-            endpoint.getProxy().enable();
-        }
+    void beforeEach() {
+        enableAllEndpoints();
     }
 
     protected static List<Endpoint> getEndpoints() {
diff --git a/resilience-tests/src/test/java/resilience/loadbalance/LoadBalanceNoneClusterTest.java b/resilience-tests/src/test/java/resilience/loadbalance/LoadBalanceNoneClusterTest.java
@@ -7,7 +7,6 @@
 import com.arangodb.entity.LoadBalancingStrategy;
 import eu.rekawek.toxiproxy.model.ToxicDirection;
 import eu.rekawek.toxiproxy.model.toxic.Latency;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import resilience.ClusterTest;
@@ -55,41 +54,41 @@ void loadBalancingAsync(ArangoDBAsync arangoDB) {
 
     @ParameterizedTest(name = "{index}")
     @MethodSource("arangoProvider")
-    void failover(ArangoDB arangoDB) throws IOException {
+    void failover(ArangoDB arangoDB) {
         List<Endpoint> endpoints = getEndpoints();
 
-        endpoints.get(0).getProxy().disable();
+        endpoints.get(0).disable();
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(1).getServerId());
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(1).getServerId());
         enableAllEndpoints();
 
-        endpoints.get(1).getProxy().disable();
+        endpoints.get(1).disable();
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(2).getServerId());
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(2).getServerId());
         enableAllEndpoints();
 
-        endpoints.get(2).getProxy().disable();
+        endpoints.get(2).disable();
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(0).getServerId());
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(0).getServerId());
         enableAllEndpoints();
     }
 
     @ParameterizedTest(name = "{index}")
     @MethodSource("asyncArangoProvider")
-    void failoverAsync(ArangoDBAsync arangoDB) throws IOException {
+    void failoverAsync(ArangoDBAsync arangoDB) {
         List<Endpoint> endpoints = getEndpoints();
 
-        endpoints.get(0).getProxy().disable();
+        endpoints.get(0).disable();
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(1).getServerId());
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(1).getServerId());
         enableAllEndpoints();
 
-        endpoints.get(1).getProxy().disable();
+        endpoints.get(1).disable();
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(2).getServerId());
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(2).getServerId());
         enableAllEndpoints();
 
-        endpoints.get(2).getProxy().disable();
+        endpoints.get(2).disable();
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(0).getServerId());
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(0).getServerId());
         enableAllEndpoints();
diff --git a/resilience-tests/src/test/java/resilience/loadbalance/LoadBalanceRoundRobinClusterTest.java b/resilience-tests/src/test/java/resilience/loadbalance/LoadBalanceRoundRobinClusterTest.java
@@ -59,22 +59,22 @@ void loadBalancingAsync(ArangoDBAsync arangoDB) {
 
     @ParameterizedTest(name = "{index}")
     @MethodSource("arangoProvider")
-    void failover(ArangoDB arangoDB) throws IOException {
+    void failover(ArangoDB arangoDB) {
         List<Endpoint> endpoints = getEndpoints();
-        endpoints.get(0).getProxy().disable();
+        endpoints.get(0).disable();
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(1).getServerId());
-        endpoints.get(0).getProxy().enable();
+        endpoints.get(0).enable();
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(2).getServerId());
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(0).getServerId());
     }
 
     @ParameterizedTest(name = "{index}")
     @MethodSource("asyncArangoProvider")
-    void failoverAsync(ArangoDBAsync arangoDB) throws IOException {
+    void failoverAsync(ArangoDBAsync arangoDB) {
         List<Endpoint> endpoints = getEndpoints();
-        endpoints.get(0).getProxy().disable();
+        endpoints.get(0).disable();
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(1).getServerId());
-        endpoints.get(0).getProxy().enable();
+        endpoints.get(0).enable();
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(2).getServerId());
         assertThat(serverIdGET(arangoDB)).isEqualTo(endpoints.get(0).getServerId());
     }
diff --git a/resilience-tests/src/test/java/resilience/retry/RetryClusterTest.java b/resilience-tests/src/test/java/resilience/retry/RetryClusterTest.java
@@ -136,93 +136,6 @@ void unreachableHostFailoverAsync(ArangoDBAsync arangoDB) throws ExecutionExcept
         arangoDB.shutdown();
     }
 
-    /**
-     * on delayed response:
-     * - ArangoDBException with cause TimeoutException
-     * <p>
-     * once the delay is removed:
-     * - the subsequent requests should be successful
-     */
-    @ParameterizedTest
-    @EnumSource(Protocol.class)
-    void connectionTimeout(Protocol protocol) throws IOException, InterruptedException {
-        // https://github.com/vert-x3/vertx-web/issues/2296
-        // WebClient: HTTP/2 request timeout does not throw TimeoutException
-        assumeTrue(protocol != Protocol.HTTP2_VPACK);
-        assumeTrue(protocol != Protocol.HTTP2_JSON);
-
-        ArangoDB arangoDB = dbBuilder()
-                .timeout(1_000)
-                .protocol(protocol)
-                .build();
-
-        arangoDB.getVersion();
-
-        // slow down the driver connection
-        Latency toxic = getEndpoints().get(0).getProxy().toxics().latency("latency", ToxicDirection.DOWNSTREAM, 10_000);
-        Thread.sleep(100);
-
-        // no failover for TimeoutException
-        for (int i = 0; i < 2; i++) {
-            Throwable thrown = catchThrowable(arangoDB::getVersion);
-            thrown.printStackTrace();
-            assertThat(thrown)
-                    .isInstanceOf(ArangoDBException.class)
-                    .extracting(Throwable::getCause)
-                    .isInstanceOf(TimeoutException.class);
-        }
-
-        toxic.remove();
-        Thread.sleep(100);
-
-        arangoDB.getVersion();
-        arangoDB.shutdown();
-    }
-
-    /**
-     * on delayed response:
-     * - ArangoDBException with cause TimeoutException
-     * <p>
-     * once the delay is removed:
-     * - the subsequent requests should be successful
-     */
-    @ParameterizedTest
-    @EnumSource(Protocol.class)
-    void connectionTimeoutAsync(Protocol protocol) throws IOException, InterruptedException, ExecutionException {
-        // https://github.com/vert-x3/vertx-web/issues/2296
-        // WebClient: HTTP/2 request timeout does not throw TimeoutException
-        assumeTrue(protocol != Protocol.HTTP2_VPACK);
-        assumeTrue(protocol != Protocol.HTTP2_JSON);
-
-        ArangoDBAsync arangoDB = dbBuilder()
-                .timeout(1_000)
-                .protocol(protocol)
-                .build()
-                .async();
-
-        arangoDB.getVersion().get();
-
-        // slow down the driver connection
-        Latency toxic = getEndpoints().get(0).getProxy().toxics().latency("latency", ToxicDirection.DOWNSTREAM, 10_000);
-        Thread.sleep(100);
-
-        // no failover for TimeoutException
-        for (int i = 0; i < 2; i++) {
-            Throwable thrown = catchThrowable(() -> arangoDB.getVersion().get()).getCause();
-            thrown.printStackTrace();
-            assertThat(thrown)
-                    .isInstanceOf(ArangoDBException.class)
-                    .extracting(Throwable::getCause)
-                    .isInstanceOf(TimeoutException.class);
-        }
-
-        toxic.remove();
-        Thread.sleep(100);
-
-        arangoDB.getVersion().get();
-        arangoDB.shutdown();
-    }
-
 
     @ParameterizedTest
     @EnumSource(Protocol.class)
@@ -306,7 +219,6 @@ void notRetryPostOnClosedConnection(Protocol protocol) throws IOException, Inter
         es.schedule(() -> getEndpoints().get(0).disable(), 300, TimeUnit.MILLISECONDS);
 
         Throwable thrown = catchThrowable(() -> arangoDB.db().query("return null", Void.class));
-        thrown.printStackTrace();
         assertThat(thrown).isInstanceOf(ArangoDBException.class);
         assertThat(thrown.getCause()).isInstanceOf(IOException.class);
         if (protocol != Protocol.VST) {
@@ -344,7 +256,6 @@ void notRetryPostOnClosedConnectionAsync(Protocol protocol) throws IOException,
         es.schedule(() -> getEndpoints().get(0).disable(), 300, TimeUnit.MILLISECONDS);
 
         Throwable thrown = catchThrowable(() -> arangoDB.db().query("return null", Void.class).get()).getCause();
-        thrown.printStackTrace();
         assertThat(thrown).isInstanceOf(ArangoDBException.class);
         assertThat(thrown.getCause()).isInstanceOf(IOException.class);
         if (protocol != Protocol.VST) {
diff --git a/resilience-tests/src/test/java/resilience/retry/RetryTest.java b/resilience-tests/src/test/java/resilience/retry/RetryTest.java
diff --git a/resilience-tests/src/test/java/resilience/timeout/TimeoutClusterTest.java b/resilience-tests/src/test/java/resilience/timeout/TimeoutClusterTest.java
diff --git a/resilience-tests/src/test/java/resilience/timeout/TimeoutTest.java b/resilience-tests/src/test/java/resilience/timeout/TimeoutTest.java
diff --git a/shaded/src/main/java/graal/VertxSubstitutions.java b/shaded/src/main/java/graal/VertxSubstitutions.java

Original file line number	Diff line number	Diff line change
`@@ -2987,7 +2987,7 @@ void grantAccessRW(ArangoCollectionAsync collection) throws ExecutionException,`
`2987`	`2987`	`ArangoDBAsync arangoDB = collection.db().arango();`
`2988`	`2988`	`try {`
`2989`	`2989`	`arangoDB.createUser("user1", "1234", null).get();`
`2990`		`- collection.grantAccess("user1", Permissions.RW);`
	`2990`	`+ collection.grantAccess("user1", Permissions.RW).get();`
`2991`	`2991`	`} finally {`
`2992`	`2992`	`arangoDB.deleteUser("user1").get();`
`2993`	`2993`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public void close(Promise<Void> promise) {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`@Substitute`
`85`		`- public MessageImpl createMessage(boolean send, String address, MultiMap headers, Object body, String codecName) {`
	`85`	`+ public MessageImpl createMessage(boolean send, boolean isLocal, String address, MultiMap headers, Object body, String codecName) {`
`86`	`86`	`throw new RuntimeException("Not Implemented");`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,8 @@ static void afterAll() throws IOException {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@BeforeEach`
`53`		`- void beforeEach() throws IOException {`
`54`		`- for (Endpoint endpoint : endpoints) {`
`55`		`- endpoint.getProxy().enable();`
`56`		`- }`
	`53`	`+ void beforeEach() {`
	`54`	`+ enableAllEndpoints();`
`57`	`55`	`}`
`58`	`56`
`59`	`57`	`protected static List<Endpoint> getEndpoints() {`