kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #318 from wu-sheng/wu-sheng-patch-db-operationName 

Fix the wrong operationName of PreparedStatement#execute(String)
This commit is contained in:
吴晟 Wu Sheng 2017-07-28 14:24:53 +08:00 committed by GitHub
parent 544feee8ff fbf9bf9748
commit 11ff93ae83
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/SWPreparedStatement.java
View File

@ -359,7 +359,7 @@ public class SWPreparedStatement implements PreparedStatement {
}
public boolean execute() throws SQLException {
return PreparedStatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new PreparedStatementTracing.Executable<Boolean>() {
return PreparedStatementTracing.execute(realStatement, connectInfo, "execute", sql, new PreparedStatementTracing.Executable<Boolean>() {
public Boolean exe(PreparedStatement realStatement, String sql)
throws SQLException {
return realStatement.execute();

17
apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SwPreparedStatementTest.java
View File

@ -298,6 +298,21 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
assertDBSpan(spans.get(0), "Mysql/JDBI/PreparedStatement/executeQuery", "SELECT * FROM test");
}
@Test
public void testExecute() throws SQLException {
PreparedStatement preparedStatement = swConnection.prepareStatement("SELECT * FROM test", 1, 1, 1);
preparedStatement.execute();
preparedStatement.close();
verify(mysqlPreparedStatement, times(1)).execute();
verify(mysqlPreparedStatement, times(1)).close();
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertThat(spans.size(), is(1));
assertDBSpan(spans.get(0), "Mysql/JDBI/PreparedStatement/execute", "SELECT * FROM test");
}
@Test
public void testQuerySqlWithSql() throws SQLException {
PreparedStatement preparedStatement = swConnection.prepareStatement("SELECT * FROM test", 1);
@ -359,7 +374,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
}
@Test
public void testExecute() throws SQLException {
public void testExecuteWithSQL() throws SQLException {
PreparedStatement preparedStatement = swConnection.prepareStatement("UPDATE test SET a = ?");
preparedStatement.setString(1, "a");
boolean updateCount = preparedStatement.execute("UPDATE test SET a = 1");