Skip to content

Commit 5d7f1b3

Browse files
emeroademeroad
committed
[#8965] Polishing
1 parent a22f54f commit 5d7f1b3

File tree

25 files changed

+76
-147
lines changed

25 files changed

+76
-147
lines changed

‎plugins-it/elasticsearch-7.16-it/src/test/java/com/navercorp/pinpoint/plugin/elasticsearch/ESServerContainerFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.navercorp.pinpoint.plugin.elasticsearch;
22

3+
import com.navercorp.pinpoint.pluginit.utils.LogUtils;
34
import org.apache.logging.log4j.LogManager;
45
import org.apache.logging.log4j.Logger;
56
import org.testcontainers.containers.output.OutputFrame;
@@ -17,7 +18,7 @@ public static ElasticsearchContainer newESServerContainerFactory(String loggerNa
1718
private final Logger logger = LogManager.getLogger(loggerName);
1819
@Override
1920
public void accept(OutputFrame outputFrame) {
20-
logger.info(outputFrame.getUtf8String());
21+
logger.info(LogUtils.removeLineBreak(outputFrame.getUtf8String()));
2122
}
2223
});
2324
return elasticsearchContainer;

‎plugins-it/elasticsearch-it/src/test/java/com/navercorp/pinpoint/plugin/elasticsearch/ESServerContainerFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.navercorp.pinpoint.plugin.elasticsearch;
22

3+
import com.navercorp.pinpoint.pluginit.utils.LogUtils;
34
import org.apache.logging.log4j.LogManager;
45
import org.apache.logging.log4j.Logger;
56
import org.testcontainers.containers.output.OutputFrame;
@@ -17,7 +18,7 @@ public static ElasticsearchContainer newESServerContainerFactory(String loggerNa
1718
private final Logger logger = LogManager.getLogger(loggerName);
1819
@Override
1920
public void accept(OutputFrame outputFrame) {
20-
logger.info(outputFrame.getUtf8String());
21+
logger.info(LogUtils.removeLineBreak(outputFrame.getUtf8String()));
2122
}
2223
});
2324
return elasticsearchContainer;

‎plugins-it/informix-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/informix/InformixConnectionIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.navercorp.pinpoint.pluginit.jdbc.DriverManagerUtils;
2020
import com.navercorp.pinpoint.pluginit.jdbc.JDBCDriverClass;
21+
import com.navercorp.pinpoint.pluginit.utils.LogUtils;
2122
import com.navercorp.pinpoint.profiler.context.SpanEvent;
2223
import com.navercorp.pinpoint.test.junit4.BasePinpointTest;
2324
import com.navercorp.pinpoint.test.junit4.JunitAgentConfigPath;
@@ -75,7 +76,7 @@ public static void beforeClass() throws Exception {
7576
container.withLogConsumer(new Consumer<OutputFrame>() {
7677
@Override
7778
public void accept(OutputFrame outputFrame) {
78-
LOGGER.info(outputFrame.getUtf8String());
79+
LOGGER.info(LogUtils.removeLineBreak(outputFrame.getUtf8String()));
7980
}
8081
});
8182
container.start();

‎plugins-it/jtds-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/jtds/JtdsConnectionIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.navercorp.pinpoint.pluginit.jdbc.DriverProperties;
2323
import com.navercorp.pinpoint.pluginit.jdbc.JDBCTestConstants;
2424
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
25+
import com.navercorp.pinpoint.pluginit.utils.LogUtils;
2526
import com.navercorp.pinpoint.pluginit.utils.TestcontainersOption;
2627
import com.navercorp.pinpoint.test.plugin.Dependency;
2728
import com.navercorp.pinpoint.test.plugin.ImportPlugin;
@@ -76,7 +77,7 @@ public static JdbcDatabaseContainer newMSSQLServerContainer(String loggerName) {
7677
private final Logger logger = LogManager.getLogger(loggerName);
7778
@Override
7879
public void accept(OutputFrame outputFrame) {
79-
logger.info(outputFrame.getUtf8String());
80+
logger.info(LogUtils.removeLineBreak(outputFrame.getUtf8String()));
8081
}
8182
});
8283
return mssqlServerContainer;
@@ -91,7 +92,7 @@ public static void beforeClass() throws Exception {
9192
String address = mssqlserver.getJdbcUrl().substring(JtdsITConstants.JDBC_URL_PREFIX.length());
9293
String jdbcUrl = JtdsITConstants.JTDS_URL_PREFIX + address;
9394

94-
driverProperties = new DriverProperties(jdbcUrl, JtdsITConstants.USER_NAME, JtdsITConstants.PASSWORD, new Properties());
95+
driverProperties = new DriverProperties(jdbcUrl, JtdsITConstants.USER_NAME, JtdsITConstants.PASSWORD);
9596
}
9697

9798
@AfterClass

‎plugins-it/jtds-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/jtds/JtdsIT.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.navercorp.pinpoint.pluginit.jdbc.JDBCApi;
2323
import com.navercorp.pinpoint.pluginit.jdbc.JDBCDriverClass;
2424
import com.navercorp.pinpoint.pluginit.jdbc.JDBCTestConstants;
25+
import com.navercorp.pinpoint.pluginit.jdbc.testcontainers.DatabaseContainers;
2526
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
2627
import com.navercorp.pinpoint.pluginit.utils.TestcontainersOption;
2728
import com.navercorp.pinpoint.test.plugin.Dependency;
@@ -53,30 +54,26 @@ public class JtdsIT extends DataBaseTestCase {
5354
private static final String MSSQL_EXECUTE_QUERY = "MSSQL_EXECUTE_QUERY";
5455

5556
private static DriverProperties driverProperties;
57+
private static DriverProperties jtdsDriverProperties;
5658
private static JDBCDriverClass driverClass;
5759
private static JDBCApi jdbcApi;
5860

5961
private static JdbcUrlParserV2 jdbcUrlParser;
6062

61-
protected static String JDBC_URL;
62-
63-
public static String getJdbcUrl() {
64-
return JDBC_URL;
65-
}
6663

6764
@SharedTestBeforeAllResult
6865
public static void setBeforeAllResult(Properties beforeAllResult) {
69-
JDBC_URL = beforeAllResult.getProperty("JDBC_URL");
66+
driverProperties = DatabaseContainers.readDriverProperties(beforeAllResult);
7067
}
7168

7269

7370
@BeforeClass
7471
public static void beforeClass() {
75-
String serverJdbcUrl = getJdbcUrl();
72+
String serverJdbcUrl = driverProperties.getUrl();
7673
String address = serverJdbcUrl.substring(JtdsITConstants.JDBC_URL_PREFIX.length());
7774
String jdbcUrl = JtdsITConstants.JTDS_URL_PREFIX + address;
7875

79-
driverProperties = new DriverProperties(jdbcUrl, JtdsITConstants.USER_NAME, JtdsITConstants.PASSWORD, new Properties());
76+
jtdsDriverProperties = new DriverProperties(jdbcUrl, driverProperties.getUser(), driverProperties.getPassword(), new Properties());
8077

8178
driverClass = new JtdsJDBCDriverClass();
8279
jdbcApi = new DefaultJDBCApi(driverClass);
@@ -93,7 +90,7 @@ protected JDBCDriverClass getJDBCDriverClass() {
9390

9491
@Before
9592
public void before() {
96-
setup(MSSQL, MSSQL_EXECUTE_QUERY, driverProperties, jdbcUrlParser, jdbcApi);
93+
setup(MSSQL, MSSQL_EXECUTE_QUERY, jtdsDriverProperties, jdbcUrlParser, jdbcApi);
9794
}
9895

9996
}

‎plugins-it/jtds-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/jtds/MsSqlServer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.navercorp.pinpoint.plugin.jdbc.jtds;
22

3+
import com.navercorp.pinpoint.pluginit.utils.LogUtils;
34
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
45
import org.junit.Assume;
56
import org.slf4j.Logger;
@@ -28,7 +29,7 @@ public Properties beforeAll() {
2829
mssqlserver.withLogConsumer(new Consumer<OutputFrame>() {
2930
@Override
3031
public void accept(OutputFrame outputFrame) {
31-
logger.info(outputFrame.getUtf8String());
32+
logger.info(LogUtils.removeLineBreak(outputFrame.getUtf8String()));
3233
}
3334
});
3435
mssqlserver.start();

‎plugins-it/mariadb-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/MariaDBServer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.navercorp.pinpoint.plugin.jdbc;
22

33
import com.navercorp.pinpoint.pluginit.jdbc.testcontainers.DatabaseContainers;
4+
import com.navercorp.pinpoint.pluginit.utils.LogUtils;
45
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
56
import org.apache.logging.log4j.LogManager;
67
import org.apache.logging.log4j.Logger;
@@ -28,7 +29,7 @@ public Properties beforeAll() {
2829
mariaDB.withLogConsumer(new Consumer<OutputFrame>() {
2930
@Override
3031
public void accept(OutputFrame outputFrame) {
31-
logger.info(outputFrame.getUtf8String());
32+
logger.info(LogUtils.removeLineBreak(outputFrame.getUtf8String()));
3233
}
3334
});
3435
mariaDB.withDatabaseName(DATABASE_NAME);

‎plugins-it/mariadb-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/MariaDB_1_3_x_IT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void testStatement() throws Exception {
7777

7878
// Driver#connect(String, Properties)
7979
Method connect = jdbcApi.getDriver().getConnect();
80-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
80+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
8181

8282
// MariaDbStatement#executeQuery(String)
8383
Method executeQuery = jdbcApi.getStatement().getExecuteQuery();
@@ -94,7 +94,7 @@ public void testPreparedStatement() throws Exception {
9494

9595
// Driver#connect(String, Properties)
9696
Method connect = jdbcApi.getDriver().getConnect();
97-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
97+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
9898

9999
// MariaDbConnection#prepareStatement(String)
100100
Method prepareStatement = jdbcApi.getConnection().getPrepareStatement();
@@ -115,7 +115,7 @@ public void testCallableStatement() throws Exception {
115115

116116
// Driver#connect(String, Properties)
117117
Method connect = jdbcApi.getDriver().getConnect();
118-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
118+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
119119

120120
// MariaDbConnection#prepareCall(String)
121121
Method prepareCall = jdbcApi.getConnection().getPrepareCall();

‎plugins-it/mariadb-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/MariaDB_1_4_x_to_1_6_0_IT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void testStatement() throws Exception {
7575

7676
// Driver#connect(String, Properties)
7777
Method connect = jdbcApi.getDriver().getConnect();
78-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
78+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
7979

8080
// MariaDbStatement#executeQuery(String)
8181
Method executeQuery = jdbcApi.getStatement().getExecuteQuery();
@@ -92,7 +92,7 @@ public void testPreparedStatement() throws Exception {
9292

9393
// Driver#connect(String, Properties)
9494
Method connect = jdbcApi.getDriver().getConnect();
95-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
95+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
9696

9797
// MariaDbConnection#prepareStatement(String)
9898
Method prepareStatement = jdbcApi.getConnection().getPrepareStatement();
@@ -113,7 +113,7 @@ public void testCallableStatement() throws Exception {
113113

114114
// Driver#connect(String, Properties)
115115
Method connect = jdbcApi.getDriver().getConnect();
116-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
116+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
117117

118118
// MariaDbConnection#prepareCall(String)
119119
Method prepareCall = jdbcApi.getConnection().getPrepareCall();

‎plugins-it/mariadb-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/MariaDB_1_6_x_to_1_8_0_IT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void testStatement() throws Exception {
9090

9191
// Driver#connect(String, Properties)
9292
Method connect = jdbcApi.getDriver().getConnect();
93-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
93+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
9494

9595
// MariaDbStatement#executeQuery(String)
9696
Method executeQuery = jdbcApi.getStatement().getExecuteQuery();
@@ -108,7 +108,7 @@ public void testPreparedStatement() throws Exception {
108108

109109
// Driver#connect(String, Properties)
110110
Method connect = jdbcApi.getDriver().getConnect();
111-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
111+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
112112

113113
// MariaDbConnection#prepareStatement(String)
114114
Method prepareStatement = jdbcApi.getConnection().getPrepareStatement();
@@ -129,7 +129,7 @@ public void testCallableStatement() throws Exception {
129129

130130
// Driver#connect(String, Properties)
131131
Method connect = jdbcApi.getDriver().getConnect();
132-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
132+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
133133

134134
// MariaDbConnection#prepareCall(String)
135135
Method prepareCall = jdbcApi.getConnection().getPrepareCall();

‎plugins-it/mariadb-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/MariaDB_1_8_0_to_2_0_0_IT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void testStatement() throws Exception {
8888

8989
// Driver#connect(String, Properties)
9090
Method connect = jdbcApi.getDriver().getConnect();
91-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
91+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
9292

9393
// MariaDbStatement#executeQuery(String)
9494
Method executeQuery = jdbcApi.getStatement().getExecuteQuery();
@@ -106,7 +106,7 @@ public void testPreparedStatement() throws Exception {
106106

107107
// Driver#connect(String, Properties)
108108
Method connect = jdbcApi.getDriver().getConnect();
109-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
109+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
110110

111111
// MariaDbConnection#prepareStatement(String)
112112
Method prepareStatement = jdbcApi.getConnection().getPrepareStatement();
@@ -127,7 +127,7 @@ public void testCallableStatement() throws Exception {
127127

128128
// Driver#connect(String, Properties)
129129
Method connect = jdbcApi.getDriver().getConnect();
130-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
130+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
131131

132132
// MariaDbConnection#prepareCall(String)
133133
Method prepareCall = jdbcApi.getConnection().getPrepareCall();

‎plugins-it/mariadb-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/MariaDB_2_0_1_to_2_4_0_IT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void testStatement() throws Exception {
8383

8484
// Driver#connect(String, Properties)
8585
Method connect = jdbcApi.getDriver().getConnect();
86-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
86+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
8787

8888
// MariaDbStatement#executeQuery(String)
8989
Method executeQuery = jdbcApi.getStatement().getExecuteQuery();
@@ -101,7 +101,7 @@ public void testPreparedStatement() throws Exception {
101101

102102
// Driver#connect(String, Properties)
103103
Method connect = jdbcApi.getDriver().getConnect();
104-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
104+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
105105

106106
// MariaDbConnection#prepareStatement(String)
107107
Method prepareStatement = jdbcApi.getConnection().getPrepareStatement();
@@ -122,7 +122,7 @@ public void testCallableStatement() throws Exception {
122122

123123
// Driver#connect(String, Properties)
124124
Method connect = jdbcApi.getDriver().getConnect();
125-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
125+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
126126

127127
// MariaDbConnection#prepareCall(String)
128128
Method prepareCall = jdbcApi.getConnection().getPrepareCall();

‎plugins-it/mariadb-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/MariaDB_2_4_x_IT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void testStatement() throws Exception {
9090

9191
// Driver#connect(String, Properties)
9292
Method connect = jdbcApi.getDriver().getConnect();
93-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
93+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
9494

9595
// MariaDbStatement#executeQuery(String)
9696
Method executeQuery = jdbcApi.getStatement().getExecuteQuery();
@@ -108,7 +108,7 @@ public void testPreparedStatement() throws Exception {
108108

109109
// Driver#connect(String, Properties)
110110
Method connect = jdbcMethod.getDriver().getConnect();
111-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
111+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
112112

113113
// MariaDbConnection#prepareStatement(String)
114114
Method prepareStatement = jdbcMethod.getConnection().getPrepareStatement();
@@ -133,7 +133,7 @@ public void testCallableStatement() throws Exception {
133133

134134
// Driver#connect(String, Properties)
135135
Method connect = jdbcApi.getDriver().getConnect();
136-
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(JDBC_URL)));
136+
verifier.verifyTrace(event(DB_TYPE, connect, null, URL, DATABASE_NAME, cachedArgs(getJdbcUrl())));
137137

138138
// MariaDbConnection#prepareCall(String)
139139
Method prepareCall = jdbcApi.getConnection().getPrepareCall();

0 commit comments

Comments
 (0)