[#noissue] Improved ARM64 compatibility

pinpoint-apm · Mar 26, 2024 · 9f381fe · 9f381fe
1 parent dc6f6ec
commit 9f381fe
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 14 deletions.
diff --git a/...est/java/com/navercorp/pinpoint/it/plugin/jdbc/postgresql/PostgreSQLContainerFactory.java b/...est/java/com/navercorp/pinpoint/it/plugin/jdbc/postgresql/PostgreSQLContainerFactory.java
@@ -30,7 +30,7 @@
 public class PostgreSQLContainerFactory {
 
     public static PostgreSQLContainer<?> newContainer(String loggerName) {
-        PostgreSQLContainer<?> container = new PostgreSQLContainer<>("postgres:9.6.12");
+        PostgreSQLContainer<?> container = new PostgreSQLContainer<>("postgres:9.6.24");
         container.withInitScript("init_postgresql.sql");
 
         container.withLogConsumer(new Consumer<OutputFrame>() {

diff --git a/...-r2dbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/r2dbc/PostgreSqlServer.java b/...-r2dbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/r2dbc/PostgreSqlServer.java
@@ -35,7 +35,7 @@ public class PostgreSqlServer implements SharedTestLifeCycle {
     public Properties beforeAll() {
         Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
 
-        postgreSql = new PostgreSQLContainer<>("postgres:9.6.12");
+        postgreSql = new PostgreSQLContainer<>("postgres:9.6.24");
         postgreSql.withInitScript("postgresql-init.sql");
         postgreSql.start();
 

diff --git a/...ata-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/MariadbR2dbcDatabase.java b/...ata-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/MariadbR2dbcDatabase.java
@@ -32,7 +32,13 @@ public class MariadbR2dbcDatabase implements R2dbcDatabase {
 
     @PostConstruct
     public void init() throws Exception {
-        MariadbConnectionConfiguration connectionConfiguration = MariadbConnectionConfiguration.builder().host("localhost").port(9115).username("root").password("").database("test").build();
+        MariadbConnectionConfiguration.Builder builder = MariadbConnectionConfiguration.builder();
+        MariadbConnectionConfiguration connectionConfiguration = builder.host("localhost")
+                .port(9115)
+                .username("root")
+                .password("")
+                .database("test")
+                .build();
         connectionFactory = new MariadbConnectionFactory(connectionConfiguration);
     }
 

diff --git a/...-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcH2Test.java b/...-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcH2Test.java
@@ -28,14 +28,13 @@ public class R2dbcH2Test {
     public static final String USERNAME = "root";
     public static final String PASSWORD = "";
 
-    private static MariaDBContainer container;
+    private static MariaDBContainer<?> container;
 
     @BeforeAll
     public static void beforeClass() {
         Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
-        Assumptions.assumeFalse(DockerTestUtils.isArmDockerServer());
 
-        container = new MariaDBContainer("mariadb:10.3.6");
+        container = new MariaDBContainer<>("mariadb:10.6.17");
         container.withDatabaseName(DATABASE_NAME);
         container.withUsername(USERNAME);
         container.withPassword(PASSWORD);

diff --git a/...in-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMariadbTest.java b/...in-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMariadbTest.java
@@ -28,14 +28,13 @@ public class R2dbcMariadbTest {
     public static final String USERNAME = "root";
     public static final String PASSWORD = "";
 
-    private static MariaDBContainer container;
+    private static MariaDBContainer<?> container;
 
     @BeforeAll
     public static void beforeClass() {
         Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
-        Assumptions.assumeFalse(DockerTestUtils.isArmDockerServer());
 
-        container = new MariaDBContainer("mariadb:10.3.6");
+        container = new MariaDBContainer<>("mariadb:10.6.17");
         container.withDatabaseName(DATABASE_NAME);
         container.withUsername(USERNAME);
         container.withPassword(PASSWORD);

diff --git a/...ugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMssqlTest.java b/...ugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMssqlTest.java
@@ -24,13 +24,14 @@
 import org.testcontainers.containers.MSSQLServerContainer;
 
 public class R2dbcMssqlTest {
-    private static MSSQLServerContainer container;
+    private static MSSQLServerContainer<?> container;
 
     @BeforeAll
     public static void beforeClass() {
         Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
+        Assumptions.assumeFalse(DockerTestUtils.isArmDockerServer());
 
-        container = new MSSQLServerContainer("mcr.microsoft.com/mssql/server:2017-CU12");
+        container = new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2017-CU12");
         container.acceptLicense();
         container.withInitScript("mssql-init.sql");
         container.start();

diff --git a/...ugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMysqlTest.java b/...ugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMysqlTest.java
@@ -29,13 +29,13 @@ public class R2dbcMysqlTest {
     public static final String USERNAME = "root";
     public static final String PASSWORD = "";
 
-    private static MySQLContainer container = new MySQLContainer();
+    private static MySQLContainer<?> container;
 
     @BeforeAll
     public static void beforeClass() {
         Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
 
-        container = new MySQLContainer("mysql:5.7.34");
+        container = new MySQLContainer<>("mysql:5.7.34");
         container.withDatabaseName(DATABASE_NAME);
         container.withUsername(USERNAME);
         container.withPassword(PASSWORD);

diff --git a/...testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcPostgresqlTest.java b/...testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcPostgresqlTest.java
@@ -31,7 +31,7 @@ public class R2dbcPostgresqlTest {
     public static void beforeClass() {
         Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
 
-        container = new PostgreSQLContainer<>();
+        container = new PostgreSQLContainer<>("postgres:9.6.24");
         container.withInitScript("postgresql-init.sql");
 
         container.start();