From 9f381fe55fb989c231c6cc97eff00222f8b2b55d Mon Sep 17 00:00:00 2001 From: emeroad Date: Tue, 26 Mar 2024 14:33:32 +0900 Subject: [PATCH] [#noissue] Improved ARM64 compatibility --- .../jdbc/postgresql/PostgreSQLContainerFactory.java | 2 +- .../pinpoint/it/plugin/jdbc/r2dbc/PostgreSqlServer.java | 2 +- .../com/pinpoint/test/plugin/MariadbR2dbcDatabase.java | 8 +++++++- .../test/plugin/spring/data/r2dbc/R2dbcH2Test.java | 5 ++--- .../test/plugin/spring/data/r2dbc/R2dbcMariadbTest.java | 5 ++--- .../test/plugin/spring/data/r2dbc/R2dbcMssqlTest.java | 5 +++-- .../test/plugin/spring/data/r2dbc/R2dbcMysqlTest.java | 4 ++-- .../plugin/spring/data/r2dbc/R2dbcPostgresqlTest.java | 2 +- 8 files changed, 19 insertions(+), 14 deletions(-) diff --git a/agent-module/plugins-it/postgresql-jdbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/postgresql/PostgreSQLContainerFactory.java b/agent-module/plugins-it/postgresql-jdbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/postgresql/PostgreSQLContainerFactory.java index 25d0bc336a2b..1e8964540ed1 100644 --- a/agent-module/plugins-it/postgresql-jdbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/postgresql/PostgreSQLContainerFactory.java +++ b/agent-module/plugins-it/postgresql-jdbc-it/src/test/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() { diff --git a/agent-module/plugins-it/spring-data-r2dbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/r2dbc/PostgreSqlServer.java b/agent-module/plugins-it/spring-data-r2dbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/r2dbc/PostgreSqlServer.java index 736795033a6e..ce45a962921a 100644 --- a/agent-module/plugins-it/spring-data-r2dbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/r2dbc/PostgreSqlServer.java +++ b/agent-module/plugins-it/spring-data-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/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/MariadbR2dbcDatabase.java b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/MariadbR2dbcDatabase.java index 89d3813c2267..7152c22a1183 100644 --- a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/MariadbR2dbcDatabase.java +++ b/agent-testweb/spring-data-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/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcH2Test.java b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcH2Test.java index 76a1bd34d5d9..b1c74f245276 100644 --- a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcH2Test.java +++ b/agent-testweb/spring-data-r2dbc-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/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMariadbTest.java b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMariadbTest.java index 99426e7e5c91..a301d3ba7c16 100644 --- a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMariadbTest.java +++ b/agent-testweb/spring-data-r2dbc-plugin-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/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMssqlTest.java b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMssqlTest.java index bfad3452773f..2a92dea5eb75 100644 --- a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMssqlTest.java +++ b/agent-testweb/spring-data-r2dbc-plugin-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/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMysqlTest.java b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMysqlTest.java index 4ead23280fb2..3acd0914df80 100644 --- a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMysqlTest.java +++ b/agent-testweb/spring-data-r2dbc-plugin-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/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcPostgresqlTest.java b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcPostgresqlTest.java index 0be9b2dfe80b..ba01bdbdd819 100644 --- a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcPostgresqlTest.java +++ b/agent-testweb/spring-data-r2dbc-plugin-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();